@vitejs/plugin-rsc 0.5.4 → 0.5.6

package/README.md

@@ -228,7 +228,7 @@ The plugin provides an additional helper for multi environment interaction.
 
 This allows importing `ssr` environment module specified by `environments.ssr.build.rollupOptions.input[entryName]` inside `rsc` environment and vice versa.
 
-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.
+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 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.
 

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

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

package/dist/core/rsc.js

@@ -1,5 +1,5 @@
 import "../dist-BRSdGcl7.js";
 import "../shared-DEpnONZf.js";
-import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-F60dNuzq.js";
+import { a as setRequireModule, i as loadServerAction, n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "../rsc-BwsRzIFM.js";
 
 export { createClientManifest, createServerDecodeClientManifest, createServerManifest, loadServerAction, setRequireModule };

package/dist/{encryption-runtime-B0Jz_4Y_.js → encryption-runtime-DlHpEnUc.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 { n as createFromReadableStream, u as renderToReadableStream } from "./rsc-DaS5-eC_.js";
+import { n as createFromReadableStream, u as renderToReadableStream } from "./rsc-BIM0wUrP.js";
 import encryptionKeySource from "virtual:vite-rsc/encryption-key";
 
 //#region src/utils/encryption-runtime.ts

package/dist/index.js

@@ -2,9 +2,9 @@ import "./plugin-D1MQNdps.js";
 import "./dist-BRSdGcl7.js";
 import "./transforms-BcLQCXiC.js";
 import "./encryption-utils-6p8t4Xqm.js";
-import "./rpc-DgBxsMKW.js";
-import { r as vitePluginRsc, t as getPluginApi } from "./plugin-yqduHnqG.js";
-import "./cjs-D5eQjp5l.js";
-import "./shared-BbMae1Gg.js";
+import "./rpc-CRpYrgKq.js";
+import { r as vitePluginRsc, t as getPluginApi } from "./plugin-BIsCR7Tu.js";
+import "./cjs-DHD_0drE.js";
+import "./shared-AtH_QTi7.js";
 
 export { vitePluginRsc as default, getPluginApi };

package/dist/{plugin-yqduHnqG.js → plugin-BIsCR7Tu.js}

@@ -3,9 +3,9 @@ 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-DgBxsMKW.js";
-import { t as cjsModuleRunnerPlugin } from "./cjs-D5eQjp5l.js";
-import { n as parseIdQuery, r as toCssVirtual, t as parseCssVirtual } from "./shared-BbMae1Gg.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 { createRequire } from "node:module";
 import assert from "node:assert";
 import fs from "node:fs";
@@ -383,6 +383,23 @@ function vitePluginRscMinimal(rscPluginOptions = {}, manager = new RscPluginMana
 		...vitePluginUseClient(rscPluginOptions, manager),
 		...vitePluginUseServer(rscPluginOptions, manager),
 		...vitePluginDefineEncryptionKey(rscPluginOptions),
+		{
+			name: "rsc:reference-validation",
+			apply: "serve",
+			load: { handler(id, _options) {
+				if (id.startsWith("\0virtual:vite-rsc/reference-validation?")) {
+					const parsed = parseReferenceValidationVirtual(id);
+					assert(parsed);
+					if (parsed.type === "client") {
+						if (Object.values(manager.clientReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id)) return `export {}`;
+					}
+					if (parsed.type === "server") {
+						if (Object.values(manager.serverReferenceMetaMap).find((meta) => meta.referenceKey === parsed.id)) return `export {}`;
+					}
+					this.error(`[vite-rsc] invalid ${parsed.type} reference '${parsed.id}'`);
+				}
+			} }
+		},
 		scanBuildStripPlugin({ manager })
 	];
 }

package/dist/plugin.js

@@ -2,9 +2,9 @@ import "./plugin-D1MQNdps.js";
 import "./dist-BRSdGcl7.js";
 import "./transforms-BcLQCXiC.js";
 import "./encryption-utils-6p8t4Xqm.js";
-import "./rpc-DgBxsMKW.js";
-import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-yqduHnqG.js";
-import "./cjs-D5eQjp5l.js";
-import "./shared-BbMae1Gg.js";
+import "./rpc-CRpYrgKq.js";
+import { i as vitePluginRscMinimal, n as transformRscCssExport, r as vitePluginRsc, t as getPluginApi } from "./plugin-BIsCR7Tu.js";
+import "./cjs-DHD_0drE.js";
+import "./shared-AtH_QTi7.js";
 
 export { vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugins/cjs.js

@@ -1,5 +1,5 @@
 import "../dist-BRSdGcl7.js";
-import { t as cjsModuleRunnerPlugin } from "../cjs-D5eQjp5l.js";
-import "../shared-BbMae1Gg.js";
+import { t as cjsModuleRunnerPlugin } from "../cjs-DHD_0drE.js";
+import "../shared-AtH_QTi7.js";
 
 export { cjsModuleRunnerPlugin };

package/dist/react/rsc.js

@@ -1,6 +1,6 @@
 import "../dist-BRSdGcl7.js";
 import "../shared-DEpnONZf.js";
-import { a as setRequireModule, i as loadServerAction } from "../rsc-F60dNuzq.js";
-import { a as decodeFormState, c as registerClientReference, i as decodeAction, l as registerServerReference, n as createFromReadableStream, o as decodeReply, r as createTemporaryReferenceSet, s as encodeReply, t as createClientTemporaryReferenceSet, u as renderToReadableStream } from "../rsc-DaS5-eC_.js";
+import { a as setRequireModule, i as loadServerAction } from "../rsc-BwsRzIFM.js";
+import { a as decodeFormState, c as registerClientReference, i as decodeAction, l as registerServerReference, n as createFromReadableStream, o as decodeReply, r as createTemporaryReferenceSet, s as encodeReply, t as createClientTemporaryReferenceSet, u as renderToReadableStream } from "../rsc-BIM0wUrP.js";
 
 export { createClientTemporaryReferenceSet, createFromReadableStream, createTemporaryReferenceSet, decodeAction, decodeFormState, decodeReply, encodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream, setRequireModule };

package/dist/{rpc-DgBxsMKW.js → rpc-CRpYrgKq.js}

@@ -1,10 +1,49 @@
 import { decode, encode } from "turbo-stream";
 
 //#region src/utils/rpc.ts
+const decodePlugins = [(type, ...rest) => {
+	switch (type) {
+		case "Request": {
+			const [method, url, headers, body] = rest;
+			return { value: new Request(url, {
+				body,
+				headers,
+				method,
+				duplex: body ? "half" : void 0
+			}) };
+		}
+		case "Response": {
+			const [status, statusText, headers, body] = rest;
+			return { value: new Response(body, {
+				headers,
+				status,
+				statusText
+			}) };
+		}
+	}
+	return false;
+}];
+const encodePlugins = [(obj) => {
+	if (obj instanceof Request) return [
+		"Request",
+		obj.method,
+		obj.url,
+		Array.from(obj.headers),
+		obj.body
+	];
+	if (obj instanceof Response) return [
+		"Response",
+		obj.status,
+		obj.statusText,
+		Array.from(obj.headers),
+		obj.body
+	];
+	return false;
+}];
 function createRpcServer(handlers) {
 	return async (request) => {
 		if (!request.body) throw new Error(`loadModuleDevProxy error: missing request body`);
-		const reqPayload = await decode(request.body.pipeThrough(new TextDecoderStream()));
+		const reqPayload = await decode(request.body.pipeThrough(new TextDecoderStream()), { plugins: decodePlugins });
 		const handler = handlers[reqPayload.method];
 		if (!handler) throw new Error(`loadModuleDevProxy error: unknown method ${reqPayload.method}`);
 		const resPayload = {
@@ -17,7 +56,10 @@ function createRpcServer(handlers) {
 			resPayload.ok = false;
 			resPayload.data = e;
 		}
-		return new Response(encode(resPayload));
+		return new Response(encode(resPayload, {
+			plugins: encodePlugins,
+			redactErrors: false
+		}));
 	};
 }
 function createRpcClient(options) {
@@ -25,6 +67,9 @@ function createRpcClient(options) {
 		const body = encode({
 			method,
 			args
+		}, {
+			plugins: encodePlugins,
+			redactErrors: false
 		}).pipeThrough(new TextEncoderStream());
 		const res = await fetch(options.endpoint, {
 			method: "POST",
@@ -32,7 +77,7 @@ function createRpcClient(options) {
 			duplex: "half"
 		});
 		if (!res.ok || !res.body) throw new Error(`loadModuleDevProxy error: ${res.status} ${res.statusText}`);
-		const resPayload = await decode(res.body.pipeThrough(new TextDecoderStream()));
+		const resPayload = await decode(res.body.pipeThrough(new TextDecoderStream()), { plugins: decodePlugins });
 		if (!resPayload.ok) throw resPayload.data;
 		return resPayload.data;
 	}

package/dist/{rsc-DaS5-eC_.js → rsc-BIM0wUrP.js}

@@ -1,4 +1,4 @@
-import { n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "./rsc-F60dNuzq.js";
+import { n as createServerDecodeClientManifest, r as createServerManifest, t as createClientManifest } from "./rsc-BwsRzIFM.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-F60dNuzq.js → rsc-BwsRzIFM.js}

@@ -21,17 +21,11 @@ function setRequireModule(options) {
 					throw new Error(`Unexpectedly client reference export '${name}' is called on server`);
 				}, id, name);
 			};
-			return new Proxy(target, {
-				get(_target, name, _receiver) {
-					if (typeof name !== "string" || name === "then") return;
-					return getOrCreateClientReference(name);
-				},
-				getOwnPropertyDescriptor(_target, name) {
-					if (typeof name !== "string" || name === "then") return Reflect.getOwnPropertyDescriptor(target, name);
-					getOrCreateClientReference(name);
-					return Reflect.getOwnPropertyDescriptor(target, name);
-				}
-			});
+			return new Proxy(target, { getOwnPropertyDescriptor(_target, name) {
+				if (typeof name !== "string" || name === "then") return Reflect.getOwnPropertyDescriptor(target, name);
+				getOrCreateClientReference(name);
+				return Reflect.getOwnPropertyDescriptor(target, name);
+			} });
 		}
 		return requireModule(id);
 	});

package/dist/rsc.js

@@ -1,20 +1,29 @@
 import "./dist-BRSdGcl7.js";
 import "./encryption-utils-6p8t4Xqm.js";
+import { a as toReferenceValidationVirtual } from "./shared-AtH_QTi7.js";
 import "./shared-DEpnONZf.js";
-import { a as setRequireModule, i as loadServerAction, r as createServerManifest, t as createClientManifest } from "./rsc-F60dNuzq.js";
-import { a as decodeFormState, c as registerClientReference, i as decodeAction, l as registerServerReference, n as createFromReadableStream, o as decodeReply, r as createTemporaryReferenceSet, s as encodeReply, t as createClientTemporaryReferenceSet, u as renderToReadableStream } from "./rsc-DaS5-eC_.js";
-import { n as encryptActionBoundArgs, t as decryptActionBoundArgs } from "./encryption-runtime-B0Jz_4Y_.js";
+import { a as setRequireModule, i as loadServerAction, r as createServerManifest, t as createClientManifest } from "./rsc-BwsRzIFM.js";
+import { a as decodeFormState, c as registerClientReference, i as decodeAction, l as registerServerReference, n as createFromReadableStream, o as decodeReply, r as createTemporaryReferenceSet, s as encodeReply, t as createClientTemporaryReferenceSet, u as renderToReadableStream } from "./rsc-BIM0wUrP.js";
+import { n as encryptActionBoundArgs, t as decryptActionBoundArgs } from "./encryption-runtime-DlHpEnUc.js";
 import serverReferences from "virtual:vite-rsc/server-references";
 
 //#region src/rsc.tsx
 initialize();
 function initialize() {
 	setRequireModule({ load: async (id) => {
-		if (!import.meta.env.__vite_rsc_build__) return import(
-			/* @vite-ignore */
-			id
+		if (!import.meta.env.__vite_rsc_build__) {
+			await import(
+				/* @vite-ignore */
+				"/@id/__x00__" + toReferenceValidationVirtual({
+					id,
+					type: "server"
+				})
 );
-		else {
+			return import(
+				/* @vite-ignore */
+				id
+);
+		} else {
 			const import_ = serverReferences[id];
 			if (!import_) throw new Error(`server reference not found '${id}'`);
 			return import_();

package/dist/{shared-BbMae1Gg.js → shared-AtH_QTi7.js}

@@ -16,6 +16,12 @@ function parseIdQuery(id) {
 		query: Object.fromEntries(new URLSearchParams(rawQuery))
 	};
 }
+function toReferenceValidationVirtual({ id, type }) {
+	return `virtual:vite-rsc/reference-validation?type=${type}&id=${encodeURIComponent(id)}&lang.js`;
+}
+function parseReferenceValidationVirtual(id) {
+	if (id.startsWith("\0virtual:vite-rsc/reference-validation?")) return parseIdQuery(id).query;
+}
 
 //#endregion
-export { parseIdQuery as n, toCssVirtual as r, parseCssVirtual as t };
+export { toReferenceValidationVirtual as a, toCssVirtual as i, parseIdQuery as n, parseReferenceValidationVirtual as r, parseCssVirtual as t };

package/dist/ssr.js

@@ -1,5 +1,5 @@
 import "./dist-BRSdGcl7.js";
-import { r as toCssVirtual } from "./shared-BbMae1Gg.js";
+import { a as toReferenceValidationVirtual, i as toCssVirtual } from "./shared-AtH_QTi7.js";
 import "./shared-DEpnONZf.js";
 import { n as setRequireModule, t as createServerConsumerManifest } from "./ssr-CDPTWY93.js";
 import { i as findSourceMapURL, n as createFromReadableStream, r as createServerReference, t as callServer } from "./ssr-B-bLmlbm.js";
@@ -11,20 +11,28 @@ import * as ReactDOM from "react-dom";
 initialize();
 function initialize() {
 	setRequireModule({ load: async (id) => {
-		if (!import.meta.env.__vite_rsc_build__) return wrapResourceProxy(await import(
-			/* @vite-ignore */
-			id
-), {
-			js: [],
-			css: (await import(
+		if (!import.meta.env.__vite_rsc_build__) {
+			await import(
 				/* @vite-ignore */
-				"/@id/__x00__" + toCssVirtual({
+				"/@id/__x00__" + toReferenceValidationVirtual({
 					id,
-					type: "ssr"
+					type: "client"
 				})
+);
+			return wrapResourceProxy(await import(
+				/* @vite-ignore */
+				id
+), {
+				js: [],
+				css: (await import(
+					/* @vite-ignore */
+					"/@id/__x00__" + toCssVirtual({
+						id,
+						type: "ssr"
+					})
 )).default
-		});
-		else {
+			});
+		} else {
 			const import_ = clientReferences.default[id];
 			if (!import_) throw new Error(`client reference not found '${id}'`);
 			const deps = assetsManifest.clientReferenceDeps[id];

package/dist/utils/encryption-runtime.js

@@ -1,8 +1,8 @@
 import "../dist-BRSdGcl7.js";
 import "../encryption-utils-6p8t4Xqm.js";
 import "../shared-DEpnONZf.js";
-import "../rsc-F60dNuzq.js";
-import "../rsc-DaS5-eC_.js";
-import { n as encryptActionBoundArgs, t as decryptActionBoundArgs } from "../encryption-runtime-B0Jz_4Y_.js";
+import "../rsc-BwsRzIFM.js";
+import "../rsc-BIM0wUrP.js";
+import { n as encryptActionBoundArgs, t as decryptActionBoundArgs } from "../encryption-runtime-DlHpEnUc.js";
 
 export { decryptActionBoundArgs, encryptActionBoundArgs };

package/dist/utils/rpc.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.5.4",
+  "version": "0.5.6",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",