Merge 4dbca17 into dcece9a

.gitignore

@@ -5,3 +5,4 @@ dist
 *.tgz
 .DS_Store
 package-lock.json
+yarn.lock

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "8"
   - "10"
+  - "12"
 
 install:
   - npm config set spin=false

package.json

@@ -49,14 +49,14 @@
   },
   "homepage": "https://github.com/apollostack/graphql-tools#readme",
   "dependencies": {
-    "apollo-link": "^1.2.3",
+    "apollo-link": "^1.2.14",
     "apollo-utilities": "^1.0.1",
     "deprecated-decorator": "^0.1.6",
     "iterall": "^1.1.3",
     "uuid": "^3.1.0"
   },
   "peerDependencies": {
-    "graphql": "^0.13.0 || ^14.0.0"
+    "graphql": "^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "devDependencies": {
     "@types/chai": "4.0.10",
@@ -69,7 +69,7 @@
     "chai": "^4.1.2",
     "dateformat": "^3.0.3",
     "express": "^4.16.2",
-    "graphql": "^14.5.8",
+    "graphql": "^15.0.0",
     "graphql-subscriptions": "^1.0.0",
     "graphql-type-json": "^0.1.4",
     "istanbul": "^0.4.5",

src/test/testSchemaGenerator.ts

@@ -243,7 +243,7 @@ describe('generating schema from shorthand', () => {
         },
         query: {
           name: 'RootQuery',
-          description: '',
+          description: <string>null,
           fields: [
             {
               name: 'species',
@@ -1605,7 +1605,7 @@ describe('generating schema from shorthand', () => {
       }, errorMatcher);
     }
 
-    assertFieldError('Bird.id', {});
+    assertFieldError('Query.bird', {});
     assertFieldError('Query.bird', {
       Bird: {
         id: (bird: { id: string }) => bird.id,

src/test/testingSchemas.ts

@@ -9,7 +9,6 @@ import {
   ExecutionResult,
   DocumentNode,
 } from 'graphql';
-import { ExecutionResultDataDefault } from 'graphql/execution/execute';
 import {
   ApolloLink,
   Observable,
@@ -23,6 +22,10 @@ import makeRemoteExecutableSchema, {
 import introspectSchema from '../stitching/introspectSchema';
 import { PubSub } from 'graphql-subscriptions';
 
+type ExecutionResultDataDefault = {
+  [key: string]: any;
+};
+
 export type Location = {
   name: string;
   coordinates: string;