fix(GraphQL): Remove graphql peer-dependency. Use it from graphql-compose re-export

Author: nodkz

src/__mocks__/rootMutationTypeComposer.js

@@ -1,9 +1,8 @@
-import {
-  GraphQLObjectType,
-} from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+/* @flow */
 
-const RootMutation = new GraphQLObjectType({
+import { TypeComposer, graphql } from 'graphql-compose';
+
+const RootMutation = new graphql.GraphQLObjectType({
   name: 'Mutation',
   fields: {},
 });

src/__mocks__/rootQueryTypeComposer.js

@@ -1,9 +1,8 @@
-import {
-  GraphQLObjectType,
-} from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+/* @flow */
 
-const RootQuery = new GraphQLObjectType({
+import { TypeComposer, graphql } from 'graphql-compose';
+
+const RootQuery = new graphql.GraphQLObjectType({
   name: 'Query',
   fields: {},
 });

src/__mocks__/userTypeComposer.js

@@ -1,11 +1,14 @@
-import {
+/* @flow */
+
+import { TypeComposer, Resolver, graphql } from 'graphql-compose';
+
+const {
   GraphQLString,
   GraphQLObjectType,
   GraphQLInputObjectType,
   GraphQLNonNull,
   GraphQLInt,
-} from 'graphql';
-import { TypeComposer, Resolver } from 'graphql-compose';
+} = graphql;
 
 export const UserType = new GraphQLObjectType({
   name: 'User',

src/__tests__/composeWithRelay-test.js

@@ -1,17 +1,14 @@
+/* @flow */
+
 import { expect } from 'chai';
-import {
-  graphql,
-  GraphQLInterfaceType,
-  GraphQLSchema,
-  GraphQLNonNull,
-} from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+import { TypeComposer, graphql } from 'graphql-compose';
 import { composeWithRelay } from '../composeWithRelay';
 import { userTypeComposer } from '../__mocks__/userTypeComposer';
 import { rootQueryTypeComposer } from '../__mocks__/rootQueryTypeComposer';
 import { rootMutationTypeComposer } from '../__mocks__/rootMutationTypeComposer';
 import { toGlobalId } from '../globalId';
 
+const { GraphQLInterfaceType, GraphQLSchema, GraphQLNonNull } = graphql;
 
 describe('composeWithRelay', () => {
   const userComposer = composeWithRelay(userTypeComposer);

src/__tests__/globalId-test.js

@@ -1,3 +1,5 @@
+/* @flow */
+
 import { expect } from 'chai';
 import { base64, unbase64, toGlobalId, fromGlobalId } from '../globalId';
 

src/__tests__/nodeFieldConfig-test.js

@@ -1,12 +1,12 @@
+/* @flow */
+
 import { expect } from 'chai';
-import {
-  GraphQLInterfaceType,
-  GraphQLNonNull,
-} from 'graphql';
+import { graphql } from 'graphql-compose';
 import { findByIdResolver, userTypeComposer } from '../__mocks__/userTypeComposer';
 import { toGlobalId } from '../globalId';
 import { getNodeFieldConfig } from '../nodeFieldConfig';
 
+const { GraphQLInterfaceType, GraphQLNonNull } = graphql;
 
 describe('nodeFieldConfig', () => {
   const typeToFindByIdMap = {

src/__tests__/wrapMutationResolver.js

@@ -1,10 +1,13 @@
+/* @flow */
+
 import { expect } from 'chai';
-import { GraphQLString, GraphQLID, GraphQLNonNull, getNamedType } from 'graphql';
-import { TypeComposer, InputTypeComposer } from 'graphql-compose';
+import { TypeComposer, InputTypeComposer, graphql } from 'graphql-compose';
 import { composeWithRelay } from '../composeWithRelay';
 import { userTypeComposer } from '../__mocks__/userTypeComposer';
 import { toGlobalId } from '../globalId';
 
+const { GraphQLString, GraphQLID, GraphQLNonNull, getNamedType } = graphql;
+
 describe('wrapMutationResolver', () => {
   composeWithRelay(userTypeComposer);
   const fieldConfig = userTypeComposer.getResolver('createOne').getFieldConfig();

src/composeWithRelay.js

@@ -1,13 +1,14 @@
 /* @flow */
 /* eslint-disable no-use-before-define */
 
-import { GraphQLID, GraphQLNonNull } from 'graphql';
-import { TypeComposer } from 'graphql-compose';
+import { TypeComposer, graphql } from 'graphql-compose';
 import NodeInterface from './nodeInterface';
 import wrapMutationResolver from './wrapMutationResolver';
 import { toGlobalId } from './globalId';
 import { getNodeFieldConfig } from './nodeFieldConfig';
 
+const { GraphQLID, GraphQLNonNull } = graphql;
+
 // all wrapped typeComposers with Relay, stored in this variable
 // for futher type resolving via NodeInterface.resolveType method
 export const typeMapForNode = {};

src/nodeFieldConfig.js

@@ -1,12 +1,12 @@
 /* @flow */
 /* eslint-disable no-param-reassign, import/prefer-default-export */
-
-import { GraphQLID, GraphQLNonNull } from 'graphql';
-import { getProjectionFromAST } from 'graphql-compose';
+import { getProjectionFromAST, graphql } from 'graphql-compose';
 import { fromGlobalId } from './globalId';
 import NodeInterface from './nodeInterface';
 import type { TypeMapForNode, GraphQLResolveInfo } from './definition';
 
+const { GraphQLID, GraphQLNonNull } = graphql;
+
 // this fieldConfig must be set to RootQuery.node field
 export function getNodeFieldConfig(typeMapForNode: TypeMapForNode) {
   return {

src/nodeInterface.js

@@ -1,6 +1,8 @@
 /* @flow */
 
-import { GraphQLID, GraphQLNonNull, GraphQLInterfaceType } from 'graphql';
+import { graphql } from 'graphql-compose';
+
+const { GraphQLID, GraphQLNonNull, GraphQLInterfaceType } = graphql;
 
 const NodeInterface = new GraphQLInterfaceType({
   name: 'Node',