@vitejs/plugin-rsc 0.4.31 → 0.4.33

package/dist/{cjs-WQBk0zA_.js → cjs-BamOAUgw.js}

@@ -1,7 +1,8 @@
 import { createDebug } from "./dist-DiJnRA1C.js";
-import { parseIdQuery } from "./shared-AvKUASD5.js";
+import { parseIdQuery } from "./shared-n-ykEs15.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 { parseAstAsync } from "vite";
@@ -10,7 +11,8 @@ import { walk } from "estree-walker";
 import { analyze } from "periscopic";
 
 //#region src/transforms/cjs.ts
-function transformCjsToEsm(code, ast) {
+const CJS_INTEROP_HELPER = `function __cjs_interop__(m) { return m.__cjs_module_runner_transform ? m.default : m; }`;
+function transformCjsToEsm(code, ast, options) {
 	const output = new MagicString(code);
 	const analyzed = analyze(ast);
 	const parentNodes = [];
@@ -27,12 +29,12 @@ function transformCjsToEsm(code, ast) {
 					if (scope && scope.declarations.has("require")) return;
 				}
 				if (isTopLevel) {
-					output.update(node.start, node.callee.end, "((await import");
-					output.appendRight(node.end, ").default)");
+					output.update(node.start, node.callee.end, "(__cjs_interop__(await import");
+					output.appendRight(node.end, "))");
 				} else {
 					const hoisted = `__cjs_to_esm_hoist_${hoistIndex}`;
 					const importee = code.slice(node.arguments[0].start, node.arguments[0].end);
-					hoistedCodes.push(`const ${hoisted} = (await import(${importee})).default;\n`);
+					hoistedCodes.push(`const ${hoisted} = __cjs_interop__(await import(${importee}));\n`);
 					output.update(node.start, node.end, hoisted);
 					hoistIndex++;
 				}
@@ -43,7 +45,16 @@ function transformCjsToEsm(code, ast) {
 		}
 	});
 	for (const hoisted of hoistedCodes.reverse()) output.prepend(hoisted);
+	if (output.hasChanged()) output.prepend(`${CJS_INTEROP_HELPER}\n`);
 	output.prepend(`let exports = {}; const module = { exports };\n`);
+	const __filename = fileURLToPath(pathToFileURL(options.id).href);
+	const __dirname = path.dirname(__filename);
+	output.prepend(`let __filename = ${JSON.stringify(__filename)}; let __dirname = ${JSON.stringify(__dirname)};\n`);
+	output.append(`
+;__vite_ssr_exportAll__(module.exports);
+export default module.exports;
+export const __cjs_module_runner_transform = true;
+`);
 	return { output };
 }
 
@@ -74,12 +85,7 @@ function cjsModuleRunnerPlugin() {
 					debug(`non-optimized CJS dependency in '${this.environment.name}' environment: ${id}`);
 					warnedPackages.add(packageKey);
 				}
