From c70018900002eb16b79e4a701da77c52cee2a33a Mon Sep 17 00:00:00 2001 From: wlee221 Date: Mon, 4 Oct 2021 15:18:27 -0700 Subject: [PATCH 1/5] Bump graphql to 14.5.0 --- packages/api-graphql/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index 54eb4aff190..3e112ca2e87 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -49,7 +49,7 @@ "@aws-amplify/cache": "4.0.21", "@aws-amplify/core": "4.3.1", "@aws-amplify/pubsub": "4.1.11", - "graphql": "14.0.0", + "graphql": "14.5.0", "uuid": "^3.2.1", "zen-observable-ts": "0.8.19" }, From ec7819532af84242a5af7eafcac74a8ccaceb12c Mon Sep 17 00:00:00 2001 From: wlee221 Date: Mon, 4 Oct 2021 18:21:04 -0700 Subject: [PATCH 2/5] Specify graphql type where needed --- packages/api-graphql/src/GraphQLAPI.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/api-graphql/src/GraphQLAPI.ts b/packages/api-graphql/src/GraphQLAPI.ts index 216710d5a55..aa742a08084 100644 --- a/packages/api-graphql/src/GraphQLAPI.ts +++ b/packages/api-graphql/src/GraphQLAPI.ts @@ -12,7 +12,7 @@ */ import { GraphQLError } from 'graphql/error/GraphQLError'; // @ts-ignore -import { OperationDefinitionNode } from 'graphql/language'; +import { DocumentNode, OperationDefinitionNode } from 'graphql/language'; import { print } from 'graphql/language/printer'; import { parse } from 'graphql/language/parser'; import Observable from 'zen-observable-ts'; @@ -203,9 +203,10 @@ export class GraphQLAPIClass { */ getGraphqlOperationType(operation) { const doc = parse(operation); - const { - definitions: [{ operation: operationType }], - } = doc; + const definitions = doc.definitions as ReadonlyArray< + OperationDefinitionNode + >; + const [{ operation: operationType }] = definitions; return operationType; } @@ -294,7 +295,7 @@ export class GraphQLAPIClass { }; const body = { - query: print(query), + query: print(query as DocumentNode), variables, }; @@ -389,7 +390,7 @@ export class GraphQLAPIClass { appSyncGraphqlEndpoint, authenticationType, apiKey, - query: print(query), + query: print(query as DocumentNode), region, variables, graphql_headers, From f8e79e45d7e5ea29e9bcebc6960cf8a0faf8cd15 Mon Sep 17 00:00:00 2001 From: wlee221 Date: Thu, 21 Oct 2021 15:32:27 -0700 Subject: [PATCH 3/5] Use graphql 15.6.0 --- packages/api-graphql/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index c9da71f1728..69de3d21f50 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -49,7 +49,7 @@ "@aws-amplify/cache": "4.0.23", "@aws-amplify/core": "4.3.3", "@aws-amplify/pubsub": "4.1.13", - "graphql": "14.5.0", + "graphql": "15.6.0", "zen-observable-ts": "0.8.19" }, "jest": { From 924a08e79d73c2873fa72b2ffc7bc8dc7507a26d Mon Sep 17 00:00:00 2001 From: wlee221 Date: Thu, 21 Oct 2021 15:32:38 -0700 Subject: [PATCH 4/5] Import directly from root --- packages/api-graphql/src/GraphQLAPI.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/api-graphql/src/GraphQLAPI.ts b/packages/api-graphql/src/GraphQLAPI.ts index aa742a08084..6a17bfd5762 100644 --- a/packages/api-graphql/src/GraphQLAPI.ts +++ b/packages/api-graphql/src/GraphQLAPI.ts @@ -10,11 +10,13 @@ * CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions * and limitations under the License. */ -import { GraphQLError } from 'graphql/error/GraphQLError'; -// @ts-ignore -import { DocumentNode, OperationDefinitionNode } from 'graphql/language'; -import { print } from 'graphql/language/printer'; -import { parse } from 'graphql/language/parser'; +import { + DocumentNode, + OperationDefinitionNode, + print, + parse, + GraphQLError, +} from 'graphql'; import Observable from 'zen-observable-ts'; import { Amplify, From 5083e0d994bc10b12b6f12f10f22e98286e6a4d4 Mon Sep 17 00:00:00 2001 From: wlee221 Date: Thu, 21 Oct 2021 17:52:31 -0700 Subject: [PATCH 5/5] Revert "Use graphql 15.6.0" This reverts commit f8e79e45d7e5ea29e9bcebc6960cf8a0faf8cd15. --- packages/api-graphql/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index 69de3d21f50..c9da71f1728 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -49,7 +49,7 @@ "@aws-amplify/cache": "4.0.23", "@aws-amplify/core": "4.3.3", "@aws-amplify/pubsub": "4.1.13", - "graphql": "15.6.0", + "graphql": "14.5.0", "zen-observable-ts": "0.8.19" }, "jest": {