Skip to content

Commit 0927572

Browse files
authored
Misc dev dep and CI updates (#1658)
1 parent c443d03 commit 0927572

File tree

12 files changed

+189
-261
lines changed

12 files changed

+189
-261
lines changed

.github/workflows/deploy-site.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ jobs:
1010
CI: true
1111
steps:
1212
- name: Checkout Repo
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414

1515
- name: Set up PNPM
1616
uses: pnpm/action-setup@v4
1717

1818
- name: Set up Node.js
19-
uses: actions/setup-node@v4
19+
uses: actions/setup-node@v6
2020
with:
2121
node-version-file: '.nvmrc'
2222
cache: 'pnpm'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
CI: true
1414
steps:
1515
- name: Checkout Repo
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717
with:
1818
fetch-depth: 0
1919
token: ${{ secrets.VANILLA_EXTRACT_CI_GITHUB_TOKEN }}
@@ -22,7 +22,7 @@ jobs:
2222
uses: pnpm/action-setup@v4
2323

2424
- name: Set up Node.js
25-
uses: actions/setup-node@v4
25+
uses: actions/setup-node@v6
2626
with:
2727
node-version-file: '.nvmrc'
2828
cache: 'pnpm'

.github/workflows/snapshot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
CI: true
1111
steps:
1212
- name: Checkout Repo
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v6
1414
with:
1515
# This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits
1616
fetch-depth: 0
@@ -20,7 +20,7 @@ jobs:
2020
uses: pnpm/action-setup@v4
2121

2222
- name: Set up Node.js
23-
uses: actions/setup-node@v4
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version-file: '.nvmrc'
2626
cache: 'pnpm'

.github/workflows/validate.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ jobs:
88
matrix:
99
# Blank string allows us to test against version in nvmrc file
1010
# configured in 'Set up Node.js' down below.
11-
node: ['20', '']
12-
name: Lint & Test (${{ (matrix.node && matrix.node != '20') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
11+
node: ['', '24']
12+
name: Lint & Test (${{ (matrix.node && matrix.node != '24') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
1313
runs-on: ubuntu-latest
1414
env:
1515
CI: true
1616
steps:
1717
- name: Checkout Repo
18-
uses: actions/checkout@v4
18+
uses: actions/checkout@v6
1919

2020
- name: Set up PNPM
2121
uses: pnpm/action-setup@v4
2222

2323
- name: Set up Node.js
24-
uses: actions/setup-node@v4
24+
uses: actions/setup-node@v6
2525
with:
2626
node-version: ${{ matrix.node }}
2727
node-version-file: ${{ matrix.node == '' && '.nvmrc' || '' }}
@@ -43,20 +43,20 @@ jobs:
4343
matrix:
4444
# Blank string allows us to test against version in nvmrc file
4545
# configured in 'Set up Node.js' down below.
46-
node: ['20', '']
47-
name: Windows Tests (${{ (matrix.node && matrix.node != '20') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
46+
node: ['', '24']
47+
name: Windows Tests (${{ (matrix.node && matrix.node != '24') && format('node {0}', matrix.node) || matrix.node || 'nvmrc' }})
4848
runs-on: windows-latest
4949
env:
5050
CI: true
5151
steps:
5252
- name: Checkout Repo
53-
uses: actions/checkout@v4
53+
uses: actions/checkout@v6
5454

5555
- name: Set up PNPM
5656
uses: pnpm/action-setup@v4
5757

5858
- name: Set up Node.js
59-
uses: actions/setup-node@v4
59+
uses: actions/setup-node@v6
6060
with:
6161
node-version: ${{ matrix.node }}
6262
node-version-file: ${{ matrix.node == '' && '.nvmrc' || '' }}
@@ -77,13 +77,13 @@ jobs:
7777
CI: true
7878
steps:
7979
- name: Checkout Repo
80-
uses: actions/checkout@v4
80+
uses: actions/checkout@v6
8181

8282
- name: Set up PNPM
8383
uses: pnpm/action-setup@v4
8484

8585
- name: Set up Node.js
86-
uses: actions/setup-node@v4
86+
uses: actions/setup-node@v6
8787
with:
8888
node-version-file: '.nvmrc'
8989
cache: 'pnpm'
@@ -101,7 +101,7 @@ jobs:
101101
run: pnpm test:playwright
102102

103103
- uses: actions/upload-artifact@v4
104-
if: failure()
104+
if: ${{ failure() }}
105105
with:
106106
name: test-results
107107
path: test-results/

benchmarks/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ This package contains scripts for benchmarking the runtime and type-checking per
77
Run a benchmark by executing it with `tsx`:
88

99
```sh
10-
pnpm tsx ./src/css-var-string-literal.ts
10+
node ./src/css-var-string-literal.ts
1111
```

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"dev": "preconstruct dev",
99
"build": "preconstruct build && pnpm build:dts",
10-
"build:dts": "tsx ./scripts/build-dts",
10+
"build:dts": "node ./scripts/build-dts.ts",
1111
"watch": "preconstruct watch",
1212
"start-fixture": "tsx ./test-helpers/src/startFixtureCLI",
1313
"start": "pnpm start-fixture themed",
@@ -17,13 +17,13 @@
1717
"test:jest": "cross-env NODE_OPTIONS=--experimental-vm-modules jest",
1818
"test:vitest": "vitest --watch=false",
1919
"test:playwright": "NODE_OPTIONS=--no-experimental-fetch pnpm test:build-next && playwright test",
20-
"test:build-next": "tsx scripts/copy-next-plugin && pnpm --filter=@fixtures/next-* clean-build",
20+
"test:build-next": "node scripts/copy-next-plugin.ts && pnpm --filter=@fixtures/next-* clean-build",
2121
"format": "prettier --write .",
2222
"lint": "pnpm run '/^lint:.*/'",
2323
"lint:manypkg": "manypkg check",
2424
"lint:prettier": "prettier --cache --check .",
2525
"lint:tsc": "tsc",
26-
"copy-readme-to-packages": "tsx scripts/copy-readme-to-packages",
26+
"copy-readme-to-packages": "node scripts/copy-readme-to-packages.ts",
2727
"version": "changeset version && pnpm install --lockfile-only",
2828
"prepare-release": "pnpm copy-readme-to-packages && pnpm build",
2929
"release": "pnpm prepare-release && changeset publish"
@@ -49,7 +49,7 @@
4949
"prettier": "^2.8.8",
5050
"tsx": "^4.20.6",
5151
"typescript": "^5.8.3",
52-
"vitest": "^3.2.4"
52+
"vitest": "^4.0.13"
5353
},
5454
"preconstruct": {
5555
"___experimentalFlags_WILL_CHANGE_IN_PATCH": {

0 commit comments

Comments
 (0)