Commit 9997737
committed
Merge
# 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.yamlmain into graphiql-6
50 files changed
Lines changed: 4673 additions & 4696 deletions
File tree
- .github
- ISSUE_TEMPLATE
- workflows
- examples
- graphiql-nextjs
- graphiql-vite-react-router
- graphiql-vite
- graphiql-webpack
- monaco-graphql-nextjs/src/app
- monaco-graphql-react-vite
- src
- monaco-graphql-webpack
- packages
- cm6-graphql
- codemirror-graphql
- graphiql-e2e
- test
- graphiql-plugin-code-exporter
- graphiql-plugin-collections
- graphiql-plugin-doc-explorer
- graphiql-plugin-history
- graphiql-plugin-query-builder
- graphiql-react
- src
- components
- stores
- graphiql-toolkit
- graphiql
- graphql-language-service-cli
- graphql-language-service-server
- src
- graphql-language-service
- benchmark/fixtures
- src/interface
- monaco-graphql
- vscode-graphql-execution
- vscode-graphql-syntax
- vscode-graphql
- resources
- scripts
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
| |||
19 | 18 | | |
20 | 19 | | |
21 | 20 | | |
22 | | - | |
23 | 21 | | |
24 | 22 | | |
25 | 23 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
101 | 101 | | |
102 | 102 | | |
103 | 103 | | |
104 | | - | |
105 | 104 | | |
106 | 105 | | |
107 | 106 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
361 | 361 | | |
362 | 362 | | |
363 | 363 | | |
364 | | - | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
365 | 379 | | |
366 | 380 | | |
367 | 381 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
6 | 4 | | |
7 | 5 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
25 | | - | |
26 | | - | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | | - | |
| 29 | + | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | | - | |
| 33 | + | |
34 | 34 | | |
35 | 35 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
| 13 | + | |
| 14 | + | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
| 21 | + | |
22 | 22 | | |
23 | 23 | | |
24 | 24 | | |
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | | - | |
32 | | - | |
| 30 | + | |
| 31 | + | |
33 | 32 | | |
34 | 33 | | |
35 | 34 | | |
36 | | - | |
| 35 | + | |
37 | 36 | | |
38 | | - | |
39 | | - | |
| 37 | + | |
| 38 | + | |
40 | 39 | | |
41 | 40 | | |
42 | 41 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
4 | 3 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
17 | | - | |
| 16 | + | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | | - | |
| 2 | + | |
4 | 3 | | |
0 commit comments