Skip to content

Commit 38652a4

Browse files
authored
migrate to pnpm v11 (tailwindlabs#20273)
This PR bumps the repo to pnpm v11 (from v9). I kept running into weird Windows specific issues for the integration tests due to some shims but they all pass right now. Bumping to pnpm v11 also meant that everything is driven by a `pnpm-workspace.yaml` file, and changes applied via the `pnpm` field in the `package.json` don't work anymore. This also moved the `node-linker` setup that was defined in the `.npmrc` file for the wasm oxide build into the `pnpm-workspace.yaml` file. Ideally this is scoped to just this package, but I couldn't get that to work, so it's applied to all packages right now. [ci-all]
1 parent 7ff413b commit 38652a4

19 files changed

Lines changed: 357 additions & 167 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5151
with:
5252
persist-credentials: false
53-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
53+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
5454

5555
- name: Use Node.js ${{ env.NODE_VERSION }}
5656
uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
5959
with:
6060
persist-credentials: false
61-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
61+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
6262

6363
- run: |
6464
git config --global user.name "github-actions[bot]"

.github/workflows/prepare-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
env:
1616
APP_NAME: tailwindcss-oxide
1717
NODE_VERSION: 24
18-
PNPM_VERSION: '9.6.0'
18+
PNPM_VERSION: '11.9.0'
1919
OXIDE_LOCATION: ./crates/node
2020

2121
permissions:
@@ -79,7 +79,7 @@ jobs:
7979
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
8080
with:
8181
persist-credentials: false
82-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
82+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
8383
with:
8484
version: ${{ env.PNPM_VERSION }}
8585

@@ -220,7 +220,7 @@ jobs:
220220
run: |
221221
echo "TAG_NAME=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
222222
223-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
223+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
224224
with:
225225
version: ${{ env.PNPM_VERSION }}
226226

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ permissions:
2222
env:
2323
APP_NAME: tailwindcss-oxide
2424
NODE_VERSION: 24
25-
PNPM_VERSION: '9.6.0'
25+
PNPM_VERSION: '11.9.0'
2626
OXIDE_LOCATION: ./crates/node
2727

2828
concurrency:
@@ -83,7 +83,7 @@ jobs:
8383
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
8484
with:
8585
persist-credentials: false
86-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
86+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
8787
with:
8888
version: ${{ env.PNPM_VERSION }}
8989

@@ -219,7 +219,7 @@ jobs:
219219
fetch-depth: 20
220220
persist-credentials: false
221221

222-
- uses: pnpm/action-setup@0e279bb959325dab635dd2c09392533439d90093 # v6
222+
- uses: pnpm/action-setup@0ebf47130e4866e96fce0953f49152a61190b271 # v6.0.9
223223
with:
224224
version: ${{ env.PNPM_VERSION }}
225225

crates/node/npm/wasm32-wasi/.npmrc

Lines changed: 0 additions & 1 deletion
This file was deleted.

integrations/cli/index.test.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,15 @@ describe.each([
639639
'git ignore files outside of a repo are not considered',
640640
{
641641
fs: {
642+
// Make the test root a pnpm workspace that includes `home/project` so
643+
// the install below resolves the transitive dependency overrides that
644+
// the test harness injects into this `pnpm-workspace.yaml`.
645+
'pnpm-workspace.yaml': yaml`
646+
#
647+
packages:
648+
- home/project
649+
`,
650+
642651
// Ignore everything in the "home" directory
643652
'home/.gitignore': '*',
644653

@@ -676,7 +685,7 @@ describe.each([
676685
installDependencies: false,
677686
},
678687
async ({ fs, root, exec }) => {
679-
await exec(`pnpm install --ignore-workspace`, {
688+
await exec(`pnpm install`, {
680689
cwd: path.join(root, 'home/project'),
681690
})
682691

integrations/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"devDependencies": {
66
"dedent": "catalog:",
77
"fast-glob": "^3.3.3",
8-
"source-map-js": "^1.2.1"
8+
"source-map-js": "^1.2.1",
9+
"yaml": "^2.9.0"
910
}
1011
}

0 commit comments

Comments
 (0)