@vitejs/plugin-rsc 0.4.12 → 0.4.14

package/README.md

@@ -11,7 +11,7 @@ This package provides [React Server Components](https://react.dev/reference/rsc/
 
 ## Getting Started
 
-You can start a project by copying an example locally by:
+You can create a starter project by:
 
 ```sh
 npx degit vitejs/vite-plugin-react/packages/plugin-rsc/examples/starter my-app
@@ -22,11 +22,9 @@ npx degit vitejs/vite-plugin-react/packages/plugin-rsc/examples/starter my-app
 - [`./examples/starter`](./examples/starter)
   - This example provides an in-depth overview of API with inline comments to explain how they function within RSC-powered React application.
 - [`./examples/react-router`](./examples/react-router)
-  - This demonstrates how to integrate [experimental React Router RSC API](https://remix.run/blog/rsc-preview) with this plugin.
-    It also includes `@cloudflare/vite-plugin` integration.
+  - This demonstrates how to integrate [experimental React Router RSC API](https://remix.run/blog/rsc-preview). React Router now provides [official RSC support](https://reactrouter.com/how-to/react-server-components), so it's recommended to follow React Router's official documentation for the latest integration.
 - [`./examples/basic`](./examples/basic)
   - This is mainly used for e2e testing and include various advanced RSC usages (e.g. `"use cache"` example).
-    It also uses a high level `@vitejs/plugin-rsc/extra/{rsc,ssr,browser}` API for quick setup.
 - [`./examples/ssg`](./examples/ssg)
   - Static site generation (SSG) example with MDX and client components for interactivity.
 
@@ -419,7 +417,10 @@ export default defineConfig({
 })
 ```
 
-## Higher level API
+## High level API
+
+> [!NOTE]
+> High level API is deprecated. Please write on your own `@vitejs/plugin-rsc/{rsc,ssr,browser}` integration.
 
 This is a wrapper of `react-server-dom` API and helper API to setup a minimal RSC app without writing own framework code like [`./examples/starter/src/framework`](./examples/starter/src/framework/). See [`./examples/basic`](./examples/basic/) for how this API is used.
 

package/dist/{browser-LizIyxet.js → browser-C1Q4O7AS.js}

@@ -5,7 +5,7 @@ import * as clientReferences from "virtual:vite-rsc/client-references";
 initialize();
 function initialize() {
 	setRequireModule({ load: async (id) => {
-		if (!import.meta.env.__vite_rsc_build__) return __vite_rsc_raw_import__(import.meta.env.BASE_URL + id.slice(1));
+		if (!import.meta.env.__vite_rsc_build__) return __vite_rsc_raw_import__(withTrailingSlash(import.meta.env.BASE_URL) + id.slice(1));
 		else {
 			const import_ = clientReferences.default[id];
 			if (!import_) throw new Error(`client reference not found '${id}'`);
@@ -13,5 +13,9 @@ function initialize() {
 		}
 	} });
 }
+function withTrailingSlash(path) {
+	if (path[path.length - 1] !== "/") return `${path}/`;
+	return path;
+}
 
 //#endregion

package/dist/{browser-DjnGtEmB.d.ts → browser-CeSkQWD5.d.ts}

@@ -5,8 +5,6 @@ declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>,
 declare function createFromFetch<T>(promiseForResponse: Promise<Response>, options?: object): Promise<T>;
 declare const encodeReply: (v: unknown[], options?: unknown) => Promise<string | FormData>;
 declare const createServerReference: (...args: any[]) => unknown;
-// use global instead of local variable  to tolerate duplicate modules
-// e.g. when `setServerCallback` is pre-bundled but `createServerReference` is not
 declare function callServer(...args: any[]): any;
 declare function setServerCallback(fn: CallServerCallback): void;
 declare const createTemporaryReferenceSet: () => unknown;

package/dist/browser.d.ts

@@ -1,4 +1,4 @@
 import { CallServerCallback } from "./index-BHqtj9tT.js";
 import { setRequireModule } from "./browser-Dw18EFgE.js";
-import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-DjnGtEmB.js";
+import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-CeSkQWD5.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/browser.js

@@ -2,6 +2,6 @@ import "./dist-DEF94lDJ.js";
 import "./shared-CEyKoKAb.js";
 import { setRequireModule } from "./browser-QWbIPyhO.js";
 import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-D8OPzpF5.js";
-import "./browser-LizIyxet.js";
+import "./browser-C1Q4O7AS.js";
 
 export { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/{client-edAdk2GF.js → client-CPc-spDn.js}

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/rsc-html-stream@0.0.6/node_modules/rsc-html-stream/client.js
+//#region ../../node_modules/.pnpm/rsc-html-stream@0.0.7/node_modules/rsc-html-stream/client.js
 let encoder = new TextEncoder();
 let streamController;
 let rscStream = new ReadableStream({ start(controller) {

package/dist/extra/browser.d.ts

@@ -1,7 +1,14 @@
-import { RscPayload } from "../rsc-Cmvt9txp.js";
+import { RscPayload } from "../rsc-DryRyKqc.js";
 
 //#region src/extra/browser.d.ts
+
+/**
+* @deprecated Use `@vitejs/plugin-rsc/browser` API instead.
+*/
 declare function hydrate(): Promise<void>;
+/**
+* @deprecated Use `@vitejs/plugin-rsc/browser` API instead.
+*/
 declare function fetchRSC(request: string | URL | Request): Promise<RscPayload["root"]>;
 //#endregion
 export { fetchRSC, hydrate };

package/dist/extra/browser.js

@@ -2,13 +2,16 @@ import "../dist-DEF94lDJ.js";
 import "../shared-CEyKoKAb.js";
 import "../browser-QWbIPyhO.js";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "../browser-D8OPzpF5.js";
-import "../browser-LizIyxet.js";
-import { rscStream } from "../client-edAdk2GF.js";
+import "../browser-C1Q4O7AS.js";
+import { rscStream } from "../client-CPc-spDn.js";
 import React from "react";
 import ReactDomClient from "react-dom/client";
 import { jsx } from "react/jsx-runtime";
 
 //#region src/extra/browser.tsx
+/**
+* @deprecated Use `@vitejs/plugin-rsc/browser` API instead.
+*/
 async function hydrate() {
 	const callServer = async (id, args) => {
 		const url = new URL(window.location.href);
@@ -45,6 +48,9 @@ async function hydrate() {
 		window.history.replaceState({}, "", window.location.href);
 	});
 }
+/**
+* @deprecated Use `@vitejs/plugin-rsc/browser` API instead.
+*/
 async function fetchRSC(request) {
 	const payload = await createFromFetch(fetch(request));
 	return payload.root;

package/dist/extra/rsc.d.ts

@@ -1,2 +1,2 @@
-import { RscPayload, renderRequest } from "../rsc-Cmvt9txp.js";
+import { RscPayload, renderRequest } from "../rsc-DryRyKqc.js";
 export { RscPayload, renderRequest };

package/dist/extra/rsc.js

@@ -3,10 +3,13 @@ import "../shared-CEyKoKAb.js";
 import "../encryption-utils-BDwwcMVT.js";
 import { loadServerAction } from "../rsc-DKA6wwTB.js";
 import { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, renderToReadableStream } from "../rsc-DHfL29FT.js";
-import "../rsc-DmPsJrxF.js";
+import "../rsc-BIUd01vh.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/extra/rsc.tsx
+/**
+* @deprecated Use `@vitejs/plugin-rsc/rsc` API instead.
+*/
 async function renderRequest(request, root, options) {
 	function RscRoot() {
 		const nonceMeta = options?.nonce && /* @__PURE__ */ jsx("meta", {

package/dist/extra/ssr.d.ts

@@ -1,6 +1,10 @@
 import { ReactFormState } from "react-dom/client";
 
 //#region src/extra/ssr.d.ts
+
+/**
+* @deprecated Use `@vitejs/plugin-rsc/ssr` API instead.
+*/
 declare function renderHtml(rscStream: ReadableStream<Uint8Array>, options?: {
   formState?: ReactFormState;
   nonce?: string;

package/dist/extra/ssr.js

@@ -2,13 +2,16 @@ import "../dist-DEF94lDJ.js";
 import "../shared-CEyKoKAb.js";
 import "../ssr-BOIYlvSn.js";
 import { createFromReadableStream } from "../ssr-D5pxP29F.js";
-import "../ssr-Do_Ok_bB.js";
-import { injectRSCPayload } from "../server-DS3S6m0g.js";
+import "../ssr-DNwSdZ9T.js";
+import { injectRSCPayload } from "../server-C50j-DRF.js";
 import React from "react";
 import { jsx } from "react/jsx-runtime";
 import ReactDomServer from "react-dom/server.edge";
 
 //#region src/extra/ssr.tsx
+/**
+* @deprecated Use `@vitejs/plugin-rsc/ssr` API instead.
+*/
 async function renderHtml(rscStream, options) {
 	const [rscStream1, rscStream2] = rscStream.tee();
 	let payload;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RscPluginOptions, vitePluginRsc } from "./plugin-Dg2agPFN.js";
+import { RscPluginOptions, vitePluginRsc } from "./plugin-DXIhXGMa.js";
 import MagicString from "magic-string";
 import { Program } from "estree";
 
@@ -21,4 +21,4 @@ declare function transformHoistInlineDirective(input: string, ast: Program, {
   names: string[];
 };
 //#endregion
-export { RscPluginOptions, vitePluginRsc as default, transformHoistInlineDirective };
+export { type RscPluginOptions, vitePluginRsc as default, transformHoistInlineDirective };

package/dist/index.js

@@ -1,8 +1,8 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-BvUB-eig.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-6e6xZIb7.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
-import "./vite-utils-CcqBE-C4.js";
+import "./vite-utils-Vzd7cqfv.js";
 
 export { vitePluginRsc as default, transformHoistInlineDirective };

package/dist/{plugin-BvUB-eig.js → plugin-6e6xZIb7.js}

@@ -2,7 +2,7 @@ import { tinyassert } from "./dist-DEF94lDJ.js";
 import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
 import { createRpcServer } from "./rpc-tGuLT8PD.js";
-import { normalizeViteImportAnalysisUrl } from "./vite-utils-CcqBE-C4.js";
+import { normalizeViteImportAnalysisUrl, prepareError } from "./vite-utils-Vzd7cqfv.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
 import { createHash } from "node:crypto";
@@ -414,7 +414,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 								clientReferenceMetaMap = sortObject(clientReferenceMetaMap);
 								serverResourcesMetaMap = sortObject(serverResourcesMetaMap);
 								await builder.build(builder.environments.client);
-								const assetsManifestCode = `export default ${JSON.stringify(buildAssetsManifest, null, 2)}`;
+								const assetsManifestCode = `export default ${serializeValueWithRuntime(buildAssetsManifest)}`;
 								const manifestPath = path.join(builder.environments.rsc.config.build.outDir, BUILD_ASSETS_MANIFEST_NAME);
 								fs.writeFileSync(manifestPath, assetsManifestCode);
 								return;
@@ -456,7 +456,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 							const resolved = await environment.pluginContainer.resolveId(source);
 							assert(resolved, `[vite-rsc] failed to resolve server handler '${source}'`);
 							const mod = await environment.runner.import(resolved.id);
-							createRequestListener(mod.default)(req, res);
+							await createRequestListener(mod.default)(req, res);
 						} catch (e) {
 							next(e);
 						}
@@ -473,8 +473,9 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				const entryFile = path.join(config.environments[options.environmentName].build.outDir, `${options.entryName}.js`);
 				const entry = pathToFileURL(entryFile).href;
 				const mod = await import(
-				/* @vite-ignore */
-				entry);
+					/* @vite-ignore */
+					entry
+);
 				const handler = createRequestListener(mod.default);
 				server$1.middlewares.use((req, _res, next) => {
 					delete req.headers["accept-encoding"];
@@ -483,7 +484,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				return () => {
 					server$1.middlewares.use(async (req, res, next) => {
 						try {
-							handler(req, res);
+							await handler(req, res);
 						} catch (e) {
 							next(e);
 						}
@@ -509,11 +510,22 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					return mods.some((mod) => recurse(mod));
 				}
 				if (!isInsideClientBoundary(ctx.modules)) {
-					if (this.environment.name === "rsc") ctx.server.environments.client.hot.send({
-						type: "custom",
-						event: "rsc:update",
-						data: { file: ctx.file }
-					});
+					if (this.environment.name === "rsc") {
+						for (const mod of ctx.modules) if (mod.type === "js") try {
+							await this.environment.transformRequest(mod.url);
+						} catch (e) {
+							server.environments.client.hot.send({
+								type: "error",
+								err: prepareError(e)
+							});
+							throw e;
+						}
+						ctx.server.environments.client.hot.send({
+							type: "custom",
+							event: "rsc:update",
+							data: { file: ctx.file }
+						});
+					}
 					if (this.environment.name === "client") {
 						const env = ctx.server.environments.rsc;
 						const mod = env.moduleGraph.getModuleById(ctx.file);
@@ -642,7 +654,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					assert(this.environment.mode === "dev");
 					const entryUrl = assetsURL("@id/__x00__" + VIRTUAL_ENTRIES.browser);
 					const manifest = {
-						bootstrapScriptContent: `import(${JSON.stringify(entryUrl)})`,
+						bootstrapScriptContent: `import(${serializeValueWithRuntime(entryUrl)})`,
 						clientReferenceDeps: {}
 					};
 					return `export default ${JSON.stringify(manifest, null, 2)}`;
@@ -680,8 +692,11 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						};
 						clientReferenceDeps[meta.referenceKey] = assetsURLOfDeps(mergeAssetDeps(deps, entry.deps));
 					}
+					let bootstrapScriptContent;
+					if (typeof entryUrl === "string") bootstrapScriptContent = `import(${JSON.stringify(entryUrl)})`;
+					else bootstrapScriptContent = new RuntimeAsset(`"import(" + JSON.stringify(${entryUrl.runtime}) + ")"`);
 					buildAssetsManifest = {
-						bootstrapScriptContent: `import(${JSON.stringify(entryUrl)})`,
+						bootstrapScriptContent,
 						clientReferenceDeps,
 						serverResources
 					};
@@ -698,7 +713,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			},
 			writeBundle() {
 				if (this.environment.name === "ssr") {
-					const assetsManifestCode = `export default ${JSON.stringify(buildAssetsManifest, null, 2)}`;
+					const assetsManifestCode = `export default ${serializeValueWithRuntime(buildAssetsManifest)}`;
 					for (const name of ["ssr", "rsc"]) {
 						const manifestPath = path.join(config.environments[name].build.outDir, BUILD_ASSETS_MANIFEST_NAME);
 						fs.writeFileSync(manifestPath, assetsManifestCode);
@@ -754,6 +769,11 @@ window.__vite_plugin_react_preamble_installed__ = true;
 			code += `
 const ssrCss = document.querySelectorAll("link[rel='stylesheet']");
 import.meta.hot.on("vite:beforeUpdate", () => ssrCss.forEach(node => node.remove()));
+`;
+			code += `
+import.meta.hot.on("rsc:update", () => {
+  document.querySelectorAll("vite-error-overlay").forEach((n) => n.close())
+});
 `;
 			return code;
 		}),
@@ -777,6 +797,7 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
 		...vitePluginDefineEncryptionKey(rscPluginOptions),
 		...vitePluginFindSourceMapURL(),
 		...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
+		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
 		scanBuildStripPlugin()
 	];
 }
@@ -802,8 +823,7 @@ function normalizeRelativePath(s) {
 }
 function getEntrySource(config$1, name = "index") {
 	const input = config$1.build.rollupOptions.input;
-	assert(input);
-	assert(typeof input === "object" && !Array.isArray(input) && name in input && typeof input[name] === "string");
+	assert(typeof input === "object" && !Array.isArray(input) && name in input && typeof input[name] === "string", `[vite-rsc:getEntrySource] expected 'build.rollupOptions.input' to be an object with a '${name}' property that is a string, but got ${JSON.stringify(input)}`);
 	return input[name];
 }
 function hashString(v) {
@@ -1084,13 +1104,50 @@ function generateDynamicImportCode(map) {
 	let code = Object.entries(map).map(([key, id]) => `${JSON.stringify(key)}: () => import(${JSON.stringify(id)}),`).join("\n");
 	return `export default {${code}};\n`;
 }
+var RuntimeAsset = class {
+	runtime;
+	constructor(value) {
+		this.runtime = value;
+	}
+};
+function serializeValueWithRuntime(value) {
+	const replacements = [];
+	let result = JSON.stringify(value, (_key, value$1) => {
+		if (value$1 instanceof RuntimeAsset) {
+			const placeholder = `__runtime_placeholder_${replacements.length}__`;
+			replacements.push([placeholder, value$1.runtime]);
+			return placeholder;
+		}
+		return value$1;
+	}, 2);
+	for (const [placeholder, runtime] of replacements) result = result.replace(`"${placeholder}"`, runtime);
+	return result;
+}
 function assetsURL(url) {
+	if (config.command === "build" && typeof config.experimental?.renderBuiltUrl === "function") {
+		const result = config.experimental.renderBuiltUrl(url, {
+			type: "asset",
+			hostType: "js",
+			ssr: true,
+			hostId: ""
+		});
+		if (typeof result === "object") {
+			if (result.runtime) return new RuntimeAsset(result.runtime);
+			assert(!result.relative, "\"result.relative\" not supported on renderBuiltUrl() for RSC");
+		} else if (result) return result;
+	}
 	return config.base + url;
 }
 function assetsURLOfDeps(deps) {
 	return {
-		js: deps.js.map((href) => assetsURL(href)),
-		css: deps.css.map((href) => assetsURL(href))
+		js: deps.js.map((href) => {
+			assert(typeof href === "string");
+			return assetsURL(href);
+		}),
+		css: deps.css.map((href) => {
+			assert(typeof href === "string");
+			return assetsURL(href);
+		})
 	};
 }
 function mergeAssetDeps(a, b) {
@@ -1262,7 +1319,7 @@ function vitePluginRscCss(rscCssOptions) {
 					const result = collectCss(server.environments.ssr, mod.id);
 					for (const file of [mod.file, ...result.visitedFiles]) this.addWatchFile(file);
 					const hrefs = result.hrefs.map((href) => assetsURL(href.slice(1)));
-					return `export default ${JSON.stringify(hrefs)}`;
+					return `export default ${serializeValueWithRuntime(hrefs)}`;
 				}
 			}
 		},
@@ -1324,7 +1381,7 @@ function vitePluginRscCss(rscCssOptions) {
 							css: cssHrefs,
 							js: jsHrefs
 						});
-						return generateResourcesCode(JSON.stringify(deps, null, 2));
+						return generateResourcesCode(serializeValueWithRuntime(deps));
 					} else {
 						const key = normalizePath(path.relative(config.root, importer));
 						serverResourcesMetaMap[importer] = { key };
@@ -1462,6 +1519,35 @@ function __fix_cloudflare() {
 		}
 	};
 }
+function validateImportPlugin() {
+	return {
+		name: "rsc:validate-imports",
+		resolveId: {
+			order: "pre",
+			async handler(source, importer, options) {
+				if ("scan" in options && options.scan) return;
+				if (source === "client-only") {
+					if (this.environment.name === "rsc") throw new Error(`'client-only' cannot be imported in server build (importer: '${importer ?? "unknown"}', environment: ${this.environment.name})`);
+					return {
+						id: `\0virtual:vite-rsc/empty`,
+						moduleSideEffects: false
+					};
+				}
+				if (source === "server-only") {
+					if (this.environment.name !== "rsc") throw new Error(`'server-only' cannot be imported in client build (importer: '${importer ?? "unknown"}', environment: ${this.environment.name})`);
+					return {
+						id: `\0virtual:vite-rsc/empty`,
+						moduleSideEffects: false
+					};
+				}
+				return;
+			}
+		},
+		load(id) {
+			if (id.startsWith("\0virtual:vite-rsc/empty")) return `export {}`;
+		}
+	};
+}
 function sortObject(o) {
 	return Object.fromEntries(Object.entries(o).sort(([a], [b]) => a.localeCompare(b)));
 }

package/dist/{plugin-Dg2agPFN.d.ts → plugin-DXIhXGMa.d.ts}

@@ -31,44 +31,56 @@ type RscPluginOptions = {
   ignoredPackageWarnings?: (string | RegExp)[];
   /**
   * This option allows customizing how client build copies assets from server build.
-  * By default, all assets are copied, but frameworks might want to establish some convention
-  * to tighten security based on this option.
+  * By default, all assets are copied, but frameworks can establish server asset convention
+  * to tighten security using this option.
   */
   copyServerAssetsToClient?: (fileName: string) => boolean;
-  defineEncryptionKey?: string;
   /**
-  * Allows enabling action closure encryption for debugging purpose.
+  * This option allows disabling action closure encryption for debugging purpose.
   * @default true
   */
   enableActionEncryption?: boolean;
+  /**
+  * By default, the plugin uses a build-time generated encryption key for
+  * "use server" closure argument binding.
+  * This can be overwritten by configuring `defineEncryptionKey` option,
+  * for example, to obtain a key through environment variable during runtime.
+  * cf. https://nextjs.org/docs/app/guides/data-security#overwriting-encryption-keys-advanced
+  */
+  defineEncryptionKey?: string;
   /** Escape hatch for Waku's `allowServer` */
   keepUseCientProxy?: boolean;
+  /**
+  * Enable build-time validation of 'client-only' and 'server-only' imports
+  * @default true
+  */
+  validateImports?: boolean;
 };
 declare function vitePluginRsc(rscPluginOptions?: RscPluginOptions): Plugin[];
-//
-// collect client reference dependency chunk for modulepreload
-//
+declare class RuntimeAsset {
+  runtime: string;
+  constructor(value: string);
+}
 type AssetsManifest = {
-  bootstrapScriptContent: string;
+  bootstrapScriptContent: string | RuntimeAsset;
   clientReferenceDeps: Record<string, AssetDeps>;
-  serverResources?: Record<string, {
-    css: string[];
-  }>;
+  serverResources?: Record<string, Pick<AssetDeps, "css">>;
 };
 type AssetDeps = {
+  js: (string | RuntimeAsset)[];
+  css: (string | RuntimeAsset)[];
+};
+type ResolvedAssetsManifest = {
+  bootstrapScriptContent: string;
+  clientReferenceDeps: Record<string, ResolvedAssetDeps>;
+  serverResources?: Record<string, Pick<ResolvedAssetDeps, "css">>;
+};
+type ResolvedAssetDeps = {
   js: string[];
   css: string[];
 };
-//
-// support findSourceMapURL
-// https://github.com/facebook/react/pull/29708
-// https://github.com/facebook/react/pull/30741
-//
 declare function vitePluginFindSourceMapURL(): Plugin[];
 declare function findSourceMapURL(server: ViteDevServer, filename: string, environmentName: string): Promise<object | undefined>;
-//
-// css support
-//
 declare function vitePluginRscCss(rscCssOptions?: Pick<RscPluginOptions, "rscCssTransform">): Plugin[];
 declare function transformRscCssExport(options: {
   ast: Awaited<ReturnType<typeof parseAstAsync>>;
@@ -85,4 +97,4 @@ declare function transformRscCssExport(options: {
 */
 declare function __fix_cloudflare(): Plugin;
 //#endregion
-export { AssetDeps, AssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss };
+export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss };

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-import { AssetDeps, AssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-Dg2agPFN.js";
-export { AssetDeps, AssetsManifest, RscPluginOptions, __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss };
+import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-DXIhXGMa.js";
+export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss };

package/dist/plugin.js

@@ -1,8 +1,8 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-BvUB-eig.js";
+import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-6e6xZIb7.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
-import "./vite-utils-CcqBE-C4.js";
+import "./vite-utils-Vzd7cqfv.js";
 
 export { __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss };

package/dist/react/browser.d.ts

@@ -1,4 +1,4 @@
 import { CallServerCallback } from "../index-BHqtj9tT.js";
 import { setRequireModule } from "../browser-Dw18EFgE.js";
-import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "../browser-DjnGtEmB.js";
+import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "../browser-CeSkQWD5.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/{rsc-DmPsJrxF.js → rsc-BIUd01vh.js}

@@ -28,8 +28,9 @@ initialize();
 function initialize() {
 	setRequireModule({ load: async (id) => {
 		if (!import.meta.env.__vite_rsc_build__) return import(
-		/* @vite-ignore */
-		id);
+			/* @vite-ignore */
+			id
+);
 		else {
 			const import_ = serverReferences[id];
 			if (!import_) throw new Error(`server reference not found '${id}'`);

package/dist/{rsc-Cmvt9txp.d.ts → rsc-DryRyKqc.d.ts}

@@ -6,6 +6,9 @@ type RscPayload = {
   formState?: ReactFormState;
   returnValue?: unknown;
 };
+/**
+* @deprecated Use `@vitejs/plugin-rsc/rsc` API instead.
+*/
 declare function renderRequest(request: Request, root: React.ReactNode, options?: {
   nonce?: string;
 }): Promise<Response>;

package/dist/rsc-html-stream/browser.d.ts

@@ -1,4 +1,5 @@
 //#region src/rsc-html-stream/browser.d.ts
+/** @deprecated use `rsc-html-stream/client` instead */
 declare const getRscStreamFromHtml: () => ReadableStream<Uint8Array>;
 //#endregion
 export { getRscStreamFromHtml };

package/dist/rsc-html-stream/browser.js

@@ -1,6 +1,7 @@
-import { rscStream } from "../client-edAdk2GF.js";
+import { rscStream } from "../client-CPc-spDn.js";
 
 //#region src/rsc-html-stream/browser.ts
+/** @deprecated use `rsc-html-stream/client` instead */
 const getRscStreamFromHtml = () => rscStream;
 
 //#endregion

package/dist/rsc-html-stream/ssr.d.ts

@@ -1,4 +1,5 @@
 //#region src/rsc-html-stream/ssr.d.ts
+/** @deprecated use `rsc-html-stream/server` instead */
 declare const injectRscStreamToHtml: (stream: ReadableStream<Uint8Array>, options?: {
   nonce?: string;
 }) => TransformStream<Uint8Array, Uint8Array>;

package/dist/rsc-html-stream/ssr.js

@@ -1,6 +1,7 @@
-import { injectRSCPayload } from "../server-DS3S6m0g.js";
+import { injectRSCPayload } from "../server-C50j-DRF.js";
 
 //#region src/rsc-html-stream/ssr.ts
+/** @deprecated use `rsc-html-stream/server` instead */
 const injectRscStreamToHtml = (stream, options) => injectRSCPayload(stream, options);
 
 //#endregion

package/dist/rsc.d.ts

@@ -3,10 +3,6 @@ import { createClientManifest, createServerManifest, loadServerAction, setRequir
 import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-DgrejoNf.js";
 
 //#region src/utils/encryption-runtime.d.ts
-// based on
-// https://github.com/parcel-bundler/parcel/blob/9855f558a69edde843b1464f39a6010f6b421efe/packages/transformers/js/src/rsc-utils.js
-// https://github.com/vercel/next.js/blob/c10c10daf9e95346c31c24dc49d6b7cda48b5bc8/packages/next/src/server/app-render/encryption.ts
-// https://github.com/vercel/next.js/pull/56377
 declare function encryptActionBoundArgs(originalValue: unknown): Promise<string>;
 declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>): Promise<unknown>;
 //#endregion

package/dist/rsc.js

@@ -3,6 +3,6 @@ import "./shared-CEyKoKAb.js";
 import "./encryption-utils-BDwwcMVT.js";
 import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-DKA6wwTB.js";
 import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-DHfL29FT.js";
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "./rsc-DmPsJrxF.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "./rsc-BIUd01vh.js";
 
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/{server-DS3S6m0g.js → server-C50j-DRF.js}

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/rsc-html-stream@0.0.6/node_modules/rsc-html-stream/server.js
+//#region ../../node_modules/.pnpm/rsc-html-stream@0.0.7/node_modules/rsc-html-stream/server.js
 const encoder = new TextEncoder();
 const trailer = "</body></html>";
 function injectRSCPayload(rscStream, options) {
@@ -28,7 +28,13 @@ function injectRSCPayload(rscStream, options) {
 			buffered.push(chunk);
 			if (timeout) return;
 			timeout = setTimeout(async () => {
-				flushBufferedChunks(controller);
+				try {
+					flushBufferedChunks(controller);
+				} catch (e) {
+					controller.error(e);
+					resolveFlightDataPromise();
+					return;
+				}
 				if (!startedRSC) {
 					startedRSC = true;
 					writeRSCStream(rscStream, controller, nonce).catch((err) => controller.error(err)).then(resolveFlightDataPromise);

package/dist/{ssr-Do_Ok_bB.js → ssr-DNwSdZ9T.js}

@@ -9,11 +9,13 @@ function initialize() {
 	setRequireModule({ load: async (id) => {
 		if (!import.meta.env.__vite_rsc_build__) {
 			const mod = await import(
-			/* @vite-ignore */
-			id);
+				/* @vite-ignore */
+				id
+);
 			const modCss = await import(
-			/* @vite-ignore */
-			"/@id/__x00__virtual:vite-rsc/css/dev-ssr/" + id);
+				/* @vite-ignore */
+				"/@id/__x00__virtual:vite-rsc/css/dev-ssr/" + id
+);
 			return wrapResourceProxy(mod, {
 				js: [],
 				css: modCss.default

package/dist/ssr.js

@@ -2,6 +2,6 @@ import "./dist-DEF94lDJ.js";
 import "./shared-CEyKoKAb.js";
 import { createServerConsumerManifest, setRequireModule } from "./ssr-BOIYlvSn.js";
 import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-D5pxP29F.js";
-import "./ssr-Do_Ok_bB.js";
+import "./ssr-DNwSdZ9T.js";
 
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/dist/{vite-utils-CcqBE-C4.js → vite-utils-Vzd7cqfv.js}

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { stripVTControlCharacters } from "node:util";
 
 //#region src/vite-utils.ts
 const VALID_ID_PREFIX = `/@id/`;
@@ -59,6 +60,20 @@ function normalizeViteImportAnalysisUrl(environment, id) {
 	}
 	return url;
 }
+function prepareError(err) {
+	return {
+		message: stripVTControlCharacters(err.message),
+		stack: stripVTControlCharacters(cleanStack(err.stack || "")),
+		id: err.id,
+		frame: stripVTControlCharacters(err.frame || ""),
+		plugin: err.plugin,
+		pluginCode: err.pluginCode?.toString(),
+		loc: err.loc
+	};
+}
+function cleanStack(stack) {
+	return stack.split(/\n/).filter((l) => /^\s*at/.test(l)).join("\n");
+}
 
 //#endregion
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };
+export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/dist/vite-utils.d.ts

@@ -1,4 +1,4 @@
-import { DevEnvironment, Rollup } from "vite";
+import { DevEnvironment, ErrorPayload, Rollup } from "vite";
 
 //#region src/vite-utils.d.ts
 declare const VALID_ID_PREFIX = "/@id/";
@@ -17,5 +17,7 @@ declare function injectQuery(url: string, queryToInject: string): string;
 declare function joinUrlSegments(a: string, b: string): string;
 declare function normalizeResolvedIdToUrl(environment: DevEnvironment, url: string, resolved: Rollup.PartialResolvedId): string;
 declare function normalizeViteImportAnalysisUrl(environment: DevEnvironment, id: string): string;
+type RollupError = Rollup.RollupError;
+declare function prepareError(err: Error | RollupError): ErrorPayload["err"];
 //#endregion
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };
+export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/dist/vite-utils.js

@@ -1,3 +1,3 @@
-import { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId } from "./vite-utils-CcqBE-C4.js";
+import { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId } from "./vite-utils-Vzd7cqfv.js";
 
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };
+export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.12",
+  "version": "0.4.14",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -48,19 +48,19 @@
   },
   "devDependencies": {
     "@hiogawa/utils": "^1.7.0",
-    "@playwright/test": "^1.53.2",
+    "@playwright/test": "^1.54.1",
     "@tsconfig/strictest": "^2.0.5",
     "@types/estree": "^1.0.8",
-    "@types/node": "^22.16.0",
+    "@types/node": "^22.16.5",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
     "@vitejs/plugin-react": "workspace:*",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-server-dom-webpack": "^19.1.0",
-    "rsc-html-stream": "^0.0.6",
+    "rsc-html-stream": "^0.0.7",
     "tinyexec": "^1.0.1",
-    "tsdown": "^0.12.9"
+    "tsdown": "^0.13.0"
   },
   "peerDependencies": {
     "react": "*",