Skip to content

Commit

Permalink
Merge branch 'main' into graphiql-v4
Browse files Browse the repository at this point in the history
  • Loading branch information
dimaMachina committed Aug 7, 2024
2 parents 445bf02 + ab119d6 commit d34246e
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 21 deletions.
9 changes: 7 additions & 2 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
{
"$schema": "https://unpkg.com/@changesets/config@1.5.0/schema.json",
"$schema": "https://unpkg.com/@changesets/config@2.0.1/schema.json",
"changelog": ["@changesets/changelog-github", { "repo": "graphql/graphiql" }],
"commit": false,
"linked": [],
"access": "public",
"baseBranch": "main",
"ignore": ["example-*"],
"ignore": [
"example-graphiql-webpack",
"example-monaco-graphql-nextjs",
"example-monaco-graphql-react-vite",
"example-monaco-graphql-webpack"
],
"updateInternalDependencies": "patch",
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
Expand Down
2 changes: 1 addition & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.changeset/
.changeset/*.md

# ignore working-group dir markdown so it's easier for people to edit from the UI
working-group/
Expand Down
2 changes: 1 addition & 1 deletion examples/cm6-graphql-legacy-parcel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-cm6-graphql-legacy-parcel",
"version": "1.1.10-alpha.8",
"version": "0.0.0",
"license": "MIT",
"description": "GraphiQL Parcel Example",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion examples/cm6-graphql-parcel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-cm6-graphql-parcel",
"version": "1.1.10-alpha.8",
"version": "0.0.0",
"license": "MIT",
"description": "GraphiQL Parcel Example",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion examples/graphiql-cdn/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-graphiql-cdn",
"version": "0.0.8",
"version": "0.0.0",
"private": true,
"license": "MIT",
"description": "An example using GraphiQL",
Expand Down
2 changes: 1 addition & 1 deletion examples/graphiql-create-react-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-graphiql-create-react-app",
"version": "0.1.11-alpha.8",
"version": "0.0.0",
"private": true,
"dependencies": {
"graphiql": "^2.2.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/graphiql-parcel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-graphiql-parcel",
"version": "1.1.10-alpha.8",
"version": "0.0.0",
"license": "MIT",
"description": "GraphiQL Parcel Example",
"main": "index.js",
Expand Down
2 changes: 1 addition & 1 deletion examples/graphiql-webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-graphiql-webpack",
"version": "1.1.1-alpha.8",
"version": "0.0.0",
"private": true,
"license": "MIT",
"description": "A GraphiQL example with webpack and typescript",
Expand Down
2 changes: 1 addition & 1 deletion examples/monaco-graphql-webpack/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "example-monaco-graphql-webpack",
"version": "1.1.1",
"version": "0.0.0",
"private": true,
"license": "MIT",
"description": "A simple monaco example with webpack and typescript",
Expand Down
1 change: 0 additions & 1 deletion packages/graphiql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
},
"devDependencies": {
"@graphiql/toolkit": "^0.9.2",
"@cypress/webpack-preprocessor": "^5.5.0",
"@testing-library/jest-dom": "5.16.5",
"@testing-library/react": "14.0.0",
"@types/testing-library__jest-dom": "5.14.5",
Expand Down
11 changes: 1 addition & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2066,15 +2066,6 @@
tunnel-agent "^0.6.0"
uuid "^8.3.2"

"@cypress/webpack-preprocessor@^5.5.0":
version "5.5.0"
resolved "https://registry.yarnpkg.com/@cypress/webpack-preprocessor/-/webpack-preprocessor-5.5.0.tgz#e7010b2ee7449691cc16a9d5d1956af17ea175fd"
integrity sha512-iqwPygSNZ1u6bM3r5QRVv6qYngkcgI2xCzi9Jmo4mrkcofwX08UaItJq7xlB2/dHbB2aryQYOsfe4xNKtQIm3A==
dependencies:
bluebird "^3.7.1"
debug "^4.1.1"
lodash "^4.17.20"

"@cypress/xvfb@^1.2.4":
version "1.2.4"
resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
Expand Down Expand Up @@ -6081,7 +6072,7 @@ blob-util@^2.0.2:
resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==

bluebird@3.7.2, bluebird@^3.4.1, bluebird@^3.5.1, bluebird@^3.7.1, bluebird@^3.7.2:
bluebird@3.7.2, bluebird@^3.4.1, bluebird@^3.5.1, bluebird@^3.7.2:
version "3.7.2"
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
Expand Down

0 comments on commit d34246e

Please sign in to comment.