Skip to content

Commit 9997737

Browse files
committed
Merge main into graphiql-6
# Conflicts: # examples/graphiql-vite-react-router/package.json # packages/cm6-graphql/package.json # packages/codemirror-graphql/package.json # packages/graphiql-e2e/test/package.json # packages/graphiql-plugin-code-exporter/package.json # packages/graphiql-plugin-doc-explorer/package.json # packages/graphiql-plugin-explorer/package.json # packages/graphiql-plugin-history/package.json # packages/graphiql-react/package.json # packages/graphiql-toolkit/package.json # packages/graphiql/package.json # packages/graphiql/vite.config.mts # packages/graphql-language-service-cli/package.json # packages/graphql-language-service-server/package.json # packages/monaco-graphql/__tests__/monaco-editor.test.ts # packages/monaco-graphql/package.json # pnpm-lock.yaml
2 parents b6ab17e + d7093c3 commit 9997737

50 files changed

Lines changed: 4673 additions & 4696 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ contact_links:
55
about: >-
66
Some questions are already answered in our github discussions Q&A section If you don't find an answer, [create a support ticket](ttps://github.com/graphql/graphiql/discussions/new?category=q-a-support)
77
8-
98
- name: '💬 `graphiql` Discord Support'
109
url: https://discord.gg/NP5vbPeUFp
1110
about: '`graphiql` Discord Support Channel'
@@ -19,7 +18,6 @@ contact_links:
1918
about: >-
2019
GraphQL LSP (Language Server Protocol) Server Discord Support Channel For `graphql-language-service-server` and/or `graphql-language-service-cli`
2120
22-
2321
- name: '💬 `monaco-graphql` Discord Support'
2422
url: https://discord.gg/r4BxrAG6fN
2523
about: '`monaco-graphql` Discord Support Channel'

.github/workflows/pr.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ jobs:
101101
run: >-
102102
pnpm exec vitest run packages/graphql-language-service/src/parser/__tests__/OnlineParser.test.ts packages/graphql-language-service/src/interface/__tests__/getAutocompleteSuggestions.test.ts packages/graphql-language-service/src/interface/__tests__/getDiagnostics.test.ts packages/graphql-language-service/src/interface/__tests__/getHoverInformation.test.ts
103103
104-
105104
lint:
106105
name: Lint
107106
runs-on: ubuntu-latest

.oxlintrc.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,21 @@
361361
],
362362
"react-hooks-js/rules-of-hooks": "off",
363363
"react-hooks-js/exhaustive-deps": "off",
364-
"react-hooks-js/react-compiler": "error"
364+
"react-hooks-js/static-components": "error",
365+
"react-hooks-js/use-memo": "error",
366+
"react-hooks-js/void-use-memo": "error",
367+
"react-hooks-js/preserve-manual-memoization": "error",
368+
"react-hooks-js/incompatible-library": "warn",
369+
"react-hooks-js/immutability": "error",
370+
"react-hooks-js/globals": "error",
371+
"react-hooks-js/refs": "error",
372+
"react-hooks-js/set-state-in-effect": "error",
373+
"react-hooks-js/error-boundaries": "error",
374+
"react-hooks-js/purity": "error",
375+
"react-hooks-js/set-state-in-render": "error",
376+
"react-hooks-js/unsupported-syntax": "warn",
377+
"react-hooks-js/config": "error",
378+
"react-hooks-js/gating": "error"
365379
}
366380
},
367381
{
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import type { NextConfig } from 'next';
22

3-
const nextConfig: NextConfig = {
4-
/* config options here */
5-
};
3+
const nextConfig: NextConfig = {/* config options here */};
64

75
export default nextConfig;

examples/graphiql-vite-react-router/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
"@graphiql/plugin-query-builder": "^1.0.0-beta.1",
1717
"@graphiql/react": "^1.0.0-beta.1",
1818
"@graphiql/toolkit": "^1.0.0-beta.0",
19-
"@react-router/fs-routes": "^7",
20-
"@react-router/node": "^7",
21-
"@react-router/serve": "^7",
19+
"@react-router/fs-routes": "^8.3.1",
20+
"@react-router/node": "^8.3.1",
21+
"@react-router/serve": "^8.3.1",
2222
"graphiql": "^6.0.0-beta.1",
2323
"isbot": "^5",
24-
"react": "^19",
25-
"react-dom": "^19",
26-
"react-router": "^7"
24+
"react": "^19.2.7",
25+
"react-dom": "^19.2.7",
26+
"react-router": "^8.3.1"
2727
},
2828
"devDependencies": {
29-
"@react-router/dev": "^7",
29+
"@react-router/dev": "^8.3.1",
3030
"@types/node": "^24",
3131
"@types/react": "^19",
3232
"typescript": "^5",
33-
"vite": "^6"
33+
"vite": "^8"
3434
}
3535
}

examples/graphiql-vite/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"react-dom": "^19"
1111
},
1212
"devDependencies": {
13-
"@vitejs/plugin-react": "^4",
14-
"vite": "^6",
13+
"@vitejs/plugin-react": "^5.2.0",
14+
"vite": "^8",
1515
"vite-plugin-monaco-editor": "^1"
1616
},
1717
"scripts": {

examples/graphiql-webpack/package.json

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"graphql-ws": "^6",
1919
"react": "^19",
2020
"react-dom": "^19",
21-
"regenerator-runtime": "^0.13"
21+
"regenerator-runtime": "^0.14"
2222
},
2323
"devDependencies": {
2424
"@babel/plugin-proposal-class-properties": "^7",
@@ -27,16 +27,15 @@
2727
"@babel/preset-react": "^7",
2828
"ajv-formats": "^3",
2929
"babel-loader": "^9",
30-
"copy-webpack-plugin": "^11",
31-
"cross-env": "^7",
32-
"css-loader": "^6",
30+
"copy-webpack-plugin": "^14",
31+
"css-loader": "^7",
3332
"file-loader": "^6",
3433
"html-webpack-plugin": "^5",
3534
"react-hot-loader": "^4",
36-
"style-loader": "^3",
35+
"style-loader": "^4",
3736
"webpack": "^5",
38-
"webpack-cli": "^6",
39-
"webpack-dev-server": "^5",
37+
"webpack-cli": "^7",
38+
"webpack-dev-server": "^6",
4039
"webpack-manifest-plugin": "^5",
4140
"workbox-webpack-plugin": "^7",
4241
"worker-loader": "^2"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
declare namespace globalThis {
2-
import type { Environment } from 'monaco-editor/esm/monaco-editor';
3-
var MonacoEnvironment: Environment;
2+
var MonacoEnvironment: import('monaco-editor/esm/monaco-editor').Environment;
43
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
"react-dom": "^19"
1414
},
1515
"devDependencies": {
16-
"@vitejs/plugin-react": "^4",
17-
"vite": "^6"
16+
"@vitejs/plugin-react": "^5.2.0",
17+
"vite": "^8"
1818
},
1919
"scripts": {
2020
"dev": "vite",
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
declare namespace globalThis {
2-
import type { Environment } from 'monaco-editor/esm/monaco-editor';
3-
var MonacoEnvironment: Environment;
2+
var MonacoEnvironment: import('monaco-editor/esm/monaco-editor').Environment;
43
}

0 commit comments

Comments
 (0)