fix: Remove graphql-js peer-dependency. Using it via graphql-compose re-export.

Author: nodkz

package.json

@@ -25,7 +25,6 @@
   },
   "homepage": "https://github.com/nodkz/graphql-compose-connection",
   "peerDependencies": {
-    "graphql": ">=0.7.1 || >=0.8.0 || >=0.9.0",
     "graphql-compose": ">=1.19.0"
   },
   "devDependencies": {
@@ -42,13 +41,13 @@
     "chai": "^4.0.1",
     "chai-as-promised": "6.0.0",
     "chai-spies": "0.7.1",
-    "graphql": "^0.9.0",
     "cz-conventional-changelog": "^2.0.0",
     "eslint": "^3.19.0",
     "eslint-config-airbnb-base": "^11.2.0",
     "eslint-plugin-flowtype": "^2.34.0",
     "eslint-plugin-import": "^2.3.0",
     "flow-bin": "^0.47.0",
+    "graphql": "^0.10.1",
     "graphql-compose": "^1.19.0",
     "mocha": "^3.4.2",
     "nyc": "^10.3.2",

src/__mocks__/rootQueryTypeComposer.js

@@ -1,9 +1,6 @@
-import {
-  GraphQLObjectType,
-} from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+import { TypeComposer, graphql } from 'graphql-compose';
 
-const RootQuery = new GraphQLObjectType({
+const RootQuery = new graphql.GraphQLObjectType({
   name: 'RootQuery',
   fields: {
   },

src/__mocks__/userTypeComposer.js

@@ -1,13 +1,14 @@
 /* eslint-disable no-param-reassign */
 
-import {
+import { TypeComposer, Resolver, graphql } from 'graphql-compose';
+
+const {
   GraphQLString,
   GraphQLObjectType,
   GraphQLInputObjectType,
   GraphQLEnumType,
   GraphQLInt,
-} from 'graphql';
-import { TypeComposer, Resolver } from 'graphql-compose';
+} = graphql;
 
 export const UserType = new GraphQLObjectType({
   name: 'User',

src/__tests__/composeWithConnection-test.js

@@ -1,12 +1,13 @@
 /* eslint-disable no-param-reassign */
 
 import { expect } from 'chai';
-import { graphql, GraphQLSchema, GraphQLList } from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+import { TypeComposer, graphql } from 'graphql-compose';
 import { composeWithConnection } from '../composeWithConnection';
 import { userTypeComposer, sortOptions } from '../__mocks__/userTypeComposer';
 import { rootQueryTypeComposer as rootQueryTC } from '../__mocks__/rootQueryTypeComposer';
 
+const { GraphQLSchema, GraphQLList } = graphql;
+
 describe('composeWithRelay', () => {
   const userComposer = composeWithConnection(userTypeComposer, {
     countResolverName: 'count',
@@ -90,7 +91,7 @@ describe('composeWithRelay', () => {
         }
       }
     }`;
-    const result = await graphql(schema, query);
+    const result = await graphql.graphql(schema, query);
     expect(result).nested.property('data.userConnection').deep.equals({
       count: 15,
       pageInfo: {
@@ -143,7 +144,7 @@ describe('composeWithRelay', () => {
         }
       }
     }`;
-    const result = await graphql(schema, query);
+    const result = await graphql.graphql(schema, query);
     expect(result).nested.property('data.userConnection').deep.equals({
       count: 15,
       pageInfo: {
@@ -206,7 +207,7 @@ describe('composeWithRelay', () => {
         gender
       }
       `;
-      const result = await graphql(schema, query);
+      const result = await graphql.graphql(schema, query);
       expect(result).to.deep.equal({
         data: {
           userConnection: {
@@ -256,7 +257,7 @@ describe('composeWithRelay', () => {
         count
       }
     }`;
-    await graphql(schema, query);
+    await graphql.graphql(schema, query);
     expect(topResolveParams).has.property('countResolveParams');
     expect(topResolveParams.countResolveParams).to.contain.all.keys([
       'source',
@@ -290,7 +291,7 @@ describe('composeWithRelay', () => {
         count
       }
     }`;
-    await graphql(schema, query);
+    await graphql.graphql(schema, query);
     expect(topResolveParams).has.property('findManyResolveParams');
     expect(topResolveParams.findManyResolveParams).to.contain.all.keys([
       'source',

src/__tests__/connectionResolver-test.js

@@ -1,13 +1,14 @@
 /* eslint-disable no-param-reassign */
 
 import { expect } from 'chai';
-import { GraphQLInt } from 'graphql';
-import { Resolver } from 'graphql-compose';
+import { Resolver, graphql } from 'graphql-compose';
 import { userTypeComposer, userList, sortOptions } from '../__mocks__/userTypeComposer';
 import { dataToCursor } from '../cursor';
 import { prepareConnectionResolver, prepareRawQuery, preparePageInfo } from '../connectionResolver';
 import Cursor from '../types/cursorType';
 
+const { GraphQLInt } = graphql;
+
 describe('connectionResolver', () => {
   const connectionResolver = prepareConnectionResolver(userTypeComposer, {
     countResolverName: 'count',

src/types/__tests__/connectionType-test.js

@@ -1,17 +1,11 @@
 import { expect } from 'chai';
-import {
-  GraphQLNonNull,
-  GraphQLObjectType,
-  getNamedType,
-  GraphQLInt,
-  GraphQLList,
-} from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+import { TypeComposer, graphql } from 'graphql-compose';
 import { userTypeComposer } from '../../__mocks__/userTypeComposer';
 import { prepareEdgeType, prepareConnectionType } from '../connectionType';
 import GraphQLConnectionCursor from '../cursorType';
 import PageInfoType from '../pageInfoType';
 
+const { GraphQLNonNull, GraphQLObjectType, getNamedType, GraphQLInt, GraphQLList } = graphql;
 
 describe('types/connectionType.js', () => {
   describe('prepareEdgeType()', () => {

src/types/__tests__/sortInputType-test.js

@@ -1,10 +1,9 @@
 import { expect } from 'chai';
-import {
-  GraphQLEnumType,
-} from 'graphql';
+import { graphql } from 'graphql-compose';
 import { userTypeComposer } from '../../__mocks__/userTypeComposer';
 import { prepareSortType } from '../sortInputType';
 
+const { GraphQLEnumType } = graphql;
 
 describe('types/sortInputType.js', () => {
   describe('basic checks', () => {

src/types/connectionType.js

@@ -1,18 +1,18 @@
 /* @flow */
 /* eslint-disable arrow-body-style */
 
-import {
+import { graphql } from 'graphql-compose';
+import type { TypeComposer } from 'graphql-compose';
+import GraphQLConnectionCursor from './cursorType';
+
+import PageInfoType from './pageInfoType';
+
+const {
   GraphQLInt,
   GraphQLObjectType,
   GraphQLNonNull,
   GraphQLList,
-} from 'graphql';
-import type {
-  TypeComposer,
-} from 'graphql-compose';
-import GraphQLConnectionCursor from './cursorType';
-
-import PageInfoType from './pageInfoType';
+} = graphql;
 
 const cachedConnectionTypes = new WeakMap();
 const cachedEdgeTypes = new WeakMap();

src/types/cursorType.js

@@ -1,6 +1,8 @@
 /* @flow */
 
-import { GraphQLScalarType, Kind } from 'graphql';
+import { graphql } from 'graphql-compose';
+
+const { GraphQLScalarType, Kind } = graphql;
 
 const GraphQLConnectionCursor = new GraphQLScalarType({
   name: 'ConnectionCursor',

src/types/pageInfoType.js

@@ -1,11 +1,13 @@
 /* @flow */
 
-import {
+import { graphql } from 'graphql-compose';
+
+const {
   GraphQLBoolean,
   GraphQLString,
   GraphQLObjectType,
   GraphQLNonNull,
-} from 'graphql';
+} = graphql;
 
 const PageInfoType = new GraphQLObjectType({
   name: 'PageInfo',