[v4] fix merge conflicts with main

.github/workflows/pr-graphql-compat-check.yml

@@ -4,8 +4,7 @@ on:
     # only on merge to main.
     # it's rare that this workflow would
     # show us an error, but when it does it's important!
-    branches:
-      - main
+    branches: [main, graphiql-v4]
     # don't run this regression suite if we don't need to
     paths-ignore:
       - '**.md'
@@ -23,7 +22,8 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        release: ['15.5.3', '^15.8.0', '16.1.0', '16.2.0', '16.3.0']
+        release:
+          ['15.5.3', '^15.8.0', '16.1.0', '16.2.0', '16.3.0', '17.0.0-alpha.5']
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4

examples/graphiql-webpack/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@graphiql/plugin-code-exporter": "^4.0.0-alpha.0",
     "@graphiql/plugin-explorer": "^4.0.0-alpha.0",
-    "@graphiql/toolkit": "^0.9.2",
+    "@graphiql/toolkit": "^0.10.0",
     "@graphiql/react": "^1.0.0-alpha.1",
     "graphiql": "^4.0.0-alpha.2",
     "graphql": "^16.9.0",

examples/monaco-graphql-nextjs/package.json

@@ -9,14 +9,14 @@
     "start": "next start"
   },
   "dependencies": {
-    "@graphiql/toolkit": "^0.9.2",
+    "@graphiql/toolkit": "^0.10.0",
     "graphql": "^16.9.0",
     "graphql-ws": "^5.5.5",
     "jsonc-parser": "^3.2.0",
     "marked": "^4.2.12",
     "monaco-editor": "^0.39.0",
     "monaco-editor-webpack-plugin": "^7.0.1",
-    "monaco-graphql": "^1.5.3",
+    "monaco-graphql": "^1.6.0",
     "next": "13.4.7",
     "prettier": "3.3.2",
     "react": "^18.2.0",

examples/monaco-graphql-react-vite/package.json

@@ -3,12 +3,12 @@
   "private": true,
   "version": "0.0.0",
   "dependencies": {
-    "@graphiql/toolkit": "^0.9.2",
+    "@graphiql/toolkit": "^0.10.0",
     "graphql": "^16.9.0",
-    "graphql-language-service": "^5.2.2",
+    "graphql-language-service": "^5.3.0",
     "jsonc-parser": "^3.2.0",
     "monaco-editor": "^0.39.0",
-    "monaco-graphql": "^1.5.3",
+    "monaco-graphql": "^1.6.0",
     "prettier": "3.3.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"

examples/monaco-graphql-webpack/package.json

@@ -10,11 +10,11 @@
   },
   "dependencies": {
     "graphql": "^16.9.0",
-    "graphql-language-service": "^5.2.2",
+    "graphql-language-service": "^5.3.0",
     "json-schema": "^0.4.0",
     "jsonc-parser": "^3.2.0",
     "monaco-editor": "^0.39.0",
-    "monaco-graphql": "^1.5.3",
+    "monaco-graphql": "^1.6.0",
     "prettier": "3.3.2"
   },
   "devDependencies": {

package.json

@@ -79,6 +79,7 @@
   "dependencies": {
     "identity-obj-proxy": "^3.0.0",
     "babel-plugin-macros": "^3.1.0",
+    "graphql-http": "^1.22.1",
     "@babel/cli": "^7.21.0",
     "@babel/core": "^7.21.0",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
@@ -144,6 +145,7 @@
   "resolutions": {
     "@babel/traverse": "^7.23.2",
     "vscode-languageserver-types": "3.17.3",
-    "markdown-it": "14.1.0"
+    "markdown-it": "14.1.0",
+    "graphql": "17.0.0-alpha.5"
   }
 }

packages/cm6-graphql/CHANGELOG.md

@@ -1,5 +1,18 @@
 # cm6-graphql
 
+## 0.1.0
+
+### Minor Changes
+
+- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward.
+
+  Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69.
+
+### Patch Changes
+
+- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]:
+  - [email protected]
+
 ## 0.0.15
 
 ### Patch Changes

packages/cm6-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cm6-graphql",
-  "version": "0.0.15",
+  "version": "0.1.0",
   "description": "GraphQL language support for CodeMirror 6",
   "scripts": {
     "build": "cm-buildhelper src/index.ts",
@@ -16,7 +16,7 @@
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "graphql-language-service": "^5.2.1"
+    "graphql-language-service": "^5.3.0"
   },
   "devDependencies": {
     "@codemirror/autocomplete": "6.2.0",
@@ -30,7 +30,7 @@
     "@lezer/highlight": "^1.0.0",
     "@lezer/lr": "^1.1.0",
     "esbuild": "0.18.10",
-    "graphql": "^16.9.0",
+    "graphql": "^17.0.0-alpha.5",
     "rollup": "^2.60.2",
     "rollup-plugin-dts": "^4.0.1",
     "rollup-plugin-esbuild": "^4.9.1",
@@ -44,7 +44,7 @@
     "@codemirror/state": "6.2.0",
     "@codemirror/view": "6.2.1",
     "@lezer/highlight": "^1.0.0",
-    "graphql": "^16.5.0"
+    "graphql": "^16.5.0 || ^17.0.0-alpha.2"
   },
   "license": "MIT"
 }

