@vitejs/plugin-rsc 0.4.21 → 0.4.23

package/dist/{plugin-CzZCeIwj.js → plugin-Ddfc3b6D.js}

@@ -3,19 +3,21 @@ import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
 import { createRpcServer } from "./rpc-tGuLT8PD.js";
 import { cleanUrl, normalizeViteImportAnalysisUrl, prepareError } from "./vite-utils-Vzd7cqfv.js";
+import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-Cwk6fxfN.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
-import { createHash } from "node:crypto";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { createRequestListener } from "@remix-run/node-fetch-server";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
+import * as vite from "vite";
 import { defaultServerConditions, isCSSRequest, normalizePath, parseAstAsync } from "vite";
 import { crawlFrameworkPkgs, findClosestPkgJsonPath } from "vitefu";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";
+import { createHash } from "node:crypto";
 
 //#region src/transforms/hoist.ts
 function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunction,...options }) {
@@ -87,26 +89,29 @@ function transformWrapExport(input, ast, options) {
 	const toAppend = [];
 	const filter = options.filter ?? (() => true);
 	function wrapSimple(start, end, exports) {
+		exportNames.push(...exports.map((e) => e.name));
 		const newCode = exports.map((e) => [filter(e.name, e.meta) && `${e.name} = /* #__PURE__ */ ${options.runtime(e.name, e.name, e.meta)};\n`, `export { ${e.name} };\n`]).flat().filter(Boolean).join("");
 		output.update(start, end, newCode);
 		output.move(start, end, input.length);
 	}
 	function wrapExport(name, exportName, meta = {}) {
+		exportNames.push(exportName);
 		if (!filter(exportName, meta)) {
 			toAppend.push(`export { ${name} as ${exportName} }`);
 			return;
 		}
 		toAppend.push(`const $$wrap_${name} = /* #__PURE__ */ ${options.runtime(name, exportName, meta)}`, `export { $$wrap_${name} as ${exportName} }`);
 	}
-	function validateNonAsyncFunction(node, ok) {
-		if (options.rejectNonAsyncFunction && !ok) throw Object.assign(/* @__PURE__ */ new Error(`unsupported non async function`), { pos: node.start });
+	function validateNonAsyncFunction(node) {
+		if (!options.rejectNonAsyncFunction) return;
+		if (node.type === "ClassDeclaration" || (node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression") && !node.async) throw Object.assign(/* @__PURE__ */ new Error(`unsupported non async function`), { pos: node.start });
 	}
 	for (const node of ast.body) {
 		if (node.type === "ExportNamedDeclaration") if (node.declaration) if (node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") {
 			/**
 			* export function foo() {}
 			*/
-			validateNonAsyncFunction(node, node.declaration.type === "FunctionDeclaration" && node.declaration.async);
+			validateNonAsyncFunction(node.declaration);
 			const name = node.declaration.id.name;
 			wrapSimple(node.start, node.declaration.start, [{
 				name,
@@ -119,7 +124,7 @@ function transformWrapExport(input, ast, options) {
 			/**
 			* export const foo = 1, bar = 2
 			*/
-			validateNonAsyncFunction(node, node.declaration.declarations.every((decl) => decl.init?.type === "ArrowFunctionExpression" && decl.init.async));
+			for (const decl of node.declaration.declarations) if (decl.init) validateNonAsyncFunction(decl.init);
 			if (node.declaration.kind === "const") output.update(node.declaration.start, node.declaration.start + 5, "let");
 			const names = node.declaration.declarations.flatMap((decl) => extract_names(decl.id));
 			let isFunction = false;
@@ -168,7 +173,7 @@ function transformWrapExport(input, ast, options) {
 		* export default () => {}
 		*/
 		if (node.type === "ExportDefaultDeclaration") {
-			validateNonAsyncFunction(node, node.declaration.type === "Identifier" || node.declaration.type === "FunctionDeclaration" && node.declaration.async);
+			validateNonAsyncFunction(node.declaration);
 			let localName;
 			let isFunction = false;
 			let declName;
@@ -301,28 +306,6 @@ function transformServerActionServer(input, ast, options) {
 	});
 }
 
-//#endregion
-//#region src/plugins/utils.ts
-function evalValue(rawValue) {
-	const fn = new Function(`
-    var console, exports, global, module, process, require
-    return (\n${rawValue}\n)
-  `);
-	return fn();
-}
-function parseIdQuery(id) {
-	if (!id.includes("?")) return {
-		filename: id,
-		query: {}
-	};
-	const [filename, rawQuery] = id.split(`?`, 2);
-	const query = Object.fromEntries(new URLSearchParams(rawQuery));
-	return {
-		filename,
-		query
-	};
-}
-
 //#endregion
 //#region src/transforms/cjs.ts
 function transformCjsToEsm(code, ast) {
@@ -417,6 +400,58 @@ function extractPackageKey(id) {
 	return id;
 }
 
+//#endregion
+//#region src/plugins/utils.ts
+function evalValue(rawValue) {
+	const fn = new Function(`
+    var console, exports, global, module, process, require
+    return (\n${rawValue}\n)
+  `);
+	return fn();
+}
+function sortObject(o) {
+	return Object.fromEntries(Object.entries(o).sort(([a], [b]) => a.localeCompare(b)));
+}
+function withRollupError(ctx, f) {
+	function processError(e) {
+		if (e && typeof e === "object" && typeof e.pos === "number") return ctx.error(e, e.pos);
+		throw e;
+	}
+	return function(...args) {
+		try {
+			const result = f.apply(this, args);
+			if (result instanceof Promise) return result.catch((e) => processError(e));
+			return result;
+		} catch (e) {
+			processError(e);
+		}
+	};
+}
+function createVirtualPlugin(name, load) {
+	name = "virtual:" + name;
+	return {
+		name: `rsc:virtual-${name}`,
+		resolveId(source, _importer, _options) {
+			return source === name ? "\0" + name : void 0;
+		},
+		load(id, options) {
+			if (id === "\0" + name) return load.apply(this, [id, options]);
+		}
+	};
+}
+function normalizeRelativePath(s) {
+	s = normalizePath(s);
+	return s[0] === "." ? s : "./" + s;
+}
+function getEntrySource(config, name = "index") {
+	const input = config.build.rollupOptions.input;
+	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) {
+	return createHash("sha256").update(v).digest().toString("hex").slice(0, 12);
+}
+
 //#endregion
 //#region src/plugins/scan.ts
 const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g;
@@ -436,17 +471,103 @@ async function transformScanBuildStrip(code) {
 	return output;
 }
 
+//#endregion
+//#region src/plugins/validate-import.ts
+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
+					};
+				}
+			}
+		},
+		load(id) {
+			if (id.startsWith("\0virtual:vite-rsc/empty")) return `export {}`;
+		}
+	};
+}
+
+//#endregion
+//#region src/plugins/find-source-map-url.ts
+function vitePluginFindSourceMapURL() {
+	return [{
+		name: "rsc:findSourceMapURL",
+		apply: "serve",
+		configureServer(server) {
+			server.middlewares.use(async (req, res, next) => {
+				const url = new URL(req.url, `http://localhost`);
+				if (url.pathname === "/__vite_rsc_findSourceMapURL") {
+					let filename = url.searchParams.get("filename");
+					let environmentName = url.searchParams.get("environmentName");
+					try {
+						const map = await findSourceMapURL(server, filename, environmentName);
+						res.setHeader("content-type", "application/json");
+						if (!map) res.statusCode = 404;
+						res.end(JSON.stringify(map ?? {}));
+					} catch (e) {
+						next(e);
+					}
+					return;
+				}
+				next();
+			});
+		}
+	}];
+}
+async function findSourceMapURL(server, filename, environmentName) {
+	if (filename.startsWith("file://")) {
+		filename = fileURLToPath(filename);
+		if (fs.existsSync(filename)) {
+			const content = fs.readFileSync(filename, "utf-8");
+			return {
+				version: 3,
+				sources: [filename],
+				sourcesContent: [content],
+				mappings: "AAAA" + ";AACA".repeat(content.split("\n").length)
+			};
+		}
+		return;
+	}
+	let mod;
+	let map;
+	if (environmentName === "Server") {
+		mod = server.environments.rsc.moduleGraph.getModuleById(filename);
+		map = mod?.transformResult?.map;
+		if (map && map.mappings) map = {
+			...map,
+			mappings: ";;" + map.mappings
+		};
+	}
+	const base = server.config.base.slice(0, -1);
+	if (environmentName === "Client") try {
+		const url = new URL(filename).pathname.slice(base.length);
+		mod = server.environments.client.moduleGraph.urlToModuleMap.get(url);
+		map = mod?.transformResult?.map;
+	} catch (e) {}
+	if (mod && map) return {
+		...map,
+		sources: [base + mod.url]
+	};
+}
+
 //#endregion
 //#region src/plugin.ts
-let serverReferences = {};
-let server;
-let config;
-let rscBundle;
-let buildAssetsManifest;
-let isScanBuild = false;
 const BUILD_ASSETS_MANIFEST_NAME = "__vite_rsc_assets_manifest.js";
-let clientReferenceMetaMap = {};
-let serverResourcesMetaMap = {};
 const PKG_NAME = "@vitejs/plugin-rsc";
 const REACT_SERVER_DOM_NAME = `${PKG_NAME}/vendor/react-server-dom`;
 const VIRTUAL_ENTRIES = { browser: "virtual:vite-rsc/entry-browser" };
@@ -454,8 +575,22 @@ const require = createRequire(import.meta.url);
 function resolvePackage(name) {
 	return pathToFileURL(require.resolve(name)).href;
 }
+var RscPluginManager = class {
+	server;
+	config;
+	rscBundle;
+	buildAssetsManifest;
+	isScanBuild = false;
+	clientReferenceMetaMap = {};
+	serverReferenceMetaMap = {};
+	serverResourcesMetaMap = {};
+	stabilize() {
+		this.clientReferenceMetaMap = sortObject(this.clientReferenceMetaMap);
+		this.serverResourcesMetaMap = sortObject(this.serverResourcesMetaMap);
+	}
+};
 /** @experimental */
-function vitePluginRscMinimal(rscPluginOptions = {}) {
+function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginManager()) {
 	return [
 		{
 			name: "rsc:minimal",
@@ -463,12 +598,12 @@ function vitePluginRscMinimal(rscPluginOptions = {}) {
 			async config() {
 				await esModuleLexer.init;
 			},
-			configResolved(config_) {
-				config = config_;
+			configResolved(config) {
+				manager.config = config;
 				for (const e of Object.values(config.environments)) e.build.outDir = path.resolve(config.root, e.build.outDir);
 			},
 			configureServer(server_) {
-				server = server_;
+				manager.server = server_;
 			}
 		},
 		{
@@ -481,55 +616,54 @@ function vitePluginRscMinimal(rscPluginOptions = {}) {
 			}
 		},
 		...vitePluginRscCore(),
-		...vitePluginUseClient(rscPluginOptions),
-		...vitePluginUseServer(rscPluginOptions),
+		...vitePluginUseClient(rscPluginOptions, manager),
+		...vitePluginUseServer(rscPluginOptions, manager),
 		...vitePluginDefineEncryptionKey(rscPluginOptions)
 	];
 }
 function vitePluginRsc(rscPluginOptions = {}) {
+	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
 		if (!builder.environments.ssr?.config.build.rollupOptions.input) {
-			isScanBuild = true;
+			manager.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;
+			manager.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);
+			manager.stabilize();
 			await builder.build(builder.environments.client);
 			writeAssetsManifest(["rsc"]);
 			return;
 		}
-		isScanBuild = true;
+		manager.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;
+		manager.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);
+		manager.stabilize();
 		await builder.build(builder.environments.client);
 		await builder.build(builder.environments.ssr);
 		writeAssetsManifest(["ssr", "rsc"]);
 	};
 	function writeAssetsManifest(environmentNames) {
-		const assetsManifestCode = `export default ${serializeValueWithRuntime(buildAssetsManifest)}`;
+		const assetsManifestCode = `export default ${serializeValueWithRuntime(manager.buildAssetsManifest)}`;
 		for (const name of environmentNames) {
-			const manifestPath = path.join(config.environments[name].build.outDir, BUILD_ASSETS_MANIFEST_NAME);
+			const manifestPath = path.join(manager.config.environments[name].build.outDir, BUILD_ASSETS_MANIFEST_NAME);
 			fs.writeFileSync(manifestPath, assetsManifestCode);
 		}
 	}
 	return [
 		{
 			name: "rsc",
-			async config(config$1, env) {
+			async config(config, env) {
 				const result = await crawlFrameworkPkgs({
 					root: process.cwd(),
 					isBuild: env.command === "build",
@@ -553,7 +687,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					environments: {
 						client: {
 							build: {
-								outDir: config$1.environments?.client?.build?.outDir ?? "dist/client",
+								outDir: config.environments?.client?.build?.outDir ?? "dist/client",
 								rollupOptions: { input: rscPluginOptions.entries?.client && { index: rscPluginOptions.entries.client } }
 							},
 							optimizeDeps: {
@@ -563,7 +697,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						},
 						ssr: {
 							build: {
-								outDir: config$1.environments?.ssr?.build?.outDir ?? "dist/ssr",
+								outDir: config.environments?.ssr?.build?.outDir ?? "dist/ssr",
 								rollupOptions: { input: rscPluginOptions.entries?.ssr && { index: rscPluginOptions.entries.ssr } }
 							},
 							resolve: { noExternal },
@@ -581,7 +715,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						},
 						rsc: {
 							build: {
-								outDir: config$1.environments?.rsc?.build?.outDir ?? "dist/rsc",
+								outDir: config.environments?.rsc?.build?.outDir ?? "dist/rsc",
 								emitAssets: true,
 								rollupOptions: { input: rscPluginOptions.entries?.rsc && { index: rscPluginOptions.entries.rsc } }
 							},
@@ -610,7 +744,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				};
 			},
 			buildApp: rscPluginOptions.useBuildAppHook ? buildApp : void 0,
-			configureServer() {
+			configureServer(server) {
 				globalThis.__viteRscDevServer = server;
 				if (rscPluginOptions.disableServerHandler) return;
 				if (rscPluginOptions.serverHandler === false) return;
@@ -633,26 +767,26 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					});
 				};
 			},
-			async configurePreviewServer(server$1) {
+			async configurePreviewServer(server) {
 				if (rscPluginOptions.disableServerHandler) return;
 				if (rscPluginOptions.serverHandler === false) return;
 				const options = rscPluginOptions.serverHandler ?? {
 					environmentName: "rsc",
 					entryName: "index"
 				};
-				const entryFile = path.join(config.environments[options.environmentName].build.outDir, `${options.entryName}.js`);
+				const entryFile = path.join(manager.config.environments[options.environmentName].build.outDir, `${options.entryName}.js`);
 				const entry = pathToFileURL(entryFile).href;
 				const mod = await import(
 					/* @vite-ignore */
 					entry
 );
 				const handler = createRequestListener(mod.default);
-				server$1.middlewares.use((req, _res, next) => {
+				server.middlewares.use((req, _res, next) => {
 					delete req.headers["accept-encoding"];
 					next();
 				});
 				return () => {
-					server$1.middlewares.use(async (req, res, next) => {
+					server.middlewares.use(async (req, res, next) => {
 						try {
 							await handler(req, res);
 						} catch (e) {
@@ -667,11 +801,16 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				}
 				const ids = ctx.modules.map((mod) => mod.id).filter((v) => v !== null);
 				if (ids.length === 0) return;
+				if (this.environment.name === "rsc") {
+					for (const mod of ctx.modules) if (mod.type === "js" && mod.id && mod.id in manager.clientReferenceMetaMap) try {
+						await this.environment.transformRequest(mod.url);
+					} catch {}
+				}
 				function isInsideClientBoundary(mods) {
 					const visited = /* @__PURE__ */ new Set();
 					function recurse(mod) {
 						if (!mod.id) return false;
-						if (clientReferenceMetaMap[mod.id]) return true;
+						if (manager.clientReferenceMetaMap[mod.id]) return true;
 						if (visited.has(mod.id)) return false;
 						visited.add(mod.id);
 						for (const importer of mod.importers) if (recurse(importer)) return true;
@@ -688,7 +827,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						for (const mod of ctx.modules) if (mod.type === "js") try {
 							await this.environment.transformRequest(mod.url);
 						} catch (e) {
-							server.environments.client.hot.send({
+							manager.server.environments.client.hot.send({
 								type: "error",
 								err: prepareError(e)
 							});
@@ -721,6 +860,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			name: "rsc:load-environment-module",
 			async transform(code) {
 				if (!code.includes("import.meta.viteRsc.loadModule")) return;
+				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();
@@ -752,6 +892,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			},
 			renderChunk(code, chunk) {
 				if (!code.includes("__vite_rsc_load_module")) return;
+				const { config } = manager;
 				const s = new MagicString(code);
 				for (const match of code.matchAll(/['"]__vite_rsc_load_module:(\w+):(\w+):(\w+)['"]/dg)) {
 					const [fromEnv, toEnv, entryName] = match.slice(1);
@@ -769,12 +910,12 @@ function vitePluginRsc(rscPluginOptions = {}) {
 		{
 			name: "vite-rsc-load-module-dev-proxy",
 			apply: () => !!rscPluginOptions.loadModuleDevProxy,
-			configureServer(server$1) {
+			configureServer(server) {
 				async function createHandler(url) {
 					const { environmentName, entryName } = Object.fromEntries(url.searchParams);
 					assert(environmentName);
 					assert(entryName);
-					const environment = server$1.environments[environmentName];
+					const environment = server.environments[environmentName];
 					const source = getEntrySource(environment.config, entryName);
 					const resolvedEntry = await environment.pluginContainer.resolveId(source);
 					assert(resolvedEntry, `[vite-rsc] failed to resolve entry '${source}'`);
@@ -787,7 +928,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					} });
 					return createRpcServer(runnerProxy);
 				}
-				server$1.middlewares.use(async (req, res, next) => {
+				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 {
@@ -817,7 +958,7 @@ 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);
+					const entryUrl = assetsURL("@id/__x00__" + VIRTUAL_ENTRIES.browser, manager);
 					const manifest = {
 						bootstrapScriptContent: `import(${serializeValueWithRuntime(entryUrl)})`,
 						clientReferenceDeps: {}
@@ -826,12 +967,12 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				}
 			},
 			generateBundle(_options, bundle) {
-				if (this.environment.name === "rsc") rscBundle = bundle;
+				if (this.environment.name === "rsc") manager.rscBundle = bundle;
 				if (this.environment.name === "client") {
 					const filterAssets = rscPluginOptions.copyServerAssetsToClient ?? (() => true);
-					const rscBuildOptions = config.environments.rsc.build;
+					const rscBuildOptions = manager.config.environments.rsc.build;
 					const rscViteManifest = typeof rscBuildOptions.manifest === "string" ? rscBuildOptions.manifest : rscBuildOptions.manifest && ".vite/manifest.json";
-					for (const asset of Object.values(rscBundle)) {
+					for (const asset of Object.values(manager.rscBundle)) {
 						if (asset.fileName === rscViteManifest) continue;
 						if (asset.type === "asset" && filterAssets(asset.fileName)) this.emitFile({
 							type: "asset",
@@ -840,27 +981,27 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						});
 					}
 					const serverResources = {};
-					const rscAssetDeps = collectAssetDeps(rscBundle);
-					for (const [id, meta] of Object.entries(serverResourcesMetaMap)) serverResources[meta.key] = assetsURLOfDeps({
+					const rscAssetDeps = collectAssetDeps(manager.rscBundle);
+					for (const [id, meta] of Object.entries(manager.serverResourcesMetaMap)) serverResources[meta.key] = assetsURLOfDeps({
 						js: [],
 						css: rscAssetDeps[id]?.deps.css ?? []
-					});
+					}, manager);
 					const assetDeps = collectAssetDeps(bundle);
 					const entry = Object.values(assetDeps).find((v) => v.chunk.name === "index");
 					assert(entry);
-					const entryUrl = assetsURL(entry.chunk.fileName);
+					const entryUrl = assetsURL(entry.chunk.fileName, manager);
 					const clientReferenceDeps = {};
-					for (const [id, meta] of Object.entries(clientReferenceMetaMap)) {
+					for (const [id, meta] of Object.entries(manager.clientReferenceMetaMap)) {
 						const deps = assetDeps[id]?.deps ?? {
 							js: [],
 							css: []
 						};
-						clientReferenceDeps[meta.referenceKey] = assetsURLOfDeps(mergeAssetDeps(deps, entry.deps));
+						clientReferenceDeps[meta.referenceKey] = assetsURLOfDeps(mergeAssetDeps(deps, entry.deps), manager);
 					}
 					let bootstrapScriptContent;
 					if (typeof entryUrl === "string") bootstrapScriptContent = `import(${JSON.stringify(entryUrl)})`;
 					else bootstrapScriptContent = new RuntimeAsset(`"import(" + JSON.stringify(${entryUrl.runtime}) + ")"`);
-					buildAssetsManifest = {
+					manager.buildAssetsManifest = {
 						bootstrapScriptContent,
 						clientReferenceDeps,
 						serverResources
@@ -952,21 +1093,21 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
 				return "";
 			}
 		},
-		...vitePluginRscMinimal(rscPluginOptions),
+		...vitePluginRscMinimal(rscPluginOptions, manager),
 		...vitePluginFindSourceMapURL(),
-		...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
+		...vitePluginRscCss(rscPluginOptions, manager),
 		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
-		scanBuildStripPlugin(),
+		scanBuildStripPlugin({ manager }),
 		...cjsModuleRunnerPlugin()
 	];
 }
-function scanBuildStripPlugin() {
+function scanBuildStripPlugin({ manager }) {
 	return {
 		name: "rsc:scan-strip",
 		apply: "build",
 		enforce: "post",
 		async transform(code, _id, _options) {
-			if (!isScanBuild) return;
+			if (!manager.isScanBuild) return;
 			const output = await transformScanBuildStrip(code);
 			return {
 				code: output,
@@ -975,28 +1116,15 @@ function scanBuildStripPlugin() {
 		}
 	};
 }
-function normalizeRelativePath(s) {
-	s = normalizePath(s);
-	return s[0] === "." ? s : "./" + s;
-}
-function getEntrySource(config$1, name = "index") {
-	const input = config$1.build.rollupOptions.input;
-	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) {
-	return createHash("sha256").update(v).digest().toString("hex").slice(0, 12);
-}
-function vitePluginUseClient(useClientPluginOptions) {
+function vitePluginUseClient(useClientPluginOptions, manager) {
 	const packageSources = /* @__PURE__ */ new Map();
 	const bareImportRE = /^(?![a-zA-Z]:)[\w@](?!.*:\/\/)/;
 	const serverEnvironmentName = useClientPluginOptions.environment?.rsc ?? "rsc";
 	const browserEnvironmentName = useClientPluginOptions.environment?.browser ?? "client";
+	let optimizerMetadata;
 	function warnInoncistentClientOptimization(ctx, id) {
-		const { depsOptimizer } = server.environments.client;
-		if (depsOptimizer) {
-			for (const dep of Object.values(depsOptimizer.metadata.optimized)) if (dep.src === id) ctx.warn("client component dependency is inconsistently optimized. It's recommended to add the dependency to 'optimizeDeps.exclude'.");
-		}
+		id = normalizePath(path.relative(process.cwd(), id));
+		if (optimizerMetadata?.ids.includes(id)) ctx.warn("client component dependency is inconsistently optimized. It's recommended to add the dependency to 'optimizeDeps.exclude'.");
 	}
 	const debug$1 = createDebug("vite-rsc:use-client");
 	return [
@@ -1004,9 +1132,15 @@ function vitePluginUseClient(useClientPluginOptions) {
 			name: "rsc:use-client",
 			async transform(code, id) {
 				if (this.environment.name !== serverEnvironmentName) return;
-				if (!code.includes("use client")) return;
+				if (!code.includes("use client")) {
+					delete manager.clientReferenceMetaMap[id];
+					return;
+				}
 				const ast = await parseAstAsync(code);
-				if (!hasDirective(ast.body, "use client")) return;
+				if (!hasDirective(ast.body, "use client")) {
+					delete manager.clientReferenceMetaMap[id];
+					return;
+				}
 				let importId;
 				let referenceKey;
 				const packageSource = packageSources.get(id);
@@ -1024,11 +1158,11 @@ function vitePluginUseClient(useClientPluginOptions) {
 					referenceKey = hashString(packageSource);
 				}
 				else if (this.environment.mode === "dev") {
-					importId = normalizeViteImportAnalysisUrl(server.environments[browserEnvironmentName], id);
+					importId = normalizeViteImportAnalysisUrl(manager.server.environments[browserEnvironmentName], id);
 					referenceKey = importId;
 				} else {
 					importId = id;
-					referenceKey = hashString(normalizePath(path.relative(config.root, id)));
+					referenceKey = hashString(normalizePath(path.relative(manager.config.root, id)));
 				}
 				const transformDirectiveProxyExport_ = withRollupError(this, transformDirectiveProxyExport);
 				const result = transformDirectiveProxyExport_(ast, {
@@ -1043,7 +1177,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 				});
 				if (!result) return;
 				const { output, exportNames } = result;
-				clientReferenceMetaMap[id] = {
+				manager.clientReferenceMetaMap[id] = {
 					importId,
 					referenceKey,
 					packageSource,
@@ -1064,7 +1198,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 				map: null
 			};
 			let code = "";
-			for (const meta of Object.values(clientReferenceMetaMap)) {
+			for (const meta of Object.values(manager.clientReferenceMetaMap)) {
 				const key = JSON.stringify(meta.referenceKey);
 				const id = JSON.stringify(meta.importId);
 				const exports = meta.renderedExports.map((name) => name === "default" ? "default: _default" : name).sort();
@@ -1114,7 +1248,7 @@ function vitePluginUseClient(useClientPluginOptions) {
 				if (id.startsWith("\0virtual:vite-rsc/client-package-proxy/")) {
 					assert(this.environment.mode === "dev");
 					const source = id.slice(39);
-					const meta = Object.values(clientReferenceMetaMap).find((v) => v.packageSource === source);
+					const meta = Object.values(manager.clientReferenceMetaMap).find((v) => v.packageSource === source);
 					const exportNames = meta.exportNames;
 					return `export {${exportNames.join(",")}} from ${JSON.stringify(source)};\n`;
 				}
@@ -1122,13 +1256,61 @@ function vitePluginUseClient(useClientPluginOptions) {
 			generateBundle(_options, bundle) {
 				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];
+					const meta = manager.clientReferenceMetaMap[id];
 					if (meta) meta.renderedExports = mod.renderedExports;
 				}
 			}
-		}
+		},
+		...customOptimizerMetadataPlugin({ setMetadata: (metadata) => {
+			optimizerMetadata = metadata;
+		} })
 	];
 }
+function customOptimizerMetadataPlugin({ setMetadata }) {
+	const MEATADATA_FILE = "_metadata-rsc.json";
+	function optimizerPluginEsbuild() {
+		return {
+			name: "vite-rsc-metafile",
+			setup(build) {
+				build.onEnd((result) => {
+					if (!result.metafile?.inputs || !build.initialOptions.outdir) return;
+					const ids = Object.keys(result.metafile.inputs);
+					const metadata = { ids };
+					setMetadata(metadata);
+					fs.writeFileSync(path.join(build.initialOptions.outdir, MEATADATA_FILE), JSON.stringify(metadata, null, 2));
+				});
+			}
+		};
+	}
+	function optimizerPluginRolldown() {
+		return {
+			name: "vite-rsc-metafile",
+			writeBundle(options) {
+				assert(options.dir);
+				const ids = [...this.getModuleIds()].map((id) => path.relative(process.cwd(), id));
+				const metadata = { ids };
+				setMetadata(metadata);
+				fs.writeFileSync(path.join(options.dir, MEATADATA_FILE), JSON.stringify(metadata, null, 2));
+			}
+		};
+	}
+	return [{
+		name: "rsc:use-client:optimizer-metadata",
+		apply: "serve",
+		config() {
+			return { environments: { client: { optimizeDeps: "rolldownVersion" in vite ? { rolldownOptions: { plugins: [optimizerPluginRolldown()] } } : { esbuildOptions: { plugins: [optimizerPluginEsbuild()] } } } } };
+		},
+		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);
+			} catch (e) {
+				this.warn(`failed to load '${file}'`);
+			}
+		}
+	}];
+}
 function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 	let defineEncryptionKey;
 	let emitEncryptionKey = false;
@@ -1167,14 +1349,17 @@ function vitePluginDefineEncryptionKey(useServerPluginOptions) {
 		}
 	}];
 }
-function vitePluginUseServer(useServerPluginOptions) {
+function vitePluginUseServer(useServerPluginOptions, manager) {
 	const serverEnvironmentName = useServerPluginOptions.environment?.rsc ?? "rsc";
 	const browserEnvironmentName = useServerPluginOptions.environment?.browser ?? "client";
 	const debug$1 = createDebug("vite-rsc:use-server");
 	return [{
 		name: "rsc:use-server",
 		async transform(code, id) {
-			if (!code.includes("use server")) return;
+			if (!code.includes("use server")) {
+				delete manager.serverReferenceMetaMap[id];
+				return;
+			}
 			const ast = await parseAstAsync(code);
 			let normalizedId_;
 			const getNormalizedId = () => {
@@ -1183,22 +1368,30 @@ function vitePluginUseServer(useServerPluginOptions) {
 						debug$1(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
 						id = cleanUrl(id);
 					}
-					if (config.command === "build") normalizedId_ = hashString(path.relative(config.root, id));
-					else normalizedId_ = normalizeViteImportAnalysisUrl(server.environments[serverEnvironmentName], id);
+					if (manager.config.command === "build") normalizedId_ = hashString(path.relative(manager.config.root, id));
+					else normalizedId_ = normalizeViteImportAnalysisUrl(manager.server.environments[serverEnvironmentName], id);
 				}
 				return normalizedId_;
 			};
 			if (this.environment.name === serverEnvironmentName) {
 				const transformServerActionServer_ = withRollupError(this, transformServerActionServer);
 				const enableEncryption = useServerPluginOptions.enableActionEncryption ?? true;
-				const { output } = transformServerActionServer_(code, ast, {
+				const result = transformServerActionServer_(code, ast, {
 					runtime: (value, name) => `$$ReactServer.registerServerReference(${value}, ${JSON.stringify(getNormalizedId())}, ${JSON.stringify(name)})`,
 					rejectNonAsyncFunction: true,
 					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 output = result.output;
+				if (!result || !output.hasChanged()) {
+					delete manager.serverReferenceMetaMap[id];
+					return;
+				}
+				manager.serverReferenceMetaMap[id] = {
+					importId: id,
+					referenceKey: getNormalizedId(),
+					exportNames: "names" in result ? result.names : result.exportNames
+				};
 				const importSource = resolvePackage(`${PKG_NAME}/react/rsc`);
 				output.prepend(`import * as $$ReactServer from "${importSource}";\n`);
 				if (enableEncryption) {
@@ -1210,7 +1403,10 @@ function vitePluginUseServer(useServerPluginOptions) {
 					map: output.generateMap({ hires: "boundary" })
 				};
 			} else {
-				if (!hasDirective(ast.body, "use server")) return;
+				if (!hasDirective(ast.body, "use server")) {
+					delete manager.serverReferenceMetaMap[id];
+					return;
+				}
 				const transformDirectiveProxyExport_ = withRollupError(this, transformDirectiveProxyExport);
 				const result = transformDirectiveProxyExport_(ast, {
 					code,
@@ -1218,9 +1414,14 @@ function vitePluginUseServer(useServerPluginOptions) {
 					directive: "use server",
 					rejectNonAsyncFunction: true
 				});
+				if (!result) return;
 				const output = result?.output;
 				if (!output?.hasChanged()) return;
-				serverReferences[getNormalizedId()] = id;
+				manager.serverReferenceMetaMap[id] = {
+					importId: id,
+					referenceKey: getNormalizedId(),
+					exportNames: result.exportNames
+				};
 				const name = this.environment.name === browserEnvironmentName ? "browser" : "ssr";
 				const importSource = resolvePackage(`${PKG_NAME}/react/${name}`);
 				output.prepend(`import * as $$ReactClient from "${importSource}";\n`);
@@ -1235,44 +1436,25 @@ function vitePluginUseServer(useServerPluginOptions) {
 			code: `export {}`,
 			map: null
 		};
-		const code = generateDynamicImportCode(serverReferences);
+		let code = "";
+		for (const meta of Object.values(manager.serverReferenceMetaMap)) {
+			const key = JSON.stringify(meta.referenceKey);
+			const id = JSON.stringify(meta.importId);
+			const exports = meta.exportNames.map((name) => name === "default" ? "default: _default" : name).sort();
+			code += `
+  ${key}: async () => {
+    const {${exports}} = await import(${id});
+    return {${exports}};
+  },
+`;
+		}
+		code = `export default {${code}};\n`;
 		return {
 			code,
 			map: null
 		};
 	})];
 }
-function withRollupError(ctx, f) {
-	function processError(e) {
-		if (e && typeof e === "object" && typeof e.pos === "number") return ctx.error(e, e.pos);
-		throw e;
-	}
-	return function(...args) {
-		try {
-			const result = f.apply(this, args);
-			if (result instanceof Promise) return result.catch((e) => processError(e));
-			return result;
-		} catch (e) {
-			processError(e);
-		}
-	};
-}
-function createVirtualPlugin(name, load) {
-	name = "virtual:" + name;
-	return {
-		name: `rsc:virtual-${name}`,
-		resolveId(source, _importer, _options) {
-			return source === name ? "\0" + name : void 0;
-		},
-		load(id, options) {
-			if (id === "\0" + name) return load.apply(this, [id, options]);
-		}
-	};
-}
-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) {
@@ -1292,7 +1474,8 @@ function serializeValueWithRuntime(value) {
 	for (const [placeholder, runtime] of replacements) result = result.replace(`"${placeholder}"`, runtime);
 	return result;
 }
-function assetsURL(url) {
+function assetsURL(url, manager) {
+	const { config } = manager;
 	if (config.command === "build" && typeof config.experimental?.renderBuiltUrl === "function") {
 		const result = config.experimental.renderBuiltUrl(url, {
 			type: "asset",
@@ -1307,15 +1490,15 @@ function assetsURL(url) {
 	}
 	return config.base + url;
 }
-function assetsURLOfDeps(deps) {
+function assetsURLOfDeps(deps, manager) {
 	return {
 		js: deps.js.map((href) => {
 			assert(typeof href === "string");
-			return assetsURL(href);
+			return assetsURL(href, manager);
 		}),
 		css: deps.css.map((href) => {
 			assert(typeof href === "string");
-			return assetsURL(href);
+			return assetsURL(href, manager);
 		})
 	};
 }
@@ -1354,67 +1537,7 @@ function collectAssetDepsInner(fileName, bundle) {
 		css: [...new Set(css)]
 	};
 }
-function vitePluginFindSourceMapURL() {
-	return [{
-		name: "rsc:findSourceMapURL",
-		apply: "serve",
-		configureServer(server$1) {
-			server$1.middlewares.use(async (req, res, next) => {
-				const url = new URL(req.url, `http://localhost`);
-				if (url.pathname === "/__vite_rsc_findSourceMapURL") {
-					let filename = url.searchParams.get("filename");
-					let environmentName = url.searchParams.get("environmentName");
-					try {
-						const map = await findSourceMapURL(server$1, filename, environmentName);
-						res.setHeader("content-type", "application/json");
-						if (!map) res.statusCode = 404;
-						res.end(JSON.stringify(map ?? {}));
-					} catch (e) {
-						next(e);
-					}
-					return;
-				}
-				next();
-			});
-		}
-	}];
-}
-async function findSourceMapURL(server$1, filename, environmentName) {
-	if (filename.startsWith("file://")) {
-		filename = fileURLToPath(filename);
-		if (fs.existsSync(filename)) {
-			const content = fs.readFileSync(filename, "utf-8");
-			return {
-				version: 3,
-				sources: [filename],
-				sourcesContent: [content],
-				mappings: "AAAA" + ";AACA".repeat(content.split("\n").length)
-			};
-		}
-		return;
-	}
-	let mod;
-	let map;
-	if (environmentName === "Server") {
-		mod = server$1.environments.rsc.moduleGraph.getModuleById(filename);
-		map = mod?.transformResult?.map;
-		if (map && map.mappings) map = {
-			...map,
-			mappings: ";;" + map.mappings
-		};
-	}
-	const base = server$1.config.base.slice(0, -1);
-	if (environmentName === "Client") try {
-		const url = new URL(filename).pathname.slice(base.length);
-		mod = server$1.environments.client.moduleGraph.urlToModuleMap.get(url);
-		map = mod?.transformResult?.map;
-	} catch (e) {}
-	if (mod && map) return {
-		...map,
-		sources: [base + mod.url]
-	};
-}
-function vitePluginRscCss(rscCssOptions) {
+function vitePluginRscCss(rscCssOptions = {}, manager) {
 	function hasSpecialCssQuery(id) {
 		return /[?&](url|inline|raw)(\b|=|&|$)/.test(id);
 	}
@@ -1481,18 +1604,20 @@ function vitePluginRscCss(rscCssOptions) {
 			}
 		},
 		{
-			name: "rsc:css/dev-ssr-virtual",
+			name: "rsc:css-virtual",
 			resolveId(source) {
-				if (source.startsWith("virtual:vite-rsc/css/dev-ssr/")) return "\0" + source;
+				if (source.startsWith("virtual:vite-rsc/css?")) return "\0" + source;
 			},
 			async load(id) {
-				if (id.startsWith("\0virtual:vite-rsc/css/dev-ssr/")) {
-					id = id.slice(30);
+				const parsed = parseCssVirtual(id);
+				if (parsed?.type === "ssr") {
+					id = parsed.id;
+					const { server } = manager;
 					const mod = await server.environments.ssr.moduleGraph.getModuleByUrl(id);
 					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)));
+					const hrefs = result.hrefs.map((href) => assetsURL(href.slice(1), manager));
 					return `export default ${serializeValueWithRuntime(hrefs)}`;
 				}
 			}
@@ -1503,6 +1628,7 @@ function vitePluginRscCss(rscCssOptions) {
 				if (!code.includes("import.meta.viteRsc.loadCss")) return;
 				assert(this.environment.name === "rsc");
 				const output = new MagicString(code);
+				let importAdded = false;
 				for (const match of code.matchAll(/import\.meta\.viteRsc\.loadCss\(([\s\S]*?)\)/dg)) {
 					const [start, end] = match.indices[0];
 					const argCode = match[1].trim();
@@ -1517,7 +1643,10 @@ function vitePluginRscCss(rscCssOptions) {
 							continue;
 						}
 					}
-					const importId = `virtual:vite-rsc/importer-resources?importer=${encodeURIComponent(importer)}`;
+					const importId = toCssVirtual({
+						id: importer,
+						type: "rsc"
+					});
 					let replacement;
 					if (this.environment.mode === "dev") replacement = `__vite_rsc_react__.createElement(async () => {
               const __m = await import(${JSON.stringify(importId)});
@@ -1525,7 +1654,10 @@ function vitePluginRscCss(rscCssOptions) {
             })`;
 					else {
 						const hash = hashString(importId);
-						if (!code.includes(`__vite_rsc_importer_resources_${hash}`)) output.prepend(`import * as __vite_rsc_importer_resources_${hash} from ${JSON.stringify(importId)};`);
+						if (!importAdded && !code.includes(`__vite_rsc_importer_resources_${hash}`)) {
+							importAdded = true;
+							output.prepend(`import * as __vite_rsc_importer_resources_${hash} from ${JSON.stringify(importId)};`);
+						}
 						replacement = `__vite_rsc_react__.createElement(__vite_rsc_importer_resources_${hash}.Resources)`;
 					}
 					output.update(start, end, replacement);
@@ -1538,37 +1670,37 @@ function vitePluginRscCss(rscCssOptions) {
 					};
 				}
 			},
-			resolveId(source) {
-				if (source.startsWith("virtual:vite-rsc/importer-resources?importer=")) {
-					assert(this.environment.name === "rsc");
-					return "\0" + source;
-				}
-			},
 			load(id) {
-				if (id.startsWith("\0virtual:vite-rsc/importer-resources?importer=")) {
-					const importer = decodeURIComponent(parseIdQuery(id).query["importer"]);
+				const { server } = manager;
+				const parsed = parseCssVirtual(id);
+				if (parsed?.type === "rsc") {
+					assert(this.environment.name === "rsc");
+					const importer = parsed.id;
 					if (this.environment.mode === "dev") {
 						const result = collectCss(server.environments.rsc, importer);
 						const cssHrefs = result.hrefs.map((href) => href.slice(1));
-						const jsHrefs = ["@id/__x00__virtual:vite-rsc/importer-resources-browser?importer=" + encodeURIComponent(importer)];
+						const jsHrefs = [`@id/__x00__${toCssVirtual({
+							id: importer,
+							type: "rsc-browser"
+						})}`];
 						const deps = assetsURLOfDeps({
 							css: cssHrefs,
 							js: jsHrefs
-						});
-						return generateResourcesCode(serializeValueWithRuntime(deps));
+						}, manager);
+						return generateResourcesCode(serializeValueWithRuntime(deps), manager);
 					} else {
-						const key = normalizePath(path.relative(config.root, importer));
-						serverResourcesMetaMap[importer] = { key };
+						const key = normalizePath(path.relative(manager.config.root, importer));
+						manager.serverResourcesMetaMap[importer] = { key };
 						return `
               import __vite_rsc_assets_manifest__ from "virtual:vite-rsc/assets-manifest";
-              ${generateResourcesCode(`__vite_rsc_assets_manifest__.serverResources[${JSON.stringify(key)}]`)}
+              ${generateResourcesCode(`__vite_rsc_assets_manifest__.serverResources[${JSON.stringify(key)}]`, manager)}
             `;
 					}
 				}
-				if (id.startsWith("\0virtual:vite-rsc/importer-resources-browser?importer=")) {
+				if (parsed?.type === "rsc-browser") {
 					assert(this.environment.name === "client");
 					assert(this.environment.mode === "dev");
-					const importer = decodeURIComponent(parseIdQuery(id).query["importer"]);
+					const importer = parsed.id;
 					const result = collectCss(server.environments.rsc, importer);
 					let code = result.ids.map((id$1) => id$1.replace(/^\0/, "")).map((id$1) => `import ${JSON.stringify(id$1)};\n`).join("");
 					code += `if (import.meta.hot) { import.meta.hot.accept() }\n`;
@@ -1577,11 +1709,17 @@ function vitePluginRscCss(rscCssOptions) {
 			},
 			hotUpdate(ctx) {
 				if (this.environment.name === "rsc") {
+					const { server } = manager;
 					const mods = collectModuleDependents(ctx.modules);
 					for (const mod of mods) if (mod.id) {
-						const importer = encodeURIComponent(mod.id);
-						invalidteModuleById(server.environments.rsc, `\0virtual:vite-rsc/importer-resources?importer=${importer}`);
-						invalidteModuleById(server.environments.client, `\0virtual:vite-rsc/importer-resources-browser?importer=${importer}`);
+						invalidteModuleById(server.environments.rsc, `\0` + toCssVirtual({
+							id: mod.id,
+							type: "rsc"
+						}));
+						invalidteModuleById(server.environments.client, `\0` + toCssVirtual({
+							id: mod.id,
+							type: "rsc-browser"
+						}));
 					}
 				}
 			}
@@ -1621,7 +1759,7 @@ function collectModuleDependents(mods) {
 	for (const mod of mods) recurse(mod);
 	return [...visited];
 }
-function generateResourcesCode(depsCode) {
+function generateResourcesCode(depsCode, manager) {
 	const ResourcesFn = (React, deps, RemoveDuplicateServerCss) => {
 		return function Resources() {
 			return React.createElement(React.Fragment, null, [
@@ -1644,7 +1782,7 @@ function generateResourcesCode(depsCode) {
 	return `
 import __vite_rsc_react__ from "react";
 
-${config.command === "serve" ? `import RemoveDuplicateServerCss from "virtual:vite-rsc/remove-duplicate-server-css";` : `const RemoveDuplicateServerCss = undefined;`}
+${manager.config.command === "serve" ? `import RemoveDuplicateServerCss from "virtual:vite-rsc/remove-duplicate-server-css";` : `const RemoveDuplicateServerCss = undefined;`}
 
 export const Resources = (${ResourcesFn.toString()})(
   __vite_rsc_react__,
@@ -1681,59 +1819,6 @@ function __vite_rsc_wrap_css__(value, name) {
 		return { output: result.output };
 	}
 }
-/**
-* temporary workaround for
-* - https://github.com/cloudflare/workers-sdk/issues/9538 (fixed in @cloudflare/vite-plugin@1.8.0)
-* - https://github.com/vitejs/vite/pull/20077 (fixed in vite@7.0.0)
-*/
-function __fix_cloudflare() {
-	return {
-		name: "rsc:workaround-cloudflare",
-		enforce: "post",
-		config(config$1) {
-			const plugin = config$1.plugins.flat().find((p) => p && "name" in p && p.name === "vite-plugin-cloudflare");
-			const original = plugin.configResolved;
-			plugin.configResolved = function(...args) {
-				try {
-					return original.apply(this, args);
-				} catch (e) {}
-			};
-			config$1.environments.ssr.resolve.noExternal = true;
-			config$1.environments.rsc.resolve.noExternal = true;
-		}
-	};
-}
-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
-					};
-				}
-			}
-		},
-		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)));
-}
 
 //#endregion
-export { __fix_cloudflare, findSourceMapURL, transformHoistInlineDirective, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss, vitePluginRscMinimal };
+export { transformHoistInlineDirective, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };