Merge branch 'master' into federation-fixes

eddeee888 · web-flow · commit c24a6143ab3a · 2025-06-27T23:19:48.000+10:00
diff --git a/.changeset/tidy-cows-knock.md b/.changeset/tidy-cows-knock.md
diff --git a/examples/persisted-documents-string-mode/package.json b/examples/persisted-documents-string-mode/package.json
@@ -10,7 +10,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "jest": "28.1.3",
     "babel-jest": "29.7.0",
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/preset-typescript": "7.26.0"
diff --git a/examples/persisted-documents-string-mode/src/gql/graphql.ts b/examples/persisted-documents-string-mode/src/gql/graphql.ts
@@ -38,7 +38,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
@@ -48,7 +48,7 @@ export class TypedDocumentString<TResult, TVariables>
     this.__meta__ = __meta__;
   }
 
-  toString(): string & DocumentTypeDecoration<TResult, TVariables> {
+  override toString(): string & DocumentTypeDecoration<TResult, TVariables> {
     return this.value;
   }
 }
diff --git a/examples/persisted-documents/package.json b/examples/persisted-documents/package.json
@@ -10,7 +10,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "jest": "28.1.3",
     "babel-jest": "29.7.0",
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/preset-typescript": "7.26.0"
diff --git a/examples/programmatic-typescript/package.json b/examples/programmatic-typescript/package.json
@@ -11,8 +11,8 @@
   },
   "dependencies": {
     "@graphql-codegen/core": "4.0.2",
-    "@graphql-codegen/plugin-helpers": "5.1.0",
-    "@graphql-codegen/typed-document-node": "5.1.1",
+    "@graphql-codegen/plugin-helpers": "5.1.1",
+    "@graphql-codegen/typed-document-node": "5.1.2",
     "@graphql-codegen/typescript": "4.1.6",
     "@graphql-codegen/typescript-operations": "4.6.1",
     "@graphql-codegen/typescript-resolvers": "4.5.1",
diff --git a/examples/react/apollo-client-defer/package.json b/examples/react/apollo-client-defer/package.json
@@ -11,7 +11,7 @@
     "graphql-yoga": "5.7.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@types/jest": "^27.5.2",
     "@types/node": "^22.0.0",
     "@types/react": "^18.0.15",
diff --git a/examples/react/apollo-client-swc-plugin/package.json b/examples/react/apollo-client-swc-plugin/package.json
@@ -9,7 +9,7 @@
   },
   "devDependencies": {
     "@graphql-codegen/client-preset-swc-plugin": "0.2.0",
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-react-swc": "^3.3.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
diff --git a/examples/react/apollo-client/package.json b/examples/react/apollo-client/package.json
@@ -9,7 +9,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-react": "^4.0.0",
     "@types/jest": "^27.5.2",
     "@types/node": "^22.0.0",
diff --git a/examples/react/http-executor/package.json b/examples/react/http-executor/package.json
@@ -8,7 +8,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-react": "^4.0.0",
     "@types/jest": "^27.5.2",
     "@types/node": "^22.0.0",
diff --git a/examples/react/nextjs-swr/package.json b/examples/react/nextjs-swr/package.json
@@ -19,7 +19,7 @@
     "swr": "^2.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@graphql-codegen/schema-ast": "4.1.0",
     "@graphql-codegen/client-preset-swc-plugin": "0.2.0",
     "@types/node": "^22.0.0",
diff --git a/examples/react/tanstack-react-query/package.json b/examples/react/tanstack-react-query/package.json
@@ -8,7 +8,7 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-react": "^4.0.0",
     "@types/jest": "^27.5.2",
     "@types/node": "^22.0.0",
diff --git a/examples/react/tanstack-react-query/src/gql/graphql.ts b/examples/react/tanstack-react-query/src/gql/graphql.ts
@@ -1302,7 +1302,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
@@ -1312,7 +1312,7 @@ export class TypedDocumentString<TResult, TVariables>
     this.__meta__ = __meta__;
   }
 
-  toString(): string & DocumentTypeDecoration<TResult, TVariables> {
+  override toString(): string & DocumentTypeDecoration<TResult, TVariables> {
     return this.value;
   }
 }
diff --git a/examples/react/urql/package.json b/examples/react/urql/package.json
@@ -10,7 +10,7 @@
   "devDependencies": {
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.10",
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-react": "^4.0.0",
     "typescript": "5.5.4",
     "serve": "14.2.3",
diff --git a/examples/react/urql/src/gql/graphql.ts b/examples/react/urql/src/gql/graphql.ts
@@ -1302,7 +1302,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
@@ -1312,7 +1312,7 @@ export class TypedDocumentString<TResult, TVariables>
     this.__meta__ = __meta__;
   }
 
