feat: upgrade to graphql 15 rc

graphql · Jan 8, 2020 · ee6302e · ee6302e
1 parent 3c5e329
commit ee6302e
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     "eslint-plugin-react": "7.17.0",
     "fetch-mock": "^6.0.0",
     "flow-bin": "^0.101.0",
-    "graphql": "^14.5.2",
+    "graphql": "^15.0.0-rc.1",
     "husky": "^3.0.5",
     "jest": "^24.8.0",
     "jest-environment-jsdom": "^24.8.0",

diff --git a/packages/codemirror-graphql/package.json b/packages/codemirror-graphql/package.json
@@ -49,7 +49,7 @@
   },
   "peerDependencies": {
     "codemirror": "^5.26.0",
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "graphql-language-service-interface": "^2.3.3",
@@ -60,7 +60,7 @@
     "chai-subset": "1.6.0",
     "codemirror": "^5.28.0",
     "cross-env": "^6.0.3",
-    "graphql": "^14.0.2",
+    "graphql": "^15.0.0-rc.1",
     "jsdom": "^11.2.0",
     "mocha": "7.0.0",
     "nyc": "^15.0.0",

diff --git a/packages/graphiql/package.json b/packages/graphiql/package.json
@@ -55,7 +55,7 @@
     "theme-ui": "^0.2.52"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0",
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0",
     "prop-types": ">=15.5.0",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"
@@ -71,7 +71,7 @@
     "cssnano": "^4.1.10",
     "express": "4.17.1",
     "express-graphql": "0.9.0",
-    "graphql": "14.5.8",
+    "graphql": "^15.0.0-rc.1",
     "html-webpack-plugin": "^3.2.0",
     "identity-obj-proxy": "^3.0.0",
     "jest": "^24.8.0",

diff --git a/packages/graphiql/src/utility/introspectionQueries.js b/packages/graphiql/src/utility/introspectionQueries.js
@@ -5,11 +5,12 @@
  *  LICENSE file in the root directory of this source tree.
  */
 
-import { getOperationAST, parse, introspectionQuery } from 'graphql';
+import { getOperationAST, parse, getIntrospectionQuery } from 'graphql';
 
 export { introspectionQuery } from 'graphql';
-export const introspectionQueryName = getOperationAST(parse(introspectionQuery))
-  .name.value;
+export const introspectionQueryName = getOperationAST(
+  parse(getIntrospectionQuery()),
+).name.value;
 
 // Some GraphQL services do not support subscriptions and fail an introspection
 // query which includes the `subscriptionType` field as the stock introspection

diff --git a/packages/graphql-language-service-interface/package.json b/packages/graphql-language-service-interface/package.json
@@ -30,7 +30,7 @@
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "graphql-config": "2.2.1",

diff --git a/packages/graphql-language-service-interface/src/__tests__/GraphQLLanguageService-test.ts b/packages/graphql-language-service-interface/src/__tests__/GraphQLLanguageService-test.ts
@@ -87,7 +87,9 @@ describe('GraphQLLanguageService', () => {
     );
     expect(diagnostics.length).toEqual(1);
     const diagnostic = diagnostics[0];
-    expect(diagnostic.message).toEqual('Syntax Error: Unexpected Name "qeury"');
+    expect(diagnostic.message).toEqual(
+      'Syntax Error: Unexpected Name "qeury".',
+    );
   });
 
   it('runs definition service as expected', async () => {

diff --git a/packages/graphql-language-service-interface/src/__tests__/getDiagnostics-test.ts b/packages/graphql-language-service-interface/src/__tests__/getDiagnostics-test.ts
@@ -40,7 +40,8 @@ describe('getDiagnostics', () => {
       schema,
     )[0];
     expect(error.message).toEqual(
-      'The field Query.deprecatedField is deprecated. Use test instead.',
+      // eslint-disable-next-line no-useless-escape
+      'The field "Query.deprecatedField" is deprecated. Use test instead.',
     );
     expect(error.severity).toEqual(SEVERITY.WARNING);
     expect(error.source).toEqual('GraphQL: Deprecation');
@@ -71,7 +72,10 @@ describe('getDiagnostics', () => {
     );
     expect(errors.length).toEqual(1);
     const error = errors[0];
-    expect(error.message).toEqual('Syntax Error: Expected :, found Name "id"');
+    expect(error.message).toEqual(
+      // eslint-disable-next-line no-useless-escape
+      'Syntax Error: Expected ":", found Name "id".',
+    );
     expect(error.severity).toEqual(SEVERITY.ERROR);
     expect(error.source).toEqual('GraphQL: Syntax');
   });

diff --git a/packages/graphql-language-service-parser/package.json b/packages/graphql-language-service-parser/package.json
@@ -29,7 +29,7 @@
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
-    "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "graphql-config": "2.2.1",

diff --git a/packages/graphql-language-service-server/package.json b/packages/graphql-language-service-server/package.json
@@ -31,7 +31,7 @@
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "@babel/parser": "^7.4.5",

diff --git a/packages/graphql-language-service-types/package.json b/packages/graphql-language-service-types/package.json
@@ -29,7 +29,7 @@
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
-    "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "graphql-config": "2.2.1"

diff --git a/packages/graphql-language-service-utils/package.json b/packages/graphql-language-service-utils/package.json
@@ -34,7 +34,7 @@
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "graphql-config": "2.2.1",

diff --git a/packages/graphql-language-service/package.json b/packages/graphql-language-service/package.json
@@ -32,7 +32,7 @@
     "build-flow": "node ../../resources/buildFlow.js"
   },
   "peerDependencies": {
-    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0"
+    "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
   },
   "dependencies": {
     "@babel/polyfill": "7.7.0",

diff --git a/yarn.lock b/yarn.lock
@@ -8371,13 +8371,20 @@ graphql-request@^1.5.0:
   dependencies:
     cross-fetch "2.2.2"
 
-graphql@14.5.8, graphql@^14.0.2, graphql@^14.5.2:
+graphql@14.5.8:
   version "14.5.8"
   resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.5.8.tgz#504f3d3114cb9a0a3f359bbbcf38d9e5bf6a6b3c"
   integrity sha512-MMwmi0zlVLQKLdGiMfWkgQD7dY/TUKt4L+zgJ/aR0Howebod3aNgP5JkgvAULiR2HPVZaP2VEElqtdidHweLkg==
   dependencies:
     iterall "^1.2.2"
 
+graphql@^15.0.0-rc.1:
+  version "15.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.0.0-rc.1.tgz#246c5c02ee60d2fe2f670bf97847da9ad95e7e0c"
+  integrity sha512-yuuP9Pjtl6Pf2js/P9WKEcCBql3fTlYqBOX8EdW9Di/Y3VyK56tdK4KLULDsgIni5gcqv8GgtY5j/DMho+RXYw==
+  dependencies:
+    iterall "^1.3.0"
+
 growl@1.10.5:
   version "1.10.5"
   resolved "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"
@@ -9783,6 +9790,11 @@ iterall@^1.2.2:
   resolved "https://registry.npmjs.org/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7"
   integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA==
 
+iterall@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea"
+  integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg==
+
 iterate-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.1.tgz#d2003239b4a06c91a3f8092e379f6062b03c268c"