Merge pull request #535 from aws-amplify/main

Release Amplify Codegen v3.3.6

Author: AaronZyLee

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

@@ -37,6 +37,6 @@
   "peerDependencies": {
     "amplify-cli-core": "^3.0.0",
     "amplify-headless-interface": "^1.13.1",
-    "graphql-transformer-core": "^7.2.1"
+    "graphql-transformer-core": "^7.6.6"
   }
 }

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

@@ -42,7 +42,7 @@
   },
   "peerDependencies": {
     "amplify-cli-core": "^3.0.0",
-    "graphql-transformer-core": "^7.2.1"
+    "graphql-transformer-core": "^7.6.6"
   },
   "jest": {
     "verbose": false,

packages/amplify-codegen/package.json

@@ -23,12 +23,12 @@
     "@aws-amplify/appsync-modelgen-plugin": "2.3.2",
     "@aws-amplify/graphql-docs-generator": "3.0.2",
     "@aws-amplify/graphql-types-generator": "3.0.0",
-    "@graphql-codegen/core": "1.8.3",
+    "@graphql-codegen/core": "2.6.6",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
     "glob-all": "^3.1.0",
     "glob-parent": "^6.0.2",
-    "graphql": "^14.5.8",
+    "graphql": "^15.5.0",
     "graphql-config": "^2.2.1",
     "inquirer": "^7.3.3",
     "js-yaml": "^4.0.0",

packages/appsync-modelgen-plugin/package.json

@@ -40,12 +40,13 @@
   },
   "devDependencies": {
     "@graphql-codegen/testing": "^1.17.7",
-    "graphql": "^14.5.8",
+    "@graphql-codegen/typescript": "^2.8.3",
+    "graphql": "^15.5.0",
     "java-ast": "^0.1.0",
     "ts-json-schema-generator": "1.0.0"
   },
   "peerDependencies": {
-    "graphql": "^14.5.8"
+    "graphql": "^15.5.0"
   },
   "typescript": {
     "definition": "lib/index.d.ts"

packages/graphql-docs-generator/package.json

@@ -32,7 +32,7 @@
     "clean": "rimraf ./lib"
   },
   "dependencies": {
-    "graphql": "^14.5.8",
+    "graphql": "^15.5.0",
     "handlebars": "4.7.7",
     "prettier": "^1.19.1",
     "yargs": "^15.1.0"

packages/graphql-types-generator/package.json

@@ -46,7 +46,7 @@
     "core-js": "^3.6.4",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
-    "graphql": "^14.5.8",
+    "graphql": "^15.5.0",
     "inflected": "^2.0.4",
     "prettier": "^1.19.1",
     "rimraf": "^3.0.0",

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

@@ -444,3 +444,5 @@ function wrapInBooleanConditionsIfNeeded(
 
   return selection;
 }
+
+export type Maybe<T> = null | undefined | T;

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

@@ -8,7 +8,7 @@ import { typeCaseForSelectionSet } from './visitors/typeCase';
 import { collectAndMergeFields } from './visitors/collectAndMergeFields';
 
 import '../utilities/array';
-import Maybe from 'graphql/tsutils/Maybe';
+import { Maybe } from './';
 
 export interface CompilerOptions {
   addTypename?: boolean;
@@ -91,7 +91,7 @@ export interface Argument {
 export function compileToLegacyIR(
   schema: GraphQLSchema,
   document: DocumentNode,
-  options: CompilerOptions = { mergeInFieldsFromFragmentSpreads: true }
+  options: CompilerOptions = { mergeInFieldsFromFragmentSpreads: true },
 ): LegacyCompilerContext {
   const context = compileToIR(schema, document, options);
   const transformer = new LegacyIRTransformer(context, options);
@@ -164,7 +164,7 @@ class LegacyIRTransformer {
         return undefined;
 
       const fragmentSpreads: string[] = this.collectFragmentSpreads(selectionSet, variant.possibleTypes).map(
-        (fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName
+        (fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName,
       );
       return variant.possibleTypes.map(possibleType => {
         return {
@@ -181,7 +181,7 @@ class LegacyIRTransformer {
     }
 
     const fragmentSpreads: string[] = this.collectFragmentSpreads(selectionSet).map(
-      (fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName
+      (fragmentSpread: FragmentSpread) => fragmentSpread.fragmentName,
     );
 
     return {

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

@@ -1,4 +1,5 @@
 import { LegacyCompilerContext, LegacyInlineFragment, LegacyFragment, LegacyField, LegacyOperation } from '../compiler/legacyIR';
+import { Maybe } from '../compiler';
 import {
   GraphQLError,
   getNamedType,
@@ -26,7 +27,6 @@ import { CodeGenerator } from '../utilities/CodeGenerator';
 import { interfaceDeclaration, propertyDeclaration, pickedPropertySetsDeclaration, Property } from './language';
 
 import { typeNameFromGraphQLType } from './types';
-import Maybe from 'graphql/tsutils/Maybe';
 
 export function generateSource(context: LegacyCompilerContext) {
   const generator = new CodeGenerator<LegacyCompilerContext>(context);

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

@@ -1,11 +1,11 @@
 import { LegacyInlineFragment } from '../compiler/legacyIR';
+import { Maybe } from '../compiler';
 
 import { pickedPropertyDeclarations } from './codeGeneration';
 import { typeNameFromGraphQLType } from './types';
 
 import { CodeGenerator } from '../utilities/CodeGenerator';
 import { GraphQLType } from 'graphql';
-import Maybe from 'graphql/tsutils/Maybe';
 
 export interface Property {
   fieldName?: string;