@vitejs/plugin-rsc 0.4.14 → 0.4.16

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

@@ -1,4 +1,4 @@
-import { CallServerCallback } from "./index-BHqtj9tT.js";
+import { CallServerCallback } from "./index-QWzVHuya.js";
 
 //#region src/react/browser.d.ts
 declare function createFromReadableStream<T>(stream: ReadableStream<Uint8Array>, options?: object): Promise<T>;

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-CeSkQWD5.js";
+import { CallServerCallback } from "./index-QWzVHuya.js";
+import { setRequireModule } from "./browser-CuwQIlVY.js";
+import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "./browser-mbRygLxB.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/core/browser.d.ts

@@ -1,2 +1,2 @@
-import { setRequireModule } from "../browser-Dw18EFgE.js";
+import { setRequireModule } from "../browser-CuwQIlVY.js";
 export { setRequireModule };

package/dist/core/rsc.d.ts

@@ -1,3 +1,3 @@
-import "../index-BHqtj9tT.js";
-import { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../rsc-BOV3yNSd.js";
+import "../index-QWzVHuya.js";
+import { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule } from "../rsc-CxDPDiLz.js";
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/ssr.d.ts

@@ -1,3 +1,3 @@
-import "../index-BHqtj9tT.js";
-import { createServerConsumerManifest, setRequireModule } from "../ssr-DgSrGrln.js";
+import "../index-QWzVHuya.js";
+import { createServerConsumerManifest, setRequireModule } from "../ssr-BoNKka-5.js";
 export { createServerConsumerManifest, setRequireModule };

package/dist/core/ssr.js

@@ -1,5 +1,5 @@
 import "../dist-DEF94lDJ.js";
 import "../shared-CEyKoKAb.js";
-import { createServerConsumerManifest, setRequireModule } from "../ssr-BOIYlvSn.js";
+import { createServerConsumerManifest, setRequireModule } from "../ssr-MYoobcMC.js";
 
 export { createServerConsumerManifest, setRequireModule };

package/dist/{rsc-BIUd01vh.js → encryption-runtime-D6SQwJ1j.js}

@@ -1,8 +1,6 @@
 import { once } from "./dist-DEF94lDJ.js";
 import { arrayToStream, concatArrayStream, decryptBuffer, encryptBuffer, fromBase64 } from "./encryption-utils-BDwwcMVT.js";
-import { setRequireModule } from "./rsc-DKA6wwTB.js";
 import { createFromReadableStream, renderToReadableStream } from "./rsc-DHfL29FT.js";
-import serverReferences from "virtual:vite-rsc/server-references";
 import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 
 //#region src/utils/encryption-runtime.ts
@@ -22,22 +20,5 @@ const getEncryptionKey = /* @__PURE__ */ once(async () => {
 	return key;
 });
 
-//#endregion
-//#region src/rsc.tsx
-initialize();
-function initialize() {
-	setRequireModule({ load: async (id) => {
-		if (!import.meta.env.__vite_rsc_build__) return import(
-			/* @vite-ignore */
-			id
-);
-		else {
-			const import_ = serverReferences[id];
-			if (!import_) throw new Error(`server reference not found '${id}'`);
-			return import_();
-		}
-	} });
-}
-
 //#endregion
 export { decryptActionBoundArgs, encryptActionBoundArgs };

package/dist/encryption-runtime-SgJRa9yj.d.ts

@@ -0,0 +1,5 @@
+//#region src/utils/encryption-runtime.d.ts
+declare function encryptActionBoundArgs(originalValue: unknown): Promise<string>;
+declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>): Promise<unknown>;
+//#endregion
+export { decryptActionBoundArgs, encryptActionBoundArgs };

package/dist/extra/browser.d.ts

@@ -1,4 +1,4 @@
-import { RscPayload } from "../rsc-DryRyKqc.js";
+import { RscPayload } from "../rsc-Cv3XEZqB.js";
 
 //#region src/extra/browser.d.ts
 

package/dist/extra/browser.js

@@ -3,7 +3,7 @@ import "../shared-CEyKoKAb.js";
 import "../browser-QWbIPyhO.js";
 import { createFromFetch, createFromReadableStream, createTemporaryReferenceSet, encodeReply, setServerCallback } from "../browser-D8OPzpF5.js";
 import "../browser-C1Q4O7AS.js";
-import { rscStream } from "../client-CPc-spDn.js";
+import { rscStream } from "../client-C1J4FCf5.js";
 import React from "react";
 import ReactDomClient from "react-dom/client";
 import { jsx } from "react/jsx-runtime";

package/dist/extra/rsc.d.ts

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

package/dist/extra/rsc.js

@@ -3,7 +3,8 @@ 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-BIUd01vh.js";
+import "../encryption-runtime-D6SQwJ1j.js";
+import "../rsc-DP-89iIT.js";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/extra/rsc.tsx

package/dist/extra/ssr.js

@@ -1,9 +1,9 @@
 import "../dist-DEF94lDJ.js";
 import "../shared-CEyKoKAb.js";
-import "../ssr-BOIYlvSn.js";
-import { createFromReadableStream } from "../ssr-D5pxP29F.js";
-import "../ssr-DNwSdZ9T.js";
-import { injectRSCPayload } from "../server-C50j-DRF.js";
+import "../ssr-MYoobcMC.js";
+import { createFromReadableStream } from "../ssr-BLt64xPK.js";
+import "../ssr-B7_J2_Qh.js";
+import { injectRSCPayload } from "../server-D0-DavPP.js";
 import React from "react";
 import { jsx } from "react/jsx-runtime";
 import ReactDomServer from "react-dom/server.edge";

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RscPluginOptions, vitePluginRsc } from "./plugin-DXIhXGMa.js";
+import { RscPluginOptions, vitePluginRsc } from "./plugin-CYYsF3qY.js";
 import MagicString from "magic-string";
 import { Program } from "estree";
 

package/dist/index.js

@@ -1,6 +1,6 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-6e6xZIb7.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-C9id3xj5.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-Vzd7cqfv.js";

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

@@ -13,7 +13,7 @@ import { createRequestListener } from "@mjackson/node-fetch-server";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
 import { defaultServerConditions, isCSSRequest, normalizePath, parseAstAsync } from "vite";
-import { crawlFrameworkPkgs } from "vitefu";
+import { crawlFrameworkPkgs, findClosestPkgJsonPath } from "vitefu";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";
 
@@ -319,12 +319,81 @@ const require = createRequire(import.meta.url);
 function resolvePackage(name) {
 	return pathToFileURL(require.resolve(name)).href;
 }
+/** @experimental */
+function vitePluginRscMinimal(rscPluginOptions = {}) {
+	return [
+		{
+			name: "rsc:minimal",
+			enforce: "pre",
+			async config() {
+				await esModuleLexer.init;
+			},
+			configResolved(config_) {
+				config = config_;
+			},
+			configureServer(server_) {
+				server = server_;
+			}
+		},
+		{
+			name: "rsc:vite-client-raw-import",
+			transform: {
+				order: "post",
+				handler(code) {
+					if (code.includes("__vite_rsc_raw_import__")) return code.replace("__vite_rsc_raw_import__", "import");
+				}
+			}
+		},
+		...vitePluginRscCore(),
+		...vitePluginUseClient(rscPluginOptions),
+		...vitePluginUseServer(rscPluginOptions),
+		...vitePluginDefineEncryptionKey(rscPluginOptions)
+	];
+}
 function vitePluginRsc(rscPluginOptions = {}) {
+	const buildApp = async (builder) => {
+		if (!builder.environments.ssr?.config.build.rollupOptions.input) {
+			isScanBuild = true;
+			builder.environments.rsc.config.build.write = false;
+			builder.environments.client.config.build.write = false;
+			await builder.build(builder.environments.rsc);
+			await builder.build(builder.environments.client);
+			isScanBuild = false;
+			builder.environments.rsc.config.build.write = true;
+			builder.environments.client.config.build.write = true;
+			await builder.build(builder.environments.rsc);
+			clientReferenceMetaMap = sortObject(clientReferenceMetaMap);
+			serverResourcesMetaMap = sortObject(serverResourcesMetaMap);
+			await builder.build(builder.environments.client);
+			writeAssetsManifest(["rsc"]);
+			return;
+		}
+		isScanBuild = true;
+		builder.environments.rsc.config.build.write = false;
+		builder.environments.ssr.config.build.write = false;
+		await builder.build(builder.environments.rsc);
+		await builder.build(builder.environments.ssr);
+		isScanBuild = false;
+		builder.environments.rsc.config.build.write = true;
+		builder.environments.ssr.config.build.write = true;
+		await builder.build(builder.environments.rsc);
+		clientReferenceMetaMap = sortObject(clientReferenceMetaMap);
+		serverResourcesMetaMap = sortObject(serverResourcesMetaMap);
+		await builder.build(builder.environments.client);
+		await builder.build(builder.environments.ssr);
+		writeAssetsManifest(["ssr", "rsc"]);
+	};
+	function writeAssetsManifest(environmentNames) {
+		const assetsManifestCode = `export default ${serializeValueWithRuntime(buildAssetsManifest)}`;
+		for (const name of environmentNames) {
+			const manifestPath = path.join(config.environments[name].build.outDir, BUILD_ASSETS_MANIFEST_NAME);
+			fs.writeFileSync(manifestPath, assetsManifestCode);
+		}
+	}
 	return [
 		{
 			name: "rsc",
 			async config(config$1, env) {
-				await esModuleLexer.init;
 				const result = await crawlFrameworkPkgs({
 					root: process.cwd(),
 					isBuild: env.command === "build",
@@ -400,47 +469,12 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					builder: {
 						sharedPlugins: true,
 						sharedConfigBuild: true,
-						async buildApp(builder) {
-							if (!builder.environments.ssr?.config.build.rollupOptions.input) {
-								isScanBuild = true;
-								builder.environments.rsc.config.build.write = false;
-								builder.environments.client.config.build.write = false;
-								await builder.build(builder.environments.rsc);
-								await builder.build(builder.environments.client);
-								isScanBuild = false;
-								builder.environments.rsc.config.build.write = true;
-								builder.environments.client.config.build.write = true;
-								await builder.build(builder.environments.rsc);
-								clientReferenceMetaMap = sortObject(clientReferenceMetaMap);
-								serverResourcesMetaMap = sortObject(serverResourcesMetaMap);
-								await builder.build(builder.environments.client);
-								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;
-							}
-							isScanBuild = true;
-							builder.environments.rsc.config.build.write = false;
-							builder.environments.ssr.config.build.write = false;
-							await builder.build(builder.environments.rsc);
-							await builder.build(builder.environments.ssr);
-							isScanBuild = false;
-							builder.environments.rsc.config.build.write = true;
-							builder.environments.ssr.config.build.write = true;
-							await builder.build(builder.environments.rsc);
-							clientReferenceMetaMap = sortObject(clientReferenceMetaMap);
-							serverResourcesMetaMap = sortObject(serverResourcesMetaMap);
-							await builder.build(builder.environments.client);
-							await builder.build(builder.environments.ssr);
-						}
+						buildApp: rscPluginOptions.useBuildAppHook ? void 0 : buildApp
 					}
 				};
 			},
-			configResolved(config_) {
-				config = config_;
-			},
-			configureServer(server_) {
-				server = server_;
+			buildApp: rscPluginOptions.useBuildAppHook ? buildApp : void 0,
+			configureServer() {
 				globalThis.__viteRscDevServer = server;
 				if (rscPluginOptions.disableServerHandler) return;
 				if (rscPluginOptions.serverHandler === false) return;
@@ -511,6 +545,10 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				}
 				if (!isInsideClientBoundary(ctx.modules)) {
 					if (this.environment.name === "rsc") {
+						if (ctx.modules.length === 1) {
+							const importers = [...ctx.modules[0].importers];
+							if (importers.length > 0 && importers.every((m) => m.id && isCSSRequest(m.id))) return [];
+						}
 						for (const mod of ctx.modules) if (mod.type === "js") try {
 							await this.environment.transformRequest(mod.url);
 						} catch (e) {
@@ -537,15 +575,6 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				}
 			}
 		},
-		{
-			name: "rsc:patch-browser-raw-import",
-			transform: {
-				order: "post",
-				handler(code) {
-					if (code.includes("__vite_rsc_raw_import__")) return code.replace("__vite_rsc_raw_import__", "import");
-				}
-			}
-		},
 		{
 			name: "rsc:load-ssr-module",
 			transform(code) {
@@ -710,15 +739,6 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					return { code };
 				}
 				return;
-			},
-			writeBundle() {
-				if (this.environment.name === "ssr") {
-					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);
-					}
-				}
 			}
 		},
 		createVirtualPlugin("vite-rsc/bootstrap-script-content", function() {
@@ -791,16 +811,34 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
 				return "";
 			}
 		},
-		...vitePluginRscCore(),
-		...vitePluginUseClient(rscPluginOptions),
-		...vitePluginUseServer(rscPluginOptions),
-		...vitePluginDefineEncryptionKey(rscPluginOptions),
+		...vitePluginRscMinimal(rscPluginOptions),
 		...vitePluginFindSourceMapURL(),
 		...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
 		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
-		scanBuildStripPlugin()
+		scanBuildStripPlugin(),
+		detectNonOptimizedCjsPlugin()
 	];
 }
+function detectNonOptimizedCjsPlugin() {
+	return {
+		name: "rsc:detect-non-optimized-cjs",
+		apply: "serve",
+		async transform(code, id) {
+			if (id.includes("/node_modules/") && !id.startsWith(this.environment.config.cacheDir) && /\b(require|exports)\b/.test(code)) {
+				id = parseIdQuery(id).filename;
+				let isEsm = id.endsWith(".mjs");
+				if (id.endsWith(".js")) {
+					const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
+					if (pkgJsonPath) {
+						const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+						isEsm = pkgJson.type === "module";
+					}
+				}
+				if (!isEsm) this.warn(`[vite-rsc] found non-optimized CJS dependency in '${this.environment.name}' environment. It is recommended to manually add the dependency to 'environments.${this.environment.name}.optimizeDeps.include'.`);
+			}
+		}
+	};
+}
 function scanBuildStripPlugin() {
 	return {
 		name: "rsc:scan-strip",
@@ -829,19 +867,16 @@ function getEntrySource(config$1, name = "index") {
 function hashString(v) {
 	return createHash("sha256").update(v).digest().toString("hex").slice(0, 12);
 }
-function normalizeReferenceId(id, name) {
-	if (!server) return hashString(path.relative(config.root, id));
-	const environment = server.environments[name];
-	return normalizeViteImportAnalysisUrl(environment, id);
-}
 function vitePluginUseClient(useClientPluginOptions) {
 	const packageSources = /* @__PURE__ */ new Map();
 	const bareImportRE = /^(?![a-zA-Z]:)[\w@](?!.*:\/\/)/;
+	const serverEnvironmentName = useClientPluginOptions.environment?.rsc ?? "rsc";
+	const browserEnvironmentName = useClientPluginOptions.environment?.browser ?? "client";
 	return [
 		{
 			name: "rsc:use-client",
 			async transform(code, id) {
-				if (this.environment.name !== "rsc") return;
+				if (this.environment.name !== serverEnvironmentName) return;
 				if (!code.includes("use client")) return;
 				const ast = await parseAstAsync(code);
 				if (!hasDirective(ast.body, "use client")) return;
@@ -862,7 +897,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 					referenceKey = hashString(packageSource);
 				}
 				else if (this.environment.mode === "dev") {
-					importId = normalizeViteImportAnalysisUrl(server.environments.client, id);
+					importId = normalizeViteImportAnalysisUrl(server.environments[browserEnvironmentName], id);
 					referenceKey = importId;
 				} else {
 					importId = id;
@@ -924,7 +959,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 			async load(id) {
 				if (id.startsWith("\0virtual:vite-rsc/client-in-server-package-proxy/")) {
 					assert.equal(this.environment.mode, "dev");
-					assert.notEqual(this.environment.name, "rsc");
+					assert(this.environment.name !== serverEnvironmentName);
 					id = decodeURIComponent(id.slice(49));
 					return `
             export * from ${JSON.stringify(id)};
@@ -939,7 +974,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 			resolveId: {
 				order: "pre",
 				async handler(source, importer, options) {
-					if (this.environment.name === "rsc" && bareImportRE.test(source)) {
+					if (this.environment.name === serverEnvironmentName && bareImportRE.test(source)) {
 						const resolved = await this.resolve(source, importer, options);
 						if (resolved && resolved.id.includes("/node_modules/")) {
 							packageSources.set(resolved.id, source);
@@ -958,7 +993,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 				}
 			},
 			generateBundle(_options, bundle) {
-				if (this.environment.name !== "rsc") return;
+				if (this.environment.name !== serverEnvironmentName) return;
 				for (const chunk of Object.values(bundle)) if (chunk.type === "chunk") for (const [id, mod] of Object.entries(chunk.modules)) {
 					const meta = clientReferenceMetaMap[id];
 					if (meta) meta.renderedExports = mod.renderedExports;
@@ -972,10 +1007,11 @@ function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 	let emitEncryptionKey = false;
 	const KEY_PLACEHOLDER = "__vite_rsc_define_encryption_key";
 	const KEY_FILE = "__vite_rsc_encryption_key.js";
+	const serverEnvironmentName = useServerPluginOptions.environment?.rsc ?? "rsc";
 	return [{
 		name: "rsc:encryption-key",
 		async configEnvironment(name, _config, env) {
-			if (name === "rsc" && !env.isPreview) defineEncryptionKey = useServerPluginOptions.defineEncryptionKey ?? JSON.stringify(toBase64(await generateEncryptionKey()));
+			if (name === serverEnvironmentName && !env.isPreview) defineEncryptionKey = useServerPluginOptions.defineEncryptionKey ?? JSON.stringify(toBase64(await generateEncryptionKey()));
 		},
 		resolveId(source) {
 			if (source === "virtual:vite-rsc/encryption-key") return {
@@ -1005,6 +1041,8 @@ function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 	}];
 }
 function vitePluginUseServer(useServerPluginOptions) {
+	const serverEnvironmentName = useServerPluginOptions.environment?.rsc ?? "rsc";
+	const browserEnvironmentName = useServerPluginOptions.environment?.browser ?? "client";
 	return [{
 		name: "rsc:use-server",
 		async transform(code, id) {
@@ -1019,23 +1057,28 @@ function vitePluginUseServer(useServerPluginOptions) {
 						if (!ignored) this.warn(`[vite-rsc] detected an internal server function created by a package imported on ${this.environment.name} environment`);
 						id = id.split("?v=")[0];
 					}
-					normalizedId_ = normalizeReferenceId(id, "rsc");
+					if (config.command === "build") normalizedId_ = hashString(path.relative(config.root, id));
+					else normalizedId_ = normalizeViteImportAnalysisUrl(server.environments[serverEnvironmentName], id);
 				}
 				return normalizedId_;
 			};
-			if (this.environment.name === "rsc") {
+			if (this.environment.name === serverEnvironmentName) {
 				const transformServerActionServer_ = withRollupError(this, transformServerActionServer);
 				const enableEncryption = useServerPluginOptions.enableActionEncryption ?? true;
 				const { output } = transformServerActionServer_(code, ast, {
 					runtime: (value, name) => `$$ReactServer.registerServerReference(${value}, ${JSON.stringify(getNormalizedId())}, ${JSON.stringify(name)})`,
 					rejectNonAsyncFunction: true,
-					encode: enableEncryption ? (value) => `$$ReactServer.encryptActionBoundArgs(${value})` : void 0,
-					decode: enableEncryption ? (value) => `await $$ReactServer.decryptActionBoundArgs(${value})` : void 0
+					encode: enableEncryption ? (value) => `__vite_rsc_encryption_runtime.encryptActionBoundArgs(${value})` : void 0,
+					decode: enableEncryption ? (value) => `await __vite_rsc_encryption_runtime.decryptActionBoundArgs(${value})` : void 0
 				});
 				if (!output.hasChanged()) return;
 				serverReferences[getNormalizedId()] = id;
-				const importSource = resolvePackage(`${PKG_NAME}/rsc`);
+				const importSource = resolvePackage(`${PKG_NAME}/react/rsc`);
 				output.prepend(`import * as $$ReactServer from "${importSource}";\n`);
+				if (enableEncryption) {
+					const importSource$1 = resolvePackage(`${PKG_NAME}/utils/encryption-runtime`);
+					output.prepend(`import * as __vite_rsc_encryption_runtime from ${JSON.stringify(importSource$1)};\n`);
+				}
 				return {
 					code: output.toString(),
 					map: output.generateMap({ hires: "boundary" })
@@ -1052,7 +1095,7 @@ function vitePluginUseServer(useServerPluginOptions) {
 				const output = result?.output;
 				if (!output?.hasChanged()) return;
 				serverReferences[getNormalizedId()] = id;
-				const name = this.environment.name === "client" ? "browser" : "ssr";
+				const name = this.environment.name === browserEnvironmentName ? "browser" : "ssr";
 				const importSource = resolvePackage(`${PKG_NAME}/react/${name}`);
 				output.prepend(`import * as $$ReactClient from "${importSource}";\n`);
 				return {
@@ -1267,7 +1310,7 @@ function vitePluginRscCss(rscCssOptions) {
 		};
 	}
 	function getRscCssTransformFilter({ id, code }) {
-		const { query } = parseIdQuery(id);
+		const { filename, query } = parseIdQuery(id);
 		if ("vite-rsc-css-export" in query) {
 			const value = query["vite-rsc-css-export"];
 			if (value) {
@@ -1278,8 +1321,8 @@ function vitePluginRscCss(rscCssOptions) {
 		}
 		const options = rscCssOptions?.rscCssTransform;
 		if (options === false) return false;
-		if (options?.filter && !options.filter(id)) return false;
-		if (id.includes("/node_modules/") || !/\.[tj]sx$/.test(id)) return false;
+		if (options?.filter && !options.filter(filename)) return false;
+		if (!/\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)\b/.test(code) || !/\.[tj]sx?$/.test(filename)) return false;
 		const result = esModuleLexer.parse(code);
 		if (!result[0].some((i) => i.t === 1 && i.n && isCSSRequest(i.n))) return false;
 		return (_name, meta) => !!(meta.isFunction && meta.declName && /^[A-Z]/.test(meta.declName) || meta.defaultExportIdentifierName && /^[A-Z]/.test(meta.defaultExportIdentifierName));
@@ -1553,4 +1596,4 @@ function sortObject(o) {
 }
 
 //#endregion
-export { __fix_cloudflare, findSourceMapURL, transformHoistInlineDirective, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss };
+export { __fix_cloudflare, findSourceMapURL, transformHoistInlineDirective, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal };

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

@@ -55,7 +55,25 @@ type RscPluginOptions = {
   * @default true
   */
   validateImports?: boolean;
+  /**
+  * use `Plugin.buildApp` hook (introduced on Vite 7) instead of `builder.buildApp` configuration
+  * for better composability with other plugins.
+  * @default false
+  */
+  useBuildAppHook?: boolean;
+  /**
+  * Custom environment configuration
+  * @experimental
+  * @default { browser: 'client', ssr: 'ssr', rsc: 'rsc' }
+  */
+  environment?: {
+    browser?: string;
+    ssr?: string;
+    rsc?: string;
+  };
 };
+/** @experimental */
+declare function vitePluginRscMinimal(rscPluginOptions?: RscPluginOptions): Plugin[];
 declare function vitePluginRsc(rscPluginOptions?: RscPluginOptions): Plugin[];
 declare class RuntimeAsset {
   runtime: string;
@@ -97,4 +115,4 @@ declare function transformRscCssExport(options: {
 */
 declare function __fix_cloudflare(): Plugin;
 //#endregion
-export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss };
+export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal };

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-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 };
+import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-CYYsF3qY.js";
+export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss, vitePluginRscMinimal };

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-6e6xZIb7.js";
+import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal } from "./plugin-C9id3xj5.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-Vzd7cqfv.js";
 
-export { __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss };
+export { __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss, vitePluginRscMinimal };

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-CeSkQWD5.js";
+import { CallServerCallback } from "../index-QWzVHuya.js";
+import { setRequireModule } from "../browser-CuwQIlVY.js";
+import { callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setServerCallback } from "../browser-mbRygLxB.js";
 export { CallServerCallback, callServer, createFromFetch, createFromReadableStream, createServerReference, createTemporaryReferenceSet, encodeReply, findSourceMapURL, setRequireModule, setServerCallback };

package/dist/react/rsc.d.ts

@@ -1,4 +1,4 @@
-import "../index-BHqtj9tT.js";
-import { loadServerAction, setRequireModule } from "../rsc-BOV3yNSd.js";
-import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "../rsc-DgrejoNf.js";
+import "../index-QWzVHuya.js";
+import { loadServerAction, setRequireModule } from "../rsc-CxDPDiLz.js";
+import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "../rsc-CFtzqEG8.js";
 export { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/react/ssr.d.ts

@@ -1,4 +1,4 @@
-import "../index-BHqtj9tT.js";
-import { setRequireModule } from "../ssr-DgSrGrln.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-D708H86k.js";
+import "../index-QWzVHuya.js";
+import { setRequireModule } from "../ssr-BoNKka-5.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-D6GTzOzx.js";
 export { callServer, createFromReadableStream, createServerReference, findSourceMapURL, setRequireModule };

package/dist/react/ssr.js

@@ -1,6 +1,6 @@
 import "../dist-DEF94lDJ.js";
 import "../shared-CEyKoKAb.js";
-import { setRequireModule } from "../ssr-BOIYlvSn.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-D5pxP29F.js";
+import { setRequireModule } from "../ssr-MYoobcMC.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "../ssr-BLt64xPK.js";
 
 export { callServer, createFromReadableStream, createServerReference, findSourceMapURL, setRequireModule };

package/dist/{rsc-BOV3yNSd.d.ts → rsc-CxDPDiLz.d.ts}

@@ -1,4 +1,4 @@
-import { BundlerConfig, ModuleMap } from "./index-BHqtj9tT.js";
+import { BundlerConfig, ModuleMap } from "./index-QWzVHuya.js";
 
 //#region src/core/rsc.d.ts
 declare function setRequireModule(options: {

package/dist/rsc-DP-89iIT.js

@@ -0,0 +1,20 @@
+import { setRequireModule } from "./rsc-DKA6wwTB.js";
+import serverReferences from "virtual:vite-rsc/server-references";
+
+//#region src/rsc.tsx
+initialize();
+function initialize() {
+	setRequireModule({ load: async (id) => {
+		if (!import.meta.env.__vite_rsc_build__) return import(
+			/* @vite-ignore */
+			id
+);
+		else {
+			const import_ = serverReferences[id];
+			if (!import_) throw new Error(`server reference not found '${id}'`);
+			return import_();
+		}
+	} });
+}
+
+//#endregion

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

@@ -1,4 +1,4 @@
-import { rscStream } from "../client-CPc-spDn.js";
+import { rscStream } from "../client-C1J4FCf5.js";
 
 //#region src/rsc-html-stream/browser.ts
 /** @deprecated use `rsc-html-stream/client` instead */

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

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

package/dist/rsc.d.ts

@@ -1,9 +1,5 @@
-import "./index-BHqtj9tT.js";
-import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-BOV3yNSd.js";
-import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-DgrejoNf.js";
-
-//#region src/utils/encryption-runtime.d.ts
-declare function encryptActionBoundArgs(originalValue: unknown): Promise<string>;
-declare function decryptActionBoundArgs(encrypted: ReturnType<typeof encryptActionBoundArgs>): Promise<unknown>;
-//#endregion
+import "./index-QWzVHuya.js";
+import { createClientManifest, createServerManifest, loadServerAction, setRequireModule } from "./rsc-CxDPDiLz.js";
+import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./rsc-CFtzqEG8.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-SgJRa9yj.js";
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/rsc.js

@@ -3,6 +3,7 @@ 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-BIUd01vh.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "./encryption-runtime-D6SQwJ1j.js";
+import "./rsc-DP-89iIT.js";
 
 export { createClientManifest, createClientTemporaryReferenceSet, createFromReadableStream, createServerManifest, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, decryptActionBoundArgs, encodeReply, encryptActionBoundArgs, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

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

@@ -1,4 +1,4 @@
-import { setRequireModule } from "./ssr-BOIYlvSn.js";
+import { setRequireModule } from "./ssr-MYoobcMC.js";
 import * as clientReferences from "virtual:vite-rsc/client-references";
 import assetsManifest from "virtual:vite-rsc/assets-manifest";
 import * as ReactDOM from "react-dom";

package/dist/{ssr-D5pxP29F.js → ssr-BLt64xPK.js}

@@ -1,4 +1,4 @@
-import { createServerConsumerManifest } from "./ssr-BOIYlvSn.js";
+import { createServerConsumerManifest } from "./ssr-MYoobcMC.js";
 import * as ReactClient from "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge";
 
 //#region src/react/ssr.ts

package/dist/{ssr-DgSrGrln.d.ts → ssr-BoNKka-5.d.ts}

@@ -1,4 +1,4 @@
-import { ServerConsumerManifest } from "./index-BHqtj9tT.js";
+import { ServerConsumerManifest } from "./index-QWzVHuya.js";
 
 //#region src/core/ssr.d.ts
 declare function setRequireModule(options: {

package/dist/ssr.d.ts

@@ -1,4 +1,4 @@
-import "./index-BHqtj9tT.js";
-import { createServerConsumerManifest, setRequireModule } from "./ssr-DgSrGrln.js";
-import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-D708H86k.js";
+import "./index-QWzVHuya.js";
+import { createServerConsumerManifest, setRequireModule } from "./ssr-BoNKka-5.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-D6GTzOzx.js";
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/dist/ssr.js

@@ -1,7 +1,7 @@
 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-DNwSdZ9T.js";
+import { createServerConsumerManifest, setRequireModule } from "./ssr-MYoobcMC.js";
+import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./ssr-BLt64xPK.js";
+import "./ssr-B7_J2_Qh.js";
 
 export { callServer, createFromReadableStream, createServerConsumerManifest, createServerReference, findSourceMapURL, setRequireModule };

package/dist/utils/encryption-runtime.d.ts

@@ -0,0 +1,2 @@
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-SgJRa9yj.js";
+export { decryptActionBoundArgs, encryptActionBoundArgs };

package/dist/utils/encryption-runtime.js

@@ -0,0 +1,8 @@
+import "../dist-DEF94lDJ.js";
+import "../shared-CEyKoKAb.js";
+import "../encryption-utils-BDwwcMVT.js";
+import "../rsc-DKA6wwTB.js";
+import "../rsc-DHfL29FT.js";
+import { decryptActionBoundArgs, encryptActionBoundArgs } from "../encryption-runtime-D6SQwJ1j.js";
+
+export { decryptActionBoundArgs, encryptActionBoundArgs };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.14",
+  "version": "0.4.16",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -60,7 +60,8 @@
     "react-server-dom-webpack": "^19.1.0",
     "rsc-html-stream": "^0.0.7",
     "tinyexec": "^1.0.1",
-    "tsdown": "^0.13.0"
+    "tsdown": "^0.13.0",
+    "vite-plugin-inspect": "^11.3.2"
   },
   "peerDependencies": {
     "react": "*",