Skip to content

Commit 80ce933

Browse files
authored
Merge branch 'main' into chore-rsc-nightly
2 parents 5c9a645 + 75e38ba commit 80ce933

File tree

36 files changed

+540
-753
lines changed

36 files changed

+540
-753
lines changed

.github/workflows/ci-rsc.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,26 @@ jobs:
6565
- name: install react
6666
if: ${{ matrix.react_version }}
6767
run: |
68-
sed -i "/^overrides:/a\ react: \"${{ matrix.react_version }}\"" pnpm-workspace.yaml
69-
sed -i "/^overrides:/a\ react-dom: \"${{ matrix.react_version }}\"" pnpm-workspace.yaml
70-
sed -i "/^overrides:/a\ react-server-dom-webpack: \"${{ matrix.react_version }}\"" pnpm-workspace.yaml
68+
sed -i "/^overrides:/a\ react: \"$REACT_VERSION\"" pnpm-workspace.yaml
69+
sed -i "/^overrides:/a\ react-dom: \"$REACT_VERSION\"" pnpm-workspace.yaml
70+
sed -i "/^overrides:/a\ react-server-dom-webpack: \"$REACT_VERSION\"" pnpm-workspace.yaml
7171
pnpm i --no-frozen-lockfile
72+
env:
73+
REACT_VERSION: ${{ matrix.react_version }}
7274
- run: pnpm build
7375
- name: install rolldown
7476
if: ${{ matrix.rolldown }}
7577
run: |
7678
sed -i '/^overrides:/a\ vite: "npm:rolldown-vite@latest"' pnpm-workspace.yaml
7779
pnpm i --no-frozen-lockfile
78-
- run: pnpm -C packages/plugin-rsc exec playwright install ${{ matrix.browser }}
79-
- run: pnpm -C packages/plugin-rsc test-e2e-ci --project=${{ matrix.browser }}
80+
- run: pnpm -C packages/plugin-rsc exec playwright install "$BROWSER_NAME"
81+
shell: bash
82+
env:
83+
BROWSER_NAME: ${{ matrix.browser }}
84+
- run: pnpm -C packages/plugin-rsc test-e2e-ci --project="$BROWSER_NAME"
85+
shell: bash
86+
env:
87+
BROWSER_NAME: ${{ matrix.browser }}
8088
- uses: actions/upload-artifact@v4
8189
if: always()
8290
with:

.github/workflows/publish.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ jobs:
2424
with:
2525
node-version: 22
2626
registry-url: https://registry.npmjs.org/
27+
# disable cache, to avoid cache poisoning (https://docs.zizmor.sh/audits/#cache-poisoning)
28+
package-manager-cache: false
29+
30+
- name: Disallow installation scripts
31+
run: yq '.onlyBuiltDependencies = []' -i pnpm-workspace.yaml
2732

2833
- name: Install deps
2934
run: pnpm install
@@ -59,7 +64,7 @@ jobs:
5964
tag-name: ${{ github.ref_name }}
6065

6166
- if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName == 'plugin-rsc'
62-
uses: yyx990803/release-tag@master
67+
uses: yyx990803/release-tag@8cccf7c5aa332d71d222df46677f70f77a8d2dc0 # v1.0.0
6368
env:
6469
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6570
with:

.github/workflows/release-continuous.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ jobs:
2626
- uses: actions/setup-node@v5
2727
with:
2828
node-version: lts/*
29+
# disable cache, to avoid cache poisoning (https://docs.zizmor.sh/audits/#cache-poisoning)
30+
package-manager-cache: false
31+
32+
- name: Disallow installation scripts
33+
run: yq '.onlyBuiltDependencies = []' -i pnpm-workspace.yaml
2934

3035
- name: Install dependencies
3136
run: pnpm install

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"engines": {
66
"node": "^20.19.0 || >=22.12.0"
77
},
8-
"packageManager": "pnpm@10.15.1",
8+
"packageManager": "pnpm@10.17.0",
99
"homepage": "https://github.com/vitejs/vite-plugin-react/",
1010
"keywords": [
1111
"frontend",
@@ -35,22 +35,22 @@
3535
"devDependencies": {
3636
"@eslint/js": "^9.35.0",
3737
"@types/fs-extra": "^11.0.4",
38-
"@types/node": "^22.18.1",
38+
"@types/node": "^22.18.6",
3939
"@vitejs/release-scripts": "^1.6.0",
4040
"eslint": "^9.35.0",
4141
"eslint-plugin-import-x": "^4.16.1",
42-
"eslint-plugin-n": "^17.21.3",
42+
"eslint-plugin-n": "^17.23.1",
4343
"eslint-plugin-regexp": "^2.10.0",
44-
"fs-extra": "^11.3.1",
45-
"globals": "^16.3.0",
44+
"fs-extra": "^11.3.2",
45+
"globals": "^16.4.0",
4646
"lint-staged": "^16.1.6",
4747
"picocolors": "^1.1.1",
4848
"playwright-chromium": "^1.55.0",
4949
"prettier": "^3.6.2",
5050
"simple-git-hooks": "^2.13.1",
5151
"typescript": "^5.9.2",
52-
"typescript-eslint": "^8.42.0",
53-
"vite": "^7.1.4",
52+
"typescript-eslint": "^8.44.0",
53+
"vite": "^7.1.6",
5454
"vite-plugin-inspect": "^11.3.3",
5555
"vitest": "^3.2.4"
5656
},

packages/plugin-react-oxc/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343
},
4444
"devDependencies": {
4545
"@vitejs/react-common": "workspace:*",
46-
"tsdown": "^0.14.2",
46+
"tsdown": "^0.15.2",
4747
"vite": "catalog:rolldown-vite"
4848
},
4949
"dependencies": {
50-
"@rolldown/pluginutils": "1.0.0-beta.35"
50+
"@rolldown/pluginutils": "1.0.0-beta.38"
5151
}
5252
}

packages/plugin-react-swc/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
3434
"dependencies": {
35-
"@rolldown/pluginutils": "1.0.0-beta.35",
35+
"@rolldown/pluginutils": "1.0.0-beta.38",
3636
"@swc/core": "^1.13.5"
3737
},
3838
"peerDependencies": {
@@ -41,11 +41,11 @@
4141
"devDependencies": {
4242
"@playwright/test": "^1.55.0",
4343
"@types/fs-extra": "^11.0.4",
44-
"@types/node": "^22.18.1",
44+
"@types/node": "^22.18.6",
4545
"@vitejs/react-common": "workspace:*",
46-
"fs-extra": "^11.3.1",
46+
"fs-extra": "^11.3.2",
4747
"prettier": "^3.0.3",
48-
"tsdown": "^0.14.2",
48+
"tsdown": "^0.15.2",
4949
"typescript": "^5.9.2"
5050
}
5151
}

packages/plugin-react-swc/playground/base-path/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react-dom": "^19.1.1"
1313
},
1414
"devDependencies": {
15-
"@types/react": "^19.1.12",
15+
"@types/react": "^19.1.13",
1616
"@types/react-dom": "^19.1.9",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}

packages/plugin-react-swc/playground/class-components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react-dom": "^19.1.1"
1313
},
1414
"devDependencies": {
15-
"@types/react": "^19.1.12",
15+
"@types/react": "^19.1.13",
1616
"@types/react-dom": "^19.1.9",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}

packages/plugin-react-swc/playground/decorators/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"react-dom": "^19.1.1"
1313
},
1414
"devDependencies": {
15-
"@types/react": "^19.1.12",
15+
"@types/react": "^19.1.13",
1616
"@types/react-dom": "^19.1.9",
1717
"@vitejs/plugin-react-swc": "../../dist"
1818
}

packages/plugin-react-swc/playground/emotion-plugin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
"devDependencies": {
1717
"@swc/plugin-emotion": "^11.1.0",
18-
"@types/react": "^19.1.12",
18+
"@types/react": "^19.1.13",
1919
"@types/react-dom": "^19.1.9",
2020
"@vitejs/plugin-react-swc": "../../dist"
2121
}

0 commit comments

Comments
 (0)