Updating to support apollo-client v2 backward compatibility

Author: jamshally

README.md

@@ -56,6 +56,7 @@ See [graphql-code-generator documentation](https://graphql-code-generator.com/do
 
 ### graphql-codegen-hasura-gql plugin
 
+- reactApolloVersion (2 | 3, default value: 3): sets the version of react-apollo
 - fragmentImportFrom: import path to the gql fragment generated code. Only required if withFragments:false
 - withFragments: boolean flag for fragment gql code generation
 - withQueries: boolean flag for query gql code generation
@@ -65,6 +66,7 @@ See [graphql-code-generator documentation](https://graphql-code-generator.com/do
 
 ### graphql-codegen-hasura-typescript plugin
 
+- reactApolloVersion (2 | 3, default value: 3): sets the version of react-apollo
 - primaryCodegenTypeScriptImportPath: import path to the code generated with dependent @graphql-codegen/typescript generated code
 - withQueries: boolean flag for query TypeScript code generation
 - withInserts: boolean flag for insert TypeScript code generation

demo/graphql-codegen-gql.yaml

@@ -11,6 +11,7 @@ generates:
     plugins:
       - graphql-codegen-hasura-gql
     config:
+      reactApolloVersion: 3
       withFragments: true
       withQueries: true
       withInserts: true

demo/graphql-codegen-typescript.yaml

@@ -15,6 +15,7 @@ generates:
       - typescript-operations
       - typescript-react-apollo
     config:
+      reactApolloVersion: 3
       withHooks: true
       withHOC: false
       withComponent: false
@@ -25,6 +26,7 @@ generates:
     plugins:
       - graphql-codegen-hasura-typescript
     config:
+      reactApolloVersion: 3
       primaryCodegenTypeScriptImportPath: "./src/autogen"
       withQueries: true
       withInserts: true

packages/graphql-codegen-hasura-gql/src/index.ts

@@ -17,6 +17,7 @@ import {
 // -----------------------------------------------------
 
 export interface CstmHasuraCrudPluginConfig extends RawTypesConfig {
+  reactApolloVersion?: number;
   fragmentImportFrom?: string;
   withFragments?: boolean;
   withQueries?: boolean;
@@ -26,7 +27,13 @@ export interface CstmHasuraCrudPluginConfig extends RawTypesConfig {
 }
 
 export const plugin: PluginFunction<CstmHasuraCrudPluginConfig> = (schema: GraphQLSchema, documents: Types.DocumentFile[], config: CstmHasuraCrudPluginConfig) => {
-  const importArray: string[] = ["/* eslint-disable @typescript-eslint/no-unused-vars */", "import gql from 'graphql-tag';"];
+  // Set config defaults
+  if (!config.reactApolloVersion) config.reactApolloVersion = 3;
+
+  const importArray: string[] = [
+    "/* eslint-disable @typescript-eslint/no-unused-vars */",
+    `import gql from '${config.reactApolloVersion === 3 ? "@apollo/client" : "graphql-tag"}';`
+  ];
   const contentArray: string[] = [];
 
   Object.values(schema.getTypeMap())

packages/graphql-codegen-hasura-typescript/src/index.ts

@@ -17,6 +17,7 @@ import {
 // -----------------------------------------------------
 
 export interface CstmHasuraCrudPluginConfig extends RawTypesConfig {
+  reactApolloVersion?: number;
   primaryCodegenTypeScriptImportPath: string;
   withQueries?: boolean;
   withInserts?: boolean;
@@ -25,7 +26,14 @@ export interface CstmHasuraCrudPluginConfig extends RawTypesConfig {
 }
 
 export const plugin: PluginFunction<CstmHasuraCrudPluginConfig> = (schema: GraphQLSchema, documents: Types.DocumentFile[], config: CstmHasuraCrudPluginConfig) => {
-  const importArray: string[] = [`import { ApolloClient, FetchResult, MutationOptions } from '@apollo/client'`];
+  // Set config defaults
+  if (!config.reactApolloVersion) config.reactApolloVersion = 3;
+
+  const importArray: string[] = [
+    `import { ApolloClient } from '${config.reactApolloVersion === 3 ? "@apollo/client" : "apollo-client"}'`,
+    `import { FetchResult } from '${config.reactApolloVersion === 3 ? "@apollo/client" : "apollo-link"}'`,
+    `import { MutationOptions } from '${config.reactApolloVersion === 3 ? "@apollo/client" : "react-apollo"}'`
+  ];
   const contentArray: string[] = [];
 
   Object.values(schema.getTypeMap())

yarn.lock

@@ -1140,13 +1140,14 @@
     tslib "1.10.0"
 
 "@graphql-codegen/core@^1.8.3":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-1.9.0.tgz#d51680f337cddd32ed8b00a311e85033aec04759"
-  integrity sha512-q8x1uJRY2GXHX1qQPQWIM8tKavPO0WRkPhYdp1FmZwLQ2OWYN889qBUsU7RqLSOrDLtHrRdwrchnhJWVWB5Ztw==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-1.9.1.tgz#aa9f063a56cf20d5cddc001dabfe18c4222f8d7b"
+  integrity sha512-BwAYMIf3BNxrINppOAdxhut5MbNuABsnqPdSfo6TQ8bcB1wvoPmFo8YI3x8wDaWXEOpdr1+IY8HVaZT/wJzLDg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "1.8.3"
-    "@graphql-toolkit/common" "0.7.2"
-    "@graphql-toolkit/schema-merging" "0.7.2"
+    "@graphql-codegen/plugin-helpers" "1.9.1"
+    "@graphql-toolkit/common" "0.7.4"
+    "@graphql-toolkit/schema-merging" "0.7.4"
+    tslib "1.10.0"
 
 "@graphql-codegen/introspection@1.8.3":
   version "1.8.3"
@@ -1167,6 +1168,17 @@
     import-from "3.0.0"
     tslib "1.10.0"
 
+"@graphql-codegen/plugin-helpers@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-1.9.1.tgz#2be98ca17d71c7395508a8f3880bd1e5cb3e206b"
+  integrity sha512-Ji8pk7t6Lcjj09R4Qc7yS7LsyQw9A5IUwFa0LFXyLpdNOmukGhnenIkHG/eLqPzWQfVSXvBsqQBYYDsW8YlDlQ==
+  dependencies:
+    "@graphql-toolkit/common" "0.7.4"
+    change-case "3.1.0"
+    common-tags "1.8.0"
+    import-from "3.0.0"
+    tslib "1.10.0"
+
 "@graphql-codegen/typescript-operations@1.8.3":
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-1.8.3.tgz#8be109d474528c21a4f0420d36278f8d1009365c"
@@ -1208,12 +1220,14 @@
     tslib "1.10.0"
 
 "@graphql-codegen/typescript@^1.8.3":
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-1.9.0.tgz#6be155c2a15308e369394a0920437b3adaaf6eb3"
-  integrity sha512-4Z0cHkEyvv2dcSW8aqGCvSTYd8GWYcPNmA/k6EReucY1dxn2+tc15X750JW5HtyO5cH284tn+zvIfOMEWO9JTg==
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-1.9.1.tgz#9bbc7fdd66885b768f2d6d3d926d6375f71de4b8"
+  integrity sha512-72MUrf/JW5euFjeHjW4jJwtWepIrhxNWMVH/sKo8ZZxa7CcNDwPffb/He9Jpx2qvJIhVgwkcnZZl/iEroYxdNQ==
   dependencies:
-    "@graphql-codegen/visitor-plugin-common" "1.8.3"
+    "@graphql-codegen/plugin-helpers" "1.9.1"
+    "@graphql-codegen/visitor-plugin-common" "1.9.1"
     auto-bind "3.0.0"
+    tslib "1.10.0"
 
 "@graphql-codegen/visitor-plugin-common@1.8.3":
   version "1.8.3"
@@ -1227,6 +1241,18 @@
     relay-compiler "6.0.0"
     tslib "1.10.0"
 
+"@graphql-codegen/visitor-plugin-common@1.9.1":
+  version "1.9.1"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-1.9.1.tgz#93b1c54e0e81c152186e01c5cf6009b5361d4c2e"
+  integrity sha512-RboMoFXD/qYvD7QojIK0KfFvo8SyNQpjl+MyqkZd894bbUqcf7MZjrnU9vOYgCLbzQjwFSj0Rs2VdM9UBTw7kg==
+  dependencies:
+    "@graphql-codegen/plugin-helpers" "1.9.1"
+    auto-bind "3.0.0"
+    dependency-graph "0.8.0"
+    graphql-tag "2.10.1"
+    relay-compiler "7.1.0"
+    tslib "1.10.0"
+
 "@graphql-toolkit/code-file-loader@0.6.6":
   version "0.6.6"
   resolved "https://registry.yarnpkg.com/@graphql-toolkit/code-file-loader/-/code-file-loader-0.6.6.tgz#aee9c8f72a29f10b0ca902321a007ff6bc6d5b29"
@@ -1253,10 +1279,10 @@
     aggregate-error "3.0.1"
     lodash "4.17.15"
 
-"@graphql-toolkit/common@0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.7.2.tgz#10d5ea0a73aac483fba1bf7b1c1274a0ec1da195"
-  integrity sha512-VXbyoaEtWIJVyld/XAysWCcdU20VFckAhTRjsf/H5IvqZy89LvVJiPgzVkJqWfYVVT1UxGJSLEnIIFyfk6V9SQ==
+"@graphql-toolkit/common@0.7.4":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@graphql-toolkit/common/-/common-0.7.4.tgz#abf995268572c83da6e093e8578a67add73d2d51"
+  integrity sha512-uRNF8JT52CVQ4SWM0lbIL+y44G8WSSZ+MIPNoYq6guT4wbwYDMHWPk/6QXyfBN8N5kZePg/Xa9tTyzWF9SLC1w==
   dependencies:
     "@kamilkisiela/graphql-tools" "4.0.6"
     aggregate-error "3.0.1"
@@ -1341,12 +1367,12 @@
     "@kamilkisiela/graphql-tools" "4.0.6"
     deepmerge "4.2.2"
 
-"@graphql-toolkit/schema-merging@0.7.2":
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.7.2.tgz#33bfc10f10c87a73082b0c06fcf7250a86d59aea"
-  integrity sha512-L6VWqS8CMtz9RJLaiGGqEH2hweFM3wz5zwT8rWLs5WcwuXYUxUYDoIeLrwKoGIsJHO0V+zJidoLiinCn6zQD6g==
+"@graphql-toolkit/schema-merging@0.7.4":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@graphql-toolkit/schema-merging/-/schema-merging-0.7.4.tgz#37769a420c3456c7bfa019ad0b0c3ba5bc0a15b5"
+  integrity sha512-kIdjADMwmUPaZ3mf0eacT7AJwit1B1bVY6vsPMVOPeD6xrpQHqaFdCaFCEq6FUyFgSpbGpBdYdvNroyn9QjwSw==
   dependencies:
-    "@graphql-toolkit/common" "0.7.2"
+    "@graphql-toolkit/common" "0.7.4"
     "@kamilkisiela/graphql-tools" "4.0.6"
     deepmerge "4.2.2"
     tslib "1.10.0"
@@ -3397,7 +3423,7 @@ babel-plugin-transform-react-remove-prop-types@0.4.24:
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
   integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
 
-babel-preset-fbjs@^3.1.2:
+babel-preset-fbjs@^3.1.2, babel-preset-fbjs@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541"
   integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==
@@ -9391,7 +9417,7 @@ nth-check@^1.0.2, nth-check@~1.0.1:
   dependencies:
     boolbase "~1.0.0"
 
-nullthrows@^1.1.0:
+nullthrows@^1.1.0, nullthrows@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/nullthrows/-/nullthrows-1.1.1.tgz#7818258843856ae971eae4208ad7d7eb19a431b1"
   integrity sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==
@@ -11437,6 +11463,28 @@ relay-compiler@6.0.0:
     signedsource "^1.0.0"
     yargs "^9.0.0"
 
+relay-compiler@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/relay-compiler/-/relay-compiler-7.1.0.tgz#cd8657c98e4d36f59bc9301ca1dc174e7f373c1a"
+  integrity sha512-8SisbLejjob1CYI9uQP7wxtsWvT+cvbx1iFDgP5U360UBukOGWLehfmn33lygY0LYqnfMShgvL1n7lrqoohs5A==
+  dependencies:
+    "@babel/core" "^7.0.0"
+    "@babel/generator" "^7.0.0"
+    "@babel/parser" "^7.0.0"
+    "@babel/runtime" "^7.0.0"
+    "@babel/traverse" "^7.0.0"
+    "@babel/types" "^7.0.0"
+    babel-preset-fbjs "^3.3.0"
+    chalk "^2.4.1"
+    fast-glob "^2.2.2"
+    fb-watchman "^2.0.0"
+    fbjs "^1.0.0"
+    immutable "~3.7.6"
+    nullthrows "^1.1.1"
+    relay-runtime "7.1.0"
+    signedsource "^1.0.0"
+    yargs "^9.0.0"
+
 relay-runtime@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-6.0.0.tgz#073ec2408f41a28c3a7310d71dd5f42f8e4e4bf3"
@@ -11445,6 +11493,14 @@ relay-runtime@6.0.0:
     "@babel/runtime" "^7.0.0"
     fbjs "^1.0.0"
 
+relay-runtime@7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/relay-runtime/-/relay-runtime-7.1.0.tgz#3a1b38cb55fae7ab2fbb404f7db7a5b900ef963f"
+  integrity sha512-19WV0dC4rcbXnVBKEA4ZL41ccfJRUZ7/KKfQsgc9SwjqCi2g3+yYIR9wJ4KoC+rEfG2yN3W1vWBEqr+igH/rzA==
+  dependencies:
+    "@babel/runtime" "^7.0.0"
+    fbjs "^1.0.0"
+
 remedial@^1.0.7:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/remedial/-/remedial-1.0.8.tgz#a5e4fd52a0e4956adbaf62da63a5a46a78c578a0"