packages/codemirror-graphql/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 2.1.0
+
+### Minor Changes
+
+- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward.
+
+  Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69.
+
+### Patch Changes
+
+- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]:
+  - [email protected]
+
 ## 2.0.13
 
 ### Patch Changes

packages/codemirror-graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codemirror-graphql",
-  "version": "2.0.13",
+  "version": "2.1.0",
   "description": "GraphQL mode and helpers for CodeMirror.",
   "contributors": [
     "Hyohyeon Jeong <[email protected]>",
@@ -40,18 +40,18 @@
   "peerDependencies": {
     "@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-alpha.2"
   },
   "// TEMPORARILY PINNED until we fix graphql 15 support": "",
   "dependencies": {
     "@types/codemirror": "^0.0.90",
-    "graphql-language-service": "5.2.2"
+    "graphql-language-service": "5.3.0"
   },
   "devDependencies": {
     "@codemirror/language": "^6.0.0",
     "codemirror": "^5.65.3",
     "cross-env": "^7.0.2",
-    "graphql": "^16.9.0",
+    "graphql": "^17.0.0-alpha.5",
     "rimraf": "^3.0.2",
     "sane": "2.0.0"
   }

packages/codemirror-graphql/src/__tests__/lint-test.ts

@@ -11,7 +11,7 @@ import CodeMirror from 'codemirror';
 import 'codemirror/addon/lint/lint';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { GraphQLError, OperationDefinitionNode } from 'graphql';
+import { GraphQLError, OperationDefinitionNode, version } from 'graphql';
 import '../lint';
 import '../mode';
 import { TestSchema } from './testSchema';
@@ -61,7 +61,13 @@ describe('graphql-lint', () => {
     const noMutationOperationRule = (context: any) => ({
       OperationDefinition(node: OperationDefinitionNode) {
         if (node.operation === 'mutation') {
-          context.reportError(new GraphQLError('I like turtles.', node));
+          context.reportError(
+            new GraphQLError(
+              'I like turtles.',
+              // @ts-expect-error
+              parseInt(version, 10) > 16 ? { nodes: node } : node,
+            ),
+          );
         }
         return false;
       },

packages/graphiql-plugin-code-exporter/CHANGELOG.md

@@ -26,6 +26,19 @@
 - Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]:
   - @graphiql/[email protected]
 
+## 3.1.0
+
+### Minor Changes
+
+- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward.
+
+  Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69.
+
+### Patch Changes
+
+- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]:
+  - @graphiql/[email protected]
+
 ## 3.0.5
 
 ### Patch Changes

packages/graphiql-plugin-code-exporter/package.json

@@ -42,14 +42,14 @@
   },
   "peerDependencies": {
     "@graphiql/react": "^1.0.0-alpha.0",
-    "graphql": "^15.5.0 || ^16.0.0",
+    "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2",
     "react": "^16.8.0 || ^17 || ^18",
     "react-dom": "^16.8.0 || ^17 || ^18"
   },
   "devDependencies": {
     "@graphiql/react": "^1.0.0-alpha.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "graphql": "^16.9.0",
+    "graphql": "^17.0.0-alpha.5",
     "postcss-nesting": "^10.1.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

packages/graphiql-plugin-explorer/CHANGELOG.md

@@ -26,6 +26,19 @@
 - Updated dependencies [[`00415d2`](https://github.com/graphql/graphiql/commit/00415d2940c4d76a4a9e683e9fa0504ba97dd627), [`9baf1f0`](https://github.com/graphql/graphiql/commit/9baf1f0fc9f32404fbb8bf57b3d1c2c2c8778ddb), [`8ff87d7`](https://github.com/graphql/graphiql/commit/8ff87d7b6b3d5d12b539612a39ca3abf7e631106), [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad), [`3c1a345`](https://github.com/graphql/graphiql/commit/3c1a345acd9bf07b45bc230009cb57c51c425673)]:
   - @graphiql/[email protected]
 
+## 3.2.0
+
+### Minor Changes
+
+- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward.
+
+  Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69.
+
+### Patch Changes
+
+- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]:
+  - @graphiql/[email protected]
+
 ## 3.1.1
 
 ### Patch Changes

packages/graphiql-plugin-explorer/package.json

@@ -41,14 +41,14 @@
   },
   "peerDependencies": {
     "@graphiql/react": "^1.0.0-alpha.0",
-    "graphql": "^15.5.0 || ^16.0.0",
+    "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2",
     "react": "^16.8.0 || ^17 || ^18",
     "react-dom": "^16.8.0 || ^17 || ^18"
   },
   "devDependencies": {
     "@graphiql/react": "^1.0.0-alpha.0",
     "@vitejs/plugin-react": "^4.3.1",
-    "graphql": "^16.9.0",
+    "graphql": "^17.0.0-alpha.5",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^4.6.3",

packages/graphiql-react/CHANGELOG.md

@@ -36,6 +36,21 @@
 - [#3692](https://github.com/graphql/graphiql/pull/3692) [`82bc961`](https://github.com/graphql/graphiql/commit/82bc961a33c4e9da29dffb4a603035a4909f49ad) Thanks [@dimaMachina](https://github.com/dimaMachina)! - - prefer `location` over `window.location`
   - prefer `navigator` over `window.navigator`
 
+## 0.24.0
+
+### Minor Changes
+
+- [#3682](https://github.com/graphql/graphiql/pull/3682) [`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931) Thanks [@yaacovCR](https://github.com/yaacovCR)! - Support v17 of `graphql-js` from `17.0.0-alpha.2` forward.
+
+  Includes support for the latest incremental delivery response format. For further details, see https://github.com/graphql/defer-stream-wg/discussions/69.
+
+### Patch Changes
+
+- Updated dependencies [[`6c9f0df`](https://github.com/graphql/graphiql/commit/6c9f0df83ea4afe7fa59f84d83d59fba73dc3931)]:
+  - [email protected]
+  - [email protected]
+  - @graphiql/[email protected]
+
 ## 0.23.1
 
 ### Patch Changes

packages/graphiql-react/package.json

@@ -41,12 +41,12 @@
     "types:check": "tsc --noEmit"
   },
   "peerDependencies": {
-    "graphql": "^15.5.0 || ^16.0.0",
+    "graphql": "^15.5.0 || ^16.0.0 || ^17.0.0-alpha.2",
     "react": "^16.8.0 || ^17 || ^18",
     "react-dom": "^16.8.0 || ^17 || ^18"
   },
   "dependencies": {
-    "@graphiql/toolkit": "^0.9.2",
+    "@graphiql/toolkit": "^0.10.0",
     "@headlessui/react": "^1.7.15",
     "@radix-ui/react-dialog": "^1.0.4",
     "@radix-ui/react-dropdown-menu": "^2.0.5",
@@ -55,20 +55,22 @@
     "@types/codemirror": "^5.60.8",
     "clsx": "^1.2.1",
     "codemirror": "^5.65.3",
-    "codemirror-graphql": "^2.0.13",
+    "codemirror-graphql": "^2.1.0",
     "copy-to-clipboard": "^3.2.0",
     "framer-motion": "^10.0.0",
-    "graphql-language-service": "^5.2.2",
+    "get-value": "^3.0.1",
+    "graphql-language-service": "^5.3.0",
     "markdown-it": "^14.1.0",
     "set-value": "^4.1.0"
   },
   "devDependencies": {
-    "@types/markdown-it": "^14.1.2",
     "@babel/helper-string-parser": "^7.19.4",
     "@testing-library/react": "14.0.0",
+    "@types/markdown-it": "^14.1.2",
+    "@types/get-value": "^3.0.5",
     "@types/set-value": "^4.0.1",
     "@vitejs/plugin-react": "^4.3.1",
-    "graphql": "^16.9.0",
+    "graphql": "^17.0.0-alpha.5",
     "postcss-nesting": "^10.1.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",