Skip to content

Commit f557503

Browse files
committed
chore: merge main
2 parents a1b5b19 + 2640add commit f557503

File tree

177 files changed

+4653
-1992
lines changed

Some content is hidden

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

177 files changed

+4653
-1992
lines changed

.github/workflows/ci-rsc.yml

Lines changed: 3 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
@@ -83,3 +83,4 @@ jobs:
8383
name: test-results-${{ matrix.os }}-${{ matrix.browser }}${{ matrix.rolldown == true && '-rolldown' || '' }}${{ matrix.react_version && format('-react-{0}', matrix.react_version) || '' }}
8484
path: |
8585
packages/plugin-rsc/test-results
86+
if-no-files-found: ignore

.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
@@ -113,7 +113,7 @@ jobs:
113113
runs-on: ubuntu-latest
114114
name: "Lint: node-20, ubuntu-latest"
115115
steps:
116-
- uses: actions/checkout@v4
116+
- uses: actions/checkout@v5
117117
with:
118118
fetch-depth: 0
119119

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# https://docs.github.com/en/copilot/how-tos/use-copilot-agents/coding-agent/customize-the-agent-environment
2+
3+
name: "Copilot Setup Steps"
4+
5+
on:
6+
workflow_dispatch:
7+
push:
8+
paths:
9+
- .github/workflows/copilot-setup-steps.yml
10+
pull_request:
11+
paths:
12+
- .github/workflows/copilot-setup-steps.yml
13+
14+
jobs:
15+
copilot-setup-steps:
16+
runs-on: ubuntu-latest
17+
18+
permissions:
19+
contents: read
20+
21+
steps:
22+
- uses: actions/checkout@v5
23+
- uses: actions/setup-node@v4
24+
with:
25+
node-version: 22
26+
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
27+
- run: pnpm i
28+
- run: pnpm exec playwright install chromium

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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

.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@fdd4d3ddf614fbcd8c29e4b106d3bbe0cb2c605d # 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: 14 additions & 13 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.13.1",
8+
"packageManager": "pnpm@10.14.0",
99
"homepage": "https://github.com/vitejs/vite-plugin-react/",
1010
"keywords": [
1111
"frontend",
@@ -34,25 +34,26 @@
3434
"ci-publish": "tsx scripts/publishCI.ts"
3535
},
3636
"devDependencies": {
37-
"@eslint/js": "^9.32.0",
37+
"@eslint/js": "^9.33.0",
3838
"@types/fs-extra": "^11.0.4",
39-
"@types/node": "^22.16.5",
39+
"@types/node": "^22.17.2",
4040
"@vitejs/release-scripts": "^1.6.0",
41-
"eslint": "^9.32.0",
41+
"eslint": "^9.33.0",
4242
"eslint-plugin-import-x": "^4.16.1",
43-
"eslint-plugin-n": "^17.21.2",
44-
"eslint-plugin-regexp": "^2.9.0",
45-
"fs-extra": "^11.3.0",
43+
"eslint-plugin-n": "^17.21.3",
44+
"eslint-plugin-regexp": "^2.10.0",
45+
"fs-extra": "^11.3.1",
4646
"globals": "^16.3.0",
4747
"lint-staged": "^15.5.2",
4848
"picocolors": "^1.1.1",
49-
"playwright-chromium": "^1.54.1",
49+
"playwright-chromium": "^1.54.2",
5050
"prettier": "^3.6.2",
51-
"simple-git-hooks": "^2.13.0",
52-
"tsx": "^4.20.3",
53-
"typescript": "^5.8.3",
54-
"typescript-eslint": "^8.38.0",
55-
"vite": "^7.0.6",
51+
"simple-git-hooks": "^2.13.1",
52+
"tsx": "^4.20.4",
53+
"typescript": "^5.9.2",
54+
"typescript-eslint": "^8.39.1",
55+
"vite": "^7.1.2",
56+
"vite-plugin-inspect": "^11.3.2",
5657
"vitest": "^3.2.4"
5758
},
5859
"simple-git-hooks": {

packages/plugin-react-oxc/CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,14 @@
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+
11+
## 0.4.0 (2025-08-07)
12+
513
## 0.4.0-beta.0 (2025-07-28)
614

715
### Deprecate this plugin

packages/plugin-react-oxc/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
> [!IMPORTANT]
2+
> This package is deprecated. Please use [@vitejs/plugin-react](https://www.npmjs.com/package/@vitejs/plugin-react) instead, which automatically enables Oxc-based Fast Refresh transform on [`rolldown-vite`](https://vitejs.dev/guide/rolldown).
3+
14
# @vitejs/plugin-react-oxc [![npm](https://img.shields.io/npm/v/@vitejs/plugin-react-oxc.svg)](https://npmjs.com/package/@vitejs/plugin-react-oxc)
25

36
The future default Vite plugin for React projects.

0 commit comments

Comments
 (0)