Skip to content

Commit deba3be

Browse files
authored
Merge branch 'main' into 07-05-feat_rsc_support_directive_pattern_transform
2 parents edfafc3 + c8ecad0 commit deba3be

40 files changed

+717
-911
lines changed

.github/renovate.json5

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

4545
"prettier", // waiting for stable choice on ternaries
46+
47+
// plugin-rsc
48+
"react-router",
49+
"@react-router/dev",
4650
],
4751
}

.github/workflows/ci-rsc.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
name: ci-rsc
2+
3+
permissions: {}
4+
25
on:
36
push:
47
branches:

.github/workflows/publish.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,17 @@ jobs:
5555
env:
5656
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
5757

58-
- if: steps.tag.outputs.isAlpha == 'false'
58+
- if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName != 'plugin-rsc'
5959
uses: ArnaudBarre/github-release@4fa6eafe8e2449c7c1c5a91ae50de4ee34db0b40 # v1.5.0
6060
with:
6161
path: packages/${{ steps.tag.outputs.pkgName }}/CHANGELOG.md
6262
tag-name: ${{ github.ref_name }}
63+
64+
- if: steps.tag.outputs.isAlpha == 'false' && steps.tag.outputs.pkgName == 'plugin-rsc'
65+
uses: yyx990803/release-tag@master
66+
env:
67+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68+
with:
69+
tag_name: ${{ github.ref }}
70+
body: |
71+
Please refer to [CHANGELOG.md](https://github.com/vitejs/vite-plugin-react/blob/${{ github.ref_name }}/packages/${{ steps.tag.outputs.pkgName }}/CHANGELOG.md) for details.

.npmrc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ hoist-pattern[]=eslint-import-resolver-*
55
strict-peer-dependencies=false
66
shell-emulator=true
77
auto-install-peers=false
8+
link-workspace-packages=true
9+
prefer-workspace-packages=true

package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@vitejs/release-scripts": "^1.6.0",
4040
"eslint": "^9.30.1",
4141
"eslint-plugin-import-x": "^4.16.1",
42-
"eslint-plugin-n": "^17.20.0",
42+
"eslint-plugin-n": "^17.21.0",
4343
"eslint-plugin-regexp": "^2.9.0",
4444
"fs-extra": "^11.3.0",
4545
"globals": "^16.3.0",
@@ -72,9 +72,6 @@
7272
]
7373
},
7474
"pnpm": {
75-
"overrides": {
76-
"@vitejs/plugin-rsc": "workspace:*"
77-
},
7875
"packageExtensions": {
7976
"generouted": {
8077
"peerDependencies": {

packages/plugin-react-oxc/CHANGELOG.md

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

33
## Unreleased
44

5+
### Return `Plugin[]` instead of `PluginOption[]`
6+
57
## 0.2.3 (2025-06-16)
68

79
### Disable refresh transform when `server.hmr: false` is set [#502](https://github.com/vitejs/vite-plugin-react/pull/502)

packages/plugin-react-oxc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@
4848
"vite": "catalog:rolldown-vite"
4949
},
5050
"dependencies": {
51-
"@rolldown/pluginutils": "1.0.0-beta.23"
51+
"@rolldown/pluginutils": "1.0.0-beta.24"
5252
}
5353
}

packages/plugin-react-oxc/src/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { dirname, join } from 'node:path'
22
import { fileURLToPath } from 'node:url'
33
import { readFileSync } from 'node:fs'
4-
import type { BuildOptions, Plugin, PluginOption } from 'vite'
4+
import type { BuildOptions, Plugin } from 'vite'
55
import {
66
addRefreshWrapper,
77
avoidSourceMapOption,
@@ -30,7 +30,7 @@ export interface Options {
3030

3131
const defaultIncludeRE = /\.[tj]sx?(?:$|\?)/
3232

33-
export default function viteReact(opts: Options = {}): PluginOption[] {
33+
export default function viteReact(opts: Options = {}): Plugin[] {
3434
const include = opts.include ?? defaultIncludeRE
3535
const exclude = [
3636
...(Array.isArray(opts.exclude)

packages/plugin-react-swc/CHANGELOG.md

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

33
## Unreleased
44

5+
### Return `Plugin[]` instead of `PluginOption[]`
6+
57
## 3.10.2 (2025-06-10)
68

79
### Suggest `@vitejs/plugin-react-oxc` if rolldown-vite is detected [#491](https://github.com/vitejs/vite-plugin-react/pull/491)

packages/plugin-react-swc/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
3131
"dependencies": {
32-
"@rolldown/pluginutils": "1.0.0-beta.23",
32+
"@rolldown/pluginutils": "1.0.0-beta.24",
3333
"@swc/core": "^1.12.9"
3434
},
3535
"peerDependencies": {

0 commit comments

Comments
 (0)