Skip to content

Commit

Permalink
Merge branch 'fd-gql-multiple-schema' of github.com:frandiox/graphiql…
Browse files Browse the repository at this point in the history
… into fd-gql-multiple-schema
  • Loading branch information
frandiox committed Dec 11, 2023
2 parents b20c7ed + bbc8a6e commit 196d830
Show file tree
Hide file tree
Showing 30 changed files with 136 additions and 66 deletions.
5 changes: 0 additions & 5 deletions .changeset/blue-rice-arrive.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/few-hats-move.md

This file was deleted.

15 changes: 0 additions & 15 deletions .changeset/fluffy-pens-lick.md

This file was deleted.

6 changes: 0 additions & 6 deletions .changeset/tame-lions-teach.md

This file was deleted.

8 changes: 4 additions & 4 deletions examples/graphiql-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"start": "NODE_ENV=development webpack-cli serve"
},
"dependencies": {
"@graphiql/plugin-code-exporter": "^0.3.4",
"@graphiql/plugin-explorer": "^0.3.4",
"@graphiql/plugin-code-exporter": "^0.3.5",
"@graphiql/plugin-explorer": "^0.3.5",
"@graphiql/toolkit": "^0.9.1",
"@graphiql/react": "^0.19.3",
"graphiql": "^3.0.5",
"@graphiql/react": "^0.19.4",
"graphiql": "^3.0.6",
"graphql": "^16.4.0",
"graphql-ws": "^5.5.5",
"react": "^18.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/monaco-graphql-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"marked": "^4.2.12",
"monaco-editor": "^0.39.0",
"monaco-editor-webpack-plugin": "^7.0.1",
"monaco-graphql": "^1.3.0",
"monaco-graphql": "^1.4.0",
"next": "13.4.7",
"prettier": "3.0.0-alpha.12",
"react": "^18.2.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/monaco-graphql-react-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"dependencies": {
"@graphiql/toolkit": "^0.9.1",
"graphql": "^16.4.0",
"graphql-language-service": "^5.1.7",
"graphql-language-service": "^5.2.0",
"jsonc-parser": "^3.2.0",
"monaco-editor": "^0.39.0",
"monaco-graphql": "^1.3.0",
"monaco-graphql": "^1.4.0",
"prettier": "3.0.0-alpha.12",
"react": "^18.2.0",
"react-dom": "^18.2.0"
Expand Down
4 changes: 2 additions & 2 deletions examples/monaco-graphql-webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
},
"dependencies": {
"graphql": "^16.4.0",
"graphql-language-service": "^5.1.7",
"graphql-language-service": "^5.2.0",
"json-schema": "^0.4.0",
"jsonc-parser": "^3.2.0",
"monaco-editor": "^0.39.0",
"monaco-graphql": "^1.3.0",
"monaco-graphql": "^1.4.0",
"prettier": "3.0.0-alpha.12"
},
"devDependencies": {
Expand Down
9 changes: 9 additions & 0 deletions packages/cm6-graphql/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# cm6-graphql

## 0.0.10

### Patch Changes

- [#3405](https://github.com/graphql/graphiql/pull/3405) [`3d4b9b75`](https://github.com/graphql/graphiql/commit/3d4b9b7551fd9bb38ef9f4a7c6c330366d43bbfa) Thanks [@imolorhe](https://github.com/imolorhe)! - relint when schema changes

- Updated dependencies [[`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c), [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c)]:
- graphql-language-service@5.2.0

## 0.0.9

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/cm6-graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cm6-graphql",
"version": "0.0.9",
"version": "0.0.10",
"description": "GraphQL language support for CodeMirror 6",
"scripts": {
"build": "cm-buildhelper src/index.ts",
Expand All @@ -16,7 +16,7 @@
"types": "dist/index.d.ts",
"sideEffects": false,
"dependencies": {
"graphql-language-service": "^5.1.7"
"graphql-language-service": "^5.2.0"
},
"devDependencies": {
"@codemirror/autocomplete": "6.2.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/codemirror-graphql/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

## 2.0.10

### Patch Changes

- Updated dependencies [[`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c), [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c)]:
- graphql-language-service@5.2.0

## 2.0.9

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/codemirror-graphql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codemirror-graphql",
"version": "2.0.9",
"version": "2.0.10",
"description": "GraphQL mode and helpers for CodeMirror.",
"contributors": [
"Hyohyeon Jeong <asiandrummer@fb.com>",
Expand Down Expand Up @@ -45,7 +45,7 @@
"// TEMPORARILY PINNED until we fix graphql 15 support": "",
"dependencies": {
"@types/codemirror": "^0.0.90",
"graphql-language-service": "5.1.7"
"graphql-language-service": "5.2.0"
},
"devDependencies": {
"@codemirror/language": "^6.0.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/graphiql-plugin-code-exporter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @graphiql/plugin-code-exporter

## 0.3.5

### Patch Changes

- Updated dependencies []:
- @graphiql/react@0.19.4

## 0.3.4

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/graphiql-plugin-code-exporter/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphiql/plugin-code-exporter",
"version": "0.3.4",
"version": "0.3.5",
"repository": {
"type": "git",
"url": "https://github.com/graphql/graphiql",
Expand Down Expand Up @@ -33,13 +33,13 @@
"graphiql-code-exporter": "^3.0.3"
},
"peerDependencies": {
"@graphiql/react": "^0.19.3",
"@graphiql/react": "^0.19.4",
"graphql": "^15.5.0 || ^16.0.0",
"react": "^16.8.0 || ^17 || ^18",
"react-dom": "^16.8.0 || ^17 || ^18"
},
"devDependencies": {
"@graphiql/react": "^0.19.3",
"@graphiql/react": "^0.19.4",
"@vitejs/plugin-react": "^4.0.1",
"graphql": "^16.4.0",
"postcss-nesting": "^10.1.7",
Expand Down
7 changes: 7 additions & 0 deletions packages/graphiql-plugin-explorer/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @graphiql/plugin-explorer

## 0.3.5

### Patch Changes

- Updated dependencies []:
- @graphiql/react@0.19.4

## 0.3.4

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/graphiql-plugin-explorer/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphiql/plugin-explorer",
"version": "0.3.4",
"version": "0.3.5",
"repository": {
"type": "git",
"url": "https://github.com/graphql/graphiql",
Expand Down Expand Up @@ -32,13 +32,13 @@
"graphiql-explorer": "^0.9.0"
},
"peerDependencies": {
"@graphiql/react": "^0.19.3",
"@graphiql/react": "^0.19.4",
"graphql": "^15.5.0 || ^16.0.0",
"react": "^16.8.0 || ^17 || ^18",
"react-dom": "^16.8.0 || ^17 || ^18"
},
"devDependencies": {
"@graphiql/react": "^0.19.3",
"@graphiql/react": "^0.19.4",
"@vitejs/plugin-react": "^4.0.1",
"graphql": "^16.4.0",
"react": "^18.2.0",
Expand Down
8 changes: 8 additions & 0 deletions packages/graphiql-react/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# @graphiql/react

## 0.19.4

### Patch Changes

- Updated dependencies [[`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c), [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c)]:
- graphql-language-service@5.2.0
- codemirror-graphql@2.0.10

## 0.19.3

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/graphiql-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@graphiql/react",
"version": "0.19.3",
"version": "0.19.4",
"repository": {
"type": "git",
"url": "https://github.com/graphql/graphiql",
Expand Down Expand Up @@ -57,10 +57,10 @@
"@types/codemirror": "^5.60.8",
"clsx": "^1.2.1",
"codemirror": "^5.65.3",
"codemirror-graphql": "^2.0.9",
"codemirror-graphql": "^2.0.10",
"copy-to-clipboard": "^3.2.0",
"framer-motion": "^6.5.1",
"graphql-language-service": "^5.1.7",
"graphql-language-service": "^5.2.0",
"markdown-it": "^12.2.0",
"set-value": "^4.1.0"
},
Expand Down
8 changes: 8 additions & 0 deletions packages/graphiql/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Change Log

## 3.0.6

### Patch Changes

- Updated dependencies [[`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c), [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c)]:
- graphql-language-service@5.2.0
- @graphiql/react@0.19.4

## 3.0.5

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/graphiql/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphiql",
"version": "3.0.5",
"version": "3.0.6",
"description": "An graphical interactive in-browser GraphQL IDE.",
"contributors": [
"Hyohyeon Jeong <asiandrummer@fb.com>",
Expand Down Expand Up @@ -47,9 +47,9 @@
"webpack": "webpack-cli --config resources/webpack.config.js"
},
"dependencies": {
"@graphiql/react": "^0.19.3",
"@graphiql/react": "^0.19.4",
"@graphiql/toolkit": "^0.9.1",
"graphql-language-service": "^5.1.7",
"graphql-language-service": "^5.2.0",
"markdown-it": "^12.2.0"
},
"peerDependencies": {
Expand Down
8 changes: 8 additions & 0 deletions packages/graphql-language-service-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# graphql-language-service-cli

## 3.3.26

### Patch Changes

- Updated dependencies [[`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c), [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c)]:
- graphql-language-service@5.2.0
- graphql-language-service-server@2.11.4

## 3.3.25

### Patch Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/graphql-language-service-cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-language-service-cli",
"version": "3.3.25",
"version": "3.3.26",
"description": "An interface for building GraphQL language services for IDEs",
"contributors": [
"Hyohyeon Jeong <asiandrummer@fb.com>",
Expand Down Expand Up @@ -37,8 +37,8 @@
"dependencies": {
"@babel/polyfill": "^7.12.1",
"@types/yargs": "16.0.5",
"graphql-language-service": "^5.1.7",
"graphql-language-service-server": "^2.11.3",
"graphql-language-service": "^5.2.0",
"graphql-language-service-server": "^2.11.4",
"yargs": "^16.2.0"
},
"devDependencies": {
Expand Down
7 changes: 7 additions & 0 deletions packages/graphql-language-service-server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# graphql-language-service-server

## 2.11.4

### Patch Changes

- Updated dependencies [[`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c), [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c)]:
- graphql-language-service@5.2.0

## 2.11.3

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/graphql-language-service-server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-language-service-server",
"version": "2.11.3",
"version": "2.11.4",
"description": "Server process backing the GraphQL Language Service",
"contributors": [
"Greg Hurrell <greg@hurrell.net> (https://greg.hurrell.net/)",
Expand Down Expand Up @@ -46,7 +46,7 @@
"fast-glob": "^3.2.7",
"glob": "^7.2.0",
"graphql-config": "5.0.2",
"graphql-language-service": "^5.1.7",
"graphql-language-service": "^5.2.0",
"mkdirp": "^1.0.4",
"node-abort-controller": "^3.0.1",
"nullthrows": "^1.0.0",
Expand Down
10 changes: 10 additions & 0 deletions packages/graphql-language-service/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# graphql-language-service

## 5.2.0

### Minor Changes

- [#3376](https://github.com/graphql/graphiql/pull/3376) [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c) Thanks [@bboure](https://github.com/bboure)! - Add support for custom scalars

### Patch Changes

- [#3376](https://github.com/graphql/graphiql/pull/3376) [`7b00774a`](https://github.com/graphql/graphiql/commit/7b00774affad1f25253ce49f1f48c9e3f372808c) Thanks [@bboure](https://github.com/bboure)! - Fix Variables JSON Schema for null values

## 5.1.7

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/graphql-language-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-language-service",
"version": "5.1.7",
"version": "5.2.0",
"description": "The official, runtime independent Language Service for GraphQL",
"contributors": [
"GraphQL Contributors"
Expand Down

0 comments on commit 196d830

Please sign in to comment.