@vitejs/plugin-rsc 0.5.33 → 0.5.35

package/README.md

@@ -26,12 +26,14 @@ npm create vite@latest -- --template rsc
 **Integration examples:**
 
 - [`./examples/basic`](./examples/basic) - Comprehensive showcase of standard RSC features and the primary E2E test fixture.
-- [`./examples/use-cache`](./examples/use-cache) - Minimal cache feature inspired by Next.js's `"use cache"`, built with generic transform and RSC runtime APIs.
-- [`./examples/use-cache-callable`](./examples/use-cache-callable) - Inline cache wrapper exported as a callable Server Function through a custom transform.
+- [`./examples/use-cache`](./examples/use-cache) - Local cached functions and components demonstrating argument keys, Flight replay, dynamic children, captured values, and invalidation.
+- [`./examples/use-cache-callable`](./examples/use-cache-callable) - Cached server references demonstrating inline and file directives, client invocation, argument admission, and encrypted closure captures.
+- [`./examples/use-cache-persistent`](./examples/use-cache-persistent) - Persistent callable cache entries demonstrating Flight value replay and dependency-aware development invalidation.
 - [`./examples/custom-server-function`](./examples/custom-server-function) - Third-party Server Function directive integration using server reference claims.
 - [`./examples/ssg`](./examples/ssg) - Static site generation with MDX and client components for interactivity.
 - [`./examples/ppr`](./examples/ppr) - Partial prerendering with a reusable static HTML shell and request-time RSC content.
 - [`./examples/no-ssr`](./examples/no-ssr) - RSC application without an SSR environment.
+- [`./examples/node-stream`](./examples/node-stream) - Starter application served end to end through Node.js request, response, and stream APIs.
 - [`./examples/client-first`](./examples/client-first) - Experimental client-owned page that consumes RSC function results.
 - [`./examples/action-reachability`](./examples/action-reachability) - Route-aware dispatch for a retained server action.
 - [`./examples/browser-mode`](./examples/browser-mode) - Advanced setup that runs both RSC and React client environments in the browser with custom module loading.
@@ -523,6 +525,20 @@ This module provides Vite-integrated RSC runtime APIs based on
 - `encodeReply`: Serializes server function arguments
 - `createTemporaryReferenceSet`: Creates a temporary reference set shared by deserialization and reply serialization
 
+### Node.js stream APIs variants
+
+Node.js environments can use runtime-specific entry points that integrate React's native Node.js stream APIs with Vite's generated manifests:
+
+| Environment  | Entry point                          | Node.js stream API       |
+| ------------ | ------------------------------------ | ------------------------ |
+| RSC server   | `@vitejs/plugin-rsc/rsc/server.node` | `renderToPipeableStream` |
+| RSC client   | `@vitejs/plugin-rsc/rsc/client.node` | `createFromNodeStream`   |
+| RSC static   | `@vitejs/plugin-rsc/rsc/static.node` | `prerenderToNodeStream`  |
+| RSC combined | `@vitejs/plugin-rsc/rsc.node`        | Server and client APIs   |
+| SSR          | `@vitejs/plugin-rsc/ssr.node`        | `createFromNodeStream`   |
+
+See [`examples/node-stream`](./examples/node-stream) for an end-to-end Node.js handler using these APIs.
+
 ### `@vitejs/plugin-rsc/browser`
 
 This module provides Vite-integrated RSC runtime APIs based on

package/dist/browser.d.ts

@@ -1,4 +1,4 @@
-import { n as CallServerCallback } from "./index-C5IY2S-e.js";
+import { n as CallServerCallback } from "./index-CROaL0MT.js";
 import { t as setRequireModule } from "./browser-DI_Wyg5Y.js";
 import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./react/browser.js";
 export { type CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/{cjs-AWVWfddx.js → cjs-DhDj_zQT.js}

@@ -1,11 +1,11 @@
-import { t as createDebug } from "./dist-uqdtSkzK.js";
-import { t as buildScopeTree } from "./scope-Bdx33sQv.js";
+import { t as buildScopeTree } from "./scope-Ck0n25my.js";
 import { n as parseIdQuery } from "./shared-B6H2TbnP.js";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
+import { createDebug } from "obug";
 import { parseAstAsync } from "vite";
 import { findClosestPkgJsonPath } from "vitefu";
 import { walk } from "estree-walker";

package/dist/client-Dq3oGLRS.d.ts

@@ -0,0 +1,8 @@
+import { o as CreateFromReadableStreamEdgeOptions, r as ClientTemporaryReferenceSet, u as EncodeReplyFunction } from "./index-CROaL0MT.js";
+import { t as CreateFromStreamExtraOptions } from "./client.shared-VT232QCM.js";
+//#region src/react/rsc/client.d.ts
+declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: CreateFromReadableStreamEdgeOptions, extraOptions?: CreateFromStreamExtraOptions): Promise<T>;
+declare const encodeReply: EncodeReplyFunction;
+declare const createClientTemporaryReferenceSet: () => ClientTemporaryReferenceSet;
+//#endregion
+export { createFromReadableStream as n, encodeReply as r, createClientTemporaryReferenceSet as t };

package/dist/{client-reference-DEZtXTv1.d.ts → client-reference-Bk5pzNGN.d.ts}

@@ -1,4 +1,4 @@
-import { t as ClientReferenceMetadata } from "./rsc-C3UdJLOW.js";
+import { t as ClientReferenceMetadata } from "./rsc-D8UlANI2.js";
 import { i as ResolvedAssetDeps } from "./plugin-CKqXjp8D.js";
 //#region src/rsc/client-reference.d.ts
 type OnClientReference = (metadata: ClientReferenceMetadata & {

package/dist/client.node-BEQT2PT-.d.ts

@@ -0,0 +1,9 @@
+import { i as CreateFromNodeStreamOptions, o as CreateFromReadableStreamEdgeOptions, r as ClientTemporaryReferenceSet, u as EncodeReplyFunction } from "./index-CROaL0MT.js";
+import { t as CreateFromStreamExtraOptions } from "./client.shared-VT232QCM.js";
+//#region src/react/rsc/client.node.d.ts
+declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: CreateFromReadableStreamEdgeOptions, extraOptions?: CreateFromStreamExtraOptions): Promise<T>;
+declare function createFromNodeStream<T>(stream: import("node:stream").Readable, options?: CreateFromNodeStreamOptions, extraOptions?: CreateFromStreamExtraOptions): Promise<T>;
+declare const encodeReply: EncodeReplyFunction;
+declare const createClientTemporaryReferenceSet: () => ClientTemporaryReferenceSet;
+//#endregion
+export { encodeReply as i, createFromNodeStream as n, createFromReadableStream as r, createClientTemporaryReferenceSet as t };

package/dist/client.shared-D1HxyClg.js

@@ -0,0 +1,10 @@
+import { createServerDecodeClientManifest, createServerManifest } from "./core/rsc.js";
+//#region src/react/rsc/client.shared.ts
+function createServerConsumerManifest(options) {
+	return {
+		serverModuleMap: createServerManifest({ preserveServerReferences: options?.preserveServerReferences }),
+		moduleMap: createServerDecodeClientManifest()
+	};
+}
+//#endregion
+export { createServerConsumerManifest as t };

package/dist/client.shared-VT232QCM.d.ts

@@ -0,0 +1,16 @@
+//#region src/react/rsc/client.shared.d.ts
+type CreateFromStreamExtraOptions = {
+  /**
+   * Preserve server references for re-serialization without loading their modules.
+   * Preserved references cannot be invoked in the current RSC environment.
+   *
+   * Disabled by default because this API also decodes bound server action
+   * arguments, which must revive references as callable implementations.
+   *
+   * @experimental
+   * @default false
+   */
+  preserveServerReferences?: boolean;
+};
+//#endregion
+export { CreateFromStreamExtraOptions as t };

package/dist/core/browser.js

@@ -1,4 +1,4 @@
-import { n as memoize } from "../dist-uqdtSkzK.js";
+import { t as memoize } from "../shared-BWJvctW6.js";
 import { a as removeReferenceCacheTag, o as setInternalRequire } from "../shared-Y4B6DJ99.js";
 //#region src/core/browser.ts
 let init = false;

package/dist/core/plugin.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
 //#region src/core/plugin.d.ts
-declare function vitePluginRscCore(): Plugin[];
-//#endregion
-export { vitePluginRscCore as default };
+export default function vitePluginRscCore(): Plugin[];
+//#endregion

package/dist/core/rsc.d.ts

@@ -1,2 +1,2 @@
-import { a as createServerManifest, i as createServerDecodeClientManifest, n as CreateClientManifestOptions, o as loadServerAction, r as createClientManifest, s as setRequireModule, t as ClientReferenceMetadata } from "../rsc-C3UdJLOW.js";
+import { a as createServerManifest, i as createServerDecodeClientManifest, n as CreateClientManifestOptions, o as loadServerAction, r as createClientManifest, s as setRequireModule, t as ClientReferenceMetadata } from "../rsc-D8UlANI2.js";
 export { ClientReferenceMetadata, CreateClientManifestOptions, createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/rsc.js

@@ -1,4 +1,4 @@
-import { i as tinyassert, n as memoize } from "../dist-uqdtSkzK.js";
+import { r as tinyassert, t as memoize } from "../shared-BWJvctW6.js";
 import { a as removeReferenceCacheTag, i as createReferenceCacheTag, n as SERVER_REFERENCE_PREFIX, o as setInternalRequire, r as SERVER_REFERENCE_PRESERVE_PREFIX, t as SERVER_DECODE_CLIENT_PREFIX } from "../shared-Y4B6DJ99.js";
 import * as ReactServer from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
 //#region src/core/rsc.ts

package/dist/core/ssr.d.ts

@@ -1,8 +1,2 @@
-import { f as ServerConsumerManifest } from "../index-C5IY2S-e.js";
-//#region src/core/ssr.d.ts
-declare function setRequireModule(options: {
-  load: (id: string) => unknown;
-}): void;
-declare function createServerConsumerManifest(): ServerConsumerManifest;
-//#endregion
+import { n as setRequireModule, t as createServerConsumerManifest } from "../ssr-C-U7jY5S.js";
 export { createServerConsumerManifest, setRequireModule };

package/dist/core/ssr.js

@@ -1,4 +1,4 @@
-import { n as memoize } from "../dist-uqdtSkzK.js";
+import { t as memoize } from "../shared-BWJvctW6.js";
 import { a as removeReferenceCacheTag, o as setInternalRequire } from "../shared-Y4B6DJ99.js";
 //#region src/core/ssr.ts
 let init = false;

package/dist/{index-C5IY2S-e.d.ts → index-CROaL0MT.d.ts}

@@ -22,40 +22,61 @@ interface ServerConsumerManifest {
   };
 }
 type CallServerCallback = (id: string, args: unknown[]) => Promise<unknown>;
-interface RenderToReadableStreamOptions {
-  debugChannel?: DebugChannel;
+interface RenderStreamOptions {
   environmentName?: string | (() => string);
   filterStackFrame?: (url: string, functionName: string) => boolean;
   identifierPrefix?: string;
-  signal?: AbortSignal;
   startTime?: number;
   temporaryReferences?: ServerTemporaryReferenceSet;
   onError?: (error: unknown) => void;
   onPostpone?: (reason: string) => void;
 }
+interface RenderToReadableStreamOptions extends RenderStreamOptions {
+  debugChannel?: WebDebugChannel;
+  signal?: AbortSignal;
+}
+interface RenderToPipeableStreamOptions extends RenderStreamOptions {
+  debugChannel?: import("node:stream").Readable | import("node:stream").Writable;
+}
+interface PrerenderOptions extends RenderStreamOptions {
+  signal?: AbortSignal;
+}
+type PrerenderToNodeStreamOptions = PrerenderOptions;
 interface PrerenderResult {
   prelude: ReadableStream<Uint8Array>;
 }
+interface PrerenderToNodeStreamResult {
+  prelude: import("node:stream").Readable;
+}
 interface CreateFromReadableStreamBrowserOptions {
   callServer?: CallServerCallback;
-  debugChannel?: DebugChannel;
+  debugChannel?: WebDebugChannel;
   encodeFormAction?: EncodeFormActionCallback;
   endTime?: number;
   environmentName?: string;
   replayConsoleLogs?: boolean;
   startTime?: number;
   temporaryReferences?: ClientTemporaryReferenceSet;
+  unstable_allowPartialStream?: boolean;
 }
-interface CreateFromReadableStreamEdgeOptions {
-  debugChannel?: DebugChannel;
+interface CreateFromStreamOptions {
   encodeFormAction?: EncodeFormActionCallback;
   endTime?: number;
   environmentName?: string;
   nonce?: string;
   replayConsoleLogs?: boolean;
   startTime?: number;
+  unstable_allowPartialStream?: boolean;
+}
+interface CreateFromReadableStreamEdgeOptions extends CreateFromStreamOptions {
+  debugChannel?: {
+    readable?: ReadableStream<Uint8Array>;
+  };
   temporaryReferences?: ClientTemporaryReferenceSet;
 }
+interface CreateFromNodeStreamOptions extends CreateFromStreamOptions {
+  debugChannel?: import("node:stream").Readable;
+}
 interface DecodeReplyOptions {
   temporaryReferences?: ServerTemporaryReferenceSet;
   arraySizeLimit?: number;
@@ -75,11 +96,16 @@ type ReactCustomFormAction = {
 };
 type EncodeReplyFunction = (value: unknown[], options?: EncodeReplyOptions) => Promise<string | FormData>;
 type DecodeReplyFunction = (body: string | FormData, options?: DecodeReplyOptions) => Promise<unknown[]>;
-type DebugChannel = {
+type DecodeReplyFromBusboyFunction = (body: import("node:stream").Writable, options?: DecodeReplyOptions) => Promise<unknown[]>;
+interface PipeableStream {
+  abort(reason?: unknown): void;
+  pipe<T extends NodeJS.WritableStream>(destination: T): T;
+}
+type WebDebugChannel = {
   readable?: ReadableStream<Uint8Array>;
   writable?: WritableStream<Uint8Array>;
 };
 type ServerTemporaryReferenceSet = unknown;
 type ClientTemporaryReferenceSet = unknown;
 //#endregion
-export { CreateFromReadableStreamEdgeOptions as a, EncodeReplyFunction as c, RenderToReadableStreamOptions as d, ServerConsumerManifest as f, CreateFromReadableStreamBrowserOptions as i, ModuleMap as l, CallServerCallback as n, DecodeReplyFunction as o, ServerTemporaryReferenceSet as p, ClientTemporaryReferenceSet as r, EncodeFormActionCallback as s, BundlerConfig as t, PrerenderResult as u };
+export { RenderToPipeableStreamOptions as _, CreateFromReadableStreamBrowserOptions as a, ServerTemporaryReferenceSet as b, DecodeReplyFunction as c, ModuleMap as d, PipeableStream as f, PrerenderToNodeStreamResult as g, PrerenderToNodeStreamOptions as h, CreateFromNodeStreamOptions as i, EncodeFormActionCallback as l, PrerenderResult as m, CallServerCallback as n, CreateFromReadableStreamEdgeOptions as o, PrerenderOptions as p, ClientTemporaryReferenceSet as r, DecodeReplyFromBusboyFunction as s, BundlerConfig as t, EncodeReplyFunction as u, RenderToReadableStreamOptions as v, ServerConsumerManifest as y };

package/dist/index.js

@@ -1,2 +1,2 @@
-import { r as vitePluginRsc, t as getPluginApi } from "./plugin-DarRieDr.js";
+import { r as vitePluginRsc, t as getPluginApi } from "./plugin-CLvIS10V.js";
 export { vitePluginRsc as default, getPluginApi };

package/dist/{picocolors-D28_L_A0.js → picocolors-DCTC64Zv.js}

@@ -1,4 +1,4 @@
-import { a as __commonJSMin } from "./plugin-DarRieDr.js";
+import { a as __commonJSMin } from "./plugin-CLvIS10V.js";
 //#region ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	let p = process || {};

package/dist/{plugin-DarRieDr.js → plugin-CLvIS10V.js}

@@ -1,7 +1,6 @@
-import { t as createDebug } from "./dist-uqdtSkzK.js";
 import vitePluginRscCore from "./core/plugin.js";
-import { i as hasDirective } from "./scope-Bdx33sQv.js";
-import { t as cjsModuleRunnerPlugin } from "./cjs-AWVWfddx.js";
+import { i as hasDirective } from "./scope-Ck0n25my.js";
+import { t as cjsModuleRunnerPlugin } from "./cjs-DhDj_zQT.js";
 import { i as toCssVirtual, n as parseIdQuery, r as parseReferenceValidationVirtual, t as parseCssVirtual } from "./shared-B6H2TbnP.js";
 import { findDirectives, transformDirectiveProxyExport, transformExpandExportAll, transformServerActionServer, transformWrapExport } from "./transforms/index.js";
 import { o as generateEncryptionKey, s as toBase64 } from "./encryption-utils-BNbYHtC4.js";
@@ -14,6 +13,7 @@ import { fileURLToPath, pathToFileURL } from "node:url";
 import { exactRegex, prefixRegex } from "@rolldown/pluginutils";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
+import { createDebug } from "obug";
 import { toNodeHandler } from "srvx/node";
 import { stripLiteral } from "strip-literal";
 import * as vite from "vite";
@@ -40,7 +40,7 @@ var __copyProps = (to, from, except, desc) => {
 	}
 	return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule || !__hasOwnProp.call(mod, "default") ? __defProp(target, "default", {
 	value: mod,
 	enumerable: true
 }) : target, mod));
@@ -428,7 +428,8 @@ async function transformScanBuildStrip(code) {
 	const [imports] = esModuleLexer.parse(code);
 	let output = imports.map((e) => e.n && `import ${JSON.stringify(e.n)};\n`).filter(Boolean).join("");
 	if (importGlobRE.test(code)) {
-		walk(await parseAstAsync(code), { enter(node) {
+		const ast = await parseAstAsync(code);
+		walk(ast, { enter(node) {
 			if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.object.type === "MetaProperty" && node.callee.object.meta.type === "Identifier" && node.callee.object.meta.name === "import" && node.callee.object.property.type === "Identifier" && node.callee.object.property.name === "meta" && node.callee.property.type === "Identifier" && node.callee.property.name === "glob") {
 				const importMetaGlob = code.slice(node.start, node.end);
 				output += `console.log(${importMetaGlob});\n`;
@@ -489,11 +490,7 @@ function aggregateClaims(importId, claims) {
 			exportNames: []
 		};
 		else if (aggregate.importId !== claim.importId || aggregate.referenceKey !== claim.referenceKey) throw new Error(`[vite-rsc] conflicting server reference identity for '${importId}'`);
-		for (const name of claim.exportNames) {
-			const existingOwner = exportOwners.get(name);
-			if (existingOwner && existingOwner !== claimOwner) throw new Error(`[vite-rsc] server reference '${claim.referenceKey}#${name}' is claimed by both '${existingOwner}' and '${claimOwner}'`);
-			exportOwners.set(name, claimOwner);
-		}
+		for (const name of claim.exportNames) if (!exportOwners.get(name)) exportOwners.set(name, claimOwner);
 	}
 	assert(aggregate);
 	aggregate.exportNames = [...exportOwners.keys()].sort();
@@ -714,7 +711,7 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 function vitePluginRsc(rscPluginOptions = {}) {
 	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
-		const colors = await import("./picocolors-D28_L_A0.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
+		const colors = await import("./picocolors-DCTC64Zv.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -906,10 +903,12 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					environmentName: "rsc",
 					entryName: "index"
 				};
-				const handler = toNodeHandler(getFetchHandlerExport(await import(
+				const entryFile = path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`);
+				const fetchHandler = getFetchHandlerExport(await import(
 					/* @vite-ignore */
-					pathToFileURL(path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`)).href
-)));
+					pathToFileURL(entryFile).href
+));
+				const handler = toNodeHandler(fetchHandler);
 				server.middlewares.use((req, _res, next) => {
 					delete req.headers["accept-encoding"];
 					next();
@@ -1070,18 +1069,20 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					const source = getEntrySource(environment.config, entryName);
 					const resolvedEntry = await environment.pluginContainer.resolveId(source);
 					assert(resolvedEntry, `[vite-rsc] failed to resolve entry '${source}'`);
-					return createRpcServer(new Proxy({}, { get(_target, p, _receiver) {
+					const runnerProxy = new Proxy({}, { get(_target, p, _receiver) {
 						if (typeof p !== "string" || p === "then") return;
 						return async (...args) => {
 							return (await environment.runner.import(resolvedEntry.id))[p](...args);
 						};
-					} }));
+					} });
+					return createRpcServer(runnerProxy);
 				}
 				server.middlewares.use(async (req, res, next) => {
 					const url = new URL(req.url ?? "/", `http://localhost`);
 					if (url.pathname === "/__vite_rsc_load_module_dev_proxy") {
 						try {
-							await toNodeHandler(await createHandler(url))(req, res);
+							const handler = await createHandler(url);
+							await toNodeHandler(handler)(req, res);
 						} catch (e) {
 							next(e);
 						}
@@ -1236,7 +1237,8 @@ export function createRpcClient(params) {
 					for (const match of stripLiteral(code).matchAll(/import\s*\.\s*meta\s*\.\s*viteRsc\s*\.\s*loadBootstrapScriptContent\(([\s\S]*?)\)/dg)) {
 						const [argStart, argEnd] = match.indices[1];
 						const argCode = code.slice(argStart, argEnd).trim();
-						assert(evalValue(argCode), `[vite-rsc] expected 'loadBootstrapScriptContent("index")' but got ${argCode}`);
+						const entryName = evalValue(argCode);
+						assert(entryName, `[vite-rsc] expected 'loadBootstrapScriptContent("index")' but got ${argCode}`);
 						let replacement = `Promise.resolve("import(" + JSON.stringify(__vite_rsc_assets_manifest.clientEntryUrl) + ")")`;
 						const [start, end] = match.indices[0];
 						output.overwrite(start, end, replacement);
@@ -1318,7 +1320,8 @@ function createTransformExpandExportAllContext(ctx) {
 		},
 		load: async (id) => {
 			const raw = await fs.promises.readFile(id, "utf-8");
-			return parseAstAsync((await (vite.transformWithOxc ?? vite.transformWithEsbuild)(raw, id, { sourcemap: false })).code);
+			const result = await (vite.transformWithOxc ?? vite.transformWithEsbuild)(raw, id, { sourcemap: false });
+			return parseAstAsync(result.code);
 		}
 	};
 }
@@ -1370,14 +1373,15 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					warnInoncistentClientOptimization(this, id);
 					importId = `/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/${encodeURIComponent(id)}`;
 					referenceKey = importId;
-				} else if (packageSource) if (this.environment.mode === "dev") {
-					importId = `/@id/__x00__virtual:vite-rsc/client-package-proxy/${packageSource}`;
-					referenceKey = importId;
-				} else {
-					importId = packageSource;
-					referenceKey = hashString(packageSource);
-				}
-				else if (this.environment.mode === "dev") {
+				} else if (packageSource) {
+					if (this.environment.mode === "dev") {
+						importId = `/@id/__x00__virtual:vite-rsc/client-package-proxy/${packageSource}`;
+						referenceKey = importId;
+					} else {
+						importId = packageSource;
+						referenceKey = hashString(packageSource);
+					}
+				} else if (this.environment.mode === "dev") {
 					importId = normalizeViteImportAnalysisUrl(manager.server.environments[browserEnvironmentName], id);
 					referenceKey = importId;
 				} else {
@@ -1861,11 +1865,13 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 			visited.add(id);
 			const mod = environment.moduleGraph.getModuleById(id);
 			if (mod?.file) visitedFiles.add(mod.file);
-			for (const next of mod?.importedModules ?? []) if (next.id) if (isCSSRequest(next.id)) {
-				if (next.file) visitedFiles.add(next.file);
-				if (hasSpecialCssQuery(next.id)) continue;
-				cssIds.add(next.id);
-			} else recurse(next.id);
+			for (const next of mod?.importedModules ?? []) if (next.id) {
+				if (isCSSRequest(next.id)) {
+					if (next.file) visitedFiles.add(next.file);
+					if (hasSpecialCssQuery(next.id)) continue;
+					cssIds.add(next.id);
+				} else recurse(next.id);
+			}
 		}
 		recurse(entryId);
 		const cssLinkPrecedence = rscCssOptions?.cssLinkPrecedence ?? true;

package/dist/plugin.js

@@ -1,2 +1,2 @@
-import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-DarRieDr.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-CLvIS10V.js";
 export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugins/cjs.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from "vite";
 //#region src/plugins/cjs.d.ts
-declare function cjsModuleRunnerPlugin(): Plugin[];
-//#endregion
-export { cjsModuleRunnerPlugin };
+export declare function cjsModuleRunnerPlugin(): Plugin[];
+//#endregion

package/dist/plugins/cjs.js

@@ -1,2 +1,2 @@
-import { t as cjsModuleRunnerPlugin } from "../cjs-AWVWfddx.js";
+import { t as cjsModuleRunnerPlugin } from "../cjs-DhDj_zQT.js";
 export { cjsModuleRunnerPlugin };

package/dist/react/browser.d.ts

@@ -1,13 +1,13 @@
-import { c as EncodeReplyFunction, i as CreateFromReadableStreamBrowserOptions, n as CallServerCallback, r as ClientTemporaryReferenceSet } from "../index-C5IY2S-e.js";
+import { a as CreateFromReadableStreamBrowserOptions, n as CallServerCallback, r as ClientTemporaryReferenceSet, u as EncodeReplyFunction } from "../index-CROaL0MT.js";
 import { t as setRequireModule } from "../browser-DI_Wyg5Y.js";
 //#region src/react/browser.d.ts
-declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: CreateFromReadableStreamBrowserOptions): Promise<T>;
-declare function createFromFetch<T>(promiseForResponse: Promise<Response>, options?: CreateFromReadableStreamBrowserOptions): Promise<T>;
-declare const encodeReply: EncodeReplyFunction;
-declare const createServerReference: (...args: any[]) => unknown;
-declare function callServer(...args: any[]): any;
-declare function setServerCallback(fn: CallServerCallback): void;
-declare const createTemporaryReferenceSet: () => ClientTemporaryReferenceSet;
-declare function findSourceMapURL(filename: string, environmentName: string): string | null;
+export declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: CreateFromReadableStreamBrowserOptions): Promise<T>;
+export declare function createFromFetch<T>(promiseForResponse: Promise<Response>, options?: CreateFromReadableStreamBrowserOptions): Promise<T>;
+export declare const encodeReply: EncodeReplyFunction;
+export declare const createServerReference: (...args: any[]) => unknown;
+export declare function callServer(...args: any[]): any;
+export declare function setServerCallback(fn: CallServerCallback): void;
+export declare const createTemporaryReferenceSet: () => ClientTemporaryReferenceSet;
+export declare function findSourceMapURL(filename: string, environmentName: string): string | null;
 //#endregion
-export { type CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };
+export { type CallServerCallback, setRequireModule };

package/dist/react/rsc/client.d.ts

@@ -1,2 +1,2 @@
-import { n as createFromReadableStream, r as encodeReply, t as createClientTemporaryReferenceSet } from "../../client-Bhch3O41.js";
+import { n as createFromReadableStream, r as encodeReply, t as createClientTemporaryReferenceSet } from "../../client-Dq3oGLRS.js";
 export { createClientTemporaryReferenceSet, createFromReadableStream, encodeReply };

package/dist/react/rsc/client.js

@@ -1,12 +1,9 @@
-import { createServerDecodeClientManifest, createServerManifest } from "../../core/rsc.js";
+import { t as createServerConsumerManifest } from "../../client.shared-D1HxyClg.js";
 import * as ReactClient from "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge";
 //#region src/react/rsc/client.ts
 function createFromReadableStream(stream, options = {}, extraOptions) {
 	return ReactClient.createFromReadableStream(stream, {
-		serverConsumerManifest: {
-			serverModuleMap: createServerManifest({ preserveServerReferences: extraOptions?.preserveServerReferences }),
-			moduleMap: createServerDecodeClientManifest()
-		},
+		serverConsumerManifest: createServerConsumerManifest(extraOptions),
 		...options
 	});
 }

package/dist/react/rsc/client.node.d.ts

@@ -0,0 +1,2 @@
+import { i as encodeReply, n as createFromNodeStream, r as createFromReadableStream, t as createClientTemporaryReferenceSet } from "../../client.node-BEQT2PT-.js";
+export { createClientTemporaryReferenceSet, createFromNodeStream, createFromReadableStream, encodeReply };

package/dist/react/rsc/client.node.js

@@ -0,0 +1,16 @@
+import { t as createServerConsumerManifest } from "../../client.shared-D1HxyClg.js";
+import * as ReactClientNode from "@vitejs/plugin-rsc/vendor/react-server-dom/client.node";
+//#region src/react/rsc/client.node.ts
+function createFromReadableStream(stream, options = {}, extraOptions) {
+	return ReactClientNode.createFromReadableStream(stream, {
+		serverConsumerManifest: createServerConsumerManifest(extraOptions),
+		...options
+	});
+}
+function createFromNodeStream(stream, options = {}, extraOptions) {
+	return ReactClientNode.createFromNodeStream(stream, createServerConsumerManifest(extraOptions), options);
+}
+const encodeReply = ReactClientNode.encodeReply;
+const createClientTemporaryReferenceSet = ReactClientNode.createTemporaryReferenceSet;
+//#endregion
+export { createClientTemporaryReferenceSet, createFromNodeStream, createFromReadableStream, encodeReply };

package/dist/react/rsc/server.d.ts

@@ -1,3 +1,3 @@
-import { o as loadServerAction, s as setRequireModule } from "../../rsc-C3UdJLOW.js";
-import { a as registerClientReference, i as decodeReply, n as decodeAction, o as registerServerReference, r as decodeFormState, s as renderToReadableStream, t as createTemporaryReferenceSet } from "../../server-ZBjqNTqU.js";
+import { o as loadServerAction, s as setRequireModule } from "../../rsc-D8UlANI2.js";
+import { a as registerClientReference, i as decodeReply, n as decodeAction, o as registerServerReference, r as decodeFormState, s as renderToReadableStream, t as createTemporaryReferenceSet } from "../../server-YwgjVtsE.js";
 export { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/react/rsc/server.node.d.ts

@@ -0,0 +1,3 @@
+import { o as loadServerAction, s as setRequireModule } from "../../rsc-D8UlANI2.js";
+import { a as decodeReplyFromBusboy, c as renderToPipeableStream, i as decodeReply, l as renderToReadableStream, n as decodeAction, o as registerClientReference, r as decodeFormState, s as registerServerReference, t as createTemporaryReferenceSet } from "../../server.node-DU77AeKU.js";
+export { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decodeReplyFromBusboy, loadServerAction, registerClientReference, registerServerReference, renderToPipeableStream, renderToReadableStream, setRequireModule };

package/dist/react/rsc/server.node.js

@@ -0,0 +1,24 @@
+import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../../core/rsc.js";
+import * as ReactServerNode from "@vitejs/plugin-rsc/vendor/react-server-dom/server.node";
+//#region src/react/rsc/server.node.ts
+function renderToReadableStream(data, options, extraOptions) {
+	return ReactServerNode.renderToReadableStream(data, createClientManifest({ onClientReference: extraOptions?.onClientReference }), options);
+}
+function renderToPipeableStream(data, options, extraOptions) {
+	return ReactServerNode.renderToPipeableStream(data, createClientManifest({ onClientReference: extraOptions?.onClientReference }), options);
+}
+function registerClientReference(proxy, id, name) {
+	return ReactServerNode.registerClientReference(proxy, id, name);
+}
+const registerServerReference = ReactServerNode.registerServerReference;
+const decodeReply = (body, options) => ReactServerNode.decodeReply(body, createServerManifest(), options);
+const decodeReplyFromBusboy = (body, options) => ReactServerNode.decodeReplyFromBusboy(body, createServerManifest(), options);
+function decodeAction(body) {
+	return ReactServerNode.decodeAction(body, createServerManifest());
+}
+function decodeFormState(actionResult, body) {
+	return ReactServerNode.decodeFormState(actionResult, body, createServerManifest());
+}
+const createTemporaryReferenceSet = ReactServerNode.createTemporaryReferenceSet;
+//#endregion
+export { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decodeReplyFromBusboy, loadServerAction, registerClientReference, registerServerReference, renderToPipeableStream, renderToReadableStream, setRequireModule };

package/dist/react/rsc/static.d.ts

@@ -1,6 +1,5 @@
-import { d as RenderToReadableStreamOptions, u as PrerenderResult } from "../../index-C5IY2S-e.js";
-import { n as CreateClientManifestOptions } from "../../rsc-C3UdJLOW.js";
+import { m as PrerenderResult, p as PrerenderOptions } from "../../index-CROaL0MT.js";
+import { n as CreateClientManifestOptions } from "../../rsc-D8UlANI2.js";
 //#region src/react/rsc/static.d.ts
-declare function prerender<T>(data: T, options?: RenderToReadableStreamOptions, extraOptions?: CreateClientManifestOptions): Promise<PrerenderResult>;
-//#endregion
-export { prerender };
+export declare function prerender<T>(data: T, options?: PrerenderOptions, extraOptions?: CreateClientManifestOptions): Promise<PrerenderResult>;
+//#endregion

package/dist/react/rsc/static.node.d.ts

@@ -0,0 +1,6 @@
+import { g as PrerenderToNodeStreamResult, h as PrerenderToNodeStreamOptions, m as PrerenderResult, p as PrerenderOptions } from "../../index-CROaL0MT.js";
+import { n as CreateClientManifestOptions } from "../../rsc-D8UlANI2.js";
+//#region src/react/rsc/static.node.d.ts
+export declare function prerender<T>(data: T, options?: PrerenderOptions, extraOptions?: CreateClientManifestOptions): Promise<PrerenderResult>;
+export declare function prerenderToNodeStream<T>(data: T, options?: PrerenderToNodeStreamOptions, extraOptions?: CreateClientManifestOptions): Promise<PrerenderToNodeStreamResult>;
+//#endregion

package/dist/react/rsc/static.node.js

@@ -0,0 +1,11 @@
+import { createClientManifest } from "../../core/rsc.js";
+import * as ReactStaticNode from "@vitejs/plugin-rsc/vendor/react-server-dom/static.node";
+//#region src/react/rsc/static.node.ts
+function prerender(data, options, extraOptions) {
+	return ReactStaticNode.prerender(data, createClientManifest({ onClientReference: extraOptions?.onClientReference }), options);
+}
+function prerenderToNodeStream(data, options, extraOptions) {
+	return ReactStaticNode.prerenderToNodeStream(data, createClientManifest({ onClientReference: extraOptions?.onClientReference }), options);
+}
+//#endregion
+export { prerender, prerenderToNodeStream };

package/dist/react/rsc.d.ts

@@ -1,4 +1,4 @@
-import { o as loadServerAction, s as setRequireModule } from "../rsc-C3UdJLOW.js";
-import { a as registerClientReference, i as decodeReply, n as decodeAction, o as registerServerReference, r as decodeFormState, s as renderToReadableStream, t as createTemporaryReferenceSet } from "../server-ZBjqNTqU.js";
-import { n as createFromReadableStream, r as encodeReply, t as createClientTemporaryReferenceSet } from "../client-Bhch3O41.js";
+import { o as loadServerAction, s as setRequireModule } from "../rsc-D8UlANI2.js";
+import { a as registerClientReference, i as decodeReply, n as decodeAction, o as registerServerReference, r as decodeFormState, s as renderToReadableStream, t as createTemporaryReferenceSet } from "../server-YwgjVtsE.js";
+import { n as createFromReadableStream, r as encodeReply, t as createClientTemporaryReferenceSet } from "../client-Dq3oGLRS.js";
 export { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };