Skip to content

Commit 38af1a6

Browse files
hi-ogawahi-ogawa
authored
Merge branch 'main' into 08-11-refactor_rsc_remove_server_optimizedeps.include
2 parents 1d4faa7 + c719e5d commit 38af1a6

File tree

156 files changed

+3497
-2519
lines changed

Some content is hidden

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

156 files changed

+3497
-2519
lines changed

‎.github/renovate.json5

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,5 @@
4141
"kill-port", // `kill-port:^2.0.0 has perf issues (#8392)
4242

4343
"prettier", // waiting for stable choice on ternaries
44-
45-
// plugin-rsc
46-
"react-router",
47-
"@react-router/dev",
4844
],
4945
}

‎.github/workflows/ci-rsc.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
test:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v4
24+
- uses: actions/checkout@v5
2525
- uses: actions/setup-node@v4
2626
with:
2727
node-version: 22
@@ -56,7 +56,7 @@ jobs:
5656
react_version: experimental
5757
fail-fast: false
5858
steps:
59-
- uses: actions/checkout@v4
59+
- uses: actions/checkout@v5
6060
- uses: actions/setup-node@v4
6161
with:
6262
node-version: 22

‎.github/workflows/ci.yml

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

4646
- name: Install pnpm
4747
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
@@ -110,7 +110,7 @@ jobs:
110110
runs-on: ubuntu-latest
111111
name: "Lint: node-20, ubuntu-latest"
112112
steps:
113-
- uses: actions/checkout@v4
113+
- uses: actions/checkout@v5
114114
with:
115115
fetch-depth: 0
116116

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
contents: read
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v5
2323
- uses: actions/setup-node@v4
2424
with:
2525
node-version: 22

‎.github/workflows/publish.yml

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

1919
- name: Install pnpm
2020
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
2121

22-
- name: Set node version to 20
22+
- name: Set node version
2323
uses: actions/setup-node@v4
2424
with:
25-
node-version: 20
25+
node-version: 22
2626
registry-url: https://registry.npmjs.org/
2727
cache: "pnpm"
2828

‎.github/workflows/release-continuous.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout code
21-
uses: actions/checkout@v4
21+
uses: actions/checkout@v5
2222

2323
- name: Install pnpm
2424
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0

‎.github/workflows/semantic-pull-request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
pull-requests: read
1717
steps:
1818
- name: Validate PR title
19-
uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5
19+
uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6
2020
with:
2121
subjectPattern: ^(?![A-Z]).+$
2222
subjectPatternError: |

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ See [`@vitejs/plugin-rsc` documentation](packages/plugin-rsc/README.md)
2424
| Package | Version (click for changelogs) |
2525
| ----------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------- |
2626
| [@vitejs/plugin-react](packages/plugin-react) | [![plugin-react version](https://img.shields.io/npm/v/@vitejs/plugin-react.svg?label=%20)](packages/plugin-react/CHANGELOG.md) |
27-
| [@vitejs/plugin-react-oxc](packages/plugin-react-oxc) | [![plugin-react-oxc version](https://img.shields.io/npm/v/@vitejs/plugin-react-oxc.svg?label=%20)](packages/plugin-react-oxc/CHANGELOG.md) |
2827
| [@vitejs/plugin-react-swc](packages/plugin-react-swc) | [![plugin-react-swc version](https://img.shields.io/npm/v/@vitejs/plugin-react-swc.svg?label=%20)](packages/plugin-react-swc/CHANGELOG.md) |
2928
| [@vitejs/plugin-rsc](packages/plugin-rsc) | [![plugin-rsc version](https://img.shields.io/npm/v/@vitejs/plugin-rsc.svg?label=%20)](packages/plugin-rsc/CHANGELOG.md) |
29+
| [@vitejs/plugin-react-oxc](packages/plugin-react-oxc) | [Deprecated](packages/plugin-react-oxc/CHANGELOG.md), merged with [`@vitejs/plugin-react`](packages/plugin-react) |
3030

3131
## License
3232

‎package.json

Lines changed: 10 additions & 10 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.14.0",
8+
"packageManager": "pnpm@10.15.0",
99
"homepage": "https://github.com/vitejs/vite-plugin-react/",
1010
"keywords": [
1111
"frontend",
@@ -29,29 +29,29 @@
2929
"debug-build": "VITE_TEST_BUILD=1 VITE_PRESERVE_BUILD_ARTIFACTS=1 vitest run -c playground/vitest.config.e2e.ts",
3030
"build": "pnpm -r --filter='./packages/*' run build",
3131
"dev": "pnpm -r --parallel --filter='./packages/*' run dev",
32-
"release": "tsx scripts/release.ts",
33-
"ci-publish": "tsx scripts/publishCI.ts"
32+
"release": "node scripts/release.ts",
33+
"ci-publish": "node scripts/publishCI.ts"
3434
},
3535
"devDependencies": {
36-
"@eslint/js": "^9.33.0",
36+
"@eslint/js": "^9.34.0",
3737
"@types/fs-extra": "^11.0.4",
38-
"@types/node": "^22.17.1",
38+
"@types/node": "^22.18.0",
3939
"@vitejs/release-scripts": "^1.6.0",
40-
"eslint": "^9.33.0",
40+
"eslint": "^9.34.0",
4141
"eslint-plugin-import-x": "^4.16.1",
4242
"eslint-plugin-n": "^17.21.3",
4343
"eslint-plugin-regexp": "^2.10.0",
4444
"fs-extra": "^11.3.1",
4545
"globals": "^16.3.0",
4646
"lint-staged": "^15.5.2",
4747
"picocolors": "^1.1.1",
48-
"playwright-chromium": "^1.54.2",
48+
"playwright-chromium": "^1.55.0",
4949
"prettier": "^3.6.2",
5050
"simple-git-hooks": "^2.13.1",
51-
"tsx": "^4.20.3",
5251
"typescript": "^5.9.2",
53-
"typescript-eslint": "^8.39.0",
54-
"vite": "^7.1.1",
52+
"typescript-eslint": "^8.41.0",
53+
"vite": "^7.1.3",
54+
"vite-plugin-inspect": "^11.3.3",
5555
"vitest": "^3.2.4"
5656
},
5757
"simple-git-hooks": {

‎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.1 (2025-08-19)
6+
7+
### Set `optimizeDeps.rollupOptions.transform.jsx` instead of `optimizeDeps.rollupOptions.jsx` ([#735](https://github.com/vitejs/vite-plugin-react/pull/735))
8+
9+
`optimizeDeps.rollupOptions.jsx` is going to be deprecated in favor of `optimizeDeps.rollupOptions.transform.jsx`.
10+
511
## 0.4.0 (2025-08-07)
612

713
## 0.4.0-beta.0 (2025-07-28)

0 commit comments

Comments
 (0)