Skip to content

Commit 4307dbd

Browse files
author
Dane Pilcher
authored
chore: upgrade to graphql 15 (#524)
1 parent ec0e433 commit 4307dbd

File tree

13 files changed

+148
-249
lines changed

13 files changed

+148
-249
lines changed

‎packages/amplify-codegen-e2e-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@
3737
"peerDependencies": {
3838
"amplify-cli-core": "^3.0.0",
3939
"amplify-headless-interface": "^1.13.1",
40-
"graphql-transformer-core": "^7.2.1"
40+
"graphql-transformer-core": "^7.6.6"
4141
}
4242
}

‎packages/amplify-codegen-e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
},
4343
"peerDependencies": {
4444
"amplify-cli-core": "^3.0.0",
45-
"graphql-transformer-core": "^7.2.1"
45+
"graphql-transformer-core": "^7.6.6"
4646
},
4747
"jest": {
4848
"verbose": false,

‎packages/amplify-codegen/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
"@aws-amplify/appsync-modelgen-plugin": "2.3.2",
2424
"@aws-amplify/graphql-docs-generator": "3.0.2",
2525
"@aws-amplify/graphql-types-generator": "3.0.0",
26-
"@graphql-codegen/core": "1.8.3",
26+
"@graphql-codegen/core": "2.6.6",
2727
"chalk": "^3.0.0",
2828
"fs-extra": "^8.1.0",
2929
"glob-all": "^3.1.0",
3030
"glob-parent": "^6.0.2",
31-
"graphql": "^14.5.8",
31+
"graphql": "^15.5.0",
3232
"graphql-config": "^2.2.1",
3333
"inquirer": "^7.3.3",
3434
"js-yaml": "^4.0.0",

‎packages/appsync-modelgen-plugin/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@
4040
},
4141
"devDependencies": {
4242
"@graphql-codegen/testing": "^1.17.7",
43-
"graphql": "^14.5.8",
43+
"@graphql-codegen/typescript": "^2.8.3",
44+
"graphql": "^15.5.0",
4445
"java-ast": "^0.1.0",
4546
"ts-json-schema-generator": "1.0.0"
4647
},
4748
"peerDependencies": {
48-
"graphql": "^14.5.8"
49+
"graphql": "^15.5.0"
4950
},
5051
"typescript": {
5152
"definition": "lib/index.d.ts"

‎packages/graphql-docs-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"clean": "rimraf ./lib"
3333
},
3434
"dependencies": {
35-
"graphql": "^14.5.8",
35+
"graphql": "^15.5.0",
3636
"handlebars": "4.7.7",
3737
"prettier": "^1.19.1",
3838
"yargs": "^15.1.0"

‎packages/graphql-types-generator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"core-js": "^3.6.4",
4747
"fs-extra": "^8.1.0",
4848
"glob": "^7.1.6",
49-
"graphql": "^14.5.8",
49+
"graphql": "^15.5.0",
5050
"inflected": "^2.0.4",
5151
"prettier": "^1.19.1",
5252
"rimraf": "^3.0.0",

‎packages/graphql-types-generator/src/compiler/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,3 +444,5 @@ function wrapInBooleanConditionsIfNeeded(
444444

445445
return selection;
446446
}
447+
448+
export type Maybe<T> = null | undefined | T;

‎packages/graphql-types-generator/src/compiler/legacyIR.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { typeCaseForSelectionSet } from './visitors/typeCase';
88
import { collectAndMergeFields } from './visitors/collectAndMergeFields';
99

1010
import '../utilities/array';
11-
import Maybe from 'graphql/tsutils/Maybe';
11+
import { Maybe } from './';
1212

1313
export interface CompilerOptions {
1414
addTypename?: boolean;
@@ -91,7 +91,7 @@ export interface Argument {
9191
export function compileToLegacyIR(
9292
schema: GraphQLSchema,
9393
document: DocumentNode,
94-
options: CompilerOptions = { mergeInFieldsFromFragmentSpreads: true }
94+
options: CompilerOptions = { mergeInFieldsFromFragmentSpreads: true },
9595
): LegacyCompilerContext {
9696
const context = compileToIR(schema, document, options);
9797
const transformer = new LegacyIRTransformer(context, options);
@@ -164,7 +164,7 @@ class LegacyIRTransformer {
164164
return undefined;
165165

166166
const fragmentSpreads: string[] = this.collectFragmentSpreads(selectionSet, variant.possibleTypes).map(
167-
(fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName
167+
(fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName,
168168
);
169169
return variant.possibleTypes.map(possibleType => {
170170
return {
@@ -181,7 +181,7 @@ class LegacyIRTransformer {
181181
}
182182

183183
const fragmentSpreads: string[] = this.collectFragmentSpreads(selectionSet).map(
184-
(fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName
184+
(fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName,
185185
);
186186

187187
return {

‎packages/graphql-types-generator/src/typescript/codeGeneration.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { LegacyCompilerContext, LegacyInlineFragment, LegacyFragment, LegacyField, LegacyOperation } from '../compiler/legacyIR';
2+
import { Maybe } from '../compiler';
23
import {
34
GraphQLError,
45
getNamedType,
@@ -26,7 +27,6 @@ import { CodeGenerator } from '../utilities/CodeGenerator';
2627
import { interfaceDeclaration, propertyDeclaration, pickedPropertySetsDeclaration, Property } from './language';
2728

2829
import { typeNameFromGraphQLType } from './types';
29-
import Maybe from 'graphql/tsutils/Maybe';
3030

3131
export function generateSource(context: LegacyCompilerContext) {
3232
const generator = new CodeGenerator<LegacyCompilerContext>(context);

‎packages/graphql-types-generator/src/typescript/language.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { LegacyInlineFragment } from '../compiler/legacyIR';
2+
import { Maybe } from '../compiler';
23

34
import { pickedPropertyDeclarations } from './codeGeneration';
45
import { typeNameFromGraphQLType } from './types';
56

67
import { CodeGenerator } from '../utilities/CodeGenerator';
78
import { GraphQLType } from 'graphql';
8-
import Maybe from 'graphql/tsutils/Maybe';
99

1010
export interface Property {
1111
fieldName?: string;

‎packages/graphql-types-generator/src/typescript/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function typeNameFromGraphQLType(
2828
context: LegacyCompilerContext,
2929
type: GraphQLType,
3030
bareTypeName?: string | null,
31-
nullable = true
31+
nullable = true,
3232
): string {
3333
if (isNonNullType(type)) {
3434
return typeNameFromGraphQLType(context, type.ofType, bareTypeName, false);

‎packages/graphql-types-generator/test/__snapshots__/jsonOutput.ts.snap

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ exports[`JSON output should generate JSON output for a mutation with an enum and
4949
\\"responseName\\": \\"__typename\\",
5050
\\"fieldName\\": \\"__typename\\",
5151
\\"type\\": \\"String!\\",
52-
\\"isConditional\\": false
52+
\\"isConditional\\": false,
53+
\\"isDeprecated\\": false
5354
},
5455
{
5556
\\"responseName\\": \\"stars\\",
@@ -194,7 +195,8 @@ exports[`JSON output should generate JSON output for a query with a fragment spr
194195
\\"responseName\\": \\"__typename\\",
195196
\\"fieldName\\": \\"__typename\\",
196197
\\"type\\": \\"String!\\",
197-
\\"isConditional\\": false
198+
\\"isConditional\\": false,
199+
\\"isDeprecated\\": false
198200
},
199201
{
200202
\\"responseName\\": \\"id\\",
@@ -235,7 +237,8 @@ exports[`JSON output should generate JSON output for a query with a fragment spr
235237
\\"responseName\\": \\"__typename\\",
236238
\\"fieldName\\": \\"__typename\\",
237239
\\"type\\": \\"String!\\",
238-
\\"isConditional\\": false
240+
\\"isConditional\\": false,
241+
\\"isDeprecated\\": false
239242
},
240243
{
241244
\\"responseName\\": \\"name\\",
@@ -258,7 +261,8 @@ exports[`JSON output should generate JSON output for a query with a fragment spr
258261
\\"responseName\\": \\"__typename\\",
259262
\\"fieldName\\": \\"__typename\\",
260263
\\"type\\": \\"String!\\",
261-
\\"isConditional\\": false
264+
\\"isConditional\\": false,
265+
\\"isDeprecated\\": false
262266
},
263267
{
264268
\\"responseName\\": \\"name\\",
@@ -289,7 +293,8 @@ exports[`JSON output should generate JSON output for a query with a fragment spr
289293
\\"responseName\\": \\"__typename\\",
290294
\\"fieldName\\": \\"__typename\\",
291295
\\"type\\": \\"String!\\",
292-
\\"isConditional\\": false
296+
\\"isConditional\\": false,
297+
\\"isDeprecated\\": false
293298
},
294299
{
295300
\\"responseName\\": \\"name\\",
@@ -595,7 +600,8 @@ exports[`JSON output should generate JSON output for a query with a nested selec
595600
\\"responseName\\": \\"__typename\\",
596601
\\"fieldName\\": \\"__typename\\",
597602
\\"type\\": \\"String!\\",
598-
\\"isConditional\\": false
603+
\\"isConditional\\": false,
604+
\\"isDeprecated\\": false
599605
},
600606
{
601607
\\"responseName\\": \\"name\\",
@@ -617,7 +623,8 @@ exports[`JSON output should generate JSON output for a query with a nested selec
617623
\\"responseName\\": \\"__typename\\",
618624
\\"fieldName\\": \\"__typename\\",
619625
\\"type\\": \\"String!\\",
620-
\\"isConditional\\": false
626+
\\"isConditional\\": false,
627+
\\"isDeprecated\\": false
621628
},
622629
{
623630
\\"responseName\\": \\"name\\",
@@ -941,7 +948,8 @@ exports[`JSON output should generate JSON output for a query with an enum variab
941948
\\"responseName\\": \\"__typename\\",
942949
\\"fieldName\\": \\"__typename\\",
943950
\\"type\\": \\"String!\\",
944-
\\"isConditional\\": false
951+
\\"isConditional\\": false,
952+
\\"isDeprecated\\": false
945953
},
946954
{
947955
\\"responseName\\": \\"name\\",

0 commit comments

Comments
 (0)