@vitejs/plugin-rsc 0.4.13 → 0.4.15

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { RscPluginOptions, vitePluginRsc } from "./plugin-CCrsoChj.js";
+import { RscPluginOptions, vitePluginRsc } from "./plugin-DXIhXGMa.js";
 import MagicString from "magic-string";
 import { Program } from "estree";
 

package/dist/index.js

@@ -1,8 +1,8 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-DgH7V82E.js";
+import { transformHoistInlineDirective, vitePluginRsc } from "./plugin-_STtCzuL.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
-import "./vite-utils-CcqBE-C4.js";
+import "./vite-utils-Vzd7cqfv.js";
 
 export { vitePluginRsc as default, transformHoistInlineDirective };

package/dist/{plugin-CCrsoChj.d.ts → plugin-DXIhXGMa.d.ts}

@@ -31,18 +31,30 @@ type RscPluginOptions = {
   ignoredPackageWarnings?: (string | RegExp)[];
   /**
   * This option allows customizing how client build copies assets from server build.
-  * By default, all assets are copied, but frameworks might want to establish some convention
-  * to tighten security based on this option.
+  * By default, all assets are copied, but frameworks can establish server asset convention
+  * to tighten security using this option.
   */
   copyServerAssetsToClient?: (fileName: string) => boolean;
-  defineEncryptionKey?: string;
   /**
-  * Allows enabling action closure encryption for debugging purpose.
+  * This option allows disabling action closure encryption for debugging purpose.
   * @default true
   */
   enableActionEncryption?: boolean;
+  /**
+  * By default, the plugin uses a build-time generated encryption key for
+  * "use server" closure argument binding.
+  * This can be overwritten by configuring `defineEncryptionKey` option,
+  * for example, to obtain a key through environment variable during runtime.
+  * cf. https://nextjs.org/docs/app/guides/data-security#overwriting-encryption-keys-advanced
+  */
+  defineEncryptionKey?: string;
   /** Escape hatch for Waku's `allowServer` */
   keepUseCientProxy?: boolean;
+  /**
+  * Enable build-time validation of 'client-only' and 'server-only' imports
+  * @default true
+  */
+  validateImports?: boolean;
 };
 declare function vitePluginRsc(rscPluginOptions?: RscPluginOptions): Plugin[];
 declare class RuntimeAsset {

package/dist/{plugin-DgH7V82E.js → plugin-_STtCzuL.js}

@@ -2,7 +2,7 @@ import { tinyassert } from "./dist-DEF94lDJ.js";
 import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
 import { createRpcServer } from "./rpc-tGuLT8PD.js";
-import { normalizeViteImportAnalysisUrl } from "./vite-utils-CcqBE-C4.js";
+import { normalizeViteImportAnalysisUrl, prepareError } from "./vite-utils-Vzd7cqfv.js";
 import { createRequire } from "node:module";
 import assert from "node:assert";
 import { createHash } from "node:crypto";
@@ -13,7 +13,7 @@ import { createRequestListener } from "@mjackson/node-fetch-server";
 import * as esModuleLexer from "es-module-lexer";
 import MagicString from "magic-string";
 import { defaultServerConditions, isCSSRequest, normalizePath, parseAstAsync } from "vite";
-import { crawlFrameworkPkgs } from "vitefu";
+import { crawlFrameworkPkgs, findClosestPkgJsonPath } from "vitefu";
 import { walk } from "estree-walker";
 import { analyze, extract_names } from "periscopic";
 
@@ -510,11 +510,22 @@ function vitePluginRsc(rscPluginOptions = {}) {
 					return mods.some((mod) => recurse(mod));
 				}
 				if (!isInsideClientBoundary(ctx.modules)) {
-					if (this.environment.name === "rsc") ctx.server.environments.client.hot.send({
-						type: "custom",
-						event: "rsc:update",
-						data: { file: ctx.file }
-					});
+					if (this.environment.name === "rsc") {
+						for (const mod of ctx.modules) if (mod.type === "js") try {
+							await this.environment.transformRequest(mod.url);
+						} catch (e) {
+							server.environments.client.hot.send({
+								type: "error",
+								err: prepareError(e)
+							});
+							throw e;
+						}
+						ctx.server.environments.client.hot.send({
+							type: "custom",
+							event: "rsc:update",
+							data: { file: ctx.file }
+						});
+					}
 					if (this.environment.name === "client") {
 						const env = ctx.server.environments.rsc;
 						const mod = env.moduleGraph.getModuleById(ctx.file);
@@ -758,6 +769,11 @@ window.__vite_plugin_react_preamble_installed__ = true;
 			code += `
 const ssrCss = document.querySelectorAll("link[rel='stylesheet']");
 import.meta.hot.on("vite:beforeUpdate", () => ssrCss.forEach(node => node.remove()));
+`;
+			code += `
+import.meta.hot.on("rsc:update", () => {
+  document.querySelectorAll("vite-error-overlay").forEach((n) => n.close())
+});
 `;
 			return code;
 		}),
@@ -781,9 +797,31 @@ globalThis.AsyncLocalStorage = __viteRscAyncHooks.AsyncLocalStorage;
 		...vitePluginDefineEncryptionKey(rscPluginOptions),
 		...vitePluginFindSourceMapURL(),
 		...vitePluginRscCss({ rscCssTransform: rscPluginOptions.rscCssTransform }),
-		scanBuildStripPlugin()
+		...rscPluginOptions.validateImports !== false ? [validateImportPlugin()] : [],
+		scanBuildStripPlugin(),
+		detectNonOptimizedCjsPlugin()
 	];
 }
