[v4] fix merge conflicts with main (#3719)

* upgrade to graphql v17 including support for new incremental delivery format (#3682)

* add support for new incremental delivery format

* fix vitest

* add patch for graphql-js bug

submittes upstream with test at graphql/graphql-js#4160

* apply feedback

* move patches!

* some fixes

* fix netlify/cypress

* remove export

* update changeset

---------

Co-authored-by: Dimitri POSTOLOV <[email protected]>

* Version Packages (#3715)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* prettier

* fix e2e

* update pr-graphql-compat-check.yml

* prettier

---------

Co-authored-by: Yaacov Rydzinski <[email protected]>
Co-authored-by: Rikki Schulte <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

Author: 4 people

.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"
   }