diff --git a/package.json b/package.json
index 87ccc7dae5..d572d7a12f 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
     "autoprefixer": "^10.4.17",
     "clsx": "^2.1.0",
     "codemirror": "5.65.1",
-    "codemirror-graphql": "1.3.2",
+    "codemirror-graphql": "2.2.0",
     "date-fns": "^2.30.0",
     "fast-glob": "^3.3.2",
     "graphql": "16.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e358755858..17b52a8b79 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -38,8 +38,8 @@ importers:
         specifier: 5.65.1
         version: 5.65.1
       codemirror-graphql:
-        specifier: 1.3.2
-        version: 1.3.2(@codemirror/language@0.20.2)(codemirror@5.65.1)(graphql@16.10.0)
+        specifier: 2.2.0
+        version: 2.2.0(@codemirror/language@0.20.2)(codemirror@5.65.1)(graphql@16.10.0)
       date-fns:
         specifier: ^2.30.0
         version: 2.30.0
@@ -1725,6 +1725,9 @@ packages:
   '@types/acorn@4.0.6':
     resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==}
 
+  '@types/codemirror@0.0.90':
+    resolution: {integrity: sha512-8Z9+tSg27NPRGubbUPUCrt5DDG/OWzLph5BvcDykwR5D7RyZh5mhHG0uS1ePKV1YFCA+/cwc4Ey2AJAEFfV3IA==}
+
   '@types/codemirror@5.60.7':
     resolution: {integrity: sha512-QXIC+RPzt/1BGSuD6iFn6UMC9TDp+9hkOANYNPVsjjrDdzKphfRkwQDKGp2YaC54Yhz0g6P5uYTCCibZZEiMAA==}
 
@@ -2101,12 +2104,12 @@ packages:
     resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
     engines: {node: '>=6'}
 
-  codemirror-graphql@1.3.2:
-    resolution: {integrity: sha512-glwFsEVlH5TvxjSKGymZ1sNy37f3Mes58CB4fXOd0zy9+JzDL08Wti1b5ycy4vFZYghMDK1/Or/zRSjMAGtC2w==}
+  codemirror-graphql@2.2.0:
+    resolution: {integrity: sha512-egIiewf5zEH5LLSkJpJDpYxO1OkNruD0gTWiBrS1JmXk7yjt5WPw7jSmDRkWJx8JheHONltaJPNPWdTUT5LRIQ==}
     peerDependencies:
-      '@codemirror/language': ^0.20.0
+      '@codemirror/language': 6.0.0
       codemirror: ^5.65.3
-      graphql: ^15.5.0 || ^16.0.0
+      graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
 
   codemirror@5.65.1:
     resolution: {integrity: sha512-s6aac+DD+4O2u1aBmdxhB7yz2XU7tG3snOyQ05Kxifahz7hoxnfxIRHxiCSEv3TUC38dIVH8G+lZH9UWSfGQxA==}
@@ -2391,6 +2394,9 @@ packages:
   dayjs@1.11.10:
     resolution: {integrity: sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==}
 
+  debounce-promise@3.1.2:
+    resolution: {integrity: sha512-rZHcgBkbYavBeD9ej6sP56XfG53d51CD4dnaw989YX/nZ/ZJfgRx/9ePKmTNiUiyQvh4mtrMoS3OAWW+yoYtpg==}
+
   debug@4.3.4:
     resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
     engines: {node: '>=6.0'}
@@ -2799,11 +2805,11 @@ packages:
     peerDependencies:
       graphql: '*'
 
-  graphql-language-service@5.2.0:
-    resolution: {integrity: sha512-o/ZgTS0pBxWm3hSF4+6GwiV1//DxzoLWEbS38+jqpzzy1d/QXBidwQuVYTOksclbtOJZ3KR/tZ8fi/tI6VpVMg==}
+  graphql-language-service@5.3.0:
+    resolution: {integrity: sha512-gCQIIy7lM9CB1KPLEb+DNZLczA9zuTLEOJE2hEQZTFYInogdmMDRa6RAkvM4LL0LcgcS+3uPs6KtHlcjCqRbUg==}
     hasBin: true
     peerDependencies:
-      graphql: ^15.5.0 || ^16.0.0
+      graphql: ^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2
 
   graphql-ws@5.16.0:
     resolution: {integrity: sha512-Ju2RCU2dQMgSKtArPbEtsK5gNLnsQyTNIo/T7cZNp96niC1x0KdJNZV0TIoilceBPQwfb5itrGl8pkFeOUMl4A==}
@@ -6491,6 +6497,10 @@ snapshots:
     dependencies:
       '@types/estree': 1.0.5
 
+  '@types/codemirror@0.0.90':
+    dependencies:
+      '@types/tern': 0.23.9
+
   '@types/codemirror@5.60.7':
     dependencies:
       '@types/tern': 0.23.9
@@ -6887,12 +6897,13 @@ snapshots:
 
   clsx@2.1.1: {}
 
-  codemirror-graphql@1.3.2(@codemirror/language@0.20.2)(codemirror@5.65.1)(graphql@16.10.0):
+  codemirror-graphql@2.2.0(@codemirror/language@0.20.2)(codemirror@5.65.1)(graphql@16.10.0):
     dependencies:
       '@codemirror/language': 0.20.2
+      '@types/codemirror': 0.0.90
       codemirror: 5.65.1
       graphql: 16.10.0
-      graphql-language-service: 5.2.0(graphql@16.10.0)
+      graphql-language-service: 5.3.0(graphql@16.10.0)
 
   codemirror@5.65.1: {}
 
@@ -7208,6 +7219,8 @@ snapshots:
 
   dayjs@1.11.10: {}
 
+  debounce-promise@3.1.2: {}
+
   debug@4.3.4:
     dependencies:
       ms: 2.1.2
@@ -7684,8 +7697,9 @@ snapshots:
       arrify: 1.0.1
       graphql: 16.10.0
 
-  graphql-language-service@5.2.0(graphql@16.10.0):
+  graphql-language-service@5.3.0(graphql@16.10.0):
     dependencies:
+      debounce-promise: 3.1.2
       graphql: 16.10.0
       nullthrows: 1.1.1
       vscode-languageserver-types: 3.17.5