diff --git a/.changeset/sixty-sheep-tease.md b/.changeset/sixty-sheep-tease.md
deleted file mode 100644
index c317e916f88..00000000000
--- a/.changeset/sixty-sheep-tease.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-'@graphql-codegen/gql-tag-operations': minor
-'@graphql-codegen/visitor-plugin-common': minor
-'@graphql-codegen/graphql-modules-preset': minor
-'@graphql-codegen/plugin-helpers': minor
-'@graphql-codegen/cli': minor
-'@graphql-codegen/client-preset': minor
----
-
-add importExtension configuration option
diff --git a/examples/persisted-documents-string-mode/package.json b/examples/persisted-documents-string-mode/package.json
index 6d8bf7892c4..77688db93fb 100644
--- a/examples/persisted-documents-string-mode/package.json
+++ b/examples/persisted-documents-string-mode/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
-    "@graphql-codegen/cli": "6.0.2",
+    "@graphql-codegen/cli": "6.1.0",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/preset-typescript": "7.27.1"
diff --git a/examples/persisted-documents/package.json b/examples/persisted-documents/package.json
index 3560922602a..8170d13f245 100644
--- a/examples/persisted-documents/package.json
+++ b/examples/persisted-documents/package.json
@@ -8,7 +8,7 @@
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
-    "@graphql-codegen/cli": "6.0.2",
+    "@graphql-codegen/cli": "6.1.0",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/preset-typescript": "7.27.1"
diff --git a/examples/programmatic-typescript/package.json b/examples/programmatic-typescript/package.json
index a279206f619..3d24988b8d6 100644
--- a/examples/programmatic-typescript/package.json
+++ b/examples/programmatic-typescript/package.json
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@graphql-codegen/core": "5.0.0",
-    "@graphql-codegen/plugin-helpers": "6.0.0",
-    "@graphql-codegen/typed-document-node": "6.1.2",
-    "@graphql-codegen/typescript": "5.0.4",
-    "@graphql-codegen/typescript-operations": "5.0.4",
-    "@graphql-codegen/typescript-resolvers": "5.1.2",
+    "@graphql-codegen/plugin-helpers": "6.1.0",
+    "@graphql-codegen/typed-document-node": "6.1.3",
+    "@graphql-codegen/typescript": "5.0.5",
+    "@graphql-codegen/typescript-operations": "5.0.5",
+    "@graphql-codegen/typescript-resolvers": "5.1.3",
     "@graphql-tools/graphql-file-loader": "8.0.1",
     "@graphql-tools/load": "8.1.0",
     "@graphql-tools/schema": "10.0.6",
diff --git a/examples/react/apollo-client-defer/package.json b/examples/react/apollo-client-defer/package.json
index ec45a88fb2b..e33fe892812 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@types/node": "^22.0.0",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.10",
diff --git a/examples/react/apollo-client-swc-plugin/package.json b/examples/react/apollo-client-swc-plugin/package.json
index 121038ca010..9d2cdede48a 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@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
index 1a586657ff4..f9d13bccbc2 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@vitejs/plugin-react": "^4.0.0",
     "@types/node": "^22.0.0",
     "@types/react": "^18.0.15",
diff --git a/examples/react/http-executor/package.json b/examples/react/http-executor/package.json
index c298a67e76a..136b2c0d766 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@vitejs/plugin-react": "^4.0.0",
     "@types/node": "^22.0.0",
     "@types/react": "^18.0.17",
diff --git a/examples/react/nextjs-swr/package.json b/examples/react/nextjs-swr/package.json
index 5e2c92f1779..f2960041392 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@graphql-codegen/schema-ast": "5.0.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
index 83e8b3e585f..c3c76ed6581 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@vitejs/plugin-react": "^4.0.0",
     "@types/node": "^22.0.0",
     "@types/react": "^18.0.17",
diff --git a/examples/react/urql/package.json b/examples/react/urql/package.json
index 29a079fca09..3b7cec50730 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@vitejs/plugin-react": "^4.0.0",
     "typescript": "5.5.4",
     "serve": "14.2.3",
