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

Author: github-actions[bot]

CONTRIBUTING.md

@@ -13,12 +13,10 @@ This repo is a monorepo using pnpm workspaces. The package manager used to insta
 - Checkout a topic branch from a base branch (e.g. `main`), and merge back against that branch.
 
 - If adding a new feature:
-
   - Add accompanying test case.
   - Provide a convincing reason to add this feature. Ideally, you should open a suggestion issue first, and have it approved before working on it.
 
 - If fixing a bug:
-
   - If you are resolving a special issue, add `(fix #xxxx[,#xxxx])` (#xxxx is the issue id) in your PR title for a better release log (e.g. `fix: update entities encoding/decoding (fix #3899)`).
   - Provide a detailed description of the bug in the PR. Live demo preferred.
   - Add appropriate test coverage if applicable.

package.json

@@ -46,7 +46,7 @@
     "lint-staged": "^15.5.2",
     "picocolors": "^1.1.1",
     "playwright-chromium": "^1.53.2",
-    "prettier": "^3.0.3",
+    "prettier": "^3.6.2",
     "simple-git-hooks": "^2.13.0",
     "tsx": "^4.20.3",
     "typescript": "^5.8.3",

packages/plugin-react/src/index.ts

@@ -351,7 +351,7 @@ export default function viteReact(opts: Options = {}): Plugin[] {
     jsxImportRuntime,
   ]
   const staticBabelPlugins =
-    typeof opts.babel === 'object' ? opts.babel?.plugins ?? [] : []
+    typeof opts.babel === 'object' ? (opts.babel?.plugins ?? []) : []
   const reactCompilerPlugin = getReactCompilerPlugin(staticBabelPlugins)
   if (reactCompilerPlugin != null) {
     const reactCompilerRuntimeModule =

packages/plugin-rsc/README.md

@@ -130,7 +130,7 @@ export default defineConfig({
 - [`entry.rsc.tsx`](./examples/starter/src/framework/entry.rsc.tsx)
 
 ```tsx
-import * as ReactServer from '@vitejs/plugin-rsc/rsc' // re-export of react-server-dom/server.edge
+import * as ReactServer from '@vitejs/plugin-rsc/rsc' // re-export of react-server-dom/server.edge and client.edge
 
 // the plugin assumes `rsc` entry having default export of request handler
 export default async function handler(request: Request): Promise<Response> {
@@ -214,11 +214,12 @@ main();
 
 ### `@vitejs/plugin-rsc/rsc`
 
-This module re-exports RSC runtime API provided by `react-server-dom/server.edge`
+This module re-exports RSC runtime API provided by `react-server-dom/server.edge` and `react-server-dom/client.edge` such as:
 
 - `renderToReadableStream`: RSC serialization (React VDOM -> RSC stream)
 - `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM). This is also available on rsc environment itself. For example, it allows saving serailized RSC and deserializing it for later use.
-- `decodeAction/decodeReply/loadServerAction`: server function related...
+- `decodeAction/decodeReply/decodeFormState/loadServerAction/createTemporaryReferenceSet`
+- `encodeReply/createClientTemporaryReferenceSet`
 
 ### `@vitejs/plugin-rsc/ssr`
 

packages/plugin-rsc/examples/basic/wrangler.jsonc

@@ -3,9 +3,9 @@
   "name": "vite-rsc-basic",
   "main": "dist/rsc/cloudflare.js",
   "assets": {
-    "directory": "dist/client"
+    "directory": "dist/client",
   },
   "workers_dev": true,
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }

packages/plugin-rsc/examples/react-router/app/paper.css

@@ -87,8 +87,8 @@
 }
 
 @utility btn-* {
-  border-color: --value(--btn-color- *);
-  color: --value(--btn-color- *);
+  border-color: --value(--btn-color-*);
+  color: --value(--btn-color-*);
 }
 
 @utility btn-sm {

packages/plugin-rsc/examples/react-router/cf/wrangler.rsc.jsonc

@@ -4,5 +4,5 @@
   "main": "./entry.rsc.tsx",
   "workers_dev": true,
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }

packages/plugin-rsc/examples/react-router/cf/wrangler.ssr.jsonc

@@ -5,5 +5,5 @@
   "workers_dev": true,
   "services": [{ "binding": "RSC", "service": "vite-rsc-react-router-rsc" }],
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }

packages/plugin-rsc/examples/starter-cf-single/wrangler.jsonc

@@ -4,5 +4,5 @@
   "main": "./src/framework/entry.rsc.tsx",
   "workers_dev": true,
   "compatibility_date": "2025-04-01",
-  "compatibility_flags": ["nodejs_als"]
+  "compatibility_flags": ["nodejs_als"],
 }