Skip to content

Commit b6ab17e

Browse files
trevor-scheertrevor-scheer
committed
Merge pnpm updates into graphiql-6 
2 parents 1d72803 + bb2d45f commit b6ab17e

65 files changed

Lines changed: 23500 additions & 25915 deletions

File tree

Some content is hidden

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

‎.gitattributes‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111
*.css text eol=lf
1212
*.sh text eol=lf
1313
*.yml text eol=lf
14-
15-
.yarn/releases/*.cjs export-ignore binary linguist-generated
14+
*.yaml text eol=lf

‎.github/actions/turbo-cache/action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ runs:
1010
- uses: actions/cache@v5
1111
with:
1212
path: .turbo/cache
13-
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'yarn.lock') }}-${{ github.job }}-${{ github.sha }}
13+
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'pnpm-lock.yaml') }}-${{ github.job }}-${{ github.sha }}
1414
restore-keys: |
15-
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'yarn.lock') }}-${{ github.job }}-
16-
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'yarn.lock') }}-build-
17-
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'yarn.lock') }}-
15+
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'pnpm-lock.yaml') }}-${{ github.job }}-
16+
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'pnpm-lock.yaml') }}-build-
17+
turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'pnpm-lock.yaml') }}-
1818
- name: Restore current build cache
1919
if: inputs.restore-build == 'true'
2020
uses: actions/cache/restore@v5
2121
with:
2222
path: .turbo/cache
23-
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'yarn.lock') }}-build-${{ github.sha }}
23+
key: turbo-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('.node-version', 'pnpm-lock.yaml') }}-build-${{ github.sha }}

‎.github/workflows/pr-graphql-compat-check.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,39 +33,43 @@ jobs:
3333
- name: Checkout Code
3434
uses: actions/checkout@v6
3535

36+
- uses: pnpm/action-setup@v4
3637
- uses: actions/setup-node@v6
3738
with:
3839
node-version-file: '.node-version'
39-
cache: yarn
40+
cache: pnpm
4041
- name: Cache node modules
4142
uses: actions/cache@v5
4243
with:
4344
path: node_modules
44-
key: node_modules-${{hashFiles('yarn.lock')}}
45+
key: node_modules-${{hashFiles('pnpm-lock.yaml')}}
4546
restore-keys: node_modules-
4647
- name: Install dependencies
47-
run: yarn install --immutable
48+
run: pnpm install --frozen-lockfile
4849

4950
- name: Force GraphQL ${{ matrix.release }} solution
50-
run: yarn repo:resolve graphql@${{ matrix.release }}
51+
run: pnpm repo:resolve graphql@${{ matrix.release }}
5152

52-
- run: yarn install --no-immutable
53+
- run: pnpm install --no-frozen-lockfile
5354

5455
- name: Turbo cache
5556
uses: ./.github/actions/turbo-cache
5657

5758
- name: Build
58-
run: yarn build
59+
run: pnpm build
5960

6061
- name: Unit Tests
61-
run: yarn test
62+
run: pnpm test
63+
64+
- name: Install Cypress
65+
run: pnpm --filter graphiql-e2e exec cypress install
6266

6367
- name: Cypress (GraphQL 16)
6468
if: matrix.release != '^17'
6569
env:
6670
CYPRESS_excludeSpecPattern: cypress/e2e/incremental-delivery.cy.ts
67-
run: yarn e2e
71+
run: pnpm e2e
6872

6973
- name: Cypress (GraphQL 17)
7074
if: matrix.release == '^17'
71-
run: yarn e2e
75+
run: pnpm e2e

‎.github/workflows/pr.yml‎

Lines changed: 55 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -13,86 +13,93 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@v6
16+
- uses: pnpm/action-setup@v4
1617
- uses: actions/setup-node@v6
1718
with:
1819
node-version-file: '.node-version'
19-
cache: yarn
20-
- run: yarn install --immutable
20+
cache: pnpm
21+
- run: pnpm install --frozen-lockfile
2122
- name: Turbo cache
2223
uses: ./.github/actions/turbo-cache
23-
- run: yarn build
24+
- run: pnpm build
2425

2526
cspell:
2627
name: CSpell
2728
runs-on: ubuntu-latest
2829
steps:
2930
- uses: actions/checkout@v6
31+
- uses: pnpm/action-setup@v4
3032
- uses: actions/setup-node@v6
3133
with:
3234
node-version-file: '.node-version'
33-
cache: yarn
34-
- run: yarn install --immutable
35-
- run: yarn lint-cspell
35+
cache: pnpm
36+
- run: pnpm install --frozen-lockfile
37+
- run: pnpm lint-cspell
3638

3739
format:
3840
name: Format
3941
runs-on: ubuntu-latest
4042
steps:
4143
- uses: actions/checkout@v6
44+
- uses: pnpm/action-setup@v4
4245
- uses: actions/setup-node@v6
4346
with:
4447
node-version-file: '.node-version'
45-
cache: yarn
46-
- run: yarn install --immutable
47-
- run: yarn format-check
48-
- run: yarn svgo-check
48+
cache: pnpm
49+
- run: pnpm install --frozen-lockfile
50+
- run: pnpm check:lockfile
51+
- run: pnpm format-check
52+
- run: pnpm svgo-check
4953

5054
dedupe-check:
51-
name: Yarn Dedupe Check
55+
name: pnpm Dedupe Check
5256
runs-on: ubuntu-latest
5357
steps:
5458
- uses: actions/checkout@v6
59+
- uses: pnpm/action-setup@v4
5560
- uses: actions/setup-node@v6
5661
with:
5762
node-version-file: '.node-version'
58-
cache: yarn
59-
- run: yarn install --immutable
60-
- run: yarn dedupe --check
63+
cache: pnpm
64+
- run: pnpm install --frozen-lockfile
65+
- run: pnpm dedupe --check
6166

6267
vitest:
6368
name: Vitest Unit Tests
6469
runs-on: ubuntu-latest
6570
needs: [build]
6671
steps:
6772
- uses: actions/checkout@v6
73+
- uses: pnpm/action-setup@v4
6874
- uses: actions/setup-node@v6
6975
with:
7076
node-version-file: '.node-version'
71-
cache: yarn
72-
- run: yarn install --immutable
77+
cache: pnpm
78+
- run: pnpm install --frozen-lockfile
7379
- name: Turbo cache
7480
uses: ./.github/actions/turbo-cache
7581
with:
7682
restore-build: true
77-
- run: npx playwright install --with-deps chromium
78-
- run: yarn test
83+
- run: pnpm --filter @graphiql/react exec playwright install --with-deps chromium
84+
- run: pnpm test
7985

8086
graphql-17-fragment-arguments:
8187
name: GraphQL 17 Fragment Arguments
8288
runs-on: ubuntu-latest
8389
steps:
8490
- uses: actions/checkout@v6
91+
- uses: pnpm/action-setup@v4
8592
- uses: actions/setup-node@v6
8693
with:
8794
node-version-file: '.node-version'
88-
cache: yarn
89-
- run: yarn install --immutable
90-
- run: yarn workspace graphql-language-service add --dev graphql@17.0.2
95+
cache: pnpm
96+
- run: pnpm install --frozen-lockfile
97+
- run: pnpm --filter graphql-language-service add --save-dev graphql@17.0.2
9198
- name: Build and typecheck graphql-language-service
92-
run: yarn workspace graphql-language-service exec tsc
99+
run: pnpm --filter graphql-language-service exec tsc
93100
- name: Test fragment argument integration
94101
run: >-
95-
yarn vitest run packages/graphql-language-service/src/parser/__tests__/OnlineParser.test.ts packages/graphql-language-service/src/interface/__tests__/getAutocompleteSuggestions.test.ts packages/graphql-language-service/src/interface/__tests__/getDiagnostics.test.ts packages/graphql-language-service/src/interface/__tests__/getHoverInformation.test.ts
102+
pnpm exec vitest run packages/graphql-language-service/src/parser/__tests__/OnlineParser.test.ts packages/graphql-language-service/src/interface/__tests__/getAutocompleteSuggestions.test.ts packages/graphql-language-service/src/interface/__tests__/getDiagnostics.test.ts packages/graphql-language-service/src/interface/__tests__/getHoverInformation.test.ts
96103
97104
98105
lint:
@@ -101,61 +108,65 @@ jobs:
101108
needs: [build]
102109
steps:
103110
- uses: actions/checkout@v6
111+
- uses: pnpm/action-setup@v4
104112
- uses: actions/setup-node@v6
105113
with:
106114
node-version-file: '.node-version'
107-
cache: yarn
108-
- run: yarn install --immutable
115+
cache: pnpm
116+
- run: pnpm install --frozen-lockfile
109117
- name: Turbo cache
110118
uses: ./.github/actions/turbo-cache
111119
with:
112120
restore-build: true
113-
- run: yarn build
114-
- run: yarn oxlint
121+
- run: pnpm build
122+
- run: pnpm oxlint
115123

116124
types-check:
117125
name: Types Check
118126
runs-on: ubuntu-latest
119127
needs: [build]
120128
steps:
121129
- uses: actions/checkout@v6
130+
- uses: pnpm/action-setup@v4
122131
- uses: actions/setup-node@v6
123132
with:
124133
node-version-file: '.node-version'
125-
cache: yarn
126-
- run: yarn install --immutable
134+
cache: pnpm
135+
- run: pnpm install --frozen-lockfile
127136
- name: Turbo cache
128137
uses: ./.github/actions/turbo-cache
129138
with:
130139
restore-build: true
131-
- run: yarn types:check
140+
- run: pnpm types:check
132141

133142
e2e:
134143
name: Cypress
135144
runs-on: ubuntu-latest
136145
needs: [build]
137146
steps:
138147
- uses: actions/checkout@v6
148+
- uses: pnpm/action-setup@v4
139149
- uses: actions/setup-node@v6
140150
with:
141151
node-version-file: '.node-version'
142-
cache: yarn
143-
- run: yarn install --immutable
152+
cache: pnpm
153+
- run: pnpm install --frozen-lockfile
144154
- name: Turbo cache
145155
uses: ./.github/actions/turbo-cache
146156
with:
147157
restore-build: true
148-
- run: yarn build
158+
- run: pnpm build
149159
- uses: actions/cache@v5
150160
with:
151161
path: |
152162
~/.cache/Cypress
153-
key: cypress-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
163+
key: cypress-${{ runner.os }}-${{ hashFiles('pnpm-lock.yaml') }}
164+
- run: pnpm --filter graphiql-e2e exec cypress install
154165
- name: Cypress run
155166
uses: cypress-io/github-action@v7
156167
with:
157168
install: false
158-
command: yarn e2e
169+
command: pnpm e2e
159170
env:
160171
# GitHub runners have no usable GPU; Electron's GPU process can
161172
# crash (dawn/Vulkan) and wedge the browser mid-run
@@ -179,27 +190,29 @@ jobs:
179190
needs: [build, lint, vitest, e2e]
180191
steps:
181192
- uses: actions/checkout@v6
193+
- uses: pnpm/action-setup@v4
182194
- uses: actions/setup-node@v6
183195
with:
184196
node-version-file: '.node-version'
185-
cache: yarn
186-
- run: yarn install --immutable
197+
cache: pnpm
198+
- run: pnpm install --frozen-lockfile
187199
- name: Turbo cache
188200
uses: ./.github/actions/turbo-cache
189201
with:
190202
restore-build: true
191-
- run: yarn build
192-
- run: npx pkg-pr-new publish --comment=off './packages/*'
203+
- run: pnpm build
204+
- run: pnpm dlx pkg-pr-new publish --comment=off './packages/*'
193205

194206
license-check:
195207
name: Check Licenses
196208
runs-on: ubuntu-latest
197209
steps:
198210
- uses: actions/checkout@v6
211+
- uses: pnpm/action-setup@v4
199212
- uses: actions/setup-node@v6
200213
with:
201214
node-version-file: '.node-version'
202-
cache: yarn
203-
- run: yarn install --immutable
215+
cache: pnpm
216+
- run: pnpm install --frozen-lockfile
204217
- name: License Check
205-
run: yarn license-check
218+
run: pnpm license-check

‎.github/workflows/release.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ jobs:
4242
with:
4343
fetch-depth: 0
4444

45+
- uses: pnpm/action-setup@v4
4546
- uses: actions/setup-node@v6
4647
with:
4748
node-version-file: '.node-version'
48-
cache: yarn
49+
cache: pnpm
4950

50-
- run: yarn install --immutable
51+
- run: pnpm install --frozen-lockfile
5152

5253
- name: Turbo cache
5354
uses: ./.github/actions/turbo-cache
@@ -56,9 +57,9 @@ jobs:
5657
id: changesets
5758
uses: changesets/action@v1
5859
with:
59-
version: yarn ci:version
60+
version: pnpm ci:version
6061
# This expects you to have a script called release which does a build for your packages and calls changeset publish
61-
publish: yarn release
62+
publish: pnpm release
6263

6364
- name: Note VSCode extension release
6465
id: vscode
@@ -103,12 +104,13 @@ jobs:
103104
steps:
104105
- uses: actions/checkout@v5
105106

107+
- uses: pnpm/action-setup@v4
106108
- uses: actions/setup-node@v6
107109
with:
108110
node-version-file: '.node-version'
109-
cache: yarn
111+
cache: pnpm
110112

111-
- run: yarn install --immutable
113+
- run: pnpm install --frozen-lockfile
112114

113115
- uses: actions/download-artifact@v4
114116
with:

‎.github/workflows/update-cdn-example.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- uses: actions/setup-node@v6
2323
with:
2424
node-version-file: '.node-version'
25-
cache: yarn
2625

2726
- name: Generate index.html
2827
id: generate

‎.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
.secrets
66
*.log
77

8-
.yarn/*
9-
!.yarn/releases/*
10-
!.yarn/plugins/*
11-
128
node_modules/
139
coverage/
1410
.nyc_output
@@ -18,7 +14,6 @@ out/
1814
*.vsix
1915
*.tsbuildinfo
2016

21-
yarn-1.18.0.js
2217
*.orig
2318
.idea/
2419

‎.npmrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
engine-strict=true
21
access=public

‎.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"npm.packageManager": "yarn",
2+
"npm.packageManager": "pnpm",
33
"editor.defaultFormatter": "oxc.oxc-vscode",
44
"editor.formatOnSave": true,
55
"files.insertFinalNewline": true,

0 commit comments

Comments
 (0)