diff --git a/.changeset/beige-rockets-wash.md b/.changeset/beige-rockets-wash.md
deleted file mode 100644
index 2135b703120..00000000000
--- a/.changeset/beige-rockets-wash.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@graphql-codegen/typescript-operations': patch
----
-
-avoidOptionals with skip/include directives fix
diff --git a/.changeset/rude-taxis-drop.md b/.changeset/rude-taxis-drop.md
deleted file mode 100644
index 6359b8b74ac..00000000000
--- a/.changeset/rude-taxis-drop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@graphql-codegen/visitor-plugin-common': minor
----
-
-Fixed an issue where ResolversParentTypes referenced non-existing fields of ResolversParentTypes when the corresponding type was a mapped enum.
diff --git a/packages/plugins/c-sharp/c-sharp-operations/CHANGELOG.md b/packages/plugins/c-sharp/c-sharp-operations/CHANGELOG.md
index f725696aaac..57f1042f2ad 100644
--- a/packages/plugins/c-sharp/c-sharp-operations/CHANGELOG.md
+++ b/packages/plugins/c-sharp/c-sharp-operations/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/c-sharp-operations
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/c-sharp/c-sharp-operations/package.json b/packages/plugins/c-sharp/c-sharp-operations/package.json
index e9a660340cb..17f3dcb064c 100644
--- a/packages/plugins/c-sharp/c-sharp-operations/package.json
+++ b/packages/plugins/c-sharp/c-sharp-operations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/c-sharp-operations",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating CSharp code based on GraphQL operations",
   "repository": "git@github.com:dotansimha/graphql-code-generator.git",
   "license": "MIT",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/c-sharp/c-sharp/CHANGELOG.md b/packages/plugins/c-sharp/c-sharp/CHANGELOG.md
index 579a5e6be83..d3cded1a257 100644
--- a/packages/plugins/c-sharp/c-sharp/CHANGELOG.md
+++ b/packages/plugins/c-sharp/c-sharp/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/c-sharp
 
+## 4.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 4.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/c-sharp/c-sharp/package.json b/packages/plugins/c-sharp/c-sharp/package.json
index a2f117badfc..69b9086848b 100644
--- a/packages/plugins/c-sharp/c-sharp/package.json
+++ b/packages/plugins/c-sharp/c-sharp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/c-sharp",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "GraphQL Code Generator plugin for generating CSharp code based on a GraphQL schema",
   "repository": "git@github.com:dotansimha/graphql-code-generator.git",
   "license": "MIT",
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "tslib": "~2.3.0",
     "unixify": "^1.0.0",
     "change-case-all": "1.0.14"
