Skip to content

Commit a4d8382

Browse files
nodkznodkz
committed
fix: Remove graphql-js peer-dependency. Using it via graphql-compose re-export.
1 parent 50d8d5a commit a4d8382

12 files changed

+49
-43
lines changed

‎package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
},
2626
"homepage": "https://github.com/nodkz/graphql-compose-connection",
2727
"peerDependencies": {
28-
"graphql": ">=0.7.1 || >=0.8.0 || >=0.9.0",
2928
"graphql-compose": ">=1.19.0"
3029
},
3130
"devDependencies": {
@@ -42,13 +41,13 @@
4241
"chai": "^4.0.1",
4342
"chai-as-promised": "6.0.0",
4443
"chai-spies": "0.7.1",
45-
"graphql": "^0.9.0",
4644
"cz-conventional-changelog": "^2.0.0",
4745
"eslint": "^3.19.0",
4846
"eslint-config-airbnb-base": "^11.2.0",
4947
"eslint-plugin-flowtype": "^2.34.0",
5048
"eslint-plugin-import": "^2.3.0",
5149
"flow-bin": "^0.47.0",
50+
"graphql": "^0.10.1",
5251
"graphql-compose": "^1.19.0",
5352
"mocha": "^3.4.2",
5453
"nyc": "^10.3.2",

‎src/__mocks__/rootQueryTypeComposer.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
import {
2-
GraphQLObjectType,
3-
} from 'graphql';
4-
import { TypeComposer } from 'graphql-compose';
1+
import { TypeComposer, graphql } from 'graphql-compose';
52

6-
const RootQuery = new GraphQLObjectType({
3+
const RootQuery = new graphql.GraphQLObjectType({
74
name: 'RootQuery',
85
fields: {
96
},

‎src/__mocks__/userTypeComposer.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* eslint-disable no-param-reassign */
22

3-
import {
3+
import { TypeComposer, Resolver, graphql } from 'graphql-compose';
4+
5+
const {
46
GraphQLString,
57
GraphQLObjectType,
68
GraphQLInputObjectType,
79
GraphQLEnumType,
810
GraphQLInt,
9-
} from 'graphql';
10-
import { TypeComposer, Resolver } from 'graphql-compose';
11+
} = graphql;
1112

1213
export const UserType = new GraphQLObjectType({
1314
name: 'User',

‎src/__tests__/composeWithConnection-test.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
/* eslint-disable no-param-reassign */
22

33
import { expect } from 'chai';
4-
import { graphql, GraphQLSchema, GraphQLList } from 'graphql';
5-
import { TypeComposer } from 'graphql-compose';
4+
import { TypeComposer, graphql } from 'graphql-compose';
65
import { composeWithConnection } from '../composeWithConnection';
76
import { userTypeComposer, sortOptions } from '../__mocks__/userTypeComposer';
87
import { rootQueryTypeComposer as rootQueryTC } from '../__mocks__/rootQueryTypeComposer';
98

9+
const { GraphQLSchema, GraphQLList } = graphql;
10+
1011
describe('composeWithRelay', () => {
1112
const userComposer = composeWithConnection(userTypeComposer, {
1213
countResolverName: 'count',
@@ -90,7 +91,7 @@ describe('composeWithRelay', () => {
9091
}
9192
}
9293
}`;
93-
const result = await graphql(schema, query);
94+
const result = await graphql.graphql(schema, query);
9495
expect(result).nested.property('data.userConnection').deep.equals({
9596
count: 15,
9697
pageInfo: {
@@ -143,7 +144,7 @@ describe('composeWithRelay', () => {
143144
}
144145
}
145146
}`;
146-
const result = await graphql(schema, query);
147+
const result = await graphql.graphql(schema, query);
147148
expect(result).nested.property('data.userConnection').deep.equals({
148149
count: 15,
149150
pageInfo: {
@@ -206,7 +207,7 @@ describe('composeWithRelay', () => {
206207
gender
207208
}
208209
`;
209-
const result = await graphql(schema, query);
210+
const result = await graphql.graphql(schema, query);
210211
expect(result).to.deep.equal({
211212
data: {
212213
userConnection: {
@@ -256,7 +257,7 @@ describe('composeWithRelay', () => {
256257
count
257258
}
258259
}`;
259-
await graphql(schema, query);
260+
await graphql.graphql(schema, query);
260261
expect(topResolveParams).has.property('countResolveParams');
261262
expect(topResolveParams.countResolveParams).to.contain.all.keys([
262263
'source',
@@ -290,7 +291,7 @@ describe('composeWithRelay', () => {
290291
count
291292
}
292293
}`;
293-
await graphql(schema, query);
294+
await graphql.graphql(schema, query);
294295
expect(topResolveParams).has.property('findManyResolveParams');
295296
expect(topResolveParams.findManyResolveParams).to.contain.all.keys([
296297
'source',

‎src/__tests__/connectionResolver-test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/* eslint-disable no-param-reassign */
22

33
import { expect } from 'chai';
4-
import { GraphQLInt } from 'graphql';
5-
import { Resolver } from 'graphql-compose';
4+
import { Resolver, graphql } from 'graphql-compose';
65
import { userTypeComposer, userList, sortOptions } from '../__mocks__/userTypeComposer';
76
import { dataToCursor } from '../cursor';
87
import { prepareConnectionResolver, prepareRawQuery, preparePageInfo } from '../connectionResolver';
98
import Cursor from '../types/cursorType';
109

10+
const { GraphQLInt } = graphql;
11+
1112
describe('connectionResolver', () => {
1213
const connectionResolver = prepareConnectionResolver(userTypeComposer, {
1314
countResolverName: 'count',

‎src/types/__tests__/connectionType-test.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
import { expect } from 'chai';
2-
import {
3-
GraphQLNonNull,
4-
GraphQLObjectType,
5-
getNamedType,
6-
GraphQLInt,
7-
GraphQLList,
8-
} from 'graphql';
9-
import { TypeComposer } from 'graphql-compose';
2+
import { TypeComposer, graphql } from 'graphql-compose';
103
import { userTypeComposer } from '../../__mocks__/userTypeComposer';
114
import { prepareEdgeType, prepareConnectionType } from '../connectionType';
125
import GraphQLConnectionCursor from '../cursorType';
136
import PageInfoType from '../pageInfoType';
147

8+
const { GraphQLNonNull, GraphQLObjectType, getNamedType, GraphQLInt, GraphQLList } = graphql;
159

1610
describe('types/connectionType.js', () => {
1711
describe('prepareEdgeType()', () => {

‎src/types/__tests__/sortInputType-test.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import { expect } from 'chai';
2-
import {
3-
GraphQLEnumType,
4-
} from 'graphql';
2+
import { graphql } from 'graphql-compose';
53
import { userTypeComposer } from '../../__mocks__/userTypeComposer';
64
import { prepareSortType } from '../sortInputType';
75

6+
const { GraphQLEnumType } = graphql;
87

98
describe('types/sortInputType.js', () => {
109
describe('basic checks', () => {

‎src/types/connectionType.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/* @flow */
22
/* eslint-disable arrow-body-style */
33

4-
import {
4+
import { graphql } from 'graphql-compose';
5+
import type { TypeComposer } from 'graphql-compose';
6+
import GraphQLConnectionCursor from './cursorType';
7+
8+
import PageInfoType from './pageInfoType';
9+
10+
const {
511
GraphQLInt,
612
GraphQLObjectType,
713
GraphQLNonNull,
814
GraphQLList,
9-
} from 'graphql';
10-
import type {
11-
TypeComposer,
12-
} from 'graphql-compose';
13-
import GraphQLConnectionCursor from './cursorType';
14-
15-
import PageInfoType from './pageInfoType';
15+
} = graphql;
1616

1717
const cachedConnectionTypes = new WeakMap();
1818
const cachedEdgeTypes = new WeakMap();

‎src/types/cursorType.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
/* @flow */
22

3-
import { GraphQLScalarType, Kind } from 'graphql';
3+
import { graphql } from 'graphql-compose';
4+
5+
const { GraphQLScalarType, Kind } = graphql;
46

57
const GraphQLConnectionCursor = new GraphQLScalarType({
68
name: 'ConnectionCursor',

‎src/types/pageInfoType.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/* @flow */
22

3-
import {
3+
import { graphql } from 'graphql-compose';
4+
5+
const {
46
GraphQLBoolean,
57
GraphQLString,
68
GraphQLObjectType,
79
GraphQLNonNull,
8-
} from 'graphql';
10+
} = graphql;
911

1012
const PageInfoType = new GraphQLObjectType({
1113
name: 'PageInfo',

‎src/types/sortInputType.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
/* @flow */
22
/* eslint-disable no-use-before-define, no-param-reassign */
33

4-
import { GraphQLEnumType } from 'graphql';
5-
import { TypeComposer } from 'graphql-compose';
4+
import { TypeComposer, graphql } from 'graphql-compose';
65
import type {
76
composeWithConnectionOpts,
87
connectionSortOpts,
98
} from '../definition';
109
import { isFunction } from '../utils/is';
1110

11+
const { GraphQLEnumType } = graphql;
1212

1313
export function prepareSortType(
1414
typeComposer: TypeComposer,

‎yarn.lock

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1682,6 +1682,12 @@ graphql-compose@^1.19.0:
16821682
babel-runtime "^6.23.0"
16831683
object-path "^0.11.4"
16841684

1685+
graphql@^0.10.1:
1686+
version "0.10.1"
1687+
resolved "https://registry.yarnpkg.com/graphql/-/graphql-0.10.1.tgz#75c93c2ce73aeb5bae2eefb555a8e9e39c36027d"
1688+
dependencies:
1689+
iterall "^1.1.0"
1690+
16851691
growl@1.9.2:
16861692
version "1.9.2"
16871693
resolved "https://registry.yarnpkg.com/growl/-/growl-1.9.2.tgz#0ea7743715db8d8de2c5ede1775e1b45ac85c02f"
@@ -2019,6 +2025,10 @@ istanbul-reports@^1.1.0:
20192025
dependencies:
20202026
handlebars "^4.0.3"
20212027

2028+
iterall@^1.1.0:
2029+
version "1.1.1"
2030+
resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.1.1.tgz#f7f0af11e9a04ec6426260f5019d9fcca4d50214"
2031+
20222032
jodid25519@^1.0.0:
20232033
version "1.0.2"
20242034
resolved "https://registry.yarnpkg.com/jodid25519/-/jodid25519-1.0.2.tgz#06d4912255093419477d425633606e0e90782967"

0 commit comments

Comments
 (0)