@vitejs/plugin-rsc 0.4.31 → 0.4.32

package/dist/{index-DWN3vCIQ.d.ts → index-B04iFwO5.d.ts}

@@ -1,5 +1,5 @@
 import MagicString from "magic-string";
-import { Program } from "estree";
+import { Literal, Program } from "estree";
 
 //#region src/transforms/hoist.d.ts
 declare function transformHoistInlineDirective(input: string, ast: Program, {
@@ -19,6 +19,7 @@ declare function transformHoistInlineDirective(input: string, ast: Program, {
   output: MagicString;
   names: string[];
 };
+declare function findDirectives(ast: Program, directive: string): Literal[];
 //#endregion
 //#region src/transforms/wrap-export.d.ts
 type ExportMeta = {
@@ -86,4 +87,4 @@ declare function transformServerActionServer(input: string, ast: Program, option
   names: string[];
 };
 //#endregion
-export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-import "./index-DWN3vCIQ.js";
-import { PluginApi, RscPluginOptions, getPluginApi, vitePluginRsc } from "./plugin-Cfy_9VpM.js";
+import "./index-B04iFwO5.js";
+import { PluginApi, RscPluginOptions, getPluginApi, vitePluginRsc } from "./plugin-DCLI7Wh8.js";
 export { type PluginApi, type RscPluginOptions, vitePluginRsc as default, getPluginApi };

package/dist/index.js

@@ -1,9 +1,9 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import "./transforms-D1-2JfCh.js";
+import "./transforms-zLwPjso_.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-CUvSZurk.js";
-import { getPluginApi, vitePluginRsc } from "./plugin-BI8kK-GE.js";
+import { getPluginApi, vitePluginRsc } from "./plugin-CiDpxrwJ.js";
 import "./cjs-WQBk0zA_.js";
 import "./shared-AvKUASD5.js";
 

package/dist/{plugin-BI8kK-GE.js → plugin-CiDpxrwJ.js}

@@ -1,6 +1,6 @@
 import { createDebug } from "./dist-DiJnRA1C.js";
 import { vitePluginRscCore } from "./plugin-CZbI4rhS.js";
-import { hasDirective, transformDirectiveProxyExport, transformServerActionServer, transformWrapExport } from "./transforms-D1-2JfCh.js";
+import { findDirectives, hasDirective, transformDirectiveProxyExport, transformServerActionServer, transformWrapExport } from "./transforms-zLwPjso_.js";
 import { generateEncryptionKey, toBase64 } from "./encryption-utils-BDwwcMVT.js";
 import { createRpcServer } from "./rpc-CUvSZurk.js";
 import { cjsModuleRunnerPlugin } from "./cjs-WQBk0zA_.js";
@@ -918,6 +918,10 @@ function vitePluginUseClient(useClientPluginOptions, manager) {
 					delete manager.clientReferenceMetaMap[id];
 					return;
 				}
+				if (code.includes("use server")) {
+					const directives = findDirectives(ast, "use server");
+					if (directives.length > 0) this.error(`'use server' directive is not allowed inside 'use client'`, directives[0]?.start);
+				}
 				let importId;
 				let referenceKey;
 				const packageSource = packageSources.get(id);

package/dist/{plugin-Cfy_9VpM.d.ts → plugin-DCLI7Wh8.d.ts}

@@ -1,4 +1,4 @@
-import { TransformWrapExportFilter } from "./index-DWN3vCIQ.js";
+import { TransformWrapExportFilter } from "./index-B04iFwO5.js";
 import MagicString from "magic-string";
 import { Plugin, ResolvedConfig, Rollup, ViteDevServer, parseAstAsync } from "vite";
 

package/dist/plugin.d.ts

@@ -1,3 +1,3 @@
-import "./index-DWN3vCIQ.js";
-import { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-Cfy_9VpM.js";
+import "./index-B04iFwO5.js";
+import { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-DCLI7Wh8.js";
 export { AssetDeps, AssetsManifest, PluginApi, ResolvedAssetDeps, ResolvedAssetsManifest, RscPluginManager, RscPluginOptions, vitePluginRsc as default, getPluginApi, transformRscCssExport, vitePluginRscMinimal };

package/dist/plugin.js

@@ -1,9 +1,9 @@
 import "./dist-DiJnRA1C.js";
 import "./plugin-CZbI4rhS.js";
-import "./transforms-D1-2JfCh.js";
+import "./transforms-zLwPjso_.js";
 import "./encryption-utils-BDwwcMVT.js";
 import "./rpc-CUvSZurk.js";
-import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-BI8kK-GE.js";
+import { getPluginApi, transformRscCssExport, vitePluginRsc, vitePluginRscMinimal } from "./plugin-CiDpxrwJ.js";
 import "./cjs-WQBk0zA_.js";
 import "./shared-AvKUASD5.js";
 

package/dist/transforms/index.d.ts

@@ -1,2 +1,2 @@
-import { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../index-DWN3vCIQ.js";
-export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+import { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../index-B04iFwO5.js";
+export { TransformProxyExportOptions, TransformWrapExportFilter, TransformWrapExportOptions, findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/transforms/index.js

@@ -1,4 +1,4 @@
 import "../dist-DiJnRA1C.js";
-import { getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../transforms-D1-2JfCh.js";
+import { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport } from "../transforms-zLwPjso_.js";
 
-export { getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+export { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/dist/{transforms-D1-2JfCh.js → transforms-zLwPjso_.js}

@@ -15,7 +15,7 @@ function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunc
 	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);
+			const match = matchDirective(node.body.body, directive)?.match;
 			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);
@@ -59,11 +59,25 @@ function transformHoistInlineDirective(input, ast, { runtime, rejectNonAsyncFunc
 }
 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;
+	for (const stmt of body) if (stmt.type === "ExpressionStatement" && stmt.expression.type === "Literal" && typeof stmt.expression.value === "string") {
+		const match = stmt.expression.value.match(directive);
+		if (match) return {
+			match,
+			node: stmt.expression
+		};
 	}
 }
+function findDirectives(ast, directive) {
+	const directiveRE = exactRegex(directive);
+	const nodes = [];
+	walk(ast, { enter(node) {
+		if (node.type === "Program" || node.type === "BlockStatement") {
+			const match = matchDirective(node.body, directiveRE);
+			if (match) nodes.push(match.node);
+		}
+	} });
+	return nodes;
+}
 
 //#endregion
 //#region src/transforms/wrap-export.ts
@@ -327,4 +341,4 @@ function transformServerActionServer(input, ast, options) {
 }
 
 //#endregion
-export { getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };
+export { findDirectives, getExportNames, hasDirective, transformDirectiveProxyExport, transformHoistInlineDirective, transformProxyExport, transformServerActionServer, transformWrapExport };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitejs/plugin-rsc",
-  "version": "0.4.31",
+  "version": "0.4.32",
   "description": "React Server Components (RSC) support for Vite.",
   "keywords": [
     "vite",
@@ -39,10 +39,10 @@
     "prepack": "tsdown"
   },
   "dependencies": {
-    "@remix-run/node-fetch-server": "^0.8.0",
+    "@remix-run/node-fetch-server": "^0.9.0",
     "es-module-lexer": "^1.7.0",
     "estree-walker": "^3.0.3",
-    "magic-string": "^0.30.18",
+    "magic-string": "^0.30.19",
     "periscopic": "^4.0.2",
     "turbo-stream": "^3.1.0",
     "vitefu": "^1.1.1"
@@ -52,8 +52,8 @@
     "@playwright/test": "^1.55.0",
     "@tsconfig/strictest": "^2.0.5",
     "@types/estree": "^1.0.8",
-    "@types/node": "^22.18.1",
-    "@types/react": "^19.1.12",
+    "@types/node": "^22.18.6",
+    "@types/react": "^19.1.13",
     "@types/react-dom": "^19.1.9",
     "@vitejs/plugin-react": "workspace:*",
     "react": "^19.1.1",
@@ -61,7 +61,7 @@
     "react-server-dom-webpack": "^19.1.1",
     "rsc-html-stream": "^0.0.7",
     "tinyexec": "^1.0.1",
-    "tsdown": "^0.14.2"
+    "tsdown": "^0.15.4"
   },
   "peerDependencies": {
     "react": "*",