diff --git a/packages/plugins/flow/flow/CHANGELOG.md b/packages/plugins/flow/flow/CHANGELOG.md
index 1754dc3a852..00f2a1e1ed3 100644
--- a/packages/plugins/flow/flow/CHANGELOG.md
+++ b/packages/plugins/flow/flow/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/flow
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/flow/flow/package.json b/packages/plugins/flow/flow/package.json
index c28458a3c19..ee0b3d0bd96 100644
--- a/packages/plugins/flow/flow/package.json
+++ b/packages/plugins/flow/flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/flow",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating Flow types",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/flow/operations/CHANGELOG.md b/packages/plugins/flow/operations/CHANGELOG.md
index 5e2395101aa..81ed875296b 100644
--- a/packages/plugins/flow/operations/CHANGELOG.md
+++ b/packages/plugins/flow/operations/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/flow-operations
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/flow@2.1.6
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/flow/operations/package.json b/packages/plugins/flow/operations/package.json
index f7227aae405..500e6cd8cd3 100644
--- a/packages/plugins/flow/operations/package.json
+++ b/packages/plugins/flow/operations/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/flow-operations",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating Flow types for GraphQL operations (query/mutation/subscription/fragment)",
   "repository": {
     "type": "git",
@@ -14,9 +14,9 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/flow": "^2.1.5",
+    "@graphql-codegen/flow": "^2.1.6",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/flow/resolvers/CHANGELOG.md b/packages/plugins/flow/resolvers/CHANGELOG.md
index a57e2bf7283..084d39079ff 100644
--- a/packages/plugins/flow/resolvers/CHANGELOG.md
+++ b/packages/plugins/flow/resolvers/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/flow-resolvers
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/flow@2.1.6
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/flow/resolvers/package.json b/packages/plugins/flow/resolvers/package.json
index 8767e4a6bd6..a9c701e7457 100644
--- a/packages/plugins/flow/resolvers/package.json
+++ b/packages/plugins/flow/resolvers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/flow-resolvers",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating Flow types for GraphQL resolvers signature",
   "repository": {
     "type": "git",
@@ -14,9 +14,9 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/flow": "^2.1.5",
+    "@graphql-codegen/flow": "^2.1.6",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "@graphql-tools/utils": "^8.1.1",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/java/apollo-android/CHANGELOG.md b/packages/plugins/java/apollo-android/CHANGELOG.md
index e98f0f5bb85..746da4c6faf 100644
--- a/packages/plugins/java/apollo-android/CHANGELOG.md
+++ b/packages/plugins/java/apollo-android/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/java-apollo-android
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/java-common@2.1.6
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/java/apollo-android/package.json b/packages/plugins/java/apollo-android/package.json
index 2f66c426034..350b453bca1 100644
--- a/packages/plugins/java/apollo-android/package.json
+++ b/packages/plugins/java/apollo-android/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/java-apollo-android",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating Java classes for Apollo-Android",
   "repository": {
     "type": "git",
@@ -14,9 +14,9 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/java-common": "^2.1.5",
+    "@graphql-codegen/java-common": "^2.1.6",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "pluralize": "^8.0.0",
diff --git a/packages/plugins/java/common/CHANGELOG.md b/packages/plugins/java/common/CHANGELOG.md
index 3b15792c604..220be1cbd8b 100644
--- a/packages/plugins/java/common/CHANGELOG.md
+++ b/packages/plugins/java/common/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/java-common
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/java/common/package.json b/packages/plugins/java/common/package.json
index d345445b2cc..c1203f05537 100644
--- a/packages/plugins/java/common/package.json
+++ b/packages/plugins/java/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/java-common",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator utils library for developing Java plugins",
   "repository": {
     "type": "git",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "min-indent": "1.0.1",
     "tslib": "~2.3.0",
diff --git a/packages/plugins/java/java/CHANGELOG.md b/packages/plugins/java/java/CHANGELOG.md
index 2e143d815aa..f0c028edd9a 100644
--- a/packages/plugins/java/java/CHANGELOG.md
+++ b/packages/plugins/java/java/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/java
 
+## 3.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/java-common@2.1.6
+
 ## 3.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/java/java/package.json b/packages/plugins/java/java/package.json
index 9d9c4a50e04..b4d2b3fea65 100644
--- a/packages/plugins/java/java/package.json
+++ b/packages/plugins/java/java/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/java",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "GraphQL Code Generator plugin for generating Java code based on a GraphQL schema",
   "repository": {
     "type": "git",
@@ -14,9 +14,9 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/java-common": "^2.1.5",
+    "@graphql-codegen/java-common": "^2.1.6",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "tslib": "~2.3.0"
   },
   "peerDependencies": {
diff --git a/packages/plugins/java/kotlin/CHANGELOG.md b/packages/plugins/java/kotlin/CHANGELOG.md
index f1892c915cc..5deb815a82d 100644
--- a/packages/plugins/java/kotlin/CHANGELOG.md
+++ b/packages/plugins/java/kotlin/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/kotlin
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/java-common@2.1.6
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/java/kotlin/package.json b/packages/plugins/java/kotlin/package.json
index a59bd2cced1..d7593e24a0d 100644
--- a/packages/plugins/java/kotlin/package.json
+++ b/packages/plugins/java/kotlin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/kotlin",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating Kotlin code based on a GraphQL schema",
   "repository": {
     "type": "git",
@@ -14,9 +14,9 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/java-common": "^2.1.5",
+    "@graphql-codegen/java-common": "^2.1.6",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "tslib": "~2.3.0"
   },
   "peerDependencies": {
diff --git a/packages/plugins/java/resolvers/CHANGELOG.md b/packages/plugins/java/resolvers/CHANGELOG.md
index bece21eb9ea..fabd2958cab 100644
--- a/packages/plugins/java/resolvers/CHANGELOG.md
+++ b/packages/plugins/java/resolvers/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/java-resolvers
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/java-common@2.1.6
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/java/resolvers/package.json b/packages/plugins/java/resolvers/package.json
index 0222bade1eb..35adb39cc7e 100644
--- a/packages/plugins/java/resolvers/package.json
+++ b/packages/plugins/java/resolvers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/java-resolvers",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating resolvers signature for Java backends",
   "repository": {
     "type": "git",
@@ -14,9 +14,9 @@
     "prepack": "bob prepack"
   },
   "dependencies": {
-    "@graphql-codegen/java-common": "^2.1.5",
+    "@graphql-codegen/java-common": "^2.1.6",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "tslib": "~2.3.0"
   },
   "peerDependencies": {
diff --git a/packages/plugins/other/jsdoc/CHANGELOG.md b/packages/plugins/other/jsdoc/CHANGELOG.md
index 9970cf5127f..fb12e64b00c 100644
--- a/packages/plugins/other/jsdoc/CHANGELOG.md
+++ b/packages/plugins/other/jsdoc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/jsdoc
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/other/jsdoc/package.json b/packages/plugins/other/jsdoc/package.json
index f5fd3a82be5..341c58c9755 100644
--- a/packages/plugins/other/jsdoc/package.json
+++ b/packages/plugins/other/jsdoc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/jsdoc",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating JSDoc based types for GraphQL queries, mutations, subscriptions and fragments",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "tslib": "~2.3.0"
   },
   "peerDependencies": {
diff --git a/packages/plugins/other/visitor-plugin-common/CHANGELOG.md b/packages/plugins/other/visitor-plugin-common/CHANGELOG.md
index aa8dcb2feb1..ba6448776c3 100644
--- a/packages/plugins/other/visitor-plugin-common/CHANGELOG.md
+++ b/packages/plugins/other/visitor-plugin-common/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @graphql-codegen/visitor-plugin-common
 
+## 2.4.0
+
+### Minor Changes
+
+- ad02cb9b8: Fixed an issue where ResolversParentTypes referenced non-existing fields of ResolversParentTypes when the corresponding type was a mapped enum.
+
 ## 2.3.0
 
 ### Minor Changes
diff --git a/packages/plugins/other/visitor-plugin-common/package.json b/packages/plugins/other/visitor-plugin-common/package.json
index 92c95955707..4726b03fb21 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": "2.3.0",
+  "version": "2.4.0",
   "license": "MIT",
   "repository": {
     "type": "git",
diff --git a/packages/plugins/typescript/apollo-angular/CHANGELOG.md b/packages/plugins/typescript/apollo-angular/CHANGELOG.md
index 2706db54a91..14d51616a0c 100644
--- a/packages/plugins/typescript/apollo-angular/CHANGELOG.md
+++ b/packages/plugins/typescript/apollo-angular/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-apollo-angular
 
+## 3.2.2
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 3.2.1
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/apollo-angular/package.json b/packages/plugins/typescript/apollo-angular/package.json
index 09308157651..cbd6998c9ce 100644
--- a/packages/plugins/typescript/apollo-angular/package.json
+++ b/packages/plugins/typescript/apollo-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-apollo-angular",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "GraphQL Code Generator plugin for generating ready-to-use Angular Components based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/apollo-client-helpers/CHANGELOG.md b/packages/plugins/typescript/apollo-client-helpers/CHANGELOG.md
index edaaefec33c..82dbcfb5090 100644
--- a/packages/plugins/typescript/apollo-client-helpers/CHANGELOG.md
+++ b/packages/plugins/typescript/apollo-client-helpers/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-apollo-client-helpers
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/apollo-client-helpers/package.json b/packages/plugins/typescript/apollo-client-helpers/package.json
index a1e2c185ce4..f9671a38912 100644
--- a/packages/plugins/typescript/apollo-client-helpers/package.json
+++ b/packages/plugins/typescript/apollo-client-helpers/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-apollo-client-helpers",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating TypeScript helpers for Apollo Client > 3",
   "repository": {
     "type": "git",
@@ -22,7 +22,7 @@
   "dependencies": {
     "change-case-all": "1.0.14",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/document-nodes/CHANGELOG.md b/packages/plugins/typescript/document-nodes/CHANGELOG.md
index 495a58acea7..e828078bb2b 100644
--- a/packages/plugins/typescript/document-nodes/CHANGELOG.md
+++ b/packages/plugins/typescript/document-nodes/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-document-nodes
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/document-nodes/package.json b/packages/plugins/typescript/document-nodes/package.json
index cf41d4533d4..ecda89b2dd4 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": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating TypeScript modules with embedded GraphQL document nodes",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/generic-sdk/CHANGELOG.md b/packages/plugins/typescript/generic-sdk/CHANGELOG.md
index 02e8bdbe785..2f711398a5b 100644
--- a/packages/plugins/typescript/generic-sdk/CHANGELOG.md
+++ b/packages/plugins/typescript/generic-sdk/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-generic-sdk
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/generic-sdk/package.json b/packages/plugins/typescript/generic-sdk/package.json
index c53970c6486..ed8005afdcd 100644
--- a/packages/plugins/typescript/generic-sdk/package.json
+++ b/packages/plugins/typescript/generic-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-generic-sdk",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use client-agnostic SDK based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md b/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md
index 5d25451fa5a..8074b67dee5 100644
--- a/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md
+++ b/packages/plugins/typescript/gql-tag-operations/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/gql-tag-operations
 
+## 1.2.2
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 1.2.1
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/gql-tag-operations/package.json b/packages/plugins/typescript/gql-tag-operations/package.json
index 563494babcb..378b2eb557b 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": "1.2.1",
+  "version": "1.2.2",
   "description": "GraphQL Code Generator plugin for generating a typed gql tag function",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   "dependencies": {
     "@graphql-tools/utils": "^8.1.1",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/graphql-request/CHANGELOG.md b/packages/plugins/typescript/graphql-request/CHANGELOG.md
index 0d94d3e5232..1ffea6a3d78 100644
--- a/packages/plugins/typescript/graphql-request/CHANGELOG.md
+++ b/packages/plugins/typescript/graphql-request/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-graphql-request
 
+## 4.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 4.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/graphql-request/package.json b/packages/plugins/typescript/graphql-request/package.json
index dfacb860fbe..ca84fb2a96a 100644
--- a/packages/plugins/typescript/graphql-request/package.json
+++ b/packages/plugins/typescript/graphql-request/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-graphql-request",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use SDK based on graphql-request and GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/jit-sdk/CHANGELOG.md b/packages/plugins/typescript/jit-sdk/CHANGELOG.md
index 05324be01b2..c09e010a35d 100644
--- a/packages/plugins/typescript/jit-sdk/CHANGELOG.md
+++ b/packages/plugins/typescript/jit-sdk/CHANGELOG.md
@@ -1,6 +1,14 @@
 # @graphql-codegen/typescript-jit-sdk
 
+## 1.0.1
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 1.0.0
+
 ### Major Changes
 
 - b9e85adae: NEW PLUGIN: GraphQL JIT SDK
diff --git a/packages/plugins/typescript/jit-sdk/package.json b/packages/plugins/typescript/jit-sdk/package.json
index 6e921094d42..b7634e957a7 100644
--- a/packages/plugins/typescript/jit-sdk/package.json
+++ b/packages/plugins/typescript/jit-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-jit-sdk",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use SDK that uses GraphQL JIT",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/mongodb/CHANGELOG.md b/packages/plugins/typescript/mongodb/CHANGELOG.md
index 3de83e982aa..5365f0b5bcf 100644
--- a/packages/plugins/typescript/mongodb/CHANGELOG.md
+++ b/packages/plugins/typescript/mongodb/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/typescript-mongodb
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/typescript@2.2.4
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/mongodb/package.json b/packages/plugins/typescript/mongodb/package.json
index 66b2b0725fc..f11e37c1ea4 100644
--- a/packages/plugins/typescript/mongodb/package.json
+++ b/packages/plugins/typescript/mongodb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-mongodb",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generting a ready-to-use ORM types for MongoDB",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/typescript": "^2.2.3",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/typescript": "^2.2.4",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "@graphql-tools/utils": "^8.1.1",
     "auto-bind": "~4.0.0",
     "lodash": "~4.17.0",
diff --git a/packages/plugins/typescript/oclif/CHANGELOG.md b/packages/plugins/typescript/oclif/CHANGELOG.md
index 1b61897554d..15d9b685eba 100644
--- a/packages/plugins/typescript/oclif/CHANGELOG.md
+++ b/packages/plugins/typescript/oclif/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-oclif
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/oclif/package.json b/packages/plugins/typescript/oclif/package.json
index 0c9b8090838..b1c51bacc07 100644
--- a/packages/plugins/typescript/oclif/package.json
+++ b/packages/plugins/typescript/oclif/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-oclif",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating a CLI tool with oclif",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/operations/CHANGELOG.md b/packages/plugins/typescript/operations/CHANGELOG.md
index a0f4be33f43..73c6a3c74b2 100644
--- a/packages/plugins/typescript/operations/CHANGELOG.md
+++ b/packages/plugins/typescript/operations/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @graphql-codegen/typescript-operations
 
+## 2.1.8
+
+### Patch Changes
+
+- 8a576b49a: avoidOptionals with skip/include directives fix
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/typescript@2.2.4
+
 ## 2.1.7
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/operations/package.json b/packages/plugins/typescript/operations/package.json
index 59142be6b57..5a8483582ac 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": "2.1.7",
+  "version": "2.1.8",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for GraphQL queries, mutations, subscriptions and fragments",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/typescript": "^2.2.3",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/typescript": "^2.2.4",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/react-apollo-offix/CHANGELOG.md b/packages/plugins/typescript/react-apollo-offix/CHANGELOG.md
index c9d986bf91a..3cd1139f2d6 100644
--- a/packages/plugins/typescript/react-apollo-offix/CHANGELOG.md
+++ b/packages/plugins/typescript/react-apollo-offix/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-react-offix
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/react-apollo-offix/package.json b/packages/plugins/typescript/react-apollo-offix/package.json
index 7c65a1c449b..fa03b61f680 100644
--- a/packages/plugins/typescript/react-apollo-offix/package.json
+++ b/packages/plugins/typescript/react-apollo-offix/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-react-offix",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating useOffline mutations for offix use",
   "repository": {
     "type": "git",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14"
   },
diff --git a/packages/plugins/typescript/react-apollo/CHANGELOG.md b/packages/plugins/typescript/react-apollo/CHANGELOG.md
index ae7012327a8..82f876beaf9 100644
--- a/packages/plugins/typescript/react-apollo/CHANGELOG.md
+++ b/packages/plugins/typescript/react-apollo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-react-apollo
 
+## 3.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 3.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/react-apollo/package.json b/packages/plugins/typescript/react-apollo/package.json
index e17ecb032bb..b1f7f8a4ffb 100644
--- a/packages/plugins/typescript/react-apollo/package.json
+++ b/packages/plugins/typescript/react-apollo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-react-apollo",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use React Components/HOC/Hooks based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/react-query/CHANGELOG.md b/packages/plugins/typescript/react-query/CHANGELOG.md
index 3d34c804916..2f4a360831a 100644
--- a/packages/plugins/typescript/react-query/CHANGELOG.md
+++ b/packages/plugins/typescript/react-query/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-react-query
 
+## 3.0.3
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 3.0.2
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/react-query/package.json b/packages/plugins/typescript/react-query/package.json
index 77ae4ab4a0c..70f7cb44f24 100644
--- a/packages/plugins/typescript/react-query/package.json
+++ b/packages/plugins/typescript/react-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-react-query",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "GraphQL Code Generator plugin for generating a ready-to-use React-Query Hooks based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/resolvers/CHANGELOG.md b/packages/plugins/typescript/resolvers/CHANGELOG.md
index dc09cf7b258..09f324c8110 100644
--- a/packages/plugins/typescript/resolvers/CHANGELOG.md
+++ b/packages/plugins/typescript/resolvers/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/typescript-resolvers
 
+## 2.3.2
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/typescript@2.2.4
+
 ## 2.3.1
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/resolvers/package.json b/packages/plugins/typescript/resolvers/package.json
index a77d6d841b3..e65678768f2 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": "2.3.1",
+  "version": "2.3.2",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for resolvers signature",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/typescript": "^2.2.3",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/typescript": "^2.2.4",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "@graphql-tools/utils": "^8.1.1",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/rtk-query/CHANGELOG.md b/packages/plugins/typescript/rtk-query/CHANGELOG.md
index 78a2da4b850..cb3ebf9127f 100644
--- a/packages/plugins/typescript/rtk-query/CHANGELOG.md
+++ b/packages/plugins/typescript/rtk-query/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-rtk-query
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/rtk-query/package.json b/packages/plugins/typescript/rtk-query/package.json
index fb038d13d5c..d5564127a39 100644
--- a/packages/plugins/typescript/rtk-query/package.json
+++ b/packages/plugins/typescript/rtk-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-rtk-query",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for injecting graphql endpoints into a preconfigured RTK Query api",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/stencil-apollo/CHANGELOG.md b/packages/plugins/typescript/stencil-apollo/CHANGELOG.md
index 07f432e98c6..4887be77670 100644
--- a/packages/plugins/typescript/stencil-apollo/CHANGELOG.md
+++ b/packages/plugins/typescript/stencil-apollo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-stencil-apollo
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/stencil-apollo/package.json b/packages/plugins/typescript/stencil-apollo/package.json
index a34ab1b9b45..104f6148fdf 100644
--- a/packages/plugins/typescript/stencil-apollo/package.json
+++ b/packages/plugins/typescript/stencil-apollo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-stencil-apollo",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating Stencil Components based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/type-graphql/CHANGELOG.md b/packages/plugins/typescript/type-graphql/CHANGELOG.md
index 905ad682e6c..abaceda211d 100644
--- a/packages/plugins/typescript/type-graphql/CHANGELOG.md
+++ b/packages/plugins/typescript/type-graphql/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @graphql-codegen/typescript-type-graphql
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+  - @graphql-codegen/typescript@2.2.4
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/type-graphql/package.json b/packages/plugins/typescript/type-graphql/package.json
index 22b9cb84695..d9d86e8cbf4 100644
--- a/packages/plugins/typescript/type-graphql/package.json
+++ b/packages/plugins/typescript/type-graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-type-graphql",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating TypeGraphQL compatible TypeScript types",
   "repository": {
     "type": "git",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/typescript": "^2.2.3",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/typescript": "^2.2.4",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/typed-document-node/CHANGELOG.md b/packages/plugins/typescript/typed-document-node/CHANGELOG.md
index 227b43084d3..c4ae2149bc9 100644
--- a/packages/plugins/typescript/typed-document-node/CHANGELOG.md
+++ b/packages/plugins/typescript/typed-document-node/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typed-document-node
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/typed-document-node/package.json b/packages/plugins/typescript/typed-document-node/package.json
index f80ac42b8e5..460ef323e8c 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": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating ready-to-use TypedDocumentNode based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "dependencies": {
     "change-case-all": "1.0.14",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/typescript/CHANGELOG.md b/packages/plugins/typescript/typescript/CHANGELOG.md
index 9ce25139051..c46981a3912 100644
--- a/packages/plugins/typescript/typescript/CHANGELOG.md
+++ b/packages/plugins/typescript/typescript/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript
 
+## 2.2.4
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.2.3
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/typescript/package.json b/packages/plugins/typescript/typescript/package.json
index 8b9989b53a7..30feafbee3a 100644
--- a/packages/plugins/typescript/typescript/package.json
+++ b/packages/plugins/typescript/typescript/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "GraphQL Code Generator plugin for generating TypeScript types",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "tslib": "~2.3.0"
   },
diff --git a/packages/plugins/typescript/urql-graphcache/CHANGELOG.md b/packages/plugins/typescript/urql-graphcache/CHANGELOG.md
index e7a5c493b1b..99b7d4a2580 100644
--- a/packages/plugins/typescript/urql-graphcache/CHANGELOG.md
+++ b/packages/plugins/typescript/urql-graphcache/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-urql-graphcache
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/urql-graphcache/package.json b/packages/plugins/typescript/urql-graphcache/package.json
index cfdf41f8d7e..8560cd2d1c4 100644
--- a/packages/plugins/typescript/urql-graphcache/package.json
+++ b/packages/plugins/typescript/urql-graphcache/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-urql-graphcache",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating a generic to be used in graphcache cache config",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/urql-svelte-operations-store/CHANGELOG.md b/packages/plugins/typescript/urql-svelte-operations-store/CHANGELOG.md
index 591bea9872a..fc094fbe8ad 100644
--- a/packages/plugins/typescript/urql-svelte-operations-store/CHANGELOG.md
+++ b/packages/plugins/typescript/urql-svelte-operations-store/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/urql-svelte-operations-store
 
+## 1.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 1.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/urql-svelte-operations-store/package.json b/packages/plugins/typescript/urql-svelte-operations-store/package.json
index c85ecbe9537..7d1bec95c98 100644
--- a/packages/plugins/typescript/urql-svelte-operations-store/package.json
+++ b/packages/plugins/typescript/urql-svelte-operations-store/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/urql-svelte-operations-store",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "GraphQL Code Generator plugin for generating wrapper for OperationsStore for Svelte & Urql",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/urql/CHANGELOG.md b/packages/plugins/typescript/urql/CHANGELOG.md
index 8be299e5ce6..f3e702af5c8 100644
--- a/packages/plugins/typescript/urql/CHANGELOG.md
+++ b/packages/plugins/typescript/urql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-urql
 
+## 3.2.2
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 3.2.1
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/urql/package.json b/packages/plugins/typescript/urql/package.json
index a07b55a35d5..e74db49875b 100644
--- a/packages/plugins/typescript/urql/package.json
+++ b/packages/plugins/typescript/urql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-urql",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "GraphQL Code Generator plugin for generating an introspection file for Urql's Schema Awareness",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/vue-apollo-smart-ops/CHANGELOG.md b/packages/plugins/typescript/vue-apollo-smart-ops/CHANGELOG.md
index 41c26c9f71a..51fcb5fd30f 100644
--- a/packages/plugins/typescript/vue-apollo-smart-ops/CHANGELOG.md
+++ b/packages/plugins/typescript/vue-apollo-smart-ops/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-vue-apollo-smart-ops
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/vue-apollo-smart-ops/package.json b/packages/plugins/typescript/vue-apollo-smart-ops/package.json
index 28894231ab2..2cc9dbc3a52 100644
--- a/packages/plugins/typescript/vue-apollo-smart-ops/package.json
+++ b/packages/plugins/typescript/vue-apollo-smart-ops/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-vue-apollo-smart-ops",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating typed Vue-Apollo Smart Query and mutation functions based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/vue-apollo/CHANGELOG.md b/packages/plugins/typescript/vue-apollo/CHANGELOG.md
index 70d14a01b43..3f85a75a888 100644
--- a/packages/plugins/typescript/vue-apollo/CHANGELOG.md
+++ b/packages/plugins/typescript/vue-apollo/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-vue-apollo
 
+## 3.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 3.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/vue-apollo/package.json b/packages/plugins/typescript/vue-apollo/package.json
index 22ad4887420..12ee030349f 100644
--- a/packages/plugins/typescript/vue-apollo/package.json
+++ b/packages/plugins/typescript/vue-apollo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-vue-apollo",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "GraphQL Code Generator plugin for generating ready-to-use Vue-Apollo composition functions based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/plugins/typescript/vue-urql/CHANGELOG.md b/packages/plugins/typescript/vue-urql/CHANGELOG.md
index a1f8c105ea2..6a821a8222e 100644
--- a/packages/plugins/typescript/vue-urql/CHANGELOG.md
+++ b/packages/plugins/typescript/vue-urql/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/typescript-vue-urql
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/plugins/typescript/vue-urql/package.json b/packages/plugins/typescript/vue-urql/package.json
index 8dfd401986e..d238934f5c9 100644
--- a/packages/plugins/typescript/vue-urql/package.json
+++ b/packages/plugins/typescript/vue-urql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-vue-urql",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator plugin for generating ready-to-use Vue-Urql composition functions based on GraphQL operations",
   "repository": {
     "type": "git",
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "auto-bind": "~4.0.0",
     "change-case-all": "1.0.14",
     "tslib": "~2.3.0"
diff --git a/packages/presets/graphql-modules/CHANGELOG.md b/packages/presets/graphql-modules/CHANGELOG.md
index 90195d9c450..db36c1300cc 100644
--- a/packages/presets/graphql-modules/CHANGELOG.md
+++ b/packages/presets/graphql-modules/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/graphql-modules-preset
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/presets/graphql-modules/package.json b/packages/presets/graphql-modules/package.json
index 83100e04dd6..d0dd603ef1f 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": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator preset for modularized schema",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "@graphql-tools/utils": "8.3.0",
     "parse-filepath": "^1.0.2",
     "change-case-all": "1.0.14",
diff --git a/packages/presets/import-types/CHANGELOG.md b/packages/presets/import-types/CHANGELOG.md
index d0d6f4772ad..fb3d440410a 100644
--- a/packages/presets/import-types/CHANGELOG.md
+++ b/packages/presets/import-types/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/import-types-preset
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/presets/import-types/package.json b/packages/presets/import-types/package.json
index a585d0774fe..a712c4a7b65 100644
--- a/packages/presets/import-types/package.json
+++ b/packages/presets/import-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/import-types-preset",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator preset for importing types to operation file",
   "repository": {
     "type": "git",
@@ -16,7 +16,7 @@
   "dependencies": {
     "@graphql-codegen/add": "^3.1.0",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "tslib": "~2.3.0"
   },
   "peerDependencies": {
diff --git a/packages/presets/near-operation-file/CHANGELOG.md b/packages/presets/near-operation-file/CHANGELOG.md
index d2da4df232a..531f8c58d1d 100644
--- a/packages/presets/near-operation-file/CHANGELOG.md
+++ b/packages/presets/near-operation-file/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @graphql-codegen/near-operation-file-preset
 
+## 2.1.6
+
+### Patch Changes
+
+- Updated dependencies [ad02cb9b8]
+  - @graphql-codegen/visitor-plugin-common@2.4.0
+
 ## 2.1.5
 
 ### Patch Changes
diff --git a/packages/presets/near-operation-file/package.json b/packages/presets/near-operation-file/package.json
index 0a01fc45815..99a60d17522 100644
--- a/packages/presets/near-operation-file/package.json
+++ b/packages/presets/near-operation-file/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/near-operation-file-preset",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "GraphQL Code Generator preset for generating operation code near the operation file",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
   "dependencies": {
     "@graphql-codegen/add": "^3.1.0",
     "@graphql-codegen/plugin-helpers": "^2.2.0",
-    "@graphql-codegen/visitor-plugin-common": "2.3.0",
+    "@graphql-codegen/visitor-plugin-common": "2.4.0",
     "parse-filepath": "^1.0.2",
     "tslib": "~2.3.0"
   },
diff --git a/website/package.json b/website/package.json
index 99997999e86..6588a4e0b62 100644
--- a/website/package.json
+++ b/website/package.json
@@ -27,42 +27,42 @@
   },
   "dependencies": {
     "@graphql-codegen/add": "3.1.0",
-    "@graphql-codegen/c-sharp": "4.1.5",
-    "@graphql-codegen/c-sharp-operations": "2.1.5",
+    "@graphql-codegen/c-sharp": "4.1.6",
+    "@graphql-codegen/c-sharp-operations": "2.1.6",
     "@graphql-codegen/cli": "2.2.1",
-    "@graphql-codegen/flow": "2.1.5",
-    "@graphql-codegen/flow-operations": "2.1.5",
-    "@graphql-codegen/flow-resolvers": "2.1.5",
+    "@graphql-codegen/flow": "2.1.6",
+    "@graphql-codegen/flow-operations": "2.1.6",
+    "@graphql-codegen/flow-resolvers": "2.1.6",
     "@graphql-codegen/fragment-matcher": "3.1.0",
-    "@graphql-codegen/import-types-preset": "2.1.5",
+    "@graphql-codegen/import-types-preset": "2.1.6",
     "@graphql-codegen/introspection": "2.1.0",
-    "@graphql-codegen/java": "3.1.5",
-    "@graphql-codegen/java-apollo-android": "2.1.5",
-    "@graphql-codegen/java-resolvers": "2.1.5",
-    "@graphql-codegen/jsdoc": "2.1.5",
-    "@graphql-codegen/near-operation-file-preset": "2.1.5",
+    "@graphql-codegen/java": "3.1.6",
+    "@graphql-codegen/java-apollo-android": "2.1.6",
+    "@graphql-codegen/java-resolvers": "2.1.6",
+    "@graphql-codegen/jsdoc": "2.1.6",
+    "@graphql-codegen/near-operation-file-preset": "2.1.6",
     "@graphql-codegen/schema-ast": "2.2.0",
     "@graphql-codegen/time": "3.1.0",
     "react-markdown": "7.0.1",
-    "@graphql-codegen/typescript": "2.2.3",
-    "@graphql-codegen/typed-document-node": "2.1.5",
-    "@graphql-codegen/typescript-apollo-angular": "3.2.1",
-    "@graphql-codegen/typescript-generic-sdk": "2.1.5",
+    "@graphql-codegen/typescript": "2.2.4",
+    "@graphql-codegen/typed-document-node": "2.1.6",
+    "@graphql-codegen/typescript-apollo-angular": "3.2.2",
+    "@graphql-codegen/typescript-generic-sdk": "2.1.6",
     "@graphql-codegen/typescript-graphql-files-modules": "2.1.0",
-    "@graphql-codegen/typescript-graphql-request": "4.1.5",
-    "@graphql-codegen/typescript-mongodb": "2.1.5",
-    "@graphql-codegen/typescript-operations": "2.1.7",
-    "@graphql-codegen/typescript-react-apollo": "3.1.5",
-    "@graphql-codegen/typescript-react-query": "3.0.2",
-    "@graphql-codegen/typescript-rtk-query": "2.1.5",
-    "@graphql-codegen/typescript-resolvers": "2.3.1",
-    "@graphql-codegen/typescript-stencil-apollo": "2.1.5",
-    "@graphql-codegen/typescript-type-graphql": "2.1.5",
-    "@graphql-codegen/typescript-urql": "3.2.1",
-    "@graphql-codegen/typescript-vue-apollo": "3.1.5",
-    "@graphql-codegen/typescript-vue-urql": "2.1.5",
-    "@graphql-codegen/typescript-vue-apollo-smart-ops": "2.1.5",
-    "@graphql-codegen/typescript-apollo-client-helpers": "2.1.5",
+    "@graphql-codegen/typescript-graphql-request": "4.1.6",
+    "@graphql-codegen/typescript-mongodb": "2.1.6",
+    "@graphql-codegen/typescript-operations": "2.1.8",
+    "@graphql-codegen/typescript-react-apollo": "3.1.6",
+    "@graphql-codegen/typescript-react-query": "3.0.3",
+    "@graphql-codegen/typescript-rtk-query": "2.1.6",
+    "@graphql-codegen/typescript-resolvers": "2.3.2",
+    "@graphql-codegen/typescript-stencil-apollo": "2.1.6",
+    "@graphql-codegen/typescript-type-graphql": "2.1.6",
+    "@graphql-codegen/typescript-urql": "3.2.2",
+    "@graphql-codegen/typescript-vue-apollo": "3.1.6",
+    "@graphql-codegen/typescript-vue-urql": "2.1.6",
+    "@graphql-codegen/typescript-vue-apollo-smart-ops": "2.1.6",
+    "@graphql-codegen/typescript-apollo-client-helpers": "2.1.6",
     "node-polyfill-webpack-plugin": "1.1.4",
     "@monaco-editor/react": "4.3.1",
     "react-select": "4.3.1",