chore(admin-ui): Update apollo & codegen script

admin-ui/generate-graphql-types.ts

@@ -1,17 +1,13 @@
 import { spawn } from 'child_process';
 import * as fs from 'fs';
-import { execute, GraphQLSchema, IntrospectionQuery, IntrospectionSchema, parse } from 'graphql';
-import { makeExecutableSchema } from 'graphql-tools';
-import { buildClientSchema, introspectionQuery, printSchema } from 'graphql/utilities';
-import { fileLoader, mergeTypes } from 'merge-graphql-schemas';
 
 import { API_PATH, API_PORT } from '../shared/shared-constants';
 
 // tslint:disable:no-console
 const API_URL = `http://localhost:${API_PORT}/${API_PATH}`;
 const SCHEMA_JSON_FILE = '../schema.json';
-const CLIENT_SCHEMA_FILES = './src/app/data/types/**/*.graphql';
-const CLIENT_QUERY_FILES = '"./src/app/data/(queries|mutations|fragments)/**/*.ts"';
+const CLIENT_SCHEMA_FILES = './src/app/data/types/client-types.graphql';
+const CLIENT_QUERY_FILES = '"./src/app/data/{queries,mutations,fragments}/**/*.ts"';
 const TYPESCRIPT_DEFINITIONS_FILE = './src/app/data/types/gql-generated-types.ts';
 
 main().catch(e => {
@@ -25,26 +21,21 @@ main().catch(e => {
  * script "generate-gql-types".
  */
 async function main(): Promise<void> {
-    const introspectionQueryFromApi = await downloadSchemaFromApi(API_URL);
-    const combinedSchema = await combineSchemas(introspectionQueryFromApi, CLIENT_SCHEMA_FILES);
-
-    fs.writeFileSync(SCHEMA_JSON_FILE, JSON.stringify(combinedSchema));
-    console.log(`Generated schema file: ${SCHEMA_JSON_FILE}`);
-
+    await downloadSchemaFromApi(API_URL, SCHEMA_JSON_FILE);
     await generateTypeScriptTypesFromSchema(
         SCHEMA_JSON_FILE,
+        CLIENT_SCHEMA_FILES,
         CLIENT_QUERY_FILES,
         TYPESCRIPT_DEFINITIONS_FILE,
     );
-
-    console.log('Generated TypeScript definitions!');
 }
 
 /**
  * Downloads the schema from the provided GraphQL endpoint using the `apollo schema:download`
  * cli command and returns the result as an IntrospectionQuery object.
  */
-async function downloadSchemaFromApi(apiEndpoint: string): Promise<IntrospectionQuery> {
+async function downloadSchemaFromApi(apiEndpoint: string, outputFile: string): Promise<void> {
+    console.log(`Downloading schema from ${API_URL}`);
     const TEMP_API_SCHEMA = '../schema.temp.json';
     await runCommand('yarn', ['apollo', 'schema:download', TEMP_API_SCHEMA, `--endpoint=${API_URL}`]);
 
@@ -52,38 +43,13 @@ async function downloadSchemaFromApi(apiEndpoint: string): Promise<Introspection
 
     const schemaFromApi = fs.readFileSync(TEMP_API_SCHEMA, { encoding: 'utf8' });
     fs.unlinkSync(TEMP_API_SCHEMA);
-    const introspectionSchema: IntrospectionSchema = JSON.parse(schemaFromApi);
-    return {
-        __schema: introspectionSchema,
-    };
-}
-
-async function introspectionFromSchema(schema: GraphQLSchema): Promise<IntrospectionQuery> {
-    const queryAST = parse(introspectionQuery);
-    const result = await execute(schema, queryAST);
-    return result.data as IntrospectionQuery;
-}
-
-/**
- * Combines the IntrospectionQuery from the GraphQL API with any client-side schemas as defined by the
- * clientSchemaFiles glob.
- */
-async function combineSchemas(
-    introspectionQueryFromApi: IntrospectionQuery,
-    clientSchemaFiles: string,
-): Promise<IntrospectionQuery> {
-    const schemaFromApi = buildClientSchema(introspectionQueryFromApi);
-    const clientSchemas = fileLoader(clientSchemaFiles);
-    const remoteSchema = printSchema(schemaFromApi);
-    const typeDefs = mergeTypes([...clientSchemas, remoteSchema], {
-        all: true,
-    });
-    const executableSchema = makeExecutableSchema({
-        typeDefs,
-        resolverValidationOptions: { requireResolversForResolveType: false },
-    });
-    const introspection = await introspectionFromSchema(executableSchema);
-    return introspection;
+    const introspectionSchema = JSON.parse(schemaFromApi);
+    fs.writeFileSync(
+        SCHEMA_JSON_FILE,
+        JSON.stringify({
+            __schema: introspectionSchema,
+        }),
+    );
 }
 
 /**
@@ -91,6 +57,7 @@ async function combineSchemas(
  */
 async function generateTypeScriptTypesFromSchema(
     schemaFile: string,
+    clientSchemaFiles: string,
     queryFiles: string,
     outputFile: string,
 ): Promise<number> {
@@ -99,8 +66,11 @@ async function generateTypeScriptTypesFromSchema(
         'codegen:generate',
         outputFile,
         '--addTypename',
+        '--outputFlat',
+        '--target=typescript',
+        `--clientSchema=${clientSchemaFiles}`,
         `--queries=${queryFiles}`,
-        `--schema ${schemaFile}`,
+        `--schema=${schemaFile}`,
     ]);
 }
 

admin-ui/package.json

@@ -32,8 +32,8 @@
     "apollo-angular": "^1.1.1",
     "apollo-angular-cache-ngrx": "^1.0.0-beta.0",
     "apollo-angular-link-http": "^1.1.0",
-    "apollo-cache-inmemory": "^1.2.4",
-    "apollo-client": "^2.3.4",
+    "apollo-cache-inmemory": "^1.2.7",
+    "apollo-client": "^2.3.8",
     "apollo-link": "^1.2.2",
     "apollo-link-state": "^0.4.1",
     "core-js": "^2.5.4",
@@ -55,9 +55,9 @@
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "apollo": "1.1.1",
+    "apollo": "1.7.0",
     "codelyzer": "~4.2.1",
-    "graphql-tools": "^3.0.4",
+    "graphql-tools": "^3.1.1",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
     "karma": "~1.7.1",
@@ -65,7 +65,6 @@
     "karma-coverage-istanbul-reporter": "~2.0.0",
     "karma-jasmine": "~1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "merge-graphql-schemas": "^1.5.2",
     "protractor": "~5.3.0",
     "puppeteer": "^1.5.0",
     "rimraf": "^2.6.2",

admin-ui/yarn.lock

@@ -462,9 +462,9 @@
   version "2.53.43"
   resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-2.53.43.tgz#2de3d718819bc20165754c4a59afb7e9833f6707"
 
-"@types/zen-observable@^0.5.3":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.5.4.tgz#b863a4191e525206819e008097ebf0fb2e3a1cdc"
+"@types/zen-observable@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.0.tgz#8b63ab7f1aa5321248aad5ac890a485656dcea4d"
 
 "@webassemblyjs/ast@1.4.3":
   version "1.4.3"
@@ -770,7 +770,7 @@ apollo-angular@^1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/apollo-angular/-/apollo-angular-1.1.2.tgz#7aaad1c996d26b538eea043b825c0ab59fdfe8e5"
 
-apollo-cache-inmemory@^1.1.5, apollo-cache-inmemory@^1.2.4:
+apollo-cache-inmemory@^1.1.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.5.tgz#b57951947b1db486a60db11c7dcfc6b112e5abe9"
   dependencies:
@@ -778,77 +778,92 @@ apollo-cache-inmemory@^1.1.5, apollo-cache-inmemory@^1.2.4:
     apollo-utilities "^1.0.16"
     graphql-anywhere "^4.1.14"
 
+apollo-cache-inmemory@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/apollo-cache-inmemory/-/apollo-cache-inmemory-1.2.7.tgz#80517c4b5e910022ab8d318f47d9364f99db8541"
+  dependencies:
+    apollo-cache "^1.1.14"
+    apollo-utilities "^1.0.18"
+    graphql-anywhere "^4.1.16"
+
 apollo-cache@^1.1.0, apollo-cache@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.12.tgz#070015c9051b2ebb69676beb10466a9c0b259f91"
   dependencies:
     apollo-utilities "^1.0.16"
 
-apollo-client@^2.3.4:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.5.tgz#74b62bd7e7bd7030d01c35e2e221ed65a807af23"
+apollo-cache@^1.1.14:
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/apollo-cache/-/apollo-cache-1.1.14.tgz#c7d54cdbc7f544161f78fa5e4bae56650e22f7ad"
   dependencies:
-    "@types/zen-observable" "^0.5.3"
-    apollo-cache "^1.1.12"
+    apollo-utilities "^1.0.18"
+
+apollo-client@^2.3.8:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/apollo-client/-/apollo-client-2.3.8.tgz#0384a7210eb601ab88b1c13750da076fc9255b95"
+  dependencies:
+    "@types/zen-observable" "^0.8.0"
+    apollo-cache "^1.1.14"
     apollo-link "^1.0.0"
     apollo-link-dedup "^1.0.0"
-    apollo-utilities "^1.0.16"
+    apollo-utilities "^1.0.18"
     symbol-observable "^1.0.2"
     zen-observable "^0.8.0"
   optionalDependencies:
     "@types/async" "2.0.49"
 
-apollo-codegen-core@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-core/-/apollo-codegen-core-0.21.0.tgz#0859dc414c0328a1a6202c5511c379f1135e91ba"
+apollo-codegen-core@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-core/-/apollo-codegen-core-0.27.0.tgz#09cdcb3b2632c55ffe25385b0b29eaec40258e0d"
   dependencies:
     "@babel/generator" "7.0.0-beta.38"
     "@babel/types" "7.0.0-beta.38"
     common-tags "^1.5.1"
     core-js "^2.5.3"
-    graphql-config "^2.0.1"
 
-apollo-codegen-flow-legacy@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-flow-legacy/-/apollo-codegen-flow-legacy-0.21.0.tgz#4366c22b840a87ea57b59711d9182f3b8580e99e"
+apollo-codegen-flow-legacy@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-flow-legacy/-/apollo-codegen-flow-legacy-0.27.0.tgz#b30568944ed2f393e0081ffd4c23c2f6ed13bb28"
   dependencies:
-    apollo-codegen-core "^0.21.0"
+    apollo-codegen-core "^0.27.0"
 
-apollo-codegen-flow@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-flow/-/apollo-codegen-flow-0.21.0.tgz#9ee25406c2f177b733fd4977f13b8395262821db"
+apollo-codegen-flow@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-flow/-/apollo-codegen-flow-0.27.0.tgz#6448a14a0fe09ae7f888868b3f9544a678037558"
   dependencies:
-    apollo-codegen-core "^0.21.0"
+    "@babel/types" "7.0.0-beta.38"
+    apollo-codegen-core "^0.27.0"
     change-case "^3.0.1"
     inflected "^2.0.3"
 
-apollo-codegen-scala@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-scala/-/apollo-codegen-scala-0.21.0.tgz#007eae060ae7f556aaa8fd1fba35826c778762af"
+apollo-codegen-scala@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-scala/-/apollo-codegen-scala-0.27.0.tgz#249fa2222dd2805b632b1e2b118e33c334c18dbe"
   dependencies:
-    apollo-codegen-core "^0.21.0"
+    apollo-codegen-core "^0.27.0"
     change-case "^3.0.1"
     inflected "^2.0.3"
 
-apollo-codegen-swift@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-swift/-/apollo-codegen-swift-0.21.0.tgz#d689725a7008f9908a723504d4fd09a7c76640ee"
+apollo-codegen-swift@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-swift/-/apollo-codegen-swift-0.27.0.tgz#bebaf38587993604eb79cd9c77566d6179d98f14"
   dependencies:
-    apollo-codegen-core "^0.21.0"
+    apollo-codegen-core "^0.27.0"
     change-case "^3.0.1"
     inflected "^2.0.3"
 
-apollo-codegen-typescript-legacy@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-typescript-legacy/-/apollo-codegen-typescript-legacy-0.21.0.tgz#9beab947ccdf0d4c05602385b044393d3c4b1bfa"
+apollo-codegen-typescript-legacy@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-typescript-legacy/-/apollo-codegen-typescript-legacy-0.27.0.tgz#07ce85f67d614b752842292e09bda66a2bfa5e12"
   dependencies:
-    apollo-codegen-core "^0.21.0"
+    apollo-codegen-core "^0.27.0"
 
-apollo-codegen-typescript@^0.21.0:
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/apollo-codegen-typescript/-/apollo-codegen-typescript-0.21.0.tgz#9cfeb565ba97a569b774f7df9d04433a6fb434ea"
+apollo-codegen-typescript@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/apollo-codegen-typescript/-/apollo-codegen-typescript-0.27.0.tgz#11848852913d40c19b7fe5e815def4aacca0110c"
   dependencies:
-    apollo-codegen-core "^0.21.0"
+    "@babel/types" "7.0.0-beta.38"
+    apollo-codegen-core "^0.27.0"
     change-case "^3.0.1"
     inflected "^2.0.3"
 
@@ -878,7 +893,7 @@ apollo-link-state@^0.4.1:
     apollo-utilities "^1.0.8"
     graphql-anywhere "^4.1.0-alpha.0"
 
-apollo-link@1.2.2, apollo-link@^1.0.0, apollo-link@^1.2.2:
+apollo-link@^1.0.0, apollo-link@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.2.tgz#54c84199b18ac1af8d63553a68ca389c05217a03"
   dependencies:
@@ -892,9 +907,15 @@ apollo-utilities@^1.0.0, apollo-utilities@^1.0.1, apollo-utilities@^1.0.16, apol
   dependencies:
     fast-json-stable-stringify "^2.0.0"
 
-apollo@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/apollo/-/apollo-1.1.1.tgz#36bd69a19fbfc109b2ae655fcd53377d9f692dda"
+apollo-utilities@^1.0.18:
+  version "1.0.18"
+  resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.0.18.tgz#e4ee91534283fde2b744a26caaea120fe6a94f67"
+  dependencies:
+    fast-json-stable-stringify "^2.0.0"
+
+apollo@1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/apollo/-/apollo-1.7.0.tgz#5fc2c755ce03d15c6ef00e694120e42a843ae53a"
   dependencies:
     "@oclif/command" "^1.4.21"
     "@oclif/config" "^1.6.17"
@@ -906,22 +927,23 @@ apollo@1.1.1:
     "@types/react" "^16.3.14"
     "@types/react-dom" "^16.0.5"
     "@types/rimraf" "^2.0.2"
-    apollo-codegen-core "^0.21.0"
-    apollo-codegen-flow "^0.21.0"
-    apollo-codegen-flow-legacy "^0.21.0"
-    apollo-codegen-scala "^0.21.0"
-    apollo-codegen-swift "^0.21.0"
-    apollo-codegen-typescript "^0.21.0"
-    apollo-codegen-typescript-legacy "^0.21.0"
+    apollo-codegen-core "^0.27.0"
+    apollo-codegen-flow "^0.27.0"
+    apollo-codegen-flow-legacy "^0.27.0"
+    apollo-codegen-scala "^0.27.0"
+    apollo-codegen-swift "^0.27.0"
+    apollo-codegen-typescript "^0.27.0"
+    apollo-codegen-typescript-legacy "^0.27.0"
     apollo-link "^1.2.2"
     apollo-link-http "^1.5.4"
     chalk "^2.4.1"
     cli-ux "^4.3.0"
     decode-html "^2.0.0"
     env-ci "^2.1.0"
+    gaze "^1.1.3"
     git-parse "^1.0.3"
     git-rev-sync "^1.12.0"
-    globby "^8.0.1"
+    glob "^7.1.2"
     graphql "^0.13.1"
     graphql-tag "^2.9.2"
     heroku-cli-util "^8.0.9"
@@ -2056,13 +2078,6 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-fetch@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.0.0.tgz#a17475449561e0f325146cea636a8619efb9b382"
-  dependencies:
-    node-fetch "2.0.0"
-    whatwg-fetch "2.0.3"
-
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -2241,10 +2256,6 @@ deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
 
-deepmerge@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.1.1.tgz#e862b4e45ea0555072bf51e7fd0d9845170ae768"
-
 default-require-extensions@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/default-require-extensions/-/default-require-extensions-2.0.0.tgz#f5f8fbb18a7d6d50b21f641f649ebb522cfe24f7"
@@ -3197,7 +3208,7 @@ gauge@~2.7.3:
     strip-ansi "^3.0.1"
     wide-align "^1.1.0"
 
-gaze@^1.0.0:
+gaze@^1.0.0, gaze@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a"
   dependencies:
@@ -3349,18 +3360,6 @@ globby@^7.1.1:
     pify "^3.0.0"
     slash "^1.0.0"
 
-globby@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.1.tgz#b5ad48b8aa80b35b814fc1281ecc851f1d2b5b50"
-  dependencies:
-    array-union "^1.0.1"
-    dir-glob "^2.0.0"
-    fast-glob "^2.0.2"
-    glob "^7.1.2"
-    ignore "^3.3.5"
-    pify "^3.0.0"
-    slash "^1.0.0"
-
 globule@^1.0.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d"
@@ -3401,37 +3400,21 @@ graphql-anywhere@^4.1.0-alpha.0, graphql-anywhere@^4.1.14:
   dependencies:
     apollo-utilities "^1.0.16"
 
-graphql-config@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/graphql-config/-/graphql-config-2.0.1.tgz#d34a9bdf1d7360af7b01db9b20260a342ddc7390"
+graphql-anywhere@^4.1.16:
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/graphql-anywhere/-/graphql-anywhere-4.1.16.tgz#82bb59643e30183cfb7b485ed4262a7b39d8a6c1"
   dependencies:
-    graphql-import "^0.4.4"
-    graphql-request "^1.5.0"
-    js-yaml "^3.10.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.4"
-
-graphql-import@^0.4.4:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/graphql-import/-/graphql-import-0.4.5.tgz#e2f18c28d335733f46df8e0733d8deb1c6e2a645"
-  dependencies:
-    lodash "^4.17.4"
-
-graphql-request@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.6.0.tgz#afe87cf2a336acabb0cc2a875900202eda89f412"
-  dependencies:
-    cross-fetch "2.0.0"
+    apollo-utilities "^1.0.18"
 
 graphql-tag@^2.9.2:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.9.2.tgz#2f60a5a981375f430bf1e6e95992427dc18af686"
 
-graphql-tools@^3.0.4:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-3.0.5.tgz#544542dbf2fddc8c3d7d654965285a3bc747b10b"
+graphql-tools@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-3.1.1.tgz#d593358f01e7c8b1671a17b70ddb034dea9dbc50"
   dependencies:
-    apollo-link "1.2.2"
+    apollo-link "^1.2.2"
     apollo-utilities "^1.0.1"
     deprecated-decorator "^0.1.6"
     iterall "^1.1.3"
@@ -4345,7 +4328,7 @@ js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
-js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@3.x, js-yaml@^3.7.0, js-yaml@^3.9.0:
   version "3.12.0"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
@@ -4880,14 +4863,6 @@ merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
 
-merge-graphql-schemas@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/merge-graphql-schemas/-/merge-graphql-schemas-1.5.2.tgz#7e75afb56cea6ff163924744846817d054c1ebaf"
-  dependencies:
-    deepmerge "^2.1.0"
-    glob "^7.1.2"
-    is-glob "^4.0.0"
-
 merge2@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
@@ -5168,10 +5143,6 @@ no-case@^2.2.0, no-case@^2.3.2:
   dependencies:
     lower-case "^1.1.1"
 
-node-fetch@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.0.0.tgz#982bba43ecd4f2922a29cc186a6bbb0bb73fcba6"
-
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -7810,10 +7781,6 @@ websocket-extensions@>=0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
 
-whatwg-fetch@2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
-
 whatwg-fetch@>=0.10.0:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"