-  toString(): string & DocumentTypeDecoration<TResult, TVariables> {
+  override toString(): string & DocumentTypeDecoration<TResult, TVariables> {
     return this.value;
   }
 }
diff --git a/examples/typescript-esm/package.json b/examples/typescript-esm/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.6"
+    "@graphql-codegen/cli": "5.0.7"
   },
   "dependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
diff --git a/examples/typescript-graphql-request/package.json b/examples/typescript-graphql-request/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "babel-jest": "29.7.0",
     "jest": "28.1.3"
   },
diff --git a/examples/typescript-graphql-request/src/gql/graphql.ts b/examples/typescript-graphql-request/src/gql/graphql.ts
@@ -1315,7 +1315,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
@@ -1325,7 +1325,7 @@ export class TypedDocumentString<TResult, TVariables>
     this.__meta__ = __meta__;
   }
 
-  toString(): string & DocumentTypeDecoration<TResult, TVariables> {
+  override toString(): string & DocumentTypeDecoration<TResult, TVariables> {
     return this.value;
   }
 }
diff --git a/examples/typescript-resolvers/package.json b/examples/typescript-resolvers/package.json
@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@graphql-codegen/typescript": "4.1.6",
     "@graphql-codegen/typescript-resolvers": "4.5.1"
   },
diff --git a/examples/vite/vite-react-cts/package.json b/examples/vite/vite-react-cts/package.json
@@ -21,7 +21,7 @@
     "vite": "^6.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
     "cypress": "14.0.0",
diff --git a/examples/vite/vite-react-mts/package.json b/examples/vite/vite-react-mts/package.json
@@ -21,7 +21,7 @@
     "vite": "^6.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
     "cypress": "14.0.0",
diff --git a/examples/vite/vite-react-ts/package.json b/examples/vite/vite-react-ts/package.json
@@ -21,7 +21,7 @@
     "vite": "^6.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
     "cypress": "14.0.0",
diff --git a/examples/vue/apollo-composable/package.json b/examples/vue/apollo-composable/package.json
@@ -17,7 +17,7 @@
     "vue": "^3.2.37"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-vue": "^5.0.0",
     "typescript": "^5.0.0",
     "vite": "^6.0.0",
diff --git a/examples/vue/urql/package.json b/examples/vue/urql/package.json
@@ -16,7 +16,7 @@
     "vue": "^3.2.45"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-vue": "^5.0.0",
     "typescript": "^5.0.0",
     "vite": "^6.0.0",
diff --git a/examples/vue/villus/package.json b/examples/vue/villus/package.json
@@ -16,7 +16,7 @@
     "vue": "^3.2.37"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^5.0.6",
+    "@graphql-codegen/cli": "^5.0.7",
     "@vitejs/plugin-vue": "^5.0.0",
     "typescript": "^5.0.0",
     "vite": "^6.0.0",
diff --git a/examples/yoga-tests/package.json b/examples/yoga-tests/package.json
@@ -9,7 +9,7 @@
     "@graphql-typed-document-node/core": "3.2.0",
     "jest": "28.1.3",
     "babel-jest": "29.7.0",
-    "@graphql-codegen/cli": "5.0.6",
+    "@graphql-codegen/cli": "5.0.7",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/preset-typescript": "7.26.0"
diff --git a/packages/graphql-codegen-cli/CHANGELOG.md b/packages/graphql-codegen-cli/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @graphql-codegen/cli
 