diff --git a/examples/typescript-esm/package.json b/examples/typescript-esm/package.json
index d029b17468b..4a16bc65178 100644
--- 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": "6.0.2"
+    "@graphql-codegen/cli": "6.1.0"
   },
   "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
index 70e8d921992..28a85e3c7bb 100644
--- 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": "6.0.2"
+    "@graphql-codegen/cli": "6.1.0"
   },
   "dependencies": {
     "graphql": "16.9.0",
diff --git a/examples/typescript-resolvers/package.json b/examples/typescript-resolvers/package.json
index eed4e23b278..c766723fe64 100644
--- a/examples/typescript-resolvers/package.json
+++ b/examples/typescript-resolvers/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": true,
   "devDependencies": {
-    "@graphql-codegen/cli": "6.0.2",
-    "@graphql-codegen/typescript": "5.0.4",
-    "@graphql-codegen/typescript-resolvers": "5.1.2"
+    "@graphql-codegen/cli": "6.1.0",
+    "@graphql-codegen/typescript": "5.0.5",
+    "@graphql-codegen/typescript-resolvers": "5.1.3"
   },
   "dependencies": {
     "graphql": "16.9.0",
diff --git a/examples/vite/vite-react-cts/package.json b/examples/vite/vite-react-cts/package.json
index c58354e983b..40d40390361 100644
--- 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": "6.0.2",
+    "@graphql-codegen/cli": "6.1.0",
     "@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
index d2d85169b8c..348aeb1661b 100644
--- 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": "6.0.2",
+    "@graphql-codegen/cli": "6.1.0",
     "@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
index df591ee20b0..352968bebec 100644
--- 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": "6.0.2",
+    "@graphql-codegen/cli": "6.1.0",
     "@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
index 51107306306..af5546479ea 100644
--- 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": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@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
index e70c9822acd..fb834241feb 100644
--- a/examples/vue/urql/package.json
+++ b/examples/vue/urql/package.json
@@ -16,7 +16,7 @@
     "vue": "^3.2.45"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@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
index 768ff5f0e5f..5486c45e5cb 100644
--- a/examples/vue/villus/package.json
+++ b/examples/vue/villus/package.json
@@ -16,7 +16,7 @@
     "vue": "^3.2.37"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "^6.0.2",
+    "@graphql-codegen/cli": "^6.1.0",
     "@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
index 7e4685721e8..49bb299383a 100644
--- a/examples/yoga-tests/package.json
+++ b/examples/yoga-tests/package.json
@@ -7,7 +7,7 @@
   },
   "devDependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
-    "@graphql-codegen/cli": "6.0.2",
+    "@graphql-codegen/cli": "6.1.0",
     "@babel/core": "7.25.2",
     "@babel/preset-env": "7.25.3",
     "@babel/preset-typescript": "7.27.1"
diff --git a/packages/graphql-codegen-cli/CHANGELOG.md b/packages/graphql-codegen-cli/CHANGELOG.md
index 9182b9a6aa9..cdc0056ccea 100644
--- a/packages/graphql-codegen-cli/CHANGELOG.md
+++ b/packages/graphql-codegen-cli/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @graphql-codegen/cli
 
+## 6.1.0
+
+### Minor Changes
+
+- [#10510](https://github.com/dotansimha/graphql-code-generator/pull/10510) [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670) Thanks [@nickmessing](https://github.com/nickmessing)! - add importExtension configuration option
+
+### Patch Changes
+
+- Updated dependencies [[`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/plugin-helpers@6.1.0
+  - @graphql-codegen/client-preset@5.2.0
+
 ## 6.0.2
 
 ### Patch Changes
diff --git a/packages/graphql-codegen-cli/package.json b/packages/graphql-codegen-cli/package.json
index e5a812ce767..7cf4649fb04 100644
--- a/packages/graphql-codegen-cli/package.json
+++ b/packages/graphql-codegen-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/cli",
-  "version": "6.0.2",
+  "version": "6.1.0",
   "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": "^5.1.2",
+    "@graphql-codegen/client-preset": "^5.2.0",
     "@graphql-codegen/core": "^5.0.0",
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
     "@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/plugins/other/visitor-plugin-common/CHANGELOG.md b/packages/plugins/other/visitor-plugin-common/CHANGELOG.md
index 1deda628cda..624377475df 100644
--- a/packages/plugins/other/visitor-plugin-common/CHANGELOG.md
+++ b/packages/plugins/other/visitor-plugin-common/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @graphql-codegen/visitor-plugin-common
 
+## 6.2.0
+
+### Minor Changes
+
+- [#10510](https://github.com/dotansimha/graphql-code-generator/pull/10510) [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670) Thanks [@nickmessing](https://github.com/nickmessing)! - add importExtension configuration option
+
+### Patch Changes
+
+- [#10512](https://github.com/dotansimha/graphql-code-generator/pull/10512) [`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8) Thanks [@realies](https://github.com/realies)! - fix: allow mappers to override root types (Query, Mutation, Subscription)
+
+  Previously, mappers configured for root types were ignored because root types were checked before mappers. This fix moves the mapper check before the root type check, allowing mappers to override `rootValueType` when configured.
+
+- Updated dependencies [[`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/plugin-helpers@6.1.0
+
 ## 6.1.2
 
 ### Patch Changes
diff --git a/packages/plugins/other/visitor-plugin-common/package.json b/packages/plugins/other/visitor-plugin-common/package.json
index 067d509c766..bcdb103f1ec 100644
--- a/packages/plugins/other/visitor-plugin-common/package.json
+++ b/packages/plugins/other/visitor-plugin-common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "6.1.2",
+  "version": "6.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@graphql-tools/optimize": "^2.0.0",
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
     "@graphql-tools/relay-operation-optimizer": "^7.0.0",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",
diff --git a/packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts b/packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts
index bb8cef98b18..df1f1105110 100644
--- a/packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts
+++ b/packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts
@@ -971,15 +971,20 @@ export class BaseResolversVisitor<
       const isScalar = this.config.scalars[typeName];
       const hasDefaultMapper = !!this.config.defaultMapper?.type;
 
+      // Check for mappers first, even for root types, to allow overriding rootValueType
+      if (isMapped && this.config.mappers[typeName].type && !hasPlaceholder(this.config.mappers[typeName].type)) {
+        this.markMapperAsUsed(typeName);
+        prev[typeName] = applyWrapper(this.config.mappers[typeName].type);
+
+        return prev;
+      }
+
       if (isRootType) {
         prev[typeName] = applyWrapper(this.config.rootValueType.type);
 
         return prev;
       }
-      if (isMapped && this.config.mappers[typeName].type && !hasPlaceholder(this.config.mappers[typeName].type)) {
-        this.markMapperAsUsed(typeName);
-        prev[typeName] = applyWrapper(this.config.mappers[typeName].type);
-      } else if (isEnumType(schemaType) && this.config.enumValues[typeName]) {
+      if (isEnumType(schemaType) && this.config.enumValues[typeName]) {
         const isExternalFile = !!this.config.enumValues[typeName].sourceFile;
         prev[typeName] = isExternalFile
           ? this.convertName(this.config.enumValues[typeName].typeIdentifier, {
diff --git a/packages/plugins/typescript/document-nodes/CHANGELOG.md b/packages/plugins/typescript/document-nodes/CHANGELOG.md
index 95b2a13e404..1ebb2fd8148 100644
--- a/packages/plugins/typescript/document-nodes/CHANGELOG.md
+++ b/packages/plugins/typescript/document-nodes/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/typescript-document-nodes
 
+## 5.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+
 ## 5.0.4
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/document-nodes/package.json b/packages/plugins/typescript/document-nodes/package.json
index f59a588878f..9dc1e67a138 100644
--- a/packages/plugins/typescript/document-nodes/package.json
+++ b/packages/plugins/typescript/document-nodes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-document-nodes",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "GraphQL Code Generator plugin for generating TypeScript modules with embedded GraphQL document nodes",
   "repository": {
     "type": "git",
@@ -13,8 +13,8 @@
     "test": "vitest --no-watch"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
   },
diff --git a/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md b/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md
index 63c4a97a766..7a0c3e0fd42 100644
--- a/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md
+++ b/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @graphql-codegen/gql-tag-operations
 
+## 5.1.0
+
+### Minor Changes
+
+- [#10510](https://github.com/dotansimha/graphql-code-generator/pull/10510) [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670) Thanks [@nickmessing](https://github.com/nickmessing)! - add importExtension configuration option
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+
 ## 5.0.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/gql-tag-operations/package.json b/packages/plugins/typescript/gql-tag-operations/package.json
index a5c055d7df1..f21aaedfec5 100644
--- a/packages/plugins/typescript/gql-tag-operations/package.json
+++ b/packages/plugins/typescript/gql-tag-operations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/gql-tag-operations",
-  "version": "5.0.5",
+  "version": "5.1.0",
   "description": "GraphQL Code Generator plugin for generating a typed gql tag function",
   "repository": {
     "type": "git",
@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@graphql-tools/utils": "^10.0.0",
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
   },
diff --git a/packages/plugins/typescript/operations/CHANGELOG.md b/packages/plugins/typescript/operations/CHANGELOG.md
index 2cb5d57b152..f953be4d204 100644
--- a/packages/plugins/typescript/operations/CHANGELOG.md
+++ b/packages/plugins/typescript/operations/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @graphql-codegen/typescript-operations
 
+## 5.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+  - @graphql-codegen/typescript@5.0.5
+
 ## 5.0.4
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/operations/package.json b/packages/plugins/typescript/operations/package.json
index a890d6a6af8..704ad204a60 100644
--- a/packages/plugins/typescript/operations/package.json
+++ b/packages/plugins/typescript/operations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-operations",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for GraphQL queries, mutations, subscriptions and fragments",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "test": "vitest --no-watch"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/typescript": "^5.0.4",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/typescript": "^5.0.5",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
   },
diff --git a/packages/plugins/typescript/resolvers/CHANGELOG.md b/packages/plugins/typescript/resolvers/CHANGELOG.md
index 86cf2c485b5..e8759bd833c 100644
--- a/packages/plugins/typescript/resolvers/CHANGELOG.md
+++ b/packages/plugins/typescript/resolvers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @graphql-codegen/typescript-resolvers
 
+## 5.1.3
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+  - @graphql-codegen/typescript@5.0.5
+
 ## 5.1.2
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/resolvers/package.json b/packages/plugins/typescript/resolvers/package.json
index 11b8afacd3e..20f61db6e5f 100644
--- a/packages/plugins/typescript/resolvers/package.json
+++ b/packages/plugins/typescript/resolvers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-resolvers",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for resolvers signature",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "test": "vitest --no-watch"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/typescript": "^5.0.4",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/typescript": "^5.0.5",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
diff --git a/packages/plugins/typescript/typed-document-node/CHANGELOG.md b/packages/plugins/typescript/typed-document-node/CHANGELOG.md
index 3f9029b4196..4629fd307da 100644
--- 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
 
+## 6.1.3
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+
 ## 6.1.2
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/typed-document-node/package.json b/packages/plugins/typescript/typed-document-node/package.json
index e41dd74de07..e227a72e077 100644
--- 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": "6.1.2",
+  "version": "6.1.3",
   "description": "GraphQL Code Generator plugin for generating ready-to-use TypedDocumentNode based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "change-case-all": "1.0.15",
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
   },
diff --git a/packages/plugins/typescript/typescript/CHANGELOG.md b/packages/plugins/typescript/typescript/CHANGELOG.md
index a3345c0ab03..49c2e6593b0 100644
--- a/packages/plugins/typescript/typescript/CHANGELOG.md
+++ b/packages/plugins/typescript/typescript/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/typescript
 
+## 5.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+
 ## 5.0.4
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/typescript/package.json b/packages/plugins/typescript/typescript/package.json
index b8a64e5af9a..c3ff5f1b3b9 100644
--- a/packages/plugins/typescript/typescript/package.json
+++ b/packages/plugins/typescript/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript",
-  "version": "5.0.4",
+  "version": "5.0.5",
   "description": "GraphQL Code Generator plugin for generating TypeScript types",
   "repository": {
     "type": "git",
@@ -13,9 +13,9 @@
     "test": "vitest --no-watch"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
     "@graphql-codegen/schema-ast": "^5.0.0",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
   },
diff --git a/packages/presets/client/CHANGELOG.md b/packages/presets/client/CHANGELOG.md
index 111a597d4b7..3146dd46e95 100644
--- a/packages/presets/client/CHANGELOG.md
+++ b/packages/presets/client/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @graphql-codegen/client-preset
 
+## 5.2.0
+
+### Minor Changes
+
+- [#10510](https://github.com/dotansimha/graphql-code-generator/pull/10510) [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670) Thanks [@nickmessing](https://github.com/nickmessing)! - add importExtension configuration option
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/gql-tag-operations@5.1.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+  - @graphql-codegen/typescript-operations@5.0.5
+  - @graphql-codegen/typed-document-node@6.1.3
+  - @graphql-codegen/typescript@5.0.5
+
 ## 5.1.3
 
 ### Patch Changes
diff --git a/packages/presets/client/package.json b/packages/presets/client/package.json
index 43906b7269e..2b6c8997c12 100644
--- a/packages/presets/client/package.json
+++ b/packages/presets/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/client-preset",
-  "version": "5.1.3",
+  "version": "5.2.0",
   "description": "GraphQL Code Generator preset for client.",
   "repository": {
     "type": "git",
@@ -21,12 +21,12 @@
     "@babel/helper-plugin-utils": "^7.20.2",
     "@babel/template": "^7.20.7",
     "@graphql-codegen/add": "^6.0.0",
-    "@graphql-codegen/typed-document-node": "^6.1.2",
-    "@graphql-codegen/typescript": "^5.0.4",
-    "@graphql-codegen/typescript-operations": "^5.0.4",
-    "@graphql-codegen/gql-tag-operations": "5.0.5",
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/visitor-plugin-common": "^6.1.2",
+    "@graphql-codegen/typed-document-node": "^6.1.3",
+    "@graphql-codegen/typescript": "^5.0.5",
+    "@graphql-codegen/typescript-operations": "^5.0.5",
+    "@graphql-codegen/gql-tag-operations": "5.1.0",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/visitor-plugin-common": "^6.2.0",
     "@graphql-typed-document-node/core": "3.2.0",
     "@graphql-tools/documents": "^1.0.0",
     "@graphql-tools/utils": "^10.0.0",
diff --git a/packages/presets/graphql-modules/CHANGELOG.md b/packages/presets/graphql-modules/CHANGELOG.md
index 24e9dc241b0..6b6702c0a01 100644
--- a/packages/presets/graphql-modules/CHANGELOG.md
+++ b/packages/presets/graphql-modules/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @graphql-codegen/graphql-modules-preset
 
+## 5.1.0
+
+### Minor Changes
+
+- [#10510](https://github.com/dotansimha/graphql-code-generator/pull/10510) [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670) Thanks [@nickmessing](https://github.com/nickmessing)! - add importExtension configuration option
+
+### Patch Changes
+
+- Updated dependencies [[`f821e8a`](https://github.com/dotansimha/graphql-code-generator/commit/f821e8ab9351f23a9f7e5d5e6fc69c8e8868cad8), [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670)]:
+  - @graphql-codegen/visitor-plugin-common@6.2.0
+  - @graphql-codegen/plugin-helpers@6.1.0
+
 ## 5.0.5
 
 ### Patch Changes
diff --git a/packages/presets/graphql-modules/package.json b/packages/presets/graphql-modules/package.json
index 294fb89f6db..d1fd6c7f6ee 100644
--- a/packages/presets/graphql-modules/package.json
+++ b/packages/presets/graphql-modules/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/graphql-modules-preset",
-  "version": "5.0.5",
+  "version": "5.1.0",
   "description": "GraphQL Code Generator preset for modularized schema",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
     "@types/parse-filepath": "1.0.2"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/visitor-plugin-common": "6.1.2",
+    "@graphql-codegen/plugin-helpers": "^6.1.0",
+    "@graphql-codegen/visitor-plugin-common": "6.2.0",
     "@graphql-tools/utils": "^10.0.0",
     "parse-filepath": "^1.0.2",
     "change-case-all": "1.0.15",
diff --git a/packages/utils/plugins-helpers/CHANGELOG.md b/packages/utils/plugins-helpers/CHANGELOG.md
index 538f0bc608a..3bc4f7d9425 100644
--- a/packages/utils/plugins-helpers/CHANGELOG.md
+++ b/packages/utils/plugins-helpers/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @graphql-codegen/plugin-helpers
 
+## 6.1.0
+
+### Minor Changes
+
+- [#10510](https://github.com/dotansimha/graphql-code-generator/pull/10510) [`9e70bcb`](https://github.com/dotansimha/graphql-code-generator/commit/9e70bcbf5390e815a6844f1965b04056e5d8e670) Thanks [@nickmessing](https://github.com/nickmessing)! - add importExtension configuration option
+
 ## 6.0.0
 
 ### Major Changes
diff --git a/packages/utils/plugins-helpers/package.json b/packages/utils/plugins-helpers/package.json
index b4425e71f20..4065cc51670 100644
--- a/packages/utils/plugins-helpers/package.json
+++ b/packages/utils/plugins-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/plugin-helpers",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "GraphQL Code Generator common utils and types",
   "repository": {
     "type": "git",
diff --git a/website/package.json b/website/package.json
index 3e4a7d308ff..ca468872c02 100644
--- a/website/package.json
+++ b/website/package.json
@@ -26,8 +26,8 @@
     "@graphql-codegen/add": "6.0.0",
     "@graphql-codegen/c-sharp": "4.3.1",
     "@graphql-codegen/c-sharp-operations": "2.3.1",
-    "@graphql-codegen/cli": "6.0.2",
-    "@graphql-codegen/client-preset": "5.1.3",
+    "@graphql-codegen/cli": "6.1.0",
+    "@graphql-codegen/client-preset": "5.2.0",
     "@graphql-codegen/core": "5.0.0",
     "@graphql-codegen/flow": "2.3.6",
     "@graphql-codegen/flow-operations": "2.3.6",
@@ -46,8 +46,8 @@
     "@graphql-codegen/near-operation-file-preset": "2.5.0",
     "@graphql-codegen/schema-ast": "5.0.0",
     "@graphql-codegen/time": "6.0.0",
-    "@graphql-codegen/typed-document-node": "6.1.2",
-    "@graphql-codegen/typescript": "5.0.4",
+    "@graphql-codegen/typed-document-node": "6.1.3",
+    "@graphql-codegen/typescript": "5.0.5",
     "@graphql-codegen/typescript-apollo-angular": "3.5.6",
     "@graphql-codegen/typescript-apollo-client-helpers": "2.2.6",
     "@graphql-codegen/typescript-generic-sdk": "3.1.0",
@@ -56,10 +56,10 @@
     "@graphql-codegen/typescript-mongodb": "2.4.6",
     "@graphql-codegen/typescript-msw": "3.0.1",
     "@graphql-codegen/typescript-nhost": "0.0.3",
-    "@graphql-codegen/typescript-operations": "5.0.4",
+    "@graphql-codegen/typescript-operations": "5.0.5",
     "@graphql-codegen/typescript-react-apollo": "3.3.7",
     "@graphql-codegen/typescript-react-query": "4.1.0",
-    "@graphql-codegen/typescript-resolvers": "5.1.2",
+    "@graphql-codegen/typescript-resolvers": "5.1.3",
     "@graphql-codegen/typescript-rtk-query": "2.4.1",
     "@graphql-codegen/typescript-stencil-apollo": "2.3.6",
     "@graphql-codegen/typescript-type-graphql": "2.3.6",