Getting ready for v17 (#4470)

* Testing alpha in CI * .. * ... * Fix GraphQL v17 incompatibility issues * Update changeset * Fix build * Fix TS * ... * .. * Go * Fix TS * Update peer dependencies
ardatan · May 20, 2022 · da7ad43 · da7ad43
1 parent f890605
commit da7ad43
Show file tree

Hide file tree

Showing 50 changed files with 261 additions and 201 deletions.
diff --git a/.changeset/rare-schools-judge.md b/.changeset/rare-schools-judge.md
@@ -0,0 +1,6 @@
+---
+'@graphql-tools/links': patch
+'@graphql-tools/utils': patch
+---
+
+Fix GraphQL v17 incompatibility issues and introduce `createGraphQLError` helper function for backwards compatibility.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -77,6 +77,7 @@ jobs:
           - 14
           - 15
           - 16
+          - '17.0.0-alpha.1'
     steps:
       - name: Checkout Master
         uses: actions/checkout@v3
@@ -117,6 +118,7 @@ jobs:
           - 14
           - 15
           - 16
+          - '17.0.0-alpha.1'
         include:
           - node-version: 14
             os: windows-latest

diff --git a/jest.config.js b/jest.config.js
@@ -15,4 +15,5 @@ module.exports = {
   moduleNameMapper: pathsToModuleNameMapper(tsconfig.compilerOptions.paths, { prefix: `${ROOT_DIR}/` }),
   collectCoverage: false,
   cacheDirectory: resolve(ROOT_DIR, `${CI ? '' : 'node_modules/'}.cache/jest`),
+  transformIgnorePatterns: ['node_modules/(?!graphql)'],
 };
diff --git a/packages/batch-delegate/package.json b/packages/batch-delegate/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/batch-execute/package.json b/packages/batch-execute/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/delegate/package.json b/packages/delegate/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/delegate/tests/errors.test.ts b/packages/delegate/tests/errors.test.ts
@@ -1,20 +1,14 @@
 import { GraphQLError, GraphQLResolveInfo, locatedError, graphql, OperationTypeNode } from 'graphql';
 
 import { makeExecutableSchema } from '@graphql-tools/schema';
-import { ExecutionResult } from '@graphql-tools/utils';
+import { createGraphQLError, ExecutionResult } from '@graphql-tools/utils';
 import { stitchSchemas } from '@graphql-tools/stitch';
 
 import { checkResultAndHandleErrors } from '../src/checkResultAndHandleErrors';
 import { UNPATHED_ERRORS_SYMBOL } from '../src/symbols';
 import { getUnpathedErrors } from '../src/mergeFields';
 import { delegateToSchema, defaultMergedResolver, DelegationContext } from '../src';
 
-class ErrorWithExtensions extends GraphQLError {
-  constructor(message: string, code: string) {
-    super(message, null as any, null, null, null, null, { code });
-  }
-}
-
 describe('Errors', () => {
   describe('getUnpathedErrors', () => {
     test('should return all unpathed errors', () => {
@@ -61,7 +55,13 @@ describe('Errors', () => {
 
     test('persists single error with extensions', () => {
       const result = {
-        errors: [new ErrorWithExtensions('Test error', 'UNAUTHENTICATED')],
+        errors: [
+          createGraphQLError('Test error', {
+            extensions: {
+              code: 'UNAUTHENTICATED',
+            },
+          }),
+        ],
       };
       try {
         checkResultAndHandleErrors(result, {

diff --git a/packages/graphql-tag-pluck/package.json b/packages/graphql-tag-pluck/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@babel/parser": "^7.16.8",

diff --git a/packages/graphql-tools/package.json b/packages/graphql-tools/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "optionalDependencies": {
     "@apollo/client": "~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0"

diff --git a/packages/import/package.json b/packages/import/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "publishConfig": {
     "access": "public",

diff --git a/packages/jest-transform/package.json b/packages/jest-transform/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/links/package.json b/packages/links/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0",
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0",
     "@apollo/client": "~3.2.5 || ~3.3.0 || ~3.4.0 || ~3.5.0 || ~3.6.0"
   },
   "buildOptions": {

diff --git a/packages/links/src/GraphQLUpload.ts b/packages/links/src/GraphQLUpload.ts
@@ -1,4 +1,5 @@
-import { GraphQLScalarType, GraphQLError } from 'graphql';
+import { GraphQLScalarType } from 'graphql';
+import { createGraphQLError } from '@graphql-tools/utils';
 
 const GraphQLUpload = new GraphQLScalarType({
   name: 'Upload',
@@ -15,7 +16,9 @@ const GraphQLUpload = new GraphQLScalarType({
   // serialization requires to support schema stitching
   serialize: value => value,
   parseLiteral: ast => {
-    throw new GraphQLError('Upload literal unsupported.', ast);
+    throw createGraphQLError('Upload scalar literal unsupported', {
+      nodes: ast,
+    });
   },
 });
 

diff --git a/packages/load-files/package.json b/packages/load-files/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "globby": "11.1.0",

diff --git a/packages/load/package.json b/packages/load/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "devDependencies": {
     "graphql-tag": "2.12.6",

diff --git a/packages/loaders/apollo-engine/package.json b/packages/loaders/apollo-engine/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.6.11",

diff --git a/packages/loaders/code-file/package.json b/packages/loaders/code-file/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.6.11",

diff --git a/packages/loaders/git/package.json b/packages/loaders/git/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/graphql-tag-pluck": "7.2.8",

diff --git a/packages/loaders/github/package.json b/packages/loaders/github/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.6.11",

diff --git a/packages/loaders/graphql-file/package.json b/packages/loaders/graphql-file/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/loaders/json-file/package.json b/packages/loaders/json-file/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.6.11",

diff --git a/packages/loaders/module/package.json b/packages/loaders/module/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.6.11",

diff --git a/packages/loaders/prisma/package.json b/packages/loaders/prisma/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/url-loader": "7.9.22",

diff --git a/packages/loaders/url/package.json b/packages/loaders/url/package.json
@@ -32,7 +32,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "devDependencies": {
     "@envelop/live-query": "3.3.2",

diff --git a/packages/merge/package.json b/packages/merge/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/mock/package.json b/packages/mock/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/node-require/package.json b/packages/node-require/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/optimize/package.json b/packages/optimize/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/relay-operation-optimizer/package.json b/packages/relay-operation-optimizer/package.json
@@ -38,7 +38,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "dependencies": {
     "@graphql-tools/utils": "8.6.11",

diff --git a/packages/resolvers-composition/package.json b/packages/resolvers-composition/package.json
@@ -27,7 +27,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "devDependencies": {
     "@types/lodash": "4.14.182",

diff --git a/packages/schema/package.json b/packages/schema/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "devDependencies": {
     "graphql-scalars": "1.17.0"

diff --git a/packages/stitch/package.json b/packages/stitch/package.json
@@ -26,7 +26,7 @@
     "definition": "dist/index.d.ts"
   },
   "peerDependencies": {
-    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
+    "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
   },
   "buildOptions": {
     "input": "./src/index.ts"

diff --git a/packages/stitch/src/typeFromAST.ts b/packages/stitch/src/typeFromAST.ts
@@ -26,10 +26,9 @@ import {
   getDirectiveValues,
   GraphQLDeprecatedDirective,
   TypeDefinitionNode,
-  DirectiveLocationEnum,
 } from 'graphql';
 
-import { createStub, createNamedStub, Maybe, getDescription } from '@graphql-tools/utils';
+import { createStub, createNamedStub, Maybe, getDescription, DirectiveLocationEnum } from '@graphql-tools/utils';
 
 const backcompatOptions = { commentDescriptions: true };