Skip to content

Commit d51d24a

Browse files
committed
Merge remote-tracking branch origin/master into incremental-delivery-adjustments
2 parents 102fa19 + 5ecdb9d commit d51d24a

File tree

446 files changed

+9127
-68967
lines changed

Some content is hidden

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

446 files changed

+9127
-68967
lines changed

.changeset/config.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,8 @@
1010
"useCalculatedVersion": true,
1111
"prereleaseTemplate": "{tag}-{datetime}-{commit}"
1212
},
13+
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
14+
"updateInternalDependents": "always"
15+
},
1316
"ignore": ["website"]
1417
}

.eslintrc.cjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ module.exports = {
2222
'no-dupe-class-members': 'off',
2323
'dot-notation': 'off',
2424
'no-use-before-define': 'off',
25+
'@typescript-eslint/no-empty-object-type': 'off',
2526
'@typescript-eslint/no-unused-vars': 'off',
2627
'@typescript-eslint/no-use-before-define': 'off',
2728
'@typescript-eslint/no-namespace': 'off',

.github/workflows/benchmark.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/codeql-analysis.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

.github/workflows/pr.yml

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches:
55
- master
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
710
jobs:
811
dependencies:
912
uses: the-guild-org/shared-config/.github/workflows/changesets-dependencies.yaml@main
@@ -20,22 +23,7 @@ jobs:
2023
with:
2124
npmTag: alpha
2225
buildScript: build
23-
nodeVersion: 18
24-
secrets:
25-
githubToken: ${{ secrets.GUILD_BOT_TOKEN }}
26-
npmToken: ${{ secrets.NODE_AUTH_TOKEN }}
27-
28-
release-candidate:
29-
permissions:
30-
contents: read
31-
id-token: write
32-
uses: the-guild-org/shared-config/.github/workflows/release-snapshot.yml@main
33-
if: ${{ github.event.pull_request.title == 'Upcoming Release Changes' }}
34-
with:
35-
npmTag: rc
36-
buildScript: build
37-
restoreDeletedChangesets: true
38-
nodeVersion: 18
26+
nodeVersion: 22
3927
secrets:
4028
githubToken: ${{ secrets.GUILD_BOT_TOKEN }}
4129
npmToken: ${{ secrets.NODE_AUTH_TOKEN }}

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
branches:
55
- master
66

7+
concurrency:
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
710
jobs:
811
stable:
912
permissions:
@@ -12,7 +15,7 @@ jobs:
1215
uses: the-guild-org/shared-config/.github/workflows/release-stable.yml@main
1316
with:
1417
releaseScript: release
15-
nodeVersion: 18
18+
nodeVersion: 22
1619
secrets:
1720
githubToken: ${{ secrets.GUILD_BOT_TOKEN }}
1821
npmToken: ${{ secrets.NODE_AUTH_TOKEN }}

.github/workflows/tests.yml

Lines changed: 32 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -5,61 +5,53 @@ env:
55
NODE_OPTIONS: '--max-old-space-size=8192'
66
CI: true
77

8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
812
on:
913
push:
1014
branches:
1115
- master
1216
pull_request:
1317

1418
jobs:
15-
prettier-check:
16-
name: 🧹 Prettier Check
19+
typecheck-15:
20+
name: Type Check on GraphQL v15
1721
runs-on: ubuntu-latest
1822
steps:
1923
- name: Checkout Master
20-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
24+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
2125

2226
- name: Setup env
2327
uses: the-guild-org/shared-config/setup@main
2428
with:
25-
nodeVersion: 18
26-
27-
- name: Prettier Check
28-
run: yarn prettier:check
29-
lint:
30-
name: Lint
31-
uses: the-guild-org/shared-config/.github/workflows/lint.yml@main
32-
with:
33-
script: yarn ci:lint
34-
secrets:
35-
githubToken: ${{ secrets.GITHUB_TOKEN }}
29+
nodeVersion: 22
3630

37-
build:
38-
name: Type Check on GraphQL v${{matrix.graphql_version}}
31+
- name: Use GraphQL v15
32+
run: node ./scripts/match-graphql.js 15
33+
- name: Install Dependencies using Yarn
34+
run: yarn install --ignore-engines && git checkout yarn.lock
35+
- name: Type Check
36+
run: yarn ts:check
37+
check:
38+
name: Full Check on GraphQL v16
3939
runs-on: ubuntu-latest
40-
strategy:
41-
fail-fast: false
42-
matrix:
43-
graphql_version:
44-
- 15
45-
- 16
46-
- '17.0.0-alpha.1'
4740
steps:
4841
- name: Checkout Master
49-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
50-
42+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
5143
- name: Setup env
5244
uses: the-guild-org/shared-config/setup@main
5345
with:
54-
nodeVersion: 18
55-
56-
- name: Use GraphQL v${{matrix.graphql_version}}
57-
run: node ./scripts/match-graphql.js ${{matrix.graphql_version}}
58-
- name: Install Dependencies using Yarn
59-
run: yarn install --ignore-engines && git checkout yarn.lock
60-
- name: Type Check
61-
run: yarn ts:check
62-
46+
nodeVersion: 22
47+
- name: Prettier
48+
run: yarn prettier:check
49+
- name: Lint
50+
run: yarn lint
51+
- name: Build
52+
run: yarn build
53+
- name: Test ESM and CJS integrity
54+
run: yarn bob check
6355
test:
6456
name:
6557
Unit Test on Node ${{matrix.node-version}} (${{matrix.os}}) and GraphQL
@@ -69,18 +61,17 @@ jobs:
6961
fail-fast: false
7062
matrix:
7163
os: [ubuntu-latest] # remove windows to speed up the tests
72-
node-version: [18, 20, 22]
64+
node-version: [18, 20, 22, 23]
7365
graphql_version:
7466
- 15
7567
- 16
76-
- '17.0.0-alpha.1'
7768
include:
7869
- node-version: 18
7970
os: windows-latest
8071
graphql_version: 16
8172
steps:
8273
- name: Checkout Master
83-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
74+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
8475

8576
- name: Setup env
8677
uses: the-guild-org/shared-config/setup@main
@@ -100,60 +91,13 @@ jobs:
10091
hashFiles('yarn.lock') }}
10192
restore-keys: |
10293
${{ runner.os }}-${{matrix.node-version}}-${{matrix.graphql_version}}-jest-
103-
- name: Test
104-
if: ${{ matrix.node-version >= 20 }}
94+
- name: Build
95+
run: yarn build
96+
- name: Unit Tests
10597
run: yarn test --ci
106-
- name: Test
107-
if: ${{ matrix.node-version < 20 }}
98+
- name: Leak Tests
10899
uses: nick-fields/retry@v3
109100
with:
110101
timeout_minutes: 10
111102
max_attempts: 5
112103
command: yarn test:leaks --ci
113-
114-
trackback:
115-
name: trackback rc dependencies
116-
needs: test
117-
if: ${{ always() }}}
118-
runs-on: ubuntu-latest
119-
steps:
120-
- uses: the-guild-org/shared-config/release-trackback@main
121-
with:
122-
token: ${{ secrets.GITHUB_TOKEN }}
123-
relevantPackages: |
124-
@whatwg-node/*
125-
126-
test_esm:
127-
name: ESM Test
128-
runs-on: ubuntu-latest
129-
steps:
130-
- name: Checkout Master
131-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
132-
133-
- name: Setup env
134-
uses: the-guild-org/shared-config/setup@main
135-
with:
136-
nodeVersion: 18
137-
138-
- name: Build Packages
139-
run: yarn build
140-
- name: Test ESM and CJS integrity
141-
run: yarn bob check
142-
test_browser:
143-
name: Browser Test
144-
runs-on: ubuntu-latest
145-
steps:
146-
- name: Checkout Master
147-
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
148-
- name: Setup env
149-
uses: the-guild-org/shared-config/setup@main
150-
with:
151-
nodeVersion: 18
152-
- name: Build Packages
153-
run: yarn build
154-
- name: Test
155-
uses: nick-fields/retry@v3
156-
with:
157-
timeout_minutes: 10
158-
max_attempts: 5
159-
command: TEST_BROWSER=true yarn jest --no-watchman --ci browser

0 commit comments

Comments
 (0)