Merge remote-tracking branch 'upstream/main' into chore-rsc-nightly

Author: github-actions[bot]

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -19,6 +19,8 @@ body:
             [plugin-react-swc](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc)
         - label: |
             [plugin-react-oxc](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-oxc)
+        - label: |
+            [plugin-rsc](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-rsc)
   - type: textarea
     id: bug-description
     attributes:

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -19,6 +19,8 @@ body:
             [plugin-react-swc](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc)
         - label: |
             [plugin-react-oxc](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-oxc)
+        - label: |
+            [plugin-rsc](https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-rsc)
   - type: textarea
     id: feature-description
     attributes:

packages/plugin-react-swc/package.json

@@ -30,7 +30,7 @@
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-react-swc#readme",
   "dependencies": {
     "@rolldown/pluginutils": "1.0.0-beta.24",
-    "@swc/core": "^1.12.9"
+    "@swc/core": "^1.12.11"
   },
   "peerDependencies": {
     "vite": "^4 || ^5 || ^6 || ^7"

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

@@ -17,6 +17,6 @@
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react-swc": "../../dist",
-    "@swc/plugin-emotion": "^10.0.2"
+    "@swc/plugin-emotion": "^10.0.3"
   }
 }

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

@@ -14,7 +14,7 @@
     "styled-components": "^6.1.19"
   },
   "devDependencies": {
-    "@swc/plugin-styled-components": "^8.0.2",
+    "@swc/plugin-styled-components": "^8.0.3",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@types/styled-components": "^5.1.34",

packages/plugin-rsc/CHANGELOG.md

@@ -1,3 +1,12 @@
+## <small>[0.4.12](https://github.com/vitejs/vite-plugin-react/compare/plugin-rsc@0.4.11...plugin-rsc@0.4.12) (2025-07-14)</small>
+### Features
+
+* **rsc:** support regex directive for `transformHoistInlineDirective` ([#527](https://github.com/vitejs/vite-plugin-react/issues/527)) ([b598bb5](https://github.com/vitejs/vite-plugin-react/commit/b598bb57d6a7d76bb4ce41ae5990913461949ec3))
+
+### Bug Fixes
+
+* **rsc:** support setups without an SSR environment ([#562](https://github.com/vitejs/vite-plugin-react/issues/562)) ([0fc7fcd](https://github.com/vitejs/vite-plugin-react/commit/0fc7fcdae31568dcd2568a10333ad1e79e2d5176))
+
 ## <small>[0.4.11](https://github.com/vitejs/vite-plugin-react/compare/plugin-rsc@0.4.10...plugin-rsc@0.4.11) (2025-07-07)</small>
 ### Miscellaneous Chores
 
@@ -13,19 +22,6 @@
 * **deps:** update all non-major dependencies ([#540](https://github.com/vitejs/vite-plugin-react/issues/540)) ([cfe2912](https://github.com/vitejs/vite-plugin-react/commit/cfe29122a8eec6c1e2ed9999531237dbce140e60))
 * return `Plugin[]` instead of `PluginOption[]` ([#537](https://github.com/vitejs/vite-plugin-react/issues/537)) ([11f56d6](https://github.com/vitejs/vite-plugin-react/commit/11f56d63a9ed082137732211db556c784cadb523))
 
-### Miscellaneous Chores
-
-* **rsc:** fix example deps ([#534](https://github.com/vitejs/vite-plugin-react/issues/534)) ([a7d32a0](https://github.com/vitejs/vite-plugin-react/commit/a7d32a0a1c383964b67fa01c1f5959446759f02d))
-* **rsc:** fix links ([#530](https://github.com/vitejs/vite-plugin-react/issues/530)) ([feb762f](https://github.com/vitejs/vite-plugin-react/commit/feb762f291cf6460281e64820374bf288485c4a3))
-* **rsc:** remove `examples/hono` ([#533](https://github.com/vitejs/vite-plugin-react/issues/533)) ([46df0fd](https://github.com/vitejs/vite-plugin-react/commit/46df0fd6274365168259a67bc63ea1e689eb9681))
-
-### Tests
-
-* **rsc:** check hydration mismatch ([#526](https://github.com/vitejs/vite-plugin-react/issues/526)) ([ce84449](https://github.com/vitejs/vite-plugin-react/commit/ce84449c87a8834ffafcf0b3f2fc63ad464b921d))
-* **rsc:** fix flaky server restart test ([#535](https://github.com/vitejs/vite-plugin-react/issues/535)) ([079feaf](https://github.com/vitejs/vite-plugin-react/commit/079feaf1ac2b06a704efc0c7ef6d6a0276207d53))
-* **rsc:** test browser only component ([#528](https://github.com/vitejs/vite-plugin-react/issues/528)) ([795303e](https://github.com/vitejs/vite-plugin-react/commit/795303efe78fed2cff2237c6d6d066d76c284ced))
-* **rsc:** test react compiler ([#529](https://github.com/vitejs/vite-plugin-react/issues/529)) ([2966af5](https://github.com/vitejs/vite-plugin-react/commit/2966af52393514e0c23d3236afccba699b042322))
-
 ## v0.4.10-alpha.1 (2025-07-04)
 
 - feat: add `@vitejs/plugin-rsc` ([#521](https://github.com/vitejs/vite-plugin-react/pull/521))

packages/plugin-rsc/examples/basic/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build --app",
+    "build": "vite build",
     "preview": "vite preview",
     "cf-build": "CF_BUILD=1 pnpm build",
     "cf-preview": "wrangler dev",

packages/plugin-rsc/examples/react-router/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "vite",
-    "build": "vite build --app",
+    "build": "vite build",
     "preview": "vite preview",
     "cf-dev": "vite -c ./cf/vite.config.ts",
     "cf-build": "vite -c ./cf/vite.config.ts build",

packages/plugin-rsc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.11",
+  "version": "0.4.12",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",

packages/plugin-rsc/src/plugin.ts

@@ -303,7 +303,9 @@ export default function vitePluginRsc(
                 `[vite-rsc] failed to resolve server handler '${source}'`,
               )
               const mod = await environment.runner.import(resolved.id)
-              createRequestListener(mod.default)(req, res)
+              // ensure catching rejected promise
+              // https://github.com/mjackson/remix-the-web/blob/b5aa2ae24558f5d926af576482caf6e9b35461dc/packages/node-fetch-server/src/lib/request-listener.ts#L87
+              await createRequestListener(mod.default)(req, res)
             } catch (e) {
               next(e)
             }
@@ -336,7 +338,7 @@ export default function vitePluginRsc(
         return () => {
           server.middlewares.use(async (req, res, next) => {
             try {
-              handler(req, res)
+              await handler(req, res)
             } catch (e) {
               next(e)
             }