Skip to content

Commit e7991b5

Browse files
authored
Merge branch 'main' into 10-18-feat_rsc_support_non_global_dev_runner
2 parents a4d9c98 + 3fd9997 commit e7991b5

File tree

131 files changed

+4024
-2416
lines changed

Some content is hidden

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

131 files changed

+4024
-2416
lines changed

.github/workflows/ci-rsc.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
test:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
29-
- uses: actions/setup-node@v5
29+
- uses: actions/setup-node@v6
3030
with:
3131
node-version: 22
3232
- run: pnpm i
@@ -59,9 +59,9 @@ jobs:
5959
react_version: experimental
6060
fail-fast: false
6161
steps:
62-
- uses: actions/checkout@v5
62+
- uses: actions/checkout@v6
6363
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
64-
- uses: actions/setup-node@v5
64+
- uses: actions/setup-node@v6
6565
with:
6666
node-version: 22
6767
- run: pnpm i
@@ -88,7 +88,7 @@ jobs:
8888
shell: bash
8989
env:
9090
BROWSER_NAME: ${{ matrix.browser }}
91-
- uses: actions/upload-artifact@v4
91+
- uses: actions/upload-artifact@v6
9292
if: always()
9393
with:
9494
name: test-results-${{ matrix.os }}-${{ matrix.browser }}${{ matrix.rolldown == true && '-rolldown' || '' }}${{ matrix.react_version && format('-react-{0}', matrix.react_version) || '' }}

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ jobs:
4141
name: "Build&Test: node-${{ matrix.node_version }}, ${{ matrix.os }}"
4242
steps:
4343
- name: Checkout
44-
uses: actions/checkout@v5
44+
uses: actions/checkout@v6
4545

4646
- name: Install pnpm
4747
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
4848

4949
- name: Set node version to ${{ matrix.node_version }}
50-
uses: actions/setup-node@v5
50+
uses: actions/setup-node@v6
5151
with:
5252
node-version: ${{ matrix.node_version }}
5353

@@ -69,7 +69,7 @@ jobs:
6969
echo "PLAYWRIGHT_VERSION=$env:PLAYWRIGHT_VERSION" >> $env:GITHUB_ENV
7070
7171
- name: Cache Playwright's binary
72-
uses: actions/cache@v4
72+
uses: actions/cache@v5
7373
with:
7474
key: ${{ runner.os }}-playwright-bin-v1-${{ env.PLAYWRIGHT_VERSION }}
7575
path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}
@@ -109,15 +109,15 @@ jobs:
109109
runs-on: ubuntu-latest
110110
name: "Lint: node-20, ubuntu-latest"
111111
steps:
112-
- uses: actions/checkout@v5
112+
- uses: actions/checkout@v6
113113
with:
114114
fetch-depth: 0
115115

116116
- name: Install pnpm
117117
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
118118

119119
- name: Set node version to 20
120-
uses: actions/setup-node@v5
120+
uses: actions/setup-node@v6
121121
with:
122122
node-version: 20
123123

.github/workflows/copilot-setup-steps.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
contents: read
2020

2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
24-
- uses: actions/setup-node@v5
24+
- uses: actions/setup-node@v6
2525
with:
2626
node-version: 22
2727
- run: pnpm i

.github/workflows/issue-close-require.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for actions-cool/issues-helper to update PRs
1414
steps:
1515
- name: need reproduction
16-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
16+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
1717
with:
1818
actions: "close-issues"
1919
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issue-labeled.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: contribution welcome
1616
if: github.event.label.name == 'contribution welcome' || github.event.label.name == 'help wanted'
17-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
17+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
1818
with:
1919
actions: "create-comment, remove-labels"
2020
token: ${{ secrets.GITHUB_TOKEN }}
@@ -25,7 +25,7 @@ jobs:
2525

2626
- name: remove pending
2727
if: (github.event.label.name == 'enhancement' || contains(github.event.label.description, '(priority)')) && contains(github.event.issue.labels.*.name, 'pending triage')
28-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
28+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
2929
with:
3030
actions: "remove-labels"
3131
token: ${{ secrets.GITHUB_TOKEN }}
@@ -34,7 +34,7 @@ jobs:
3434

