diff --git a/package.json b/package.json
index 042e767a3c..061a6663a5 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "calendar-link": "^2.10.0",
     "clsx": "^2.1.1",
     "codemirror": "^5.65.19",
-    "codemirror-graphql": "1.3.2",
+    "codemirror-graphql": "2.2.4",
     "date-fns": "^2.30.0",
     "fast-glob": "^3.3.3",
     "github-slugger": "2.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aea5d1e7d8..6a1502ef8c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -44,8 +44,8 @@ importers:
         specifier: ^5.65.19
         version: 5.65.20
       codemirror-graphql:
-        specifier: 1.3.2
-        version: 1.3.2(@codemirror/language@0.20.2)(codemirror@5.65.20)(graphql@16.10.0)
+        specifier: 2.2.4
+        version: 2.2.4(@codemirror/language@0.20.2)(codemirror@5.65.20)(graphql@16.10.0)
       date-fns:
         specifier: ^2.30.0
         version: 2.30.0
@@ -1848,6 +1848,9 @@ packages:
     resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
     engines: {node: '>=10.13.0'}
 
+  '@types/codemirror@0.0.90':
+    resolution: {integrity: sha512-8Z9+tSg27NPRGubbUPUCrt5DDG/OWzLph5BvcDykwR5D7RyZh5mhHG0uS1ePKV1YFCA+/cwc4Ey2AJAEFfV3IA==}
+
   '@types/codemirror@5.60.16':
     resolution: {integrity: sha512-V/yHdamffSS075jit+fDxaOAmdP2liok8NSNJnAZfDJErzOheuygHZEhAJrfmk5TEyM32MhkZjwo/idX791yxw==}
 
@@ -2292,12 +2295,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.4:
+    resolution: {integrity: sha512-VW4rpbAqgAIEWKXwE3nDFz2QEaY5Cme0CnKET43ZE3RSKAAeOaUcecR6wBf3LYfxWwOyyzeCzqxRoUj+HNAEQA==}
     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.20:
     resolution: {integrity: sha512-i5dLDDxwkFCbhjvL2pNjShsojoL3XHyDwsGv1jqETUoW+lzpBKKqNTUWgQwVAOa0tUm4BwekT455ujafi8payA==}
@@ -2594,6 +2597,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'}
@@ -3130,11 +3136,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.5.0:
+    resolution: {integrity: sha512-9EvWrLLkF6Y5e29/2cmFoAO6hBPPAZlCyjznmpR11iFtRydfkss+9m6x+htA8h7YznGam+TtJwS6JuwoWWgb2Q==}
     hasBin: true
     peerDependencies:
-      graphql: ^15.5.0 || ^16.0.0
+      graphql: ^15.5.0 || ^16.0.0 || ^17.0.0
 
   graphql-ws@5.16.0:
     resolution: {integrity: sha512-Ju2RCU2dQMgSKtArPbEtsK5gNLnsQyTNIo/T7cZNp96niC1x0KdJNZV0TIoilceBPQwfb5itrGl8pkFeOUMl4A==}
@@ -7371,6 +7377,10 @@ snapshots:
 
   '@trysound/sax@0.2.0': {}
 
+  '@types/codemirror@0.0.90':
+    dependencies:
+      '@types/tern': 0.23.9
+
   '@types/codemirror@5.60.16':
     dependencies:
       '@types/tern': 0.23.9
@@ -7870,12 +7880,13 @@ snapshots:
 
   clsx@2.1.1: {}
 
-  codemirror-graphql@1.3.2(@codemirror/language@0.20.2)(codemirror@5.65.20)(graphql@16.10.0):
+  codemirror-graphql@2.2.4(@codemirror/language@0.20.2)(codemirror@5.65.20)(graphql@16.10.0):
     dependencies:
       '@codemirror/language': 0.20.2
+      '@types/codemirror': 0.0.90
       codemirror: 5.65.20
       graphql: 16.10.0
-      graphql-language-service: 5.2.0(graphql@16.10.0)
+      graphql-language-service: 5.5.0(graphql@16.10.0)
 
   codemirror@5.65.20: {}
 
@@ -8209,6 +8220,8 @@ snapshots:
 
   dayjs@1.11.10: {}
 
+  debounce-promise@3.1.2: {}
+
   debug@4.3.4:
     dependencies:
       ms: 2.1.2
@@ -8907,8 +8920,9 @@ snapshots:
       arrify: 1.0.1
       graphql: 16.10.0
 
-  graphql-language-service@5.2.0(graphql@16.10.0):
+  graphql-language-service@5.5.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