+## 5.0.7
+
+### Patch Changes
+
+- [#10150](https://github.com/dotansimha/graphql-code-generator/pull/10150) [`e324382`](https://github.com/dotansimha/graphql-code-generator/commit/e3243824cfe0d7ab463cf0d5a6455715510959be) Thanks [@ArminWiebigke](https://github.com/ArminWiebigke)! - Allow functions to be passed as valid values for `UrlSchemaOptions.customFetch`. This was already possible, but the type definitions did not reflect that correctly.
+
+- [#10358](https://github.com/dotansimha/graphql-code-generator/pull/10358) [`157c823`](https://github.com/dotansimha/graphql-code-generator/commit/157c8236320f00b06c470e2289315179119d4504) Thanks [@eddeee888](https://github.com/eddeee888)! - Remove extraneous error stacktrace if fails to load `@parcel/watcher`
+
+- Updated dependencies [[`e324382`](https://github.com/dotansimha/graphql-code-generator/commit/e3243824cfe0d7ab463cf0d5a6455715510959be), [`98392fc`](https://github.com/dotansimha/graphql-code-generator/commit/98392fc5d91035b5b5b0ffdefd78d0398762a523)]:
+  - @graphql-codegen/plugin-helpers@5.1.1
+  - @graphql-codegen/client-preset@4.8.2
+
 ## 5.0.6
 
 ### Patch Changes
diff --git a/packages/graphql-codegen-cli/package.json b/packages/graphql-codegen-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "5.0.6",
+  "version": "5.0.7",
   "license": "MIT",
   "bin": {
     "gql-gen": "dist/cjs/bin.js",
@@ -43,9 +43,9 @@
     "@babel/generator": "^7.18.13",
     "@babel/template": "^7.18.10",
     "@babel/types": "^7.18.13",
-    "@graphql-codegen/client-preset": "^4.8.1",
+    "@graphql-codegen/client-preset": "^4.8.2",
     "@graphql-codegen/core": "^4.0.2",
-    "@graphql-codegen/plugin-helpers": "^5.0.3",
+    "@graphql-codegen/plugin-helpers": "^5.1.1",
     "@graphql-tools/apollo-engine-loader": "^8.0.0",
     "@graphql-tools/code-file-loader": "^8.0.0",
     "@graphql-tools/git-loader": "^8.0.0",
diff --git a/packages/graphql-codegen-cli/tests/codegen.spec.ts b/packages/graphql-codegen-cli/tests/codegen.spec.ts
@@ -967,6 +967,31 @@ describe('Codegen Executor', () => {
     expect((global as any).CUSTOM_FETCH_FN_CALLED).toBeTruthy();
   });
 
+  it('should load schema with custom fetch function', async () => {
+    let fetchCalledFor = null;
+
+    async function myCustomFetch(url: string, _options?: RequestInit): Promise<Response> {
+      fetchCalledFor = url;
+      return Promise.resolve(new Response());
+    }
+
+    try {
+      await executeCodegen({
+        schema: ['http://www.dummyschema.com/graphql'],
+        customFetch: myCustomFetch,
+        documents: ['./tests/test-documents/valid.graphql'],
+        generates: {
+          'out1.ts': {
+            plugins: ['typescript'],
+          },
+        },
+      });
+    } catch (error) {
+      expect(error.message).toContain('Failed to load schema from http://www.dummyschema.com/graphql');
+    }
+    expect(fetchCalledFor).toBe('http://www.dummyschema.com/graphql');
+  });
+
   it('should evaluate glob expressions correctly', async () => {
     try {
       await executeCodegen({
diff --git a/packages/plugins/typescript/typed-document-node/CHANGELOG.md b/packages/plugins/typescript/typed-document-node/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/typed-document-node
 
+## 5.1.2
+
+### Patch Changes
+
+- [#10362](https://github.com/dotansimha/graphql-code-generator/pull/10362) [`3188b8c`](https://github.com/dotansimha/graphql-code-generator/commit/3188b8c39e9fd24e3dbbd0bcc8767052153eb399) Thanks [@Brookke](https://github.com/Brookke)! - Make generated type compatible with noImplicitOverride=true
+
+- [#10373](https://github.com/dotansimha/graphql-code-generator/pull/10373) [`c3295f9`](https://github.com/dotansimha/graphql-code-generator/commit/c3295f9c60383e5631ccc4080bc28e7c00a4d61b) Thanks [@eddeee888](https://github.com/eddeee888)! - Fix client preset not working with exactOptionalPropertyTypes=true when documentMode=string
+
 ## 5.1.1
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/typed-document-node/package.json b/packages/plugins/typescript/typed-document-node/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typed-document-node",
-  "version": "5.1.1",
+  "version": "5.1.2",
   "description": "GraphQL Code Generator plugin for generating ready-to-use TypedDocumentNode based on GraphQL operations",
   "repository": {
     "type": "git",
diff --git a/packages/plugins/typescript/typed-document-node/src/index.ts b/packages/plugins/typescript/typed-document-node/src/index.ts
@@ -41,7 +41,7 @@ export class TypedDocumentString<TResult, TVariables>
   extends String
   implements DocumentTypeDecoration<TResult, TVariables>
 {
-  __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];
+  __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;
   private value: string;
   public __meta__?: Record<string, any> | undefined;
 
@@ -51,7 +51,7 @@ export class TypedDocumentString<TResult, TVariables>
     this.__meta__ = __meta__;
   }
 
-  toString(): string & DocumentTypeDecoration<TResult, TVariables> {
+  override toString(): string & DocumentTypeDecoration<TResult, TVariables> {
     return this.value;
   }
 }`,
diff --git a/packages/presets/client/CHANGELOG.md b/packages/presets/client/CHANGELOG.md
@@ -1,5 +1,25 @@
 # @graphql-codegen/client-preset
 
+## 4.8.3
+
+### Patch Changes
+
+- [#10362](https://github.com/dotansimha/graphql-code-generator/pull/10362) [`3188b8c`](https://github.com/dotansimha/graphql-code-generator/commit/3188b8c39e9fd24e3dbbd0bcc8767052153eb399) Thanks [@Brookke](https://github.com/Brookke)! - Make generated type compatible with noImplicitOverride=true
+
+- [#10373](https://github.com/dotansimha/graphql-code-generator/pull/10373) [`c3295f9`](https://github.com/dotansimha/graphql-code-generator/commit/c3295f9c60383e5631ccc4080bc28e7c00a4d61b) Thanks [@eddeee888](https://github.com/eddeee888)! - Fix client preset not working with exactOptionalPropertyTypes=true when documentMode=string
+
+- Updated dependencies [[`3188b8c`](https://github.com/dotansimha/graphql-code-generator/commit/3188b8c39e9fd24e3dbbd0bcc8767052153eb399), [`c3295f9`](https://github.com/dotansimha/graphql-code-generator/commit/c3295f9c60383e5631ccc4080bc28e7c00a4d61b)]:
+  - @graphql-codegen/typed-document-node@5.1.2
+
+## 4.8.2
+
+### Patch Changes
+
+- [#10120](https://github.com/dotansimha/graphql-code-generator/pull/10120) [`98392fc`](https://github.com/dotansimha/graphql-code-generator/commit/98392fc5d91035b5b5b0ffdefd78d0398762a523) Thanks [@yangirov](https://github.com/yangirov)! - The `@graphql-codegen/client-preset` package now supports the `enumValues` option.
+
+- Updated dependencies [[`e324382`](https://github.com/dotansimha/graphql-code-generator/commit/e3243824cfe0d7ab463cf0d5a6455715510959be)]:
+  - @graphql-codegen/plugin-helpers@5.1.1
+
 ## 4.8.1
 
 ### Patch Changes
diff --git a/packages/presets/client/package.json b/packages/presets/client/package.json
diff --git a/packages/presets/client/src/index.ts b/packages/presets/client/src/index.ts
diff --git a/packages/presets/client/tests/client-preset.spec.ts b/packages/presets/client/tests/client-preset.spec.ts
diff --git a/packages/presets/client/tests/fixtures/with-enum-values.ts b/packages/presets/client/tests/fixtures/with-enum-values.ts
diff --git a/packages/utils/plugins-helpers/CHANGELOG.md b/packages/utils/plugins-helpers/CHANGELOG.md
diff --git a/packages/utils/plugins-helpers/package.json b/packages/utils/plugins-helpers/package.json
diff --git a/packages/utils/plugins-helpers/src/types.ts b/packages/utils/plugins-helpers/src/types.ts
diff --git a/website/next.config.js b/website/next.config.js
diff --git a/website/package.json b/website/package.json
diff --git a/website/src/pages/docs/config-reference/schema-field.mdx b/website/src/pages/docs/config-reference/schema-field.mdx
diff --git a/website/src/pages/docs/guides/react-vue.mdx b/website/src/pages/docs/guides/react-vue.mdx
diff --git a/website/src/pages/docs/guides/vanilla-typescript.mdx b/website/src/pages/docs/guides/vanilla-typescript.mdx
diff --git a/website/src/pages/plugins/presets/preset-client.mdx b/website/src/pages/plugins/presets/preset-client.mdx

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ export class TypedDocumentString<TResult, TVariables>`
`38`	`38`	`extends String`
`39`	`39`	`implements DocumentTypeDecoration<TResult, TVariables>`
`40`	`40`	`{`
`41`		`- __apiType?: DocumentTypeDecoration<TResult, TVariables>['__apiType'];`
	`41`	`+ __apiType?: NonNullable<DocumentTypeDecoration<TResult, TVariables>['__apiType']>;`
`42`	`42`	`private value: string;`
`43`	`43`	`public __meta__?: Record<string, any> \| undefined;`
`44`	`44`
`@@ -48,7 +48,7 @@ export class TypedDocumentString<TResult, TVariables>`
`48`	`48`	`this.__meta__ = __meta__;`
`49`	`49`	`}`
`50`	`50`
`51`		`- toString(): string & DocumentTypeDecoration<TResult, TVariables> {`
	`51`	`+ override toString(): string & DocumentTypeDecoration<TResult, TVariables> {`
`52`	`52`	`return this.value;`
`53`	`53`	`}`
`54`	`54`	`}`