3535
- name: need reproduction
3636
if: github.event.label.name == 'need reproduction'
37-
uses: actions-cool/issues-helper@45d75b6cf72bf4f254be6230cb887ad002702491 # v3
37+
uses: actions-cool/issues-helper@e2ff99831a4f13625d35064e2b3dfe65c07a0396 # v3
3838
with:
3939
actions: "create-comment, remove-labels"
4040
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
environment: Release
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v5
17+
uses: actions/checkout@v6
1818

1919
- name: Install pnpm
2020
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2121

2222
- name: Set node version
23-
uses: actions/setup-node@v5
23+
uses: actions/setup-node@v6
2424
with:
2525
node-version: 22
2626
registry-url: https://registry.npmjs.org/

.github/workflows/release-continuous.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v5
21+
uses: actions/checkout@v6
2222

2323
- name: Install pnpm
2424
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
2525

26-
- uses: actions/setup-node@v5
26+
- uses: actions/setup-node@v6
2727
with:
2828
node-version: lts/*
2929
# disable cache, to avoid cache poisoning (https://docs.zizmor.sh/audits/#cache-poisoning)

package.json

Lines changed: 11 additions & 11 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.18.2",
8+
"packageManager": "pnpm@10.27.0",
99
"homepage": "https://github.com/vitejs/vite-plugin-react/",
1010
"keywords": [
1111
"frontend",
@@ -33,26 +33,26 @@
3333
"ci-publish": "node scripts/publishCI.ts"
3434
},
3535
"devDependencies": {
36-
"@eslint/js": "^9.37.0",
36+
"@eslint/js": "^9.39.2",
3737
"@types/fs-extra": "^11.0.4",
38-
"@types/node": "^22.18.10",
38+
"@types/node": "^24.10.4",
3939
"@vitejs/release-scripts": "^1.6.0",
40-
"eslint": "^9.37.0",
40+
"eslint": "^9.39.2",
4141
"eslint-plugin-import-x": "^4.16.1",
4242
"eslint-plugin-n": "^17.23.1",
4343
"eslint-plugin-regexp": "^2.10.0",
44-
"fs-extra": "^11.3.2",
45-
"globals": "^16.4.0",
46-
"lint-staged": "^16.2.4",
44+
"fs-extra": "^11.3.3",
45+
"globals": "^17.0.0",
46+
"lint-staged": "^16.2.7",
4747
"picocolors": "^1.1.1",
48-
"playwright-chromium": "^1.56.0",
48+
"playwright-chromium": "^1.57.0",
4949
"prettier": "^3.6.2",
5050
"simple-git-hooks": "^2.13.1",
5151
"typescript": "^5.9.3",
52-
"typescript-eslint": "^8.46.1",
53-
"vite": "^7.1.9",
52+
"typescript-eslint": "^8.51.0",
53+
"vite": "^7.3.0",
5454
"vite-plugin-inspect": "^11.3.3",
55-
"vitest": "^3.2.4"
55+
"vitest": "^4.0.16"
5656
},
5757
"simple-git-hooks": {
5858
"pre-commit": "pnpm exec lint-staged --concurrent false"

packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"./refresh-runtime": "./refresh-runtime.js"
99
},
1010
"dependencies": {
11-
"@rolldown/pluginutils": "1.0.0-beta.43"
11+
"@rolldown/pluginutils": "1.0.0-beta.58"
1212
},
1313
"peerDependencies": {
1414
"vite": "^4.2.0 || ^5.0.0 || ^6.0.0"

packages/plugin-react-oxc/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
## Unreleased
44

5+
## 0.4.3 (2025-11-12)
6+
7+
### Update code to support newer `rolldown-vite` ([#978](https://github.com/vitejs/vite-plugin-react/pull/978))
8+
9+
`rolldown-vite` will remove `optimizeDeps.rollupOptions` in favor of `optimizeDeps.rolldownOptions` soon. This plugin now uses `optimizeDeps.rolldownOptions` to support newer `rolldown-vite`. Please update `rolldown-vite` to the latest version if you are using an older version.
10+
511
## 0.4.2 (2025-09-17)
612

713
### Perf: simplify refresh wrapper generation ([#835](https://github.com/vitejs/vite-plugin-react/pull/835))

0 commit comments

Comments
 (0)