Skip to content

Commit

Permalink
Merge branch 'main' into patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
trevor-scheer authored Sep 30, 2024
2 parents 3ff3379 + 43d7eed commit 36afde3
Show file tree
Hide file tree
Showing 141 changed files with 2,563 additions and 1,505 deletions.
5 changes: 5 additions & 0 deletions .changeset/clean-mice-chew.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'cm6-graphql': minor
---

The cm6-graphql package currently specifies exact versions for its peer dependencies on @codemirror packages. This is causing conflicts when projects use newer versions of these packages, leading to multiple instances being installed.
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
20 changes: 0 additions & 20 deletions .changeset/eighty-maps-change.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/fifty-swans-care.md

This file was deleted.

9 changes: 0 additions & 9 deletions .changeset/gold-numbers-crash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/lazy-beers-confess.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/light-geckos-vanish.md

This file was deleted.

16 changes: 16 additions & 0 deletions .changeset/neat-houses-explode.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
'graphql-language-service-server': minor
'@graphiql/plugin-code-exporter': minor
'graphql-language-service-cli': minor
'@graphiql/plugin-explorer': minor
'graphql-language-service': minor
'codemirror-graphql': minor
'@graphiql/toolkit': minor
'@graphiql/react': minor
'monaco-graphql': minor
'cm6-graphql': minor
'graphiql': minor
---

officially deprecate graphql@15 support, as our types and other runtime capabilities ceased to be compatible in 2022 or 2023, but the regression tests were disabled
`graphql-language-service` is where the bug is, which is used by all of the libraries and applications in `graphiql` monorepo.
18 changes: 18 additions & 0 deletions .changeset/strange-knives-hammer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
'graphql-language-service-server': patch
'@graphiql/plugin-code-exporter': patch
'graphql-language-service-cli': patch
'@graphiql/plugin-explorer': patch
'graphql-language-service': patch
'codemirror-graphql': patch
'@graphiql/toolkit': patch
'@graphiql/react': patch
'monaco-graphql': patch
'cm6-graphql': patch
'graphiql': patch
'vscode-graphql': patch
'vscode-graphql-execution': patch
'vscode-graphql-syntax': patch
---

use latest stable version of graphql 16.9.0
7 changes: 0 additions & 7 deletions .changeset/ten-mangos-judge.md

This file was deleted.

7 changes: 0 additions & 7 deletions .changeset/tidy-fans-reflect.md

This file was deleted.

3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.changeset/
.changeset/*.md

# ignore working-group dir markdown so it's easier for people to edit from the UI
working-group/
packages/codemirror-graphql/src/__tests__/schema-kitchen-sink.graphql
CHANGELOG.md
**/CHANGELOG.md
packages/vscode-graphql-syntax/tests/__fixtures__/
packages/graphql-language-service-server/src/__tests__/parseDocument.test.ts
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ module.exports = {
'unicorn/prefer-node-protocol': 'error',
'import-x/no-unresolved': [
'error',
{ ignore: ['^node:', '\\.svg\\?react$'] },
{ ignore: ['^node:', '\\.svg\\?react$', 'vitest/config'] },
],
'no-extra-boolean-cast': [
'error',
Expand Down
22 changes: 13 additions & 9 deletions .github/workflows/main-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,41 +9,45 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Cancel Previous Runs
uses: styfle/[email protected]
with:
access_token: ${{ github.token }}
- name: Checkout Code
uses: actions/checkout@v3
- uses: actions/setup-node@v3
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
cache: yarn
- name: Cache node modules
id: cache-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
key: modules-${{ github.sha }}
- uses: actions/cache@v3
- uses: actions/cache@v4
with:
path: |
~/.cache/Cypress
key: cypress-${{ runner.os }}
key: cypress-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
- run: yarn install --frozen-lockfile --immutable

jest:
name: Jest Unit Tests
runs-on: ubuntu-latest
needs: [install]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4

- id: cache-modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
**/node_modules
key: modules-${{ github.sha }}
- run: yarn test --coverage
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage/lcov.info
Expand Down
14 changes: 10 additions & 4 deletions .github/workflows/pr-graphql-compat-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,22 @@ 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:
# test against the latest 16.x version, which might be newer than what we have
- '^16'
# test against the oldest version we support
- '^16.0.0'
# test against the latest alpha
- '^17.0.0-alpha'
steps:
- name: Checkout Code
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: yarn
- name: Cache node modules
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: node_modules
key: node_modules-${{hashFiles('yarn.lock')}}
Expand Down
Loading

0 comments on commit 36afde3

Please sign in to comment.