feat(graphql): Upgrade GraphQL to v14

dotansimha · Nov 16, 2018 · cd8ac54 · cd8ac54
1 parent e2c01be
commit cd8ac54
Show file tree

Hide file tree

Showing 4 changed files with 788 additions and 18 deletions.
diff --git a/package.json b/package.json
@@ -28,11 +28,11 @@
     "test": "npm-run-all lint test-only"
   },
   "devDependencies": {
-    "@types/graphql": "0.13.0",
+    "@types/graphql": "14.0.3",
     "@types/node": "10.0.2",
     "apollo-link": "1.2.2",
     "ava": "^0.25.0",
-    "graphql": "0.13.2",
+    "graphql": "^14.0.2",
     "graphql-tag": "^2.9.2",
     "npm-run-all": "^4.1.3",
     "rimraf": "^2.6.2",
@@ -51,6 +51,6 @@
     "yargs": "^11.0.0"
   },
   "peerDependencies": {
-    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0"
+    "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
   }
 }
diff --git a/src/codegen/FlowGenerator.ts b/src/codegen/FlowGenerator.ts
@@ -30,6 +30,7 @@ import {
   GraphQLFieldMap,
   GraphQLObjectType as GraphQLObjectTypeRef,
 } from 'graphql'
+import Maybe from 'graphql/tsutils/Maybe'
 
 export class FlowGenerator extends Generator {
   scalarMapping = {
@@ -338,7 +339,7 @@ ${this.renderTypes()}`
 
   renderTypeWrapper(
     typeName: string,
-    typeDescription: string | void,
+    typeDescription: Maybe<string>,
     fieldDefinition: string,
   ): string {
     return `${this.renderDescription(
@@ -348,7 +349,7 @@ ${this.renderTypes()}`
 
   renderObjectWrapper(
     typeName: string,
-    typeDescription: string | void,
+    typeDescription: Maybe<string>,
     objects: GraphQLObjectTypeRef[],
     fieldDefinition: string,
   ): string {
@@ -360,7 +361,7 @@ ${this.renderTypes()}`
 
   renderInterfaceWrapper(
     typeName: string,
-    typeDescription: string | void,
+    typeDescription: Maybe<string>,
     interfaces: GraphQLInterfaceType[],
     fieldDefinition: string,
   ): string {
@@ -375,7 +376,7 @@ ${fieldDefinition}
 |}`
   }
 
-  renderDescription(description?: string | void): string {
+  renderDescription(description: Maybe<string>): string {
     return `${
       description
         ? `/*

diff --git a/src/codegen/TypescriptGenerator.ts b/src/codegen/TypescriptGenerator.ts
@@ -24,6 +24,7 @@ import {
   GraphQLFieldMap,
   GraphQLObjectType as GraphQLObjectTypeRef,
 } from 'graphql'
+import Maybe from 'graphql/tsutils/Maybe'
 
 import { Generator } from './Generator'
 
@@ -333,7 +334,7 @@ ${this.renderTypes()}`
 
   renderTypeWrapper(
     typeName: string,
-    typeDescription: string | void,
+    typeDescription: Maybe<string>,
     fieldDefinition: string,
   ): string {
     return `${this.renderDescription(
@@ -345,7 +346,7 @@ ${fieldDefinition}
 
   renderInterfaceWrapper(
     typeName: string,
-    typeDescription: string | void,
+    typeDescription: Maybe<string>,
     interfaces: GraphQLInterfaceType[],
     fieldDefinition: string,
   ): string {
@@ -360,7 +361,7 @@ ${fieldDefinition}
 }`
   }
 
-  renderDescription(description?: string | void) {
+  renderDescription(description: Maybe<string>) {
     return `${
       description
         ? `/*