+function detectNonOptimizedCjsPlugin() {
+	return {
+		name: "rsc:detect-non-optimized-cjs",
+		apply: "serve",
+		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;
+				let isEsm = id.endsWith(".mjs");
+				if (id.endsWith(".js")) {
+					const pkgJsonPath = await findClosestPkgJsonPath(path.dirname(id));
+					if (pkgJsonPath) {
+						const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+						isEsm = pkgJson.type === "module";
+					}
+				}
+				if (!isEsm) this.warn(`[vite-rsc] found non-optimized CJS dependency in '${this.environment.name}' environment. It is recommended to manually add the dependency to 'environments.${this.environment.name}.optimizeDeps.include'.`);
+			}
+		}
+	};
+}
 function scanBuildStripPlugin() {
 	return {
 		name: "rsc:scan-strip",
@@ -806,8 +844,7 @@ function normalizeRelativePath(s) {
 }
 function getEntrySource(config$1, name = "index") {
 	const input = config$1.build.rollupOptions.input;
-	assert(input);
-	assert(typeof input === "object" && !Array.isArray(input) && name in input && typeof input[name] === "string");
+	assert(typeof input === "object" && !Array.isArray(input) && name in input && typeof input[name] === "string", `[vite-rsc:getEntrySource] expected 'build.rollupOptions.input' to be an object with a '${name}' property that is a string, but got ${JSON.stringify(input)}`);
 	return input[name];
 }
 function hashString(v) {
@@ -1251,7 +1288,7 @@ function vitePluginRscCss(rscCssOptions) {
 		};
 	}
 	function getRscCssTransformFilter({ id, code }) {
-		const { query } = parseIdQuery(id);
+		const { filename, query } = parseIdQuery(id);
 		if ("vite-rsc-css-export" in query) {
 			const value = query["vite-rsc-css-export"];
 			if (value) {
@@ -1262,8 +1299,8 @@ function vitePluginRscCss(rscCssOptions) {
 		}
 		const options = rscCssOptions?.rscCssTransform;
 		if (options === false) return false;
-		if (options?.filter && !options.filter(id)) return false;
-		if (id.includes("/node_modules/") || !/\.[tj]sx$/.test(id)) 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;
 		return (_name, meta) => !!(meta.isFunction && meta.declName && /^[A-Z]/.test(meta.declName) || meta.defaultExportIdentifierName && /^[A-Z]/.test(meta.defaultExportIdentifierName));
@@ -1503,6 +1540,35 @@ function __fix_cloudflare() {
 		}
 	};
 }
+function validateImportPlugin() {
+	return {
+		name: "rsc:validate-imports",
+		resolveId: {
+			order: "pre",
+			async handler(source, importer, options) {
+				if ("scan" in options && options.scan) return;
+				if (source === "client-only") {
+					if (this.environment.name === "rsc") throw new Error(`'client-only' cannot be imported in server build (importer: '${importer ?? "unknown"}', environment: ${this.environment.name})`);
+					return {
+						id: `\0virtual:vite-rsc/empty`,
+						moduleSideEffects: false
+					};
+				}
+				if (source === "server-only") {
+					if (this.environment.name !== "rsc") throw new Error(`'server-only' cannot be imported in client build (importer: '${importer ?? "unknown"}', environment: ${this.environment.name})`);
+					return {
+						id: `\0virtual:vite-rsc/empty`,
+						moduleSideEffects: false
+					};
+				}
+				return;
+			}
+		},
+		load(id) {
+			if (id.startsWith("\0virtual:vite-rsc/empty")) return `export {}`;
+		}
+	};
+}
 function sortObject(o) {
 	return Object.fromEntries(Object.entries(o).sort(([a], [b]) => a.localeCompare(b)));
 }

package/dist/plugin.d.ts

@@ -1,2 +1,2 @@
-import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-CCrsoChj.js";
+import { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-DXIhXGMa.js";
 export { AssetDeps, AssetsManifest, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginOptions, __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss };

package/dist/plugin.js

@@ -1,8 +1,8 @@
 import "./dist-DEF94lDJ.js";
 import "./plugin-CZbI4rhS.js";
-import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-DgH7V82E.js";
+import { __fix_cloudflare, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRsc, vitePluginRscCss } from "./plugin-_STtCzuL.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-tGuLT8PD.js";
-import "./vite-utils-CcqBE-C4.js";
+import "./vite-utils-Vzd7cqfv.js";
 
 export { __fix_cloudflare, vitePluginRsc as default, findSourceMapURL, transformRscCssExport, vitePluginFindSourceMapURL, vitePluginRscCss };

package/dist/{vite-utils-CcqBE-C4.js → vite-utils-Vzd7cqfv.js}

@@ -1,5 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
+import { stripVTControlCharacters } from "node:util";
 
 //#region src/vite-utils.ts
 const VALID_ID_PREFIX = `/@id/`;
@@ -59,6 +60,20 @@ function normalizeViteImportAnalysisUrl(environment, id) {
 	}
 	return url;
 }
+function prepareError(err) {
+	return {
+		message: stripVTControlCharacters(err.message),
+		stack: stripVTControlCharacters(cleanStack(err.stack || "")),
+		id: err.id,
+		frame: stripVTControlCharacters(err.frame || ""),
+		plugin: err.plugin,
+		pluginCode: err.pluginCode?.toString(),
+		loc: err.loc
+	};
+}
+function cleanStack(stack) {
+	return stack.split(/\n/).filter((l) => /^\s*at/.test(l)).join("\n");
+}
 
 //#endregion
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };
+export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/dist/vite-utils.d.ts

@@ -1,4 +1,4 @@
-import { DevEnvironment, Rollup } from "vite";
+import { DevEnvironment, ErrorPayload, Rollup } from "vite";
 
 //#region src/vite-utils.d.ts
 declare const VALID_ID_PREFIX = "/@id/";
@@ -17,5 +17,7 @@ declare function injectQuery(url: string, queryToInject: string): string;
 declare function joinUrlSegments(a: string, b: string): string;
 declare function normalizeResolvedIdToUrl(environment: DevEnvironment, url: string, resolved: Rollup.PartialResolvedId): string;
 declare function normalizeViteImportAnalysisUrl(environment: DevEnvironment, id: string): string;
+type RollupError = Rollup.RollupError;
+declare function prepareError(err: Error | RollupError): ErrorPayload["err"];
 //#endregion
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };
+export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/dist/vite-utils.js

@@ -1,3 +1,3 @@
-import { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId } from "./vite-utils-CcqBE-C4.js";
+import { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId } from "./vite-utils-Vzd7cqfv.js";
 
-export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };
+export { FS_PREFIX, NULL_BYTE_PLACEHOLDER, VALID_ID_PREFIX, cleanUrl, injectQuery, joinUrlSegments, normalizeResolvedIdToUrl, normalizeViteImportAnalysisUrl, prepareError, slash, splitFileAndPostfix, unwrapId, withTrailingSlash, wrapId };

package/package.json

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