-				const ast = await parseAstAsync(code);
-				const output = transformCjsToEsm(code, ast).output;
-				output.append(`
-;__vite_ssr_exportAll__(module.exports);
-export default module.exports;
-`);
+				const output = transformCjsToEsm(code, await parseAstAsync(code), { id }).output;
 				return {
 					code: output.toString(),
 					map: output.generateMap({ hires: "boundary" })

package/dist/{encryption-runtime-CugTJCLM.js → encryption-runtime-DT6dtlC5.js}

@@ -5,14 +5,11 @@ import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 
 //#region src/utils/encryption-runtime.ts
 async function encryptActionBoundArgs(originalValue) {
-	const serialized = renderToReadableStream(originalValue);
-	const serializedBuffer = await concatArrayStream(serialized);
-	return encryptBuffer(serializedBuffer, await getEncryptionKey());
+	return encryptBuffer(await concatArrayStream(renderToReadableStream(originalValue)), await getEncryptionKey());
 }
 async function decryptActionBoundArgs(encrypted) {
 	const serializedBuffer = await decryptBuffer(await encrypted, await getEncryptionKey());
-	const serialized = arrayToStream(new Uint8Array(serializedBuffer));
-	return createFromReadableStream(serialized);
+	return createFromReadableStream(arrayToStream(new Uint8Array(serializedBuffer)));
 }
 const getEncryptionKey = /* @__PURE__ */ once(async () => {
 	const resolved = await encryptionKeySource();

package/dist/extra/rsc.js

@@ -3,7 +3,7 @@ import "../shared-CXg_u-4h.js";
 import "../encryption-utils-BDwwcMVT.js";
 import { loadServerAction } from "../rsc-GFzFWyhT.js";
 import { createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, renderToReadableStream } from "../rsc-BdCB3621.js";
-import "../encryption-runtime-CugTJCLM.js";
+import "../encryption-runtime-DT6dtlC5.js";
 import "../rsc-CiAoLCx8.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
@@ -13,11 +13,10 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 */
 async function renderRequest(request, root, options) {
 	function RscRoot() {
-		const nonceMeta = options?.nonce && /* @__PURE__ */ jsx("meta", {
+		return /* @__PURE__ */ jsxs(Fragment, { children: [options?.nonce && /* @__PURE__ */ jsx("meta", {
 			property: "csp-nonce",
 			nonce: options.nonce
-		});
-		return /* @__PURE__ */ jsxs(Fragment, { children: [nonceMeta, root] });
+		}), root] });
 	}
 	const url = new URL(request.url);
 	const isAction = request.method === "POST";
@@ -34,8 +33,7 @@ async function renderRequest(request, root, options) {
 			returnValue = await (await loadServerAction(actionId)).apply(null, args);
 		} else {
 			const formData = await request.formData();
-			const result = await (await decodeAction(formData))();
-			formState = await decodeFormState(result, formData);
+			formState = await decodeFormState(await (await decodeAction(formData))(), formData);
 		}
 	}
 	const rscStream = renderToReadableStream({

package/dist/extra/ssr.js

@@ -1,10 +1,10 @@
 import "../dist-DiJnRA1C.js";
 import "../shared-CXg_u-4h.js";
-import "../shared-AvKUASD5.js";
+import "../shared-n-ykEs15.js";
 import "../ssr-Cm2FP2zD.js";
 import { createFromReadableStream } from "../ssr-Cd4SbAaO.js";
-import "../ssr-8BA2nj0-.js";
-import { injectRSCPayload } from "../server-BTo03tXh.js";
+import "../ssr-BQwZitKq.js";
+import { injectRSCPayload } from "../server-DMhFuTz_.js";
 import React from "react";
 import { jsx } from "react/jsx-runtime";
 import ReactDomServer from "react-dom/server.edge";

package/dist/{index-DWN3vCIQ.d.ts → index-B04iFwO5.d.ts}

@@ -1,5 +1,5 @@
 import MagicString from "magic-string";
-import { Program } from "estree";
+import { Literal, Program } from "estree";
 
 //#region src/transforms/hoist.d.ts
 declare function transformHoistInlineDirective(input: string, ast: Program, {
@@ -19,6 +19,7 @@ declare function transformHoistInlineDirective(input: string, ast: Program, {
   output: MagicString;
   names: string[];
 };
+declare function findDirectives(ast: Program, directive: string): Literal[];
 //#endregion
 //#region src/transforms/wrap-export.d.ts
 type ExportMeta = {
@@ -86,4 +87,4 @@ declare function transformServerActionServer(input: string, ast: Program, option
   names: string[];
 };
 //#endregion
-export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import "./index-DWN3vCIQ.js";
-import { PluginApi, RscPluginOptions, getPluginApi, vitePluginRsc } from "./plugin-Cfy_9VpM.js";
+import "./index-B04iFwO5.js";
+import { PluginApi, RscPluginOptions, getPluginApi, vitePluginRsc } from "./plugin-DCLI7Wh8.js";
 export { type PluginApi, type RscPluginOptions, vitePluginRsc as default, getPluginApi };

package/dist/index.js

@@ -1,10 +1,10 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import "./transforms-D1-2JfCh.js";
+import "./transforms-CpF3zNE0.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-CUvSZurk.js";
-import { getPluginApi, vitePluginRsc } from "./plugin-BI8kK-GE.js";
-import "./cjs-WQBk0zA_.js";
-import "./shared-AvKUASD5.js";
+import { getPluginApi, vitePluginRsc } from "./plugin-BDLEZ1UW.js";
+import "./cjs-BamOAUgw.js";
+import "./shared-n-ykEs15.js";
 
 export { vitePluginRsc as default, getPluginApi };

package/dist/{plugin-BI8kK-GE.js → plugin-BDLEZ1UW.js}

@@ -1,10 +1,10 @@
 import { createDebug } from "./dist-DiJnRA1C.js";
 import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
-import { hasDirective, transformDirectiveProxyExport, transformServerActionServer, transformWrapExport } from "./transforms-D1-2JfCh.js";
+import { findDirectives, hasDirective, transformDirectiveProxyExport, transformServerActionServer, transformWrapExport } from "./transforms-CpF3zNE0.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
 import { createRpcServer } from "./rpc-CUvSZurk.js";
-import { cjsModuleRunnerPlugin } from "./cjs-WQBk0zA_.js";
-import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-AvKUASD5.js";
+import { cjsModuleRunnerPlugin } from "./cjs-BamOAUgw.js";
+import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-n-ykEs15.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
 import fs from "node:fs";
@@ -164,8 +164,7 @@ 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)) {
-		const ast = await parseAstAsync(code);
-		walk(ast, { enter(node) {
+		walk(await parseAstAsync(code), { 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`;
@@ -205,19 +204,14 @@ function validateImportPlugin() {
 			order: "post",
 			async handler(_code, id) {
 				if (this.environment.mode === "dev") {
-					if (id.startsWith(`\0virtual:vite-rsc/validate-imports/invalid/`)) {
-						const chain = getImportChainDev(this.environment, id);
-						validateImportChain(chain, this.environment.name, this.environment.config.root);
-					}
+					if (id.startsWith(`\0virtual:vite-rsc/validate-imports/invalid/`)) validateImportChain(getImportChainDev(this.environment, id), this.environment.name, this.environment.config.root);
 				}
 			}
 		},
 		buildEnd() {
 			if (this.environment.mode === "build") {
-				const serverOnly = getImportChainBuild(this, "\0virtual:vite-rsc/validate-imports/invalid/server-only");
-				validateImportChain(serverOnly, this.environment.name, this.environment.config.root);
-				const clientOnly = getImportChainBuild(this, "\0virtual:vite-rsc/validate-imports/invalid/client-only");
-				validateImportChain(clientOnly, this.environment.name, this.environment.config.root);
+				validateImportChain(getImportChainBuild(this, "\0virtual:vite-rsc/validate-imports/invalid/server-only"), this.environment.name, this.environment.config.root);
+				validateImportChain(getImportChainBuild(this, "\0virtual:vite-rsc/validate-imports/invalid/client-only"), this.environment.name, this.environment.config.root);
 			}
 		}
 	};
@@ -434,22 +428,21 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			name: "rsc",
 			async config(config, env) {
 				if (config.rsc) Object.assign(rscPluginOptions, vite.mergeConfig(config.rsc, rscPluginOptions));
-				const result = await crawlFrameworkPkgs({
-					root: process.cwd(),
-					isBuild: env.command === "build",
-					isFrameworkPkgByJson(pkgJson) {
-						if ([PKG_NAME, "react-dom"].includes(pkgJson.name)) return;
-						const deps = pkgJson["peerDependencies"];
-						return deps && "react" in deps;
-					}
-				});
 				const noExternal = [
 					"react",
 					"react-dom",
 					"server-only",
 					"client-only",
 					PKG_NAME,
-					...result.ssr.noExternal.sort()
+					...(await crawlFrameworkPkgs({
+						root: process.cwd(),
+						isBuild: env.command === "build",
+						isFrameworkPkgByJson(pkgJson) {
+							if ([PKG_NAME, "react-dom"].includes(pkgJson.name)) return;
+							const deps = pkgJson["peerDependencies"];
+							return deps && "react" in deps;
+						}
+					})).ssr.noExternal.sort()
 				];
 				return {
 					appType: config.appType ?? "custom",
@@ -553,8 +546,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						try {
 							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);
-							const fetchHandler = getFetchHandlerExport(mod);
+							const fetchHandler = getFetchHandlerExport(await environment.runner.import(resolved.id));
 							req.url = req.originalUrl ?? req.url;
 							await createRequestListener(fetchHandler)(req, res);
 						} catch (e) {
@@ -570,10 +562,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					environmentName: "rsc",
 					entryName: "index"
 				};
-				const entryFile = path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`);
-				const mod = await import(pathToFileURL(entryFile).href);
-				const fetchHandler = getFetchHandlerExport(mod);
-				const handler = createRequestListener(fetchHandler);
+				const handler = createRequestListener(getFetchHandlerExport(await import(pathToFileURL(path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`)).href)));
 				server.middlewares.use((req, _res, next) => {
 					delete req.headers["accept-encoding"];
 					next();
@@ -654,8 +643,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				const { server } = manager;
 				const s = new MagicString(code);
 				for (const match of code.matchAll(/import\.meta\.viteRsc\.loadModule\(([\s\S]*?)\)/dg)) {
-					const argCode = match[1].trim();
-					const [environmentName, entryName] = evalValue(`[${argCode}]`);
+					const [environmentName, entryName] = evalValue(`[${match[1].trim()}]`);
 					let replacement;
 					if (this.environment.mode === "dev" && rscPluginOptions.loadModuleDevProxy) {
 						const origin = server.resolvedUrls?.local[0];
@@ -710,20 +698,18 @@ 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}'`);
-					const runnerProxy = new Proxy({}, { get(_target, p, _receiver) {
+					return createRpcServer(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 {
-							const handler = await createHandler(url);
-							createRequestListener(handler)(req, res);
+							createRequestListener(await createHandler(url))(req, res);
 						} catch (e) {
 							next(e);
 						}
@@ -748,9 +734,8 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				if (id === "\0virtual:vite-rsc/assets-manifest") {
 					assert(this.environment.name !== "client");
 					assert(this.environment.mode === "dev");
-					const entryUrl = assetsURL("@id/__x00__" + VIRTUAL_ENTRIES.browser, manager);
 					const manifest = {
-						bootstrapScriptContent: `import(${serializeValueWithRuntime(entryUrl)})`,
+						bootstrapScriptContent: `import(${serializeValueWithRuntime(assetsURL("@id/__x00__" + VIRTUAL_ENTRIES.browser, manager))})`,
 						clientReferenceDeps: {}
 					};
 					return `export default ${JSON.stringify(manifest, null, 2)}`;
@@ -822,8 +807,7 @@ export default assetsManifest.bootstrapScriptContent;
 				const output = new MagicString(code);
 				for (const match of code.matchAll(/import\s*\.\s*meta\s*\.\s*viteRsc\s*\.\s*loadBootstrapScriptContent\(([\s\S]*?)\)/dg)) {
 					const argCode = match[1].trim();
-					const entryName = evalValue(argCode);
-					assert(entryName, `[vite-rsc] expected 'loadBootstrapScriptContent("index")' but got ${argCode}`);
+					assert(evalValue(argCode), `[vite-rsc] expected 'loadBootstrapScriptContent("index")' but got ${argCode}`);
 					let replacement = `Promise.resolve(__vite_rsc_assets_manifest.bootstrapScriptContent)`;
 					const [start, end] = match.indices[0];
 					output.overwrite(start, end, replacement);
@@ -918,6 +902,10 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					delete manager.clientReferenceMetaMap[id];
 					return;
 				}
+				if (code.includes("use server")) {
+					const directives = findDirectives(ast, "use server");
+					if (directives.length > 0) this.error(`'use server' directive is not allowed inside 'use client'`, directives[0]?.start);
+				}
 				let importId;
 				let referenceKey;
 				const packageSource = packageSources.get(id);
@@ -1134,8 +1122,7 @@ function customOptimizerMetadataPlugin({ setMetadata }) {
 		configResolved(config) {
 			const file = path.join(config.cacheDir, "deps", MEATADATA_FILE);
 			if (fs.existsSync(file)) try {
-				const metadata = JSON.parse(fs.readFileSync(file, "utf-8"));
-				setMetadata(metadata);
+				setMetadata(JSON.parse(fs.readFileSync(file, "utf-8")));
 			} catch (e) {
 				this.warn(`failed to load '${file}'`);
 			}
@@ -1240,7 +1227,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 				}
 				const result = withRollupError(this, transformDirectiveProxyExport)(ast, {
 					code,
-					runtime: (name$1) => `$$ReactClient.createServerReference(${JSON.stringify(getNormalizedId() + "#" + name$1)},$$ReactClient.callServer, undefined, ` + (this.environment.mode === "dev" ? `$$ReactClient.findSourceMapURL,` : "undefined,") + `${JSON.stringify(name$1)})`,
+					runtime: (name) => `$$ReactClient.createServerReference(${JSON.stringify(getNormalizedId() + "#" + name)},$$ReactClient.callServer, undefined, ` + (this.environment.mode === "dev" ? `$$ReactClient.findSourceMapURL,` : "undefined,") + `${JSON.stringify(name)})`,
 					directive: "use server",
 					rejectNonAsyncFunction: true
 				});
@@ -1252,8 +1239,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 					referenceKey: getNormalizedId(),
 					exportNames: result.exportNames
 				};
-				const name = this.environment.name === browserEnvironmentName ? "browser" : "ssr";
-				const importSource = resolvePackage(`${PKG_NAME}/react/${name}`);
+				const importSource = resolvePackage(`${PKG_NAME}/react/${this.environment.name === browserEnvironmentName ? "browser" : "ssr"}`);
 				output.prepend(`import * as $$ReactClient from "${importSource}";\n`);
 				return {
 					code: output.toString(),
@@ -1420,9 +1406,8 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 					code
 				});
 				if (!filter) return;
-				const ast = await parseAstAsync(code);
 				const result = await transformRscCssExport({
-					ast,
+					ast: await parseAstAsync(code),
 					code,
 					filter
 				});
@@ -1459,8 +1444,7 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 					if (!mod?.id || !mod?.file) return `export default []`;
 					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), manager));
-					return `export default ${serializeValueWithRuntime(hrefs)}`;
+					return `export default ${serializeValueWithRuntime(result.hrefs.map((href) => assetsURL(href.slice(1), manager)))}`;
 				}
 			}
 		},
@@ -1534,12 +1518,10 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 					if (this.environment.mode === "dev") {
 						const result = collectCss(server.environments.rsc, importer);
 						for (const file of [importer, ...result.visitedFiles]) this.addWatchFile(file);
-						const cssHrefs = result.hrefs.map((href) => href.slice(1));
-						const deps = assetsURLOfDeps({
-							css: cssHrefs,
+						return generateResourcesCode(serializeValueWithRuntime(assetsURLOfDeps({
+							css: result.hrefs.map((href) => href.slice(1)),
 							js: []
-						}, manager);
-						return generateResourcesCode(serializeValueWithRuntime(deps), manager);
+						}, manager)), manager);
 					} else {
 						const key = manager.toRelativeId(importer);
 						manager.serverResourcesMetaMap[importer] = { key };

package/dist/{plugin-Cfy_9VpM.d.ts → plugin-DCLI7Wh8.d.ts}

@@ -1,4 +1,4 @@
-import { TransformWrapExportFilter } from "./index-DWN3vCIQ.js";
+import { TransformWrapExportFilter } from "./index-B04iFwO5.js";
 import MagicString from "magic-string";
 import { Plugin, ResolvedConfig, Rollup, ViteDevServer, parseAstAsync } from "vite";
 

package/dist/plugin.d.ts

@@ -1,3 +1,3 @@
-import "./index-DWN3vCIQ.js";
-import { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-Cfy_9VpM.js";
+import "./index-B04iFwO5.js";
+import { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-DCLI7Wh8.js";
 export { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugin.js

@@ -1,10 +1,10 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import "./transforms-D1-2JfCh.js";
+import "./transforms-CpF3zNE0.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-CUvSZurk.js";
-import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-BI8kK-GE.js";
-import "./cjs-WQBk0zA_.js";
-import "./shared-AvKUASD5.js";
+import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-BDLEZ1UW.js";
+import "./cjs-BamOAUgw.js";
+import "./shared-n-ykEs15.js";
 
 export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugins/cjs.js

@@ -1,5 +1,5 @@
 import "../dist-DiJnRA1C.js";
-import { cjsModuleRunnerPlugin } from "../cjs-WQBk0zA_.js";
-import "../shared-AvKUASD5.js";
+import { cjsModuleRunnerPlugin } from "../cjs-BamOAUgw.js";
+import "../shared-n-ykEs15.js";
 
 export { cjsModuleRunnerPlugin };

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

@@ -1,4 +1,4 @@
-import { injectRSCPayload } from "../server-BTo03tXh.js";
+import { injectRSCPayload } from "../server-DMhFuTz_.js";
 
 //#region src/rsc-html-stream/ssr.ts
 /** @deprecated use `rsc-html-stream/server` instead */

package/dist/rsc.js

@@ -3,7 +3,7 @@ import "./shared-CXg_u-4h.js";
 import "./encryption-utils-BDwwcMVT.js";
 import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-GFzFWyhT.js";
 import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-BdCB3621.js";
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-CugTJCLM.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-DT6dtlC5.js";
 import "./rsc-CiAoLCx8.js";
 
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/{server-BTo03tXh.js → server-DMhFuTz_.js}

@@ -56,8 +56,7 @@ async function writeRSCStream(rscStream, controller, nonce) {
 	for await (let chunk of rscStream) try {
 		writeChunk(JSON.stringify(decoder.decode(chunk, { stream: true })), controller, nonce);
 	} catch (err) {
-		let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
-		writeChunk(`Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`, controller, nonce);
+		writeChunk(`Uint8Array.from(atob(${JSON.stringify(btoa(String.fromCodePoint(...chunk)))}), m => m.codePointAt(0))`, controller, nonce);
 	}
 	let remaining = decoder.decode();
 	if (remaining.length) writeChunk(JSON.stringify(remaining), controller, nonce);

package/dist/{shared-AvKUASD5.js → shared-n-ykEs15.js}

@@ -11,10 +11,9 @@ function parseIdQuery(id) {
 		query: {}
 	};
 	const [filename, rawQuery] = id.split(`?`, 2);
-	const query = Object.fromEntries(new URLSearchParams(rawQuery));
 	return {
 		filename,
-		query
+		query: Object.fromEntries(new URLSearchParams(rawQuery))
 	};
 }
 

package/dist/{ssr-8BA2nj0-.js → ssr-BQwZitKq.js}

@@ -1,4 +1,4 @@
-import { toCssVirtual } from "./shared-AvKUASD5.js";
+import { toCssVirtual } from "./shared-n-ykEs15.js";
 import { setRequireModule } from "./ssr-Cm2FP2zD.js";
 import * as clientReferences from "virtual:vite-rsc/client-references";
 import assetsManifest from "virtual:vite-rsc/assets-manifest";
@@ -8,29 +8,25 @@ import * as ReactDOM from "react-dom";
 initialize();
 function initialize() {
 	setRequireModule({ load: async (id) => {
-		if (!import.meta.env.__vite_rsc_build__) {
-			const mod = await import(
-				/* @vite-ignore */
-				id
-);
-			const modCss = await import(
+		if (!import.meta.env.__vite_rsc_build__) return wrapResourceProxy(await import(
+			/* @vite-ignore */
+			id
+), {
+			js: [],
+			css: (await import(
 				/* @vite-ignore */
 				"/@id/__x00__" + toCssVirtual({
 					id,
 					type: "ssr"
 				})
-);
-			return wrapResourceProxy(mod, {
-				js: [],
-				css: modCss.default
-			});
-		} else {
+)).default
+		});
+		else {
 			const import_ = clientReferences.default[id];
 			if (!import_) throw new Error(`client reference not found '${id}'`);
 			const deps = assetsManifest.clientReferenceDeps[id];
 			if (deps) preloadDeps(deps);
-			const mod = await import_();
-			return wrapResourceProxy(mod, deps);
+			return wrapResourceProxy(await import_(), deps);
 		}
 	} });
 }

package/dist/ssr.js

@@ -1,8 +1,8 @@
 import "./dist-DiJnRA1C.js";
 import "./shared-CXg_u-4h.js";
-import "./shared-AvKUASD5.js";
+import "./shared-n-ykEs15.js";
 import { createServerConsumerManifest, setRequireModule } from "./ssr-Cm2FP2zD.js";
 import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-Cd4SbAaO.js";
-import "./ssr-8BA2nj0-.js";
+import "./ssr-BQwZitKq.js";
 
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/dist/transforms/index.d.ts

@@ -1,2 +1,2 @@
-import { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../index-DWN3vCIQ.js";
-export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+import { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../index-B04iFwO5.js";
+export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/transforms/index.js

@@ -1,4 +1,4 @@
 import "../dist-DiJnRA1C.js";
-import { getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../transforms-D1-2JfCh.js";
+import { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../transforms-CpF3zNE0.js";
 
-export { getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+export { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/{transforms-D1-2JfCh.js → transforms-CpF3zNE0.js}

@@ -15,7 +15,7 @@ function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunc
 	const names = [];
 	walk(ast, { enter(node, parent) {
 		if ((node.type === "FunctionExpression" || node.type === "FunctionDeclaration" || node.type === "ArrowFunctionExpression") && node.body.type === "BlockStatement") {
-			const match = matchDirective(node.body.body, directive);
+			const match = matchDirective(node.body.body, directive)?.match;
 			if (!match) return;
 			if (!node.async && rejectNonAsyncFunction) throw Object.assign(/* @__PURE__ */ new Error(`"${directive}" doesn't allow non async function`), { pos: node.start });
 			const scope = analyzed.map.get(node);
@@ -59,11 +59,25 @@ function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunc
 }
 const exactRegex = (s) => /* @__PURE__ */ new RegExp("^" + s.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&") + "$");
 function matchDirective(body, directive) {
-	for (const stable of body) if (stable.type === "ExpressionStatement" && stable.expression.type === "Literal" && typeof stable.expression.value === "string") {
-		const match = stable.expression.value.match(directive);
-		if (match) return match;
+	for (const stmt of body) if (stmt.type === "ExpressionStatement" && stmt.expression.type === "Literal" && typeof stmt.expression.value === "string") {
+		const match = stmt.expression.value.match(directive);
+		if (match) return {
+			match,
+			node: stmt.expression
+		};
 	}
 }
+function findDirectives(ast, directive) {
+	const directiveRE = exactRegex(directive);
+	const nodes = [];
+	walk(ast, { enter(node) {
+		if (node.type === "Program" || node.type === "BlockStatement") {
+			const match = matchDirective(node.body, directiveRE);
+			if (match) nodes.push(match.node);
+		}
+	} });
+	return nodes;
+}
 
 //#endregion
 //#region src/transforms/wrap-export.ts
@@ -276,8 +290,7 @@ function transformProxyExport(ast, options) {
 						}
 					}
 				}
-				const names = node.declaration.declarations.flatMap((decl) => extract_names(decl.id));
-				createExport(node, names);
+				createExport(node, node.declaration.declarations.flatMap((decl) => extract_names(decl.id)));
 			} else node.declaration;
 			else {
 				/**
@@ -327,4 +340,4 @@ function transformServerActionServer(input, ast, options) {
 }
 
 //#endregion
-export { getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+export { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/utils/encryption-runtime.js

@@ -3,6 +3,6 @@ import "../shared-CXg_u-4h.js";
 import "../encryption-utils-BDwwcMVT.js";
 import "../rsc-GFzFWyhT.js";
 import "../rsc-BdCB3621.js";
-import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-CugTJCLM.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-DT6dtlC5.js";
 
 export { decryptActionBoundArgs, encryptActionBoundArgs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -39,29 +39,30 @@
     "prepack": "tsdown"
   },
   "dependencies": {
-    "@remix-run/node-fetch-server": "^0.8.0",
+    "@remix-run/node-fetch-server": "^0.10.0",
     "es-module-lexer": "^1.7.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.18",
+    "magic-string": "^0.30.19",
     "periscopic": "^4.0.2",
     "turbo-stream": "^3.1.0",
     "vitefu": "^1.1.1"
   },
   "devDependencies": {
     "@hiogawa/utils": "^1.7.0",
-    "@playwright/test": "^1.55.0",
-    "@tsconfig/strictest": "^2.0.5",
+    "@playwright/test": "^1.55.1",
+    "@tsconfig/strictest": "^2.0.6",
     "@types/estree": "^1.0.8",
-    "@types/node": "^22.18.1",
-    "@types/react": "^19.1.12",
+    "@types/node": "^22.18.8",
+    "@types/react": "^19.1.16",
     "@types/react-dom": "^19.1.9",
     "@vitejs/plugin-react": "workspace:*",
+    "@vitejs/test-dep-cjs-and-esm": "./test-dep/cjs-and-esm",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-server-dom-webpack": "^19.1.1",
     "rsc-html-stream": "^0.0.7",
     "tinyexec": "^1.0.1",
-    "tsdown": "^0.14.2"
+    "tsdown": "^0.15.6"
   },
   "peerDependencies": {
     "react": "*",