@vitejs/plugin-rsc 0.5.10 → 0.5.12

package/README.md

@@ -224,11 +224,13 @@ The plugin provides an additional helper for multi environment interaction.
 
 #### `import.meta.viteRsc.loadModule`
 
-- Type: `(environmentName: "ssr" | "rsc", entryName: string) => Promise<T>`
+- Type: `(environmentName: "ssr" | "rsc", entryName?: string) => Promise<T>`
 
-This allows importing `ssr` environment module specified by `environments.ssr.build.rollupOptions.input[entryName]` inside `rsc` environment and vice versa.
+This allows importing `ssr` environment module specified by `environments.ssr.build.rollupOptions.input[entryName]` inside `rsc` environment and vice versa. When `entryName` is omitted, the function automatically uses the single entry from the target environment's `rollupOptions.input`.
 
-During development, by default, this API assumes both `rsc` and `ssr` environments execute under the main Vite process. When enabling `rsc({ loadModuleDevProxy: true })` plugin option, the loaded module is implemented as a proxy with `fetch`-based RPC to call in node environment on the main Vite process, which for example, allows `rsc` environment inside cloudflare workers to access `ssr` environment on the main Vite process. This proxy mechanism uses [turbo-stream](https://github.com/jacob-ebey/turbo-stream) for serializing data types beyond JSON, with custom encoders/decoders to additionally support `Request` and `Response` instances.
+During development, by default, this API assumes both `rsc` and `ssr` environments execute under the main Vite process as `RunnableDevEnvironment`. Internally, `loadModule` uses the global `__VITE_ENVIRONMENT_RUNNER_IMPORT__` function to import modules in the target environment (see [`__VITE_ENVIRONMENT_RUNNER_IMPORT__`](#__vite_environment_runner_import__) below).
+
+When enabling `rsc({ loadModuleDevProxy: true })` plugin option, the loaded module is implemented as a proxy with `fetch`-based RPC to call in node environment on the main Vite process, which for example, allows `rsc` environment inside cloudflare workers to access `ssr` environment on the main Vite process. This proxy mechanism uses [turbo-stream](https://github.com/jacob-ebey/turbo-stream) for serializing data types beyond JSON, with custom encoders/decoders to additionally support `Request` and `Response` instances.
 
 During production build, this API will be rewritten into a static import of the specified entry of other environment build and the modules are executed inside the same runtime.
 
@@ -327,6 +329,35 @@ import.meta.hot.on('rsc:update', async () => {
 })
 ```
 
+### Global API
+
+#### `__VITE_ENVIRONMENT_RUNNER_IMPORT__`
+
+- Type: `(environmentName: string, id: string) => Promise<any>`
+
+This global function provides a standardized way to import a module in a given environment during development. It is used internally by `import.meta.viteRsc.loadModule` to execute modules in the target environment.
+
+By default, the plugin sets this global to import via the environment's module runner:
+
+```js
+globalThis.__VITE_ENVIRONMENT_RUNNER_IMPORT__ = async (environmentName, id) => {
+  return server.environments[environmentName].runner.import(id)
+}
+```
+
+**Custom Environment Integration:**
+
+Frameworks with custom environment setups (e.g., environments running in separate workers or with custom module loading) can override this global to provide their own module import logic.
+
+```js
+// Custom logic to import module between multiple environments inside worker
+globalThis.__VITE_ENVIRONMENT_RUNNER_IMPORT__ = async (environmentName, id) => {
+  return myWorkerRunners[environmentname].import(id)
+}
+```
+
+This allows `import.meta.viteRsc.loadModule` to work seamlessly with different runtime configurations without requiring changes to user code.
+
 ## Plugin API
 
 ### `@vitejs/plugin-rsc`
@@ -519,7 +550,7 @@ Types for global API are defined in `@vitejs/plugin-rsc/types`. For example, you
 ```ts
 import.meta.viteRsc.loadModule
 //                  ^^^^^^^^^^
-// <T>(environmentName: string, entryName: string) => Promise<T>
+// <T>(environmentName: string, entryName?: string) => Promise<T>
 ```
 
 See also [Vite documentation](https://vite.dev/guide/api-hmr.html#intellisense-for-typescript) for `vite/client` types.

package/dist/{chunk-ezxmLbPQ.js → chunk-BFhhoFQb.js}

@@ -26,7 +26,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	value: mod,
 	enumerable: true
 }) : target, mod));
-var __toDynamicImportESM = (isNodeMode) => (mod) => __toESM(mod.default, isNodeMode);
 
 //#endregion
-export { __toDynamicImportESM as n, __commonJSMin as t };
+export { __toESM as n, __commonJSMin as t };

package/dist/{cjs-DHD_0drE.js → cjs-DH9Oa3zy.js}

@@ -1,5 +1,5 @@
-import { t as createDebug } from "./dist-BRSdGcl7.js";
-import { n as parseIdQuery } from "./shared-AtH_QTi7.js";
+import { t as createDebug } from "./dist-DZUJDIM2.js";
+import { n as parseIdQuery } from "./shared-Chot7h9j.js";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";

package/dist/core/browser.js

@@ -1,4 +1,4 @@
-import { n as memoize } from "../dist-BRSdGcl7.js";
+import { n as memoize } from "../dist-DZUJDIM2.js";
 import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-DEpnONZf.js";
 
 //#region src/core/browser.ts

package/dist/core/plugin.js

@@ -1,3 +1,3 @@
-import { t as vitePluginRscCore } from "../plugin-D1MQNdps.js";
+import { t as vitePluginRscCore } from "../plugin-B1AJWrMi.js";
 
 export { vitePluginRscCore as default };

package/dist/core/rsc.js

@@ -1,3 +1,3 @@
-import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-BRh4PjTs.js";
+import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-DRNoX2Q6.js";
 
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/core/ssr.js

@@ -1,4 +1,4 @@
-import { n as memoize } from "../dist-BRSdGcl7.js";
+import { n as memoize } from "../dist-DZUJDIM2.js";
 import { a as setInternalRequire, i as removeReferenceCacheTag } from "../shared-DEpnONZf.js";
 
 //#region src/core/ssr.ts

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./transforms-BcLQCXiC.js";
-import "./rpc-CRpYrgKq.js";
-import { r as vitePluginRsc, t as getPluginApi } from "./plugin-DNlyqBiD.js";
-import "./cjs-DHD_0drE.js";
+import "./cjs-DH9Oa3zy.js";
+import { r as vitePluginRsc, t as getPluginApi } from "./plugin-BY6tsuyx.js";
+import "./transforms-D4jDIHgD.js";
+import "./rpc-DbBe389F.js";
 
 export { vitePluginRsc as default, getPluginApi };

package/dist/{picocolors-BxaHL81J.js → picocolors-kt7Y18A3.js}

@@ -1,4 +1,4 @@
-import { t as __commonJSMin } from "./chunk-ezxmLbPQ.js";
+import { t as __commonJSMin } from "./chunk-BFhhoFQb.js";
 
 //#region ../../node_modules/.pnpm/picocolors@1.1.1/node_modules/picocolors/picocolors.js
 var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {

package/dist/{plugin-DNlyqBiD.js → plugin-BY6tsuyx.js}

@@ -1,26 +1,26 @@
-import { n as __toDynamicImportESM } from "./chunk-ezxmLbPQ.js";
-import { t as vitePluginRscCore } from "./plugin-D1MQNdps.js";
-import { t as createDebug } from "./dist-BRSdGcl7.js";
-import { a as hasDirective, n as transformDirectiveProxyExport, o as transformWrapExport, s as findDirectives, t as transformServerActionServer } from "./transforms-BcLQCXiC.js";
-import { o as generateEncryptionKey, s as toBase64 } from "./encryption-utils-6p8t4Xqm.js";
-import { n as createRpcServer } from "./rpc-CRpYrgKq.js";
-import { t as cjsModuleRunnerPlugin } from "./cjs-DHD_0drE.js";
-import { i as toCssVirtual, n as parseIdQuery, r as parseReferenceValidationVirtual, t as parseCssVirtual } from "./shared-AtH_QTi7.js";
+import { n as __toESM } from "./chunk-BFhhoFQb.js";
+import { t as createDebug } from "./dist-DZUJDIM2.js";
+import { t as vitePluginRscCore } from "./plugin-B1AJWrMi.js";
+import { t as cjsModuleRunnerPlugin } from "./cjs-DH9Oa3zy.js";
+import { i as toCssVirtual, n as parseIdQuery, r as parseReferenceValidationVirtual, t as parseCssVirtual } from "./shared-Chot7h9j.js";
+import { a as hasDirective, n as transformDirectiveProxyExport, o as transformWrapExport, s as findDirectives, t as transformServerActionServer } from "./transforms-D4jDIHgD.js";
+import { o as generateEncryptionKey, s as toBase64 } from "./encryption-utils-BPYvebX4.js";
+import { n as createRpcServer } from "./rpc-DbBe389F.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
 import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { toNodeHandler } from "srvx/node";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
+import { toNodeHandler } from "srvx/node";
+import { stripLiteral } from "strip-literal";
 import * as vite from "vite";
 import { defaultServerConditions, isCSSRequest, isFileLoadingAllowed, normalizePath, parseAstAsync } from "vite";
 import { crawlFrameworkPkgs } from "vitefu";
 import { walk } from "estree-walker";
 import { stripVTControlCharacters } from "node:util";
 import { createHash } from "node:crypto";
-import { stripLiteral } from "strip-literal";
 
 //#region src/plugins/vite-utils.ts
 const VALID_ID_PREFIX = `/@id/`;
@@ -92,6 +92,128 @@ function evalValue(rawValue) {
 }
 const directRequestRE = /(\?|&)direct=?(?:&|$)/;
 
+//#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 = slash(fileURLToPath(filename));
+		if (isFileLoadingAllowed(server.config, filename) && 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/plugins/resolved-id-proxy.ts
+const RESOLVED_ID_PROXY_PREFIX = "virtual:vite-rsc/resolved-id/";
+function toResolvedIdProxy(resolvedId) {
+	return RESOLVED_ID_PROXY_PREFIX + encodeURIComponent(resolvedId);
+}
+function withResolvedIdProxy(resolvedId) {
+	return resolvedId.startsWith("\0") ? toResolvedIdProxy(resolvedId) : resolvedId;
+}
+function fromResolvedIdProxy(source) {
+	if (!source.startsWith(RESOLVED_ID_PROXY_PREFIX)) return;
+	const clean = source.split("?")[0];
+	return decodeURIComponent(clean.slice(29));
+}
+/**
+* Vite plugin that resolves proxy import specifiers to the original resolved IDs.
+*/
+function vitePluginResolvedIdProxy() {
+	return {
+		name: "rsc:resolved-id-proxy",
+		resolveId: { handler(source) {
+			const originalId = fromResolvedIdProxy(source);
+			if (originalId !== void 0) return originalId;
+		} }
+	};
+}
+
+//#endregion
+//#region src/plugins/scan.ts
+function scanBuildStripPlugin({ manager }) {
+	return {
+		name: "rsc:scan-strip",
+		apply: "build",
+		enforce: "post",
+		async transform(code, _id, _options) {
+			if (!manager.isScanBuild) return;
+			return {
+				code: await transformScanBuildStrip(code),
+				map: { mappings: "" }
+			};
+		}
+	};
+}
+const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g;
+async function transformScanBuildStrip(code) {
+	const [imports] = esModuleLexer.parse(code);
+	let output = imports.map((e) => e.n && `import ${JSON.stringify(e.n)};\n`).filter(Boolean).join("");
+	if (importGlobRE.test(code)) {
+		walk(await parseAstAsync(code), { enter(node) {
+			if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.object.type === "MetaProperty" && node.callee.object.meta.type === "Identifier" && node.callee.object.meta.name === "import" && node.callee.object.property.type === "Identifier" && node.callee.object.property.name === "meta" && node.callee.property.type === "Identifier" && node.callee.property.name === "glob") {
+				const importMetaGlob = code.slice(node.start, node.end);
+				output += `console.log(${importMetaGlob});\n`;
+			}
+		} });
+		output += "";
+	}
+	return output;
+}
+
 //#endregion
 //#region src/plugins/utils.ts
 function sortObject(o) {
@@ -128,10 +250,27 @@ function normalizeRelativePath(s) {
 	s = normalizePath(s);
 	return s[0] === "." ? s : "./" + s;
 }
-function getEntrySource(config, name = "index") {
+function getEntrySource(config, name) {
 	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];
+	if (!name) return getFallbackRollupEntry(input).source;
+	if (typeof input === "object" && !Array.isArray(input) && name in input && typeof input[name] === "string") return input[name];
+	throw new Error(`[vite-rsc:getEntrySource] expected 'build.rollupOptions.input' to be an object with a '${name}' property that is a string, but got ${JSON.stringify(input)}`);
+}
+function getFallbackRollupEntry(input = {}) {
+	const inputEntries = Object.entries(normalizeRollupOpitonsInput(input));
+	if (inputEntries.length === 1) {
+		const [name, source] = inputEntries[0];
+		return {
+			name,
+			source
+		};
+	}
+	throw new Error(`[vite-rsc] cannot determine fallback entry name from multiple entries, please specify the entry name explicitly`);
+}
+function normalizeRollupOpitonsInput(input = {}) {
+	if (typeof input === "string") input = [input];
+	if (Array.isArray(input)) return Object.fromEntries(input.map((file) => [path.basename(file).slice(0, -path.extname(file).length), file]));
+	return input;
 }
 function hashString(v) {
 	return createHash("sha256").update(v).digest().toString("hex").slice(0, 12);
@@ -145,38 +284,6 @@ function getFetchHandlerExport(exports) {
 	throw new Error("Invalid server handler entry");
 }
 
-//#endregion
-//#region src/plugins/scan.ts
-function scanBuildStripPlugin({ manager }) {
-	return {
-		name: "rsc:scan-strip",
-		apply: "build",
-		enforce: "post",
-		async transform(code, _id, _options) {
-			if (!manager.isScanBuild) return;
-			return {
-				code: await transformScanBuildStrip(code),
-				map: { mappings: "" }
-			};
-		}
-	};
-}
-const importGlobRE = /\bimport\.meta\.glob(?:<\w+>)?\s*\(/g;
-async function transformScanBuildStrip(code) {
-	const [imports] = esModuleLexer.parse(code);
-	let output = imports.map((e) => e.n && `import ${JSON.stringify(e.n)};\n`).filter(Boolean).join("");
-	if (importGlobRE.test(code)) {
-		walk(await parseAstAsync(code), { enter(node) {
-			if (node.type === "CallExpression" && node.callee.type === "MemberExpression" && node.callee.object.type === "MetaProperty" && node.callee.object.meta.type === "Identifier" && node.callee.object.meta.name === "import" && node.callee.object.property.type === "Identifier" && node.callee.object.property.name === "meta" && node.callee.property.type === "Identifier" && node.callee.property.name === "glob") {
-				const importMetaGlob = code.slice(node.start, node.end);
-				output += `console.log(${importMetaGlob});\n`;
-			}
-		} });
-		output += "";
-	}
-	return output;
-}
-
 //#endregion
 //#region src/plugins/validate-import.ts
 function validateImportPlugin() {
@@ -256,69 +363,6 @@ function validateImportChain(chain, environmentName, root) {
 	throw error;
 }
 
-//#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 = slash(fileURLToPath(filename));
-		if (isFileLoadingAllowed(server.config, filename) && 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
 const isRolldownVite = "rolldownVersion" in vite;
@@ -400,13 +444,14 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 				}
 			} }
 		},
-		scanBuildStripPlugin({ manager })
+		scanBuildStripPlugin({ manager }),
+		vitePluginResolvedIdProxy()
 	];
 }
 function vitePluginRsc(rscPluginOptions = {}) {
 	const manager = new RscPluginManager();
 	const buildApp = async (builder) => {
-		const colors = await import("./picocolors-BxaHL81J.js").then(__toDynamicImportESM());
+		const colors = await import("./picocolors-kt7Y18A3.js").then((m) => /* @__PURE__ */ __toESM(m.default, 1));
 		const logStep = (msg) => {
 			builder.config.logger.info(colors.blue(msg));
 		};
@@ -554,7 +599,12 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				if (rscPluginOptions.useBuildAppHook) await buildApp(builder);
 			} },
 			configureServer(server) {
-				globalThis.__viteRscDevServer = server;
+				globalThis.__VITE_ENVIRONMENT_RUNNER_IMPORT__ = async function(environmentName, id) {
+					const environment$1 = server.environments[environmentName];
+					if (!environment$1) throw new Error(`[vite-rsc] unknown environment '${environmentName}'`);
+					if (!vite.isRunnableDevEnvironment(environment$1)) throw new Error(`[vite-rsc] environment '${environmentName}' is not runnable`);
+					return environment$1.runner.import(id);
+				};
 				const oldSend = server.environments.client.hot.send;
 				server.environments.client.hot.send = async function(...args) {
 					const e = args[0];
@@ -698,8 +748,16 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						const source = getEntrySource(environment.config, entryName);
 						const resolved = await environment.pluginContainer.resolveId(source);
 						assert(resolved, `[vite-rsc] failed to resolve entry '${source}'`);
-						replacement = `globalThis.__viteRscDevServer.environments[${JSON.stringify(environmentName)}].runner.import(${JSON.stringify(resolved.id)})`;
-					} else replacement = JSON.stringify(`__vite_rsc_load_module:${this.environment.name}:${environmentName}:${entryName}`);
+						replacement = `globalThis.__VITE_ENVIRONMENT_RUNNER_IMPORT__(${JSON.stringify(environmentName)}, ${JSON.stringify(resolved.id)})`;
+					} else {
+						const environment = manager.config.environments[environmentName];
+						const targetName = entryName || getFallbackRollupEntry(environment.build.rollupOptions.input).name;
+						replacement = JSON.stringify(`__vite_rsc_load_module_start__:` + JSON.stringify({
+							fromEnv: this.environment.name,
+							toEnv: environmentName,
+							targetFileName: `${targetName}.js`
+						}) + `:__vite_rsc_load_module_end__`);
+					}
 					const [start, end] = match.indices[0];
 					s.overwrite(start, end, replacement);
 				}
@@ -712,9 +770,10 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				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);
-					const importPath = normalizeRelativePath(path.relative(path.join(config.environments[fromEnv].build.outDir, chunk.fileName, ".."), path.join(config.environments[toEnv].build.outDir, `${entryName}.js`)));
+				for (const match of code.matchAll(/[`'"]__vite_rsc_load_module_start__:([\s\S]*?):__vite_rsc_load_module_end__[`'"]/dg)) {
+					const markerString = evalValue(match[0]);
+					const { fromEnv, toEnv, targetFileName } = JSON.parse(markerString.slice(31, -29));
+					const importPath = normalizeRelativePath(path.relative(path.join(config.environments[fromEnv].build.outDir, chunk.fileName, ".."), path.join(config.environments[toEnv].build.outDir, targetFileName)));
 					const replacement = `(import(${JSON.stringify(importPath)}))`;
 					const [start, end] = match.indices[0];
 					s.overwrite(start, end, replacement);
@@ -732,7 +791,6 @@ function vitePluginRsc(rscPluginOptions = {}) {
 				async function createHandler(url) {
 					const { environmentName, entryName } = Object.fromEntries(url.searchParams);
 					assert(environmentName);
-					assert(entryName);
 					const environment = server.environments[environmentName];
 					const source = getEntrySource(environment.config, entryName);
 					const resolvedEntry = await environment.pluginContainer.resolveId(source);
@@ -1032,7 +1090,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					};
 					if (manager.isScanBuild) {
 						let code$1 = ``;
-						for (const meta of Object.values(manager.clientReferenceMetaMap)) code$1 += `import ${JSON.stringify(meta.importId)};\n`;
+						for (const meta of Object.values(manager.clientReferenceMetaMap)) code$1 += `import ${JSON.stringify(withResolvedIdProxy(meta.importId))};\n`;
 						return {
 							code: code$1,
 							map: null
@@ -1075,7 +1133,7 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					for (const meta of metas) {
 						const exports = meta.renderedExports.map((name$1) => `${name$1}: import_${meta.referenceKey}.${name$1},\n`).sort().join("");
 						code += `
-              import * as import_${meta.referenceKey} from ${JSON.stringify(meta.importId)};
+              import * as import_${meta.referenceKey} from ${JSON.stringify(withResolvedIdProxy(meta.importId))};
               export const export_${meta.referenceKey} = {${exports}};
             `;
 					}

package/dist/plugin.d.ts

@@ -112,6 +112,9 @@ type PluginApi = {
 declare function getPluginApi(config: Pick<ResolvedConfig, "plugins">): PluginApi | undefined;
 /** @experimental */
 declare function vitePluginRscMinimal(rscPluginOptions?: RscPluginOptions, manager?: RscPluginManager): Plugin[];
+declare global {
+  function __VITE_ENVIRONMENT_RUNNER_IMPORT__(environmentName: string, id: string): Promise<any>;
+}
 declare function vitePluginRsc(rscPluginOptions?: RscPluginOptions): Plugin[];
 declare class RuntimeAsset {
   runtime: string;

package/dist/plugin.js

@@ -1,6 +1,6 @@
-import "./transforms-BcLQCXiC.js";
-import "./rpc-CRpYrgKq.js";
-import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-DNlyqBiD.js";
-import "./cjs-DHD_0drE.js";
+import "./cjs-DH9Oa3zy.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-BY6tsuyx.js";
+import "./transforms-D4jDIHgD.js";
+import "./rpc-DbBe389F.js";
 
 export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugins/cjs.js

@@ -1,3 +1,3 @@
-import { t as cjsModuleRunnerPlugin } from "../cjs-DHD_0drE.js";
+import { t as cjsModuleRunnerPlugin } from "../cjs-DH9Oa3zy.js";
 
 export { cjsModuleRunnerPlugin };

package/dist/react/rsc.js

@@ -1,4 +1,4 @@
-import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-BRh4PjTs.js";
+import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-DRNoX2Q6.js";
 import * as ReactClient from "@vitejs/plugin-rsc/vendor/react-server-dom/client.edge";
 import * as ReactServer from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
 

package/dist/{rsc-BRh4PjTs.js → rsc-DRNoX2Q6.js}

@@ -1,4 +1,4 @@
-import { i as tinyassert, n as memoize } from "./dist-BRSdGcl7.js";
+import { i as tinyassert, n as memoize } from "./dist-DZUJDIM2.js";
 import { a as setInternalRequire, i as removeReferenceCacheTag, n as SERVER_REFERENCE_PREFIX, r as createReferenceCacheTag, t as SERVER_DECODE_CLIENT_PREFIX } from "./shared-DEpnONZf.js";
 import * as ReactServer from "@vitejs/plugin-rsc/vendor/react-server-dom/server.edge";
 

package/dist/rsc.js

@@ -1,5 +1,5 @@
-import { a as toReferenceValidationVirtual } from "./shared-AtH_QTi7.js";
-import { a as setRequireModule, i as loadServerAction, r as createServerManifest, t as createClientManifest } from "./rsc-BRh4PjTs.js";
+import { a as toReferenceValidationVirtual } from "./shared-Chot7h9j.js";
+import { a as setRequireModule, i as loadServerAction, r as createServerManifest, t as createClientManifest } from "./rsc-DRNoX2Q6.js";
 import { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, registerClientReference, registerServerReference, renderToReadableStream } from "./react/rsc.js";
 import { decryptActionBoundArgs, encryptActionBoundArgs } from "./utils/encryption-runtime.js";
 import serverReferences from "virtual:vite-rsc/server-references";

package/dist/ssr.js

@@ -1,9 +1,9 @@
-import { a as toReferenceValidationVirtual, i as toCssVirtual } from "./shared-AtH_QTi7.js";
+import { a as toReferenceValidationVirtual, i as toCssVirtual } from "./shared-Chot7h9j.js";
 import { createServerConsumerManifest, setRequireModule } from "./core/ssr.js";
 import { callServer, createFromReadableStream, createServerReference, findSourceMapURL } from "./react/ssr.js";
 import * as clientReferences from "virtual:vite-rsc/client-references";
-import assetsManifest from "virtual:vite-rsc/assets-manifest";
 import * as ReactDOM from "react-dom";
+import assetsManifest from "virtual:vite-rsc/assets-manifest";
 
 //#region src/ssr.tsx
 initialize();

package/dist/transforms/index.js

@@ -1,3 +1,3 @@
-import { a as hasDirective, c as transformHoistInlineDirective, i as getExportNames, n as transformDirectiveProxyExport, o as transformWrapExport, r as transformProxyExport, s as findDirectives, t as transformServerActionServer } from "../transforms-BcLQCXiC.js";
+import { a as hasDirective, c as transformHoistInlineDirective, i as getExportNames, n as transformDirectiveProxyExport, o as transformWrapExport, r as transformProxyExport, s as findDirectives, t as transformServerActionServer } from "../transforms-D4jDIHgD.js";
 
 export { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/{transforms-BcLQCXiC.js → transforms-D4jDIHgD.js}

@@ -1,4 +1,4 @@
-import { i as tinyassert } from "./dist-BRSdGcl7.js";
+import { i as tinyassert } from "./dist-DZUJDIM2.js";
 import MagicString from "magic-string";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";

package/dist/utils/encryption-runtime.js

@@ -1,6 +1,6 @@
-import { r as once } from "../dist-BRSdGcl7.js";
-import { a as fromBase64, i as encryptBuffer, n as concatArrayStream, r as decryptBuffer, t as arrayToStream } from "../encryption-utils-6p8t4Xqm.js";
-import "../rsc-BRh4PjTs.js";
+import { r as once } from "../dist-DZUJDIM2.js";
+import { a as fromBase64, i as encryptBuffer, n as concatArrayStream, r as decryptBuffer, t as arrayToStream } from "../encryption-utils-BPYvebX4.js";
+import "../rsc-DRNoX2Q6.js";
 import { createFromReadableStream, renderToReadableStream } from "../react/rsc.js";
 import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 

package/dist/utils/rpc.js

@@ -1,3 +1,3 @@
-import { n as createRpcServer, t as createRpcClient } from "../rpc-CRpYrgKq.js";
+import { n as createRpcServer, t as createRpcClient } from "../rpc-DbBe389F.js";
 
 export { createRpcClient, createRpcServer };

package/package.json

@@ -1,21 +1,25 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
-    "vite",
-    "vite-plugin",
     "react",
     "react-server-components",
-    "rsc"
+    "rsc",
+    "vite",
+    "vite-plugin"
   ],
   "homepage": "https://github.com/vitejs/vite-plugin-react/tree/main/packages/plugin-rsc",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/vitejs/vite-plugin-react.git",
     "directory": "packages/plugin-rsc"
   },
-  "license": "MIT",
+  "files": [
+    "dist",
+    "types"
+  ],
   "type": "module",
   "exports": {
     "./package.json": "./package.json",
@@ -24,10 +28,6 @@
     "./transforms": "./dist/transforms/index.js",
     "./*": "./dist/*.js"
   },
-  "files": [
-    "dist",
-    "types"
-  ],
   "scripts": {
     "test": "vitest",
     "test-e2e": "playwright test --project=chromium",
@@ -53,8 +53,8 @@
     "@playwright/test": "^1.57.0",
     "@tsconfig/strictest": "^2.0.8",
     "@types/estree": "^1.0.8",
-    "@types/node": "^24.10.4",
-    "@types/react": "^19.2.7",
+    "@types/node": "^24.10.7",
+    "@types/react": "^19.2.8",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react": "workspace:*",
     "@vitejs/test-dep-cjs-and-esm": "./test-dep/cjs-and-esm",
@@ -63,7 +63,7 @@
     "react-dom": "^19.2.3",
     "react-server-dom-webpack": "^19.2.3",
     "tinyexec": "^1.0.2",
-    "tsdown": "^0.18.4"
+    "tsdown": "^0.19.0"
   },
   "peerDependencies": {
     "react": "*",

package/types/index.d.ts

@@ -2,7 +2,7 @@ declare global {
   interface ImportMeta {
     readonly viteRsc: {
       loadCss: (importer?: string) => import('react').ReactNode
-      loadModule: <T>(environmentName: string, entryName: string) => Promise<T>
+      loadModule: <T>(environmentName: string, entryName?: string) => Promise<T>
       loadBootstrapScriptContent: (entryName: string) => Promise<string>
     }
   }