Merge branch 'master' into typescript-resolvers-refactor-union-types

Author: eddeee888

.changeset/quick-carpets-teach.md

@@ -0,0 +1,5 @@
+---
+'@graphql-codegen/visitor-plugin-common': patch
+---
+
+Preserve .js extension when importDocumentNodeExternallyFrom and emitLegacyCommonJSImports is false

examples/react/apollo-client/package.json

@@ -19,7 +19,7 @@
     "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   },
   "scripts": {
     "dev": "react-scripts start",

examples/react/graphql-request/package.json

@@ -18,7 +18,7 @@
     "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   },
   "scripts": {
     "dev": "react-scripts start",

examples/react/tanstack-react-query/package.json

@@ -19,7 +19,7 @@
     "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   },
   "scripts": {
     "dev": "react-scripts start",

examples/react/urql/package.json

@@ -18,7 +18,7 @@
     "typescript": "4.9.5",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   },
   "scripts": {
     "dev": "react-scripts start",

examples/vue/apollo-composable/package.json

@@ -25,6 +25,6 @@
     "vue-tsc": "^1.0.24",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   }
 }

examples/vue/urql/package.json

@@ -24,6 +24,6 @@
     "vue-tsc": "^1.0.24",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   }
 }

examples/vue/villus/package.json

@@ -24,6 +24,6 @@
     "vue-tsc": "^1.0.24",
     "serve": "14.2.0",
     "cypress": "12.6.0",
-    "start-server-and-test": "1.15.4"
+    "start-server-and-test": "2.0.0"
   }
 }

packages/plugins/other/visitor-plugin-common/src/client-side-base-visitor.ts

@@ -542,6 +542,10 @@ export class ClientSideBaseVisitor<
   private clearExtension(path: string): string {
     const extension = extname(path);
 
+    if (!this.config.emitLegacyCommonJSImports && extension === '.js') {
+      return path;
+    }
+
     if (EXTENSIONS_TO_REMOVE.includes(extension)) {
       return path.replace(/\.[^/.]+$/, '');
     }

packages/plugins/other/visitor-plugin-common/tests/client-side-base-visitor.spec.ts

@@ -82,4 +82,51 @@ describe('getImports', () => {
       });
     });
   });
+
+  describe('when documentMode "external", importDocumentNodeExternallyFrom is relative path', () => {
+    const schema = buildSchema(/* GraphQL */ `
+      type Query {
+        a: A
+      }
+
+      type A {
+        foo: String
+        bar: String
+      }
+    `);
+
+    describe('when emitLegacyCommonJSImports is false', () => {
+      it('preserves `.js` on Operations import path', () => {
+        const fileName = 'fooBarQuery';
+        const importPath = `./src/queries/${fileName}.js`;
+
+        const document = parse(
+          `query fooBarQuery {
+            a {
+              foo
+              bar
+            }
+          }
+        `
+        );
+
+        const visitor = new ClientSideBaseVisitor(
+          schema,
+          [],
+          {
+            emitLegacyCommonJSImports: false,
+            importDocumentNodeExternallyFrom: importPath,
+            documentMode: DocumentMode.external,
+          },
+          {},
+          [{ document, location: importPath }]
+        );
+
+        visitor.OperationDefinition(document.definitions[0] as OperationDefinitionNode);
+
+        const imports = visitor.getImports();
+        expect(imports[0]).toBe(`import * as Operations from '${importPath}';`);
+      });
+    });
+  });
 });