@vitejs/plugin-rsc 0.4.11 → 0.4.12

package/README.md

@@ -130,7 +130,7 @@ export default defineConfig({
 - [`entry.rsc.tsx`](./examples/starter/src/framework/entry.rsc.tsx)
 
 ```tsx
-import * as ReactServer from '@vitejs/plugin-rsc/rsc' // re-export of react-server-dom/server.edge
+import * as ReactServer from '@vitejs/plugin-rsc/rsc' // re-export of react-server-dom/server.edge and client.edge
 
 // the plugin assumes `rsc` entry having default export of request handler
 export default async function handler(request: Request): Promise<Response> {
@@ -214,11 +214,12 @@ main();
 
 ### `@vitejs/plugin-rsc/rsc`
 
-This module re-exports RSC runtime API provided by `react-server-dom/server.edge`
+This module re-exports RSC runtime API provided by `react-server-dom/server.edge` and `react-server-dom/client.edge` such as:
 
 - `renderToReadableStream`: RSC serialization (React VDOM -> RSC stream)
 - `createFromReadableStream`: RSC deserialization (RSC stream -> React VDOM). This is also available on rsc environment itself. For example, it allows saving serailized RSC and deserializing it for later use.
-- `decodeAction/decodeReply/loadServerAction`: server function related...
+- `decodeAction/decodeReply/decodeFormState/loadServerAction/createTemporaryReferenceSet`
+- `encodeReply/createClientTemporaryReferenceSet`
 
 ### `@vitejs/plugin-rsc/ssr`
 

package/dist/index.d.ts

@@ -5,12 +5,13 @@ import { Program } from "estree";
 //#region src/transforms/hoist.d.ts
 declare function transformHoistInlineDirective(input: string, ast: Program, {
   runtime,
-  directive,
   rejectNonAsyncFunction,
   ...options
 }: {
-  runtime: (value: string, name: string) => string;
-  directive: string;
+  runtime: (value: string, name: string, meta: {
+    directiveMatch: RegExpMatchArray;
+  }) => string;
+  directive: string | RegExp;
   rejectNonAsyncFunction?: boolean;
   encode?: (value: string) => string;
   decode?: (value: string) => string;

package/dist/index.js

@@ -1,6 +1,6 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-BZEsXXjV.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-BvUB-eig.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-CcqBE-C4.js";

package/dist/{plugin-BZEsXXjV.js → plugin-BvUB-eig.js}

@@ -17,15 +17,10 @@ import { crawlFrameworkPkgs } from "vitefu";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";
 
-//#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/hoist.ts
-function transformHoistInlineDirective(input, ast, { runtime, directive, rejectNonAsyncFunction,...options }) {
+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();
@@ -33,7 +28,9 @@ function transformHoistInlineDirective(input, ast, { runtime, directive, rejectN
 	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" && hasDirective(node.body.body, directive)) {
+		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);
@@ -54,7 +51,7 @@ function transformHoistInlineDirective(input, ast, { runtime, directive, rejectN
 			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)}`;
+			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})`;
@@ -74,6 +71,13 @@ function transformHoistInlineDirective(input, ast, { runtime, directive, rejectN
 		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
@@ -197,6 +201,12 @@ function transformWrapExport(input, ast, options) {
 	};
 }
 
+//#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) {
@@ -391,6 +401,24 @@ function vitePluginRsc(rscPluginOptions = {}) {
 						sharedPlugins: true,
 						sharedConfigBuild: true,
 						async buildApp(builder) {
+							if (!builder.environments.ssr?.config.build.rollupOptions.input) {
+								isScanBuild = true;
+								builder.environments.rsc.config.build.write = false;
+								builder.environments.client.config.build.write = false;
+								await builder.build(builder.environments.rsc);
+								await builder.build(builder.environments.client);
+								isScanBuild = false;
+								builder.environments.rsc.config.build.write = true;
+								builder.environments.client.config.build.write = true;
+								await builder.build(builder.environments.rsc);
+								clientReferenceMetaMap = sortObject(clientReferenceMetaMap);
+								serverResourcesMetaMap = sortObject(serverResourcesMetaMap);
+								await builder.build(builder.environments.client);
+								const assetsManifestCode = `export default ${JSON.stringify(buildAssetsManifest, null, 2)}`;
+								const manifestPath = path.join(builder.environments.rsc.config.build.outDir, BUILD_ASSETS_MANIFEST_NAME);
+								fs.writeFileSync(manifestPath, assetsManifestCode);
+								return;
+							}
 							isScanBuild = true;
 							builder.environments.rsc.config.build.write = false;
 							builder.environments.ssr.config.build.write = false;

package/dist/plugin.js

@@ -1,6 +1,6 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-BZEsXXjV.js";
+import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-BvUB-eig.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
 import "./vite-utils-CcqBE-C4.js";

package/package.json

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