@vitejs/plugin-rsc 0.4.28 → 0.4.30

package/dist/{plugin-iKgvucKS.js → plugin-Bzocj-4a.js}

@@ -1,8 +1,10 @@
-import { createDebug, tinyassert } from "./dist-DiJnRA1C.js";
+import { createDebug } from "./dist-DiJnRA1C.js";
 import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
+import { hasDirective, transformDirectiveProxyExport, transformServerActionServer, transformWrapExport } from "./transforms-D1-2JfCh.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
-import { createRpcServer } from "./rpc-tGuLT8PD.js";
-import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-BWHxNw3Q.js";
+import { createRpcServer } from "./rpc-CUvSZurk.js";
+import { cjsModuleRunnerPlugin } from "./cjs-WQBk0zA_.js";
+import { parseCssVirtual, parseIdQuery, toCssVirtual } from "./shared-AvKUASD5.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
 import fs from "node:fs";
@@ -13,300 +15,11 @@ 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 { crawlFrameworkPkgs } from "vitefu";
 import { walk } from "estree-walker";
-import { analyze, extract_names } from "periscopic";
 import { stripVTControlCharacters } from "node:util";
 import { createHash } from "node:crypto";
 
-//#region src/transforms/hoist.ts
-function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunction,...options }) {
-	const output = new MagicString(input);
-	const directive = typeof options.directive === "string" ? exactRegex(options.directive) : options.directive;
-	walk(ast, { enter(node) {
-		if (node.type === "ExportAllDeclaration") this.remove();
-		if (node.type === "ExportNamedDeclaration" && !node.declaration) this.remove();
-	} });
-	const analyzed = analyze(ast);
-	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);
-			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);
-			tinyassert(scope);
-			const declName = node.type === "FunctionDeclaration" && node.id.name;
-			const originalName = declName || parent?.type === "VariableDeclarator" && parent.id.type === "Identifier" && parent.id.name || "anonymous_server_function";
-			const bindVars = [...scope.references].filter((ref) => {
-				if (ref === declName) return false;
-				const owner = scope.find_owner(ref);
-				return owner && owner !== scope && owner !== analyzed.scope;
-			});
-			let newParams = [...bindVars, ...node.params.map((n) => input.slice(n.start, n.end))].join(", ");
-			if (bindVars.length > 0 && options.decode) {
-				newParams = ["$$hoist_encoded", ...node.params.map((n) => input.slice(n.start, n.end))].join(", ");
-				output.appendLeft(node.body.body[0].start, `const [${bindVars.join(",")}] = ${options.decode("$$hoist_encoded")};\n`);
-			}
-			const newName = `$$hoist_${names.length}` + (originalName ? `_${originalName}` : "");
-			names.push(newName);
-			output.update(node.start, node.body.start, `\n;${options.noExport ? "" : "export "}${node.async ? "async " : ""}function ${newName}(${newParams}) `);
-			output.appendLeft(node.end, `;\n/* #__PURE__ */ Object.defineProperty(${newName}, "name", { value: ${JSON.stringify(originalName)} });\n`);
-			output.move(node.start, node.end, input.length);
-			let newCode = `/* #__PURE__ */ ${runtime(newName, newName, { directiveMatch: match })}`;
-			if (bindVars.length > 0) {
-				const bindArgs = options.encode ? options.encode("[" + bindVars.join(", ") + "]") : bindVars.join(", ");
-				newCode = `${newCode}.bind(null, ${bindArgs})`;
-			}
-			if (declName) {
-				newCode = `const ${declName} = ${newCode};`;
-				if (parent?.type === "ExportDefaultDeclaration") {
-					output.remove(parent.start, node.start);
-					newCode = `${newCode}\nexport default ${declName};`;
-				}
-			}
-			output.appendLeft(node.start, newCode);
-		}
-	} });
-	return {
-		output,
-		names
-	};
-}
-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;
-	}
-}
-
-//#endregion
-//#region src/transforms/wrap-export.ts
-function transformWrapExport(input, ast, options) {
-	const output = new MagicString(input);
-	const exportNames = [];
-	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) {
-		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.declaration);
-			const name = node.declaration.id.name;
-			wrapSimple(node.start, node.declaration.start, [{
-				name,
-				meta: {
-					isFunction: true,
-					declName: name
-				}
-			}]);
-		} else if (node.declaration.type === "VariableDeclaration") {
-			/**
-			* export const foo = 1, bar = 2
-			*/
-			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;
-			if (node.declaration.declarations.length === 1) {
-				const decl = node.declaration.declarations[0];
-				isFunction = decl.id.type === "Identifier" && (decl.init?.type === "ArrowFunctionExpression" || decl.init?.type === "FunctionExpression");
-			}
-			wrapSimple(node.start, node.declaration.start, names.map((name) => ({
-				name,
-				meta: {
-					isFunction,
-					declName: name
-				}
-			})));
-		} else node.declaration;
-		else if (node.source) {
-			/**
-			* export { foo, bar as car } from './foo'
-			*/
-			output.remove(node.start, node.end);
-			for (const spec of node.specifiers) {
-				tinyassert(spec.local.type === "Identifier");
-				tinyassert(spec.exported.type === "Identifier");
-				const name = spec.local.name;
-				toAppend.push(`import { ${name} as $$import_${name} } from ${node.source.raw}`);
-				wrapExport(`$$import_${name}`, spec.exported.name);
-			}
-		} else {
-			/**
-			* export { foo, bar as car }
-			*/
-			output.remove(node.start, node.end);
-			for (const spec of node.specifiers) {
-				tinyassert(spec.local.type === "Identifier");
-				tinyassert(spec.exported.type === "Identifier");
-				wrapExport(spec.local.name, spec.exported.name);
-			}
-		}
-		/**
-		* export * from './foo'
-		*/
-		if (!options.ignoreExportAllDeclaration && node.type === "ExportAllDeclaration") throw Object.assign(/* @__PURE__ */ new Error("unsupported ExportAllDeclaration"), { pos: node.start });
-		/**
-		* export default function foo() {}
-		* export default class Foo {}
-		* export default () => {}
-		*/
-		if (node.type === "ExportDefaultDeclaration") {
-			validateNonAsyncFunction(node.declaration);
-			let localName;
-			let isFunction = false;
-			let declName;
-			let defaultExportIdentifierName;
-			if ((node.declaration.type === "FunctionDeclaration" || node.declaration.type === "ClassDeclaration") && node.declaration.id) {
-				localName = node.declaration.id.name;
-				output.remove(node.start, node.declaration.start);
-				isFunction = node.declaration.type === "FunctionDeclaration";
-				declName = node.declaration.id.name;
-			} else {
-				localName = "$$default";
-				output.update(node.start, node.declaration.start, "const $$default = ");
-				if (node.declaration.type === "Identifier") defaultExportIdentifierName = node.declaration.name;
-			}
-			wrapExport(localName, "default", {
-				isFunction,
-				declName,
-				defaultExportIdentifierName
-			});
-		}
-	}
-	if (toAppend.length > 0) output.append([
-		"",
-		...toAppend,
-		""
-	].join(";\n"));
-	return {
-		exportNames,
-		output
-	};
-}
-
-//#endregion
-//#region src/transforms/utils.ts
-function hasDirective(body, directive) {
-	return !!body.find((stmt) => stmt.type === "ExpressionStatement" && stmt.expression.type === "Literal" && typeof stmt.expression.value === "string" && stmt.expression.value === directive);
-}
-
-//#endregion
-//#region src/transforms/proxy-export.ts
-function transformDirectiveProxyExport(ast, options) {
-	if (!hasDirective(ast.body, options.directive)) return;
-	return transformProxyExport(ast, options);
-}
-function transformProxyExport(ast, options) {
-	if (options.keep && typeof options.code !== "string") throw new Error("`keep` option requires `code`");
-	const output = new MagicString(options.code ?? " ".repeat(ast.end));
-	const exportNames = [];
-	function createExport(node, names) {
-		exportNames.push(...names);
-		const newCode = names.map((name) => (name === "default" ? `export default` : `export const ${name} =`) + ` /* #__PURE__ */ ${options.runtime(name)};\n`).join("");
-		output.update(node.start, node.end, newCode);
-	}
-	function validateNonAsyncFunction(node, ok) {
-		if (options.rejectNonAsyncFunction && !ok) 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);
-				createExport(node, [node.declaration.id.name]);
-			} else if (node.declaration.type === "VariableDeclaration") {
-				/**
-				* export const foo = 1, bar = 2
-				*/
-				validateNonAsyncFunction(node, node.declaration.declarations.every((decl) => decl.init?.type === "ArrowFunctionExpression" && decl.init.async));
-				if (options.keep && options.code) {
-					if (node.declaration.declarations.length === 1) {
-						const decl = node.declaration.declarations[0];
-						if (decl.id.type === "Identifier" && decl.init) {
-							const name = decl.id.name;
-							const value = options.code.slice(decl.init.start, decl.init.end);
-							const newCode = `export const ${name} = /* #__PURE__ */ ${options.runtime(name, { value })};`;
-							output.update(node.start, node.end, newCode);
-							exportNames.push(name);
-							continue;
-						}
-					}
-				}
-				const names = node.declaration.declarations.flatMap((decl) => extract_names(decl.id));
-				createExport(node, names);
-			} else node.declaration;
-			else {
-				/**
-				* export { foo, bar as car } from './foo'
-				* export { foo, bar as car }
-				*/
-				const names = [];
-				for (const spec of node.specifiers) {
-					tinyassert(spec.exported.type === "Identifier");
-					names.push(spec.exported.name);
-				}
-				createExport(node, names);
-			}
-			continue;
-		}
-		/**
-		* export * from './foo'
-		*/
-		if (!options.ignoreExportAllDeclaration && node.type === "ExportAllDeclaration") throw new Error("unsupported ExportAllDeclaration");
-		/**
-		* export default function foo() {}
-		* export default class Foo {}
-		* export default () => {}
-		*/
-		if (node.type === "ExportDefaultDeclaration") {
-			validateNonAsyncFunction(node, node.declaration.type === "Identifier" || node.declaration.type === "FunctionDeclaration" && node.declaration.async);
-			createExport(node, ["default"]);
-			continue;
-		}
-		if (options.keep) continue;
-		output.remove(node.start, node.end);
-	}
-	return {
-		exportNames,
-		output
-	};
-}
-
-//#endregion
-//#region src/transforms/server-action.ts
-function transformServerActionServer(input, ast, options) {
-	if (hasDirective(ast.body, "use server")) return transformWrapExport(input, ast, options);
-	return transformHoistInlineDirective(input, ast, {
-		...options,
-		directive: "use server"
-	});
-}
-
-//#endregion
 //#region src/plugins/vite-utils.ts
 const VALID_ID_PREFIX = `/@id/`;
 const NULL_BYTE_PLACEHOLDER = `__x00__`;
@@ -336,8 +49,7 @@ function slash(p) {
 const isWindows = typeof process !== "undefined" && process.platform === "win32";
 function injectQuery(url, queryToInject) {
 	const { file, postfix } = splitFileAndPostfix(url);
-	const normalizedFile = isWindows ? slash(file) : file;
-	return `${normalizedFile}?${queryToInject}${postfix[0] === "?" ? `&${postfix.slice(1)}` : postfix}`;
+	return `${isWindows ? slash(file) : file}?${queryToInject}${postfix[0] === "?" ? `&${postfix.slice(1)}` : postfix}`;
 }
 function normalizeResolvedIdToUrl(environment, url, resolved) {
 	const root = environment.config.root;
@@ -371,106 +83,12 @@ function cleanStack(stack) {
 	return stack.split(/\n/).filter((l) => /^\s*at/.test(l)).join("\n");
 }
 function evalValue(rawValue) {
-	const fn = new Function(`
+	return new Function(`
     var console, exports, global, module, process, require
     return (\n${rawValue}\n)
-  `);
-	return fn();
-}
-
-//#endregion
-//#region src/transforms/cjs.ts
-function transformCjsToEsm(code, ast) {
-	const output = new MagicString(code);
-	const analyzed = analyze(ast);
-	const parentNodes = [];
-	const hoistedCodes = [];
-	let hoistIndex = 0;
-	walk(ast, {
-		enter(node) {
-			parentNodes.push(node);
-			if (node.type === "CallExpression" && node.callee.type === "Identifier" && node.callee.name === "require" && node.arguments.length === 1) {
-				let isTopLevel = true;
-				for (const parent of parentNodes) {
-					if (parent.type === "FunctionExpression" || parent.type === "FunctionDeclaration" || parent.type === "ArrowFunctionExpression") isTopLevel = false;
-					const scope = analyzed.map.get(parent);
-					if (scope && scope.declarations.has("require")) return;
-				}
-				if (isTopLevel) {
-					output.update(node.start, node.callee.end, "(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});\n`);
-					output.update(node.start, node.end, hoisted);
-					hoistIndex++;
-				}
-			}
-		},
-		leave() {
-			parentNodes.pop();
-		}
-	});
-	for (const hoisted of hoistedCodes.reverse()) output.prepend(hoisted);
-	output.prepend(`const exports = {}; const module = { exports };\n`);
-	return { output };
-}
-
-//#endregion
-//#region src/plugins/cjs.ts
-const debug = createDebug("vite-rsc:cjs");
-function cjsModuleRunnerPlugin() {
-	const warnedPackages = /* @__PURE__ */ new Set();
-	return [{
-		name: "cjs-module-runner-transform",
-		apply: "serve",
-		applyToEnvironment: (env) => env.config.dev.moduleRunnerTransform,
-		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;
-				if (!/\.[cm]?js$/.test(id)) return;
-				if (id.endsWith(".mjs")) return;
-				if (id.endsWith(".js")) {
-					const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
-					if (pkgJsonPath) {
-						const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
-						if (pkgJson.type === "module") return;
-					}
-				}
-				const [, , , hasModuleSyntax] = esModuleLexer.parse(code);
-				if (hasModuleSyntax) return;
-				const packageKey = extractPackageKey(id);
-				if (!warnedPackages.has(packageKey)) {
-					debug(`non-optimized CJS dependency in '${this.environment.name}' environment: ${id}`);
-					warnedPackages.add(packageKey);
-				}
-				const ast = await parseAstAsync(code);
-				const result = transformCjsToEsm(code, ast);
-				const output = result.output;
-				output.append(`
-;__vite_ssr_exportAll__(module.exports);
-export default module.exports;
-`);
-				return {
-					code: output.toString(),
-					map: output.generateMap({ hires: "boundary" })
-				};
-			}
-		}
-	}];
-}
-function extractPackageKey(id) {
-	const yarnMatch = id.match(/\/.yarn\/cache\/([^/]+)/);
-	if (yarnMatch) return yarnMatch[1];
-	if (id.includes("/node_modules")) {
-		id = id.split("/node_modules/").at(-1);
-		let [x, y] = id.split("/");
-		if (x.startsWith("@")) return `${x}/${y}`;
-		return x;
-	}
-	return id;
+  `)();
 }
+const directRequestRE = /(\?|&)direct=?(?:&|$)/;
 
 //#endregion
 //#region src/plugins/utils.ts
@@ -516,6 +134,14 @@ function getEntrySource(config, name = "index") {
 function hashString(v) {
 	return createHash("sha256").update(v).digest().toString("hex").slice(0, 12);
 }
+function getFetchHandlerExport(exports) {
+	if ("default" in exports) {
+		const default_ = exports.default;
+		if (default_ && typeof default_ === "object" && "fetch" in default_ && typeof default_.fetch === "function") return default_.fetch;
+		if (typeof default_ === "function") return default_;
+	}
+	throw new Error("Invalid server handler entry");
+}
 
 //#endregion
 //#region src/plugins/scan.ts
@@ -526,9 +152,8 @@ function scanBuildStripPlugin({ manager }) {
 		enforce: "post",
 		async transform(code, _id, _options) {
 			if (!manager.isScanBuild) return;
-			const output = await transformScanBuildStrip(code);
 			return {
-				code: output,
+				code: await transformScanBuildStrip(code),
 				map: { mappings: "" }
 			};
 		}
@@ -676,8 +301,7 @@ var RscPluginManager = class {
 };
 /** @experimental */
 function getPluginApi(config) {
-	const plugin = config.plugins.find((p) => p.name === "rsc:minimal");
-	return plugin?.api;
+	return config.plugins.find((p) => p.name === "rsc:minimal")?.api;
 }
 /** @experimental */
 function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginManager()) {
@@ -791,6 +415,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						ssr: {
 							build: {
 								outDir: config.environments?.ssr?.build?.outDir ?? "dist/ssr",
+								copyPublicDir: false,
 								rollupOptions: { input: rscPluginOptions.entries?.ssr && { index: rscPluginOptions.entries.ssr } }
 							},
 							resolve: { noExternal },
@@ -810,6 +435,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						rsc: {
 							build: {
 								outDir: config.environments?.rsc?.build?.outDir ?? "dist/rsc",
+								copyPublicDir: false,
 								emitAssets: true,
 								rollupOptions: { input: rscPluginOptions.entries?.rsc && { index: rscPluginOptions.entries.rsc } }
 							},
@@ -875,8 +501,9 @@ function vitePluginRsc(rscPluginOptions = {}) {
 							const resolved = await environment.pluginContainer.resolveId(source);
 							assert(resolved, `[vite-rsc] failed to resolve server handler '${source}'`);
 							const mod = await environment.runner.import(resolved.id);
+							const fetchHandler = getFetchHandlerExport(mod);
 							req.url = req.originalUrl ?? req.url;
-							await createRequestListener(mod.default)(req, res);
+							await createRequestListener(fetchHandler)(req, res);
 						} catch (e) {
 							next(e);
 						}
@@ -891,12 +518,9 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					entryName: "index"
 				};
 				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);
+				const mod = await import(pathToFileURL(entryFile).href);
+				const fetchHandler = getFetchHandlerExport(mod);
+				const handler = createRequestListener(fetchHandler);
 				server.middlewares.use((req, _res, next) => {
 					delete req.headers["accept-encoding"];
 					next();
@@ -914,10 +538,9 @@ function vitePluginRsc(rscPluginOptions = {}) {
 			},
 			async hotUpdate(ctx) {
 				if (isCSSRequest(ctx.file)) {
-					if (this.environment.name === "client") return ctx.modules.filter((m) => !(m.id?.includes("?direct") && !m.isSelfAccepting));
+					if (this.environment.name === "client") return;
 				}
-				const ids = ctx.modules.map((mod) => mod.id).filter((v) => v !== null);
-				if (ids.length === 0) return;
+				if (ctx.modules.map((mod) => mod.id).filter((v) => v !== null).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);
@@ -957,9 +580,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						});
 					}
 					if (this.environment.name === "client") {
-						const env = ctx.server.environments.rsc;
-						const mod = env.moduleGraph.getModuleById(ctx.file);
-						if (mod) {
+						if (ctx.server.environments.rsc.moduleGraph.getModuleById(ctx.file)) {
 							for (const clientMod of ctx.modules) for (const importer of clientMod.importers) if (importer.id && isCSSRequest(importer.id)) await this.environment.reloadModule(importer);
 							return [];
 						}
@@ -1039,8 +660,7 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					const runnerProxy = new Proxy({}, { get(_target, p, _receiver) {
 						if (typeof p !== "string" || p === "then") return;
 						return async (...args) => {
-							const mod = await environment.runner.import(resolvedEntry.id);
-							return mod[p](...args);
+							return (await environment.runner.import(resolvedEntry.id))[p](...args);
 						};
 					} });
 					return createRpcServer(runnerProxy);
@@ -1167,8 +787,7 @@ export default assetsManifest.bootstrapScriptContent;
 		createVirtualPlugin(VIRTUAL_ENTRIES.browser.slice(8), async function() {
 			assert(this.environment.mode === "dev");
 			let code = "";
-			const resolved = await this.resolve("/@react-refresh");
-			if (resolved) code += `
+			if (await this.resolve("/@react-refresh")) code += `
 import RefreshRuntime from "/@react-refresh";
 RefreshRuntime.injectIntoGlobalHook(window);
 window.$RefreshReg$ = () => {};
@@ -1183,7 +802,7 @@ window.__vite_plugin_react_preamble_installed__ = true;
 const ssrCss = document.querySelectorAll("link[rel='stylesheet']");
 import.meta.hot.on("vite:beforeUpdate", () => {
   ssrCss.forEach(node => {
-    if (node.dataset.precedence?.startsWith("vite-rsc/")) {
+    if (node.dataset.precedence?.startsWith("vite-rsc/client-references")) {
       node.remove();
     }
   });
@@ -1226,7 +845,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 		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");
+	const debug = createDebug("vite-rsc:use-client");
 	return [
 		{
 			name: "rsc:use-client",
@@ -1245,7 +864,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 				let referenceKey;
 				const packageSource = packageSources.get(id);
 				if (!packageSource && this.environment.mode === "dev" && id.includes("/node_modules/")) {
-					debug$1(`internal client reference created through a package imported in '${this.environment.name}' environment: ${id}`);
+					debug(`internal client reference created through a package imported in '${this.environment.name}' environment: ${id}`);
 					id = cleanUrl(id);
 					warnInoncistentClientOptimization(this, id);
 					importId = `/@id/__x00__virtual:vite-rsc/client-in-server-package-proxy/${encodeURIComponent(id)}`;
@@ -1264,8 +883,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					importId = id;
 					referenceKey = hashString(manager.toRelativeId(id));
 				}
-				const transformDirectiveProxyExport_ = withRollupError(this, transformDirectiveProxyExport);
-				const result = transformDirectiveProxyExport_(ast, {
+				const result = withRollupError(this, transformDirectiveProxyExport)(ast, {
 					directive: "use client",
 					code,
 					keep: !!useClientPluginOptions.keepUseCientProxy,
@@ -1314,17 +932,17 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					let code = "";
 					manager.clientReferenceGroups = {};
 					for (const meta of Object.values(manager.clientReferenceMetaMap)) {
+						if (!meta.serverChunk) continue;
 						let name = useClientPluginOptions.clientChunks?.({
 							id: meta.importId,
 							normalizedId: manager.toRelativeId(meta.importId),
 							serverChunk: meta.serverChunk
 						}) ?? meta.serverChunk;
 						name = cleanUrl(name.replaceAll("..", "__"));
-						const group = manager.clientReferenceGroups[name] ??= [];
-						group.push(meta);
+						(manager.clientReferenceGroups[name] ??= []).push(meta);
 						meta.groupChunkId = `\0virtual:vite-rsc/client-references/group/${name}`;
 					}
-					debug$1("client-reference-groups", manager.clientReferenceGroups);
+					debug("client-reference-groups", manager.clientReferenceGroups);
 					for (const [name, metas] of Object.entries(manager.clientReferenceGroups)) {
 						const groupVirtual = `virtual:vite-rsc/client-references/group/${name}`;
 						for (const meta of metas) code += `\
@@ -1392,12 +1010,11 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 				if (id.startsWith("\0virtual:vite-rsc/client-package-proxy/")) {
 					assert(this.environment.mode === "dev");
 					const source = id.slice(39);
-					const meta = Object.values(manager.clientReferenceMetaMap).find((v) => v.packageSource === source);
-					const exportNames = meta.exportNames;
-					return `export {${exportNames.join(",")}} from ${JSON.stringify(source)};\n`;
+					return `export {${Object.values(manager.clientReferenceMetaMap).find((v) => v.packageSource === source).exportNames.join(",")}} from ${JSON.stringify(source)};\n`;
 				}
 			},
 			generateBundle(_options, bundle) {
+				if (manager.isScanBuild) return;
 				if (this.environment.name !== serverEnvironmentName) return;
 				for (const chunk of Object.values(bundle)) if (chunk.type === "chunk") {
 					const metas = [];
@@ -1432,8 +1049,7 @@ function customOptimizerMetadataPlugin({ setMetadata }) {
 			setup(build) {
 				build.onEnd((result) => {
 					if (!result.metafile?.inputs || !build.initialOptions.outdir) return;
-					const ids = Object.keys(result.metafile.inputs);
-					const metadata = { ids };
+					const metadata = { ids: Object.keys(result.metafile.inputs) };
 					setMetadata(metadata);
 					fs.writeFileSync(path.join(build.initialOptions.outdir, MEATADATA_FILE), JSON.stringify(metadata, null, 2));
 				});
@@ -1445,8 +1061,7 @@ function customOptimizerMetadataPlugin({ setMetadata }) {
 			name: "vite-rsc-metafile",
 			writeBundle(options) {
 				assert(options.dir);
-				const ids = [...this.getModuleIds()].map((id) => path.relative(process.cwd(), id));
-				const metadata = { ids };
+				const metadata = { ids: [...this.getModuleIds()].map((id) => path.relative(process.cwd(), id)) };
 				setMetadata(metadata);
 				fs.writeFileSync(path.join(options.dir, MEATADATA_FILE), JSON.stringify(metadata, null, 2));
 			}
@@ -1510,7 +1125,7 @@ function vitePluginDefineEncryptionKey(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");
+	const debug = createDebug("vite-rsc:use-server");
 	return [{
 		name: "rsc:use-server",
 		async transform(code, id) {
@@ -1523,7 +1138,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 			const getNormalizedId = () => {
 				if (!normalizedId_) {
 					if (this.environment.mode === "dev" && id.includes("/node_modules/")) {
-						debug$1(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
+						debug(`internal server reference created through a package imported in ${this.environment.name} environment: ${id}`);
 						id = cleanUrl(id);
 					}
 					if (manager.config.command === "build") normalizedId_ = hashString(manager.toRelativeId(id));
@@ -1565,8 +1180,7 @@ function vitePluginUseServer(useServerPluginOptions, manager) {
 					delete manager.serverReferenceMetaMap[id];
 					return;
 				}
-				const transformDirectiveProxyExport_ = withRollupError(this, transformDirectiveProxyExport);
-				const result = transformDirectiveProxyExport_(ast, {
+				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)})`,
 					directive: "use server",
@@ -1735,8 +1349,7 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 		if (options === false) 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;
+		if (!esModuleLexer.parse(code)[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));
 	}
 	return [
@@ -1761,6 +1374,19 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 				};
 			}
 		},
+		{
+			name: "rsc:rsc-css-self-accept",
+			apply: "serve",
+			transform: {
+				order: "post",
+				handler(_code, id, _options) {
+					if (this.environment.name === "client" && this.environment.mode === "dev" && isCSSRequest(id) && directRequestRE.test(id)) {
+						const mod = this.environment.moduleGraph.getModuleById(id);
+						if (mod && !mod.isSelfAccepting) mod.isSelfAccepting = true;
+					}
+				}
+			}
+		},
 		{
 			name: "rsc:css-virtual",
 			resolveId(source) {
@@ -1836,14 +1462,11 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
 					const importer = parsed.id;
 					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 jsHrefs = [`@id/__x00__${toCssVirtual({
-							id: importer,
-							type: "rsc-browser"
-						})}`];
 						const deps = assetsURLOfDeps({
 							css: cssHrefs,
-							js: jsHrefs
+							js: []
 						}, manager);
 						return generateResourcesCode(serializeValueWithRuntime(deps), manager);
 					} else {
@@ -1855,38 +1478,13 @@ function vitePluginRscCss(rscCssOptions = {}, manager) {
             `;
 					}
 				}
-				if (parsed?.type === "rsc-browser") {
-					assert(this.environment.name === "client");
-					assert(this.environment.mode === "dev");
-					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`;
-					return code;
-				}
-			},
-			hotUpdate(ctx) {
-				if (this.environment.name === "rsc") {
-					const { server } = manager;
-					const mods = collectModuleDependents(ctx.modules);
-					for (const mod of mods) if (mod.id) {
-						invalidteModuleById(server.environments.rsc, `\0` + toCssVirtual({
-							id: mod.id,
-							type: "rsc"
-						}));
-						invalidteModuleById(server.environments.client, `\0` + toCssVirtual({
-							id: mod.id,
-							type: "rsc-browser"
-						}));
-					}
-				}
 			}
 		},
 		createVirtualPlugin("vite-rsc/remove-duplicate-server-css", async function() {
 			assert.equal(this.environment.mode, "dev");
 			function removeFn() {
 				document.querySelectorAll("link[rel='stylesheet']").forEach((node) => {
-					if (node instanceof HTMLElement && node.dataset.precedence?.startsWith("vite-rsc/")) node.remove();
+					if (node instanceof HTMLElement && node.dataset.precedence?.startsWith("vite-rsc/client-reference")) node.remove();
 				});
 			}
 			return `\
@@ -1902,39 +1500,15 @@ export default function RemoveDuplicateServerCss() {
 		})
 	];
 }
-function invalidteModuleById(environment, id) {
-	const mod = environment.moduleGraph.getModuleById(id);
-	if (mod) environment.moduleGraph.invalidateModule(mod);
-	return mod;
-}
-function collectModuleDependents(mods) {
-	const visited = /* @__PURE__ */ new Set();
-	function recurse(mod) {
-		if (visited.has(mod)) return;
-		visited.add(mod);
-		for (const importer of mod.importers) recurse(importer);
-	}
-	for (const mod of mods) recurse(mod);
-	return [...visited];
-}
 function generateResourcesCode(depsCode, manager) {
 	const ResourcesFn = (React, deps, RemoveDuplicateServerCss) => {
 		return function Resources() {
-			return React.createElement(React.Fragment, null, [
-				...deps.css.map((href) => React.createElement("link", {
-					key: "css:" + href,
-					rel: "stylesheet",
-					precedence: "vite-rsc/importer-resources",
-					href
-				})),
-				...deps.js.map((href) => React.createElement("script", {
-					key: "js:" + href,
-					type: "module",
-					async: true,
-					src: href
-				})),
-				RemoveDuplicateServerCss && React.createElement(RemoveDuplicateServerCss, { key: "remove-duplicate-css" })
-			]);
+			return React.createElement(React.Fragment, null, [...deps.css.map((href) => React.createElement("link", {
+				key: "css:" + href,
+				rel: "stylesheet",
+				precedence: "vite-rsc/importer-resources",
+				href
+			})), RemoveDuplicateServerCss && React.createElement(RemoveDuplicateServerCss, { key: "remove-duplicate-css" })]);
 		};
 	};
 	return `
@@ -1979,4 +1553,4 @@ function __vite_rsc_wrap_css__(value, name) {
 }
 
 //#endregion
-export { getPluginApi, transformHoistInlineDirective, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };
+export { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal };