falling back to using 'graphql-tag' import

Author: jamshally

README.md

@@ -248,4 +248,5 @@ There are many refinements and enhancements that would be beneficial, and contri
 
 ## Notes
 
-This is development is not affiliated with either the [graphql-code-generator](https://graphql-code-generator.com/) team, the [Hasura](https://hasura.io/) team, or the [Apollo GraphQL](https://www.apollographql.com/) team.
+- This is development is not affiliated with either the [graphql-code-generator](https://graphql-code-generator.com/) team, the [Hasura](https://hasura.io/) team, or the [Apollo GraphQL](https://www.apollographql.com/) team.
+- graphql-code-generator only picking up gql from 'graphql-tag' import, and not the newer '@apollo/client' import. The 'graphql-tag' import will continue to be used until this is addressed, even for react-apollo v3.

demo/src/autogen/hasura/typescript.ts

@@ -1,4 +1,6 @@
-import { ApolloClient, FetchResult, MutationOptions } from '@apollo/client'
+import { ApolloClient } from '@apollo/client'
+import { FetchResult } from '@apollo/client'
+import { MutationOptions } from '@apollo/client'
 import { observationModelFieldsFragment } from './src/autogen';
 import { InsertobservationModelMutation } from './src/autogen';
 import { InsertobservationModelMutationVariables } from './src/autogen';

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

@@ -32,7 +32,8 @@ export const plugin: PluginFunction<CstmHasuraCrudPluginConfig> = (schema: Graph
 
   const importArray: string[] = [
     "/* eslint-disable @typescript-eslint/no-unused-vars */",
-    `import gql from '${config.reactApolloVersion === 3 ? "@apollo/client" : "graphql-tag"}';`
+    //`import gql from '${config.reactApolloVersion === 3 ? "@apollo/client" : "graphql-tag"}';` //graphql-code-generator still only picking up gql from 'graphql-tag' import. Will switch to "@apollo/client" import when this issue is addressed
+    `import gql from 'graphql-tag';`
   ];
   const contentArray: string[] = [];