@farm.js/plugin 0.1.0-beta.1 → 0.1.0-beta.100

package/dist/rsc/entries/ssr.js

@@ -40,43 +40,57 @@ const cssLinkTag = resolvedCssHref
   ? '<link rel="stylesheet" href="' + escapeHtmlAttribute(resolvedCssHref) + '" as="style" data-precedence="default">'
   : '';
 
-function injectIntoHeadStream(tag) {
+// Work on bytes: chunk boundaries need not align with UTF-8 code points.
+function injectBeforeStream(markerText, tag) {
   const encoder = new TextEncoder();
-  const decoder = new TextDecoder();
-  const marker = '</head>';
-  let buffer = '';
+  const marker = encoder.encode(markerText);
+  const insertion = encoder.encode(tag);
+  let buffer = new Uint8Array(0);
   let injected = false;
 
   return new TransformStream({
     transform(chunk, controller) {
-      const str = typeof chunk === "string" ? chunk : decoder.decode(chunk);
+      const bytes = typeof chunk === 'string' ? encoder.encode(chunk) : chunk;
       if (injected || !tag) {
-        controller.enqueue(typeof chunk === "string" ? encoder.encode(str) : chunk);
+        controller.enqueue(bytes);
         return;
       }
 
-      buffer += str;
-      const index = buffer.indexOf(marker);
+      const pending = new Uint8Array(buffer.length + bytes.length);
+      pending.set(buffer);
+      pending.set(bytes, buffer.length);
+      let index = -1;
+      outer: for (let i = 0; i <= pending.length - marker.length; i++) {
+        for (let j = 0; j < marker.length; j++) {
+          if (pending[i + j] !== marker[j]) continue outer;
+        }
+        index = i;
+        break;
+      }
       if (index >= 0) {
-        const before = buffer.slice(0, index);
-        const after = buffer.slice(index + marker.length);
-        controller.enqueue(encoder.encode(before + tag + marker + after));
-        buffer = '';
+        if (index) controller.enqueue(pending.subarray(0, index));
+        controller.enqueue(insertion);
+        controller.enqueue(pending.subarray(index));
+        buffer = new Uint8Array(0);
         injected = true;
         return;
       }
 
-      if (buffer.length > marker.length) {
-        controller.enqueue(encoder.encode(buffer.slice(0, buffer.length - marker.length)));
-        buffer = buffer.slice(-marker.length);
-      }
+      // Retain only a possible marker prefix, never the whole response.
+      const emitLength = Math.max(0, pending.length - marker.length + 1);
+      if (emitLength) controller.enqueue(pending.subarray(0, emitLength));
+      buffer = pending.slice(emitLength);
     },
     flush(controller) {
-      if (buffer) controller.enqueue(encoder.encode(buffer));
+      if (buffer.length) controller.enqueue(buffer);
     },
   });
 }
 
+function injectIntoHeadStream(tag) {
+  return injectBeforeStream('</head>', tag);
+}
+
 /** Collect Node stream (from renderToPipeableStream) into a single string. Supports Suspense. */
 function pipeableStreamToString(stream) {
   return new Promise((resolve, reject) => {
@@ -125,13 +139,19 @@ export async function renderHTML(firstArg, options = {}) {
   if (!bootstrap && PROD_BOOTSTRAP !== "__FARM_BOOTSTRAP_SCRIPT__") bootstrap = PROD_BOOTSTRAP;
   
   // Use renderToPipeableStream so Suspense streams: fallback (loading.tsx) first, then resolved content.
-  const { pipe } = renderToPipeableStream(React.createElement(Root), {
-    ...(bootstrap && { bootstrapScriptContent: bootstrap }),
-    formState: options.formState,
-  });
   const { PassThrough, Readable } = await import('stream');
   const passThrough = new PassThrough();
-  pipe(passThrough);
+  // Do not commit an empty response when the shell cannot render. Reject back
+  // to the request handler so it can render error.tsx through RSC and SSR.
+  await new Promise((resolve, reject) => {
+    const { pipe } = renderToPipeableStream(React.createElement(Root), {
+      ...(bootstrap && { bootstrapScriptContent: bootstrap }),
+      formState: options.formState,
+      onShellReady() { pipe(passThrough); resolve(); },
+      onShellError: reject,
+      onError(error) { console.error('[RSC] SSR render error:', error); },
+    });
+  });
 
   const CLIENT_ENTRY_HREF = "__FARM_CLIENT_ENTRY_HREF__";
   const PLACEHOLDER_STR = "__FARM_CLIENT_ENTRY_HREF__";
@@ -141,34 +161,7 @@ export async function renderHTML(firstArg, options = {}) {
   if (hasPayload) {
     // Stream HTML to the client while preserving the RSC payload for hydration.
     debug('Streaming HTML (loading fallback then content)');
-    const BODY_HTML_END = '</body></html>';
-    const TAG_LEN = BODY_HTML_END.length;
-    const encoder = new TextEncoder();
-    let streamBuf = '';
-    const streamingClientScriptInjector = new TransformStream({
-      transform(chunk, controller) {
-        const str = typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk);
-        if (!injectClientScriptInStream || !clientScriptTag) {
-          controller.enqueue(typeof chunk === "string" ? encoder.encode(str) : chunk);
-          return;
-        }
-        streamBuf += str;
-        while (streamBuf.length > TAG_LEN) {
-          const tail = streamBuf.slice(-TAG_LEN);
-          if (tail === BODY_HTML_END) {
-            const before = streamBuf.slice(0, streamBuf.length - TAG_LEN);
-            controller.enqueue(encoder.encode(before + clientScriptTag + BODY_HTML_END));
-            streamBuf = '';
-            return;
-          }
-          controller.enqueue(encoder.encode(streamBuf.slice(0, streamBuf.length - TAG_LEN)));
-          streamBuf = streamBuf.slice(-TAG_LEN);
-        }
-      },
-      flush(controller) {
-        if (streamBuf) controller.enqueue(encoder.encode(streamBuf));
-      }
-    });
+    const streamingClientScriptInjector = injectBeforeStream('</body></html>', clientScriptTag);
     const webStream = typeof Readable.toWeb === 'function'
       ? Readable.toWeb(passThrough)
       : new ReadableStream({
@@ -207,30 +200,7 @@ export async function renderHTML(firstArg, options = {}) {
       controller.close();
     }
   });
-  let clientBuffer = "";
-  let clientScriptInjected = false;
-  const injectClientScriptStream = new TransformStream({
-    transform(chunk, controller) {
-      const str = typeof chunk === "string" ? chunk : new TextDecoder().decode(chunk);
-      if (!injectClientScriptInStream || clientScriptInjected) {
-        controller.enqueue(chunk);
-        return;
-      }
-      clientBuffer += str;
-      if (clientBuffer.includes("</body></html>")) {
-        const href = (typeof CLIENT_ENTRY_HREF === "string" && CLIENT_ENTRY_HREF.length > 0 && CLIENT_ENTRY_HREF.indexOf(PLACEHOLDER_STR) < 0) ? CLIENT_ENTRY_HREF : "";
-        const out = href ? clientBuffer.replace("</body></html>", '<script type="module" src="' + href + '"></script></body></html>') : clientBuffer;
-        controller.enqueue(new TextEncoder().encode(out));
-        clientBuffer = "";
-        clientScriptInjected = true;
-      }
-    },
-    flush(controller) {
-      if (clientBuffer) {
-        controller.enqueue(new TextEncoder().encode(clientBuffer));
-      }
-    }
-  });
+  const injectClientScriptStream = injectBeforeStream('</body></html>', clientScriptTag);
 
   let out = streamFromHtml.pipeThrough(injectRSCPayload(s2));
   out = out.pipeThrough(injectClientScriptStream);

package/dist/rsc/index.d.ts

@@ -24,6 +24,8 @@
 import { type Plugin, type UserConfig } from "vite";
 import type { FarmRscPluginOptions, EntryContext } from "./types.js";
 import type { FarmServerActionsConfig } from "@farm.js/core/server-action-security";
+import type { FarmAPIConfig } from "@farm.js/core/api";
+import type { FarmServerConfig } from "@farm.js/core/internal/production-runtime";
 import type { FarmLayerEntry, ResolvedFarmLayer } from "@farm.js/core/server";
 export type { FarmRscPluginOptions, EntryContext };
 export { buildRscNitro, waitForRscManifest, waitForRscOutputs } from "./nitro-build.js";
@@ -36,13 +38,24 @@ export interface FarmRscConfig {
     layers?: readonly ResolvedFarmLayer[];
     outDir?: string;
     basePath?: string;
+    api?: FarmAPIConfig;
+    server?: FarmServerConfig;
     port?: number;
     experimental?: {
+        /**
+         * Enable React Server Components rendering.
+         * @default true
+         */
         serverComponents?: boolean;
+        /**
+         * Enable React Server Actions and their public POST decoder.
+         * @default false
+         */
         serverActions?: boolean;
         /**
-         * Enable server-only optimized boundaries through
-         * `@farm.js/plugin/rsc/optimized-boundary`.
+         * Automatically optimize eligible server-only host-element subtrees with
+         * the native Strata renderer. Unsupported trees keep normal React
+         * rendering; application components do not need a boundary import.
          *
          * @experimental
          * @default false

package/dist/rsc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAA4B,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,MAAM,CAAC;AAE9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA0B9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;WAMG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAiDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAqnC5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/rsc/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,EAIL,KAAK,MAAM,EACX,KAAK,UAAU,EAChB,MAAM,MAAM,CAAC;AAEd,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2CAA2C,CAAC;AAClF,OAAO,KAAK,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAwD9E,YAAY,EAAE,oBAAoB,EAAE,YAAY,EAAE,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAExF,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC1D,YAAY,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAGjE,MAAM,WAAW,aAAa;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,SAAS,cAAc,EAAE,CAAC;IACpC,MAAM,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,MAAM,CAAC,EAAE,gBAAgB,CAAC;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE;QACb;;;WAGG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;QAC3B;;;WAGG;QACH,aAAa,CAAC,EAAE,OAAO,CAAC;QACxB;;;;;;;WAOG;QACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;KAC7B,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,aAAa,CAAC,EAAE,uBAAuB,CAAC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACjD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,gHAAgH;IAChH,OAAO,CAAC,EAAE,GAAG,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,GAAE,aAAkB,GAAG,UAAU,CAuDnE;AA8TD;;;;;GAKG;AACH,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,OAAO,GAAE,oBAAyB,GAAG,MAAM,EAAE,CAgvC5E"}

package/dist/rsc/index.js

@@ -21,24 +21,35 @@
  * })
  * ```
  */
-import { parseAst } from "vite";
+import { parseAst, version as viteVersion, } from "vite";
 import { init as initModuleLexer, parse as parseModuleImports } from "es-module-lexer";
 import { farmEnvironmentFunctionsPlugin } from "@farm.js/core/environment/vite";
+import { generateClientCachePersistenceCode, resolveFarmClientCacheAdapterEntry, } from "@farm.js/core/vite";
 import { generateRscEntry } from "./entries/rsc.js";
 import { generateSsrEntry } from "./entries/ssr.js";
-import { generateClientEntry } from "./entries/client.js";
+import { generateErrorFallbackEntry } from "./entries/error-fallback.js";
+import { generateClientEntry, serverFnTransportErrorClientRuntime } from "./entries/client.js";
+import { transformFarmRouteActionClients } from "./route-action-transform.js";
 import { transformFarmServerFns } from "./server-fn-transform.js";
+import { transformAutomaticOptimizedBoundaries } from "./automatic-optimized-boundary.js";
 import { resolveRscBuildOutputPath } from "./build-paths.js";
+import { assertRscPackageCompatibility } from "./compatibility.js";
+import { sendRscDevelopmentResponse } from "./dev-response.js";
 import fs from "fs/promises";
 import path from "path";
+import { devServableFileExists } from "../dev-static.js";
 import { pathToFileURL } from "node:url";
 import { createRequire } from "node:module";
 // Use API and middleware plugins from @farm.js/core (require so CJS build resolves when ESM .mjs is missing)
 const require_ = createRequire(import.meta.url);
 const { farmApiPlugin, farmMiddlewarePlugin } = require_("@farm.js/core");
-const { resolveServerActionsConfig } = require_("@farm.js/core/server-action-security");
+const { resolveServerActionsConfig, validateServerActionRequest, createServerActionRequestErrorResponse, } = require_("@farm.js/core/server-action-security");
 const { normalizeFarmDeploymentId } = require_("@farm.js/core/deployment");
 const { getFarmLayerAliases, getFarmSourceRoots, resolveFarmLayers } = require_("@farm.js/core/server");
+const { searchParamsToObject, readNodeRequestBody, resolveFarmServerConfig, createFarmRequestBodyErrorResponse, } = require_("@farm.js/core/internal/production-runtime");
+const { isFarmAPIPathname } = require_("@farm.js/core/api/runtime");
+const { resolveFarmAPIConfig, resolveFarmAPIServerBasePath } = require_("@farm.js/core/api");
+const { getResolvedEnv } = require_("@farm.js/core/env");
 export { buildRscNitro, waitForRscManifest, waitForRscOutputs } from "./nitro-build.js";
 import { registerRscNitroRuntimePackage } from "./nitro-build.js";
 export { default as nitro } from "./vite-plugin-nitro.js";
@@ -53,7 +64,7 @@ export function defineConfig(config = {}) {
         // Core Farm RSC settings
         experimental: {
             serverComponents: config.experimental?.serverComponents ?? true,
-            serverActions: config.experimental?.serverActions ?? true,
+            serverActions: config.experimental?.serverActions ?? false,
             optimizedBoundary: config.experimental?.optimizedBoundary ?? false,
         },
         srcDir: config.srcDir ?? "src",
@@ -61,11 +72,13 @@ export function defineConfig(config = {}) {
         layers: config.layers,
         outDir: config.outDir ?? "dist",
         basePath: config.basePath ?? "/",
+        api: config.api,
         serverActions: config.serverActions,
         deploymentId: config.deploymentId,
         generateBuildId: config.generateBuildId,
         // Vite server configuration
         server: {
+            ...config.server,
             port,
             strictPort: false,
         },
@@ -78,7 +91,11 @@ export function defineConfig(config = {}) {
         },
         plugins: [
             farmMiddlewarePlugin({ srcDir: config.srcDir ?? "src", debug }),
-            farmApiPlugin({ srcDir: config.srcDir ?? "src", debug }),
+            farmApiPlugin({
+                srcDir: config.srcDir ?? "src",
+                debug,
+                bodySizeLimit: config.server?.bodySizeLimit,
+            }),
             farmRsc({
                 debug,
                 encryptActions: config.encryptActions,
@@ -370,13 +387,42 @@ export default function farmRsc(options = {}) {
     let rscEnabled = false;
     let actionsEnabled = false;
     let optimizedBoundaryEnabled = false;
+    let bodySizeLimit = resolveFarmServerConfig(undefined).bodySizeLimit;
     // Context passed to entry generators
     let entryContext;
-    /** Set in config when RSC enabled; used by build plugin to run Nitro after client writeBundle. */
     let rscBuildRoot;
     // Store for debugging
     const debug = options.debug ?? false;
     const automaticDeploymentId = `build-${Date.now()}`;
+    const supportsBuildAppHook = Number(viteVersion.split(".")[0]) >= 7;
+    const runNitroAfterApplicationBuild = async (builder) => {
+        const nitroEnabled = builder.config?.plugins?.some((plugin) => plugin.name === "vite-plugin-nitro");
+        if (!nitroEnabled || !rscBuildRoot)
+            return;
+        const { runNitroFromBuildApp } = await import("./vite-plugin-nitro.js");
+        if (globalThis.__FARM_NITRO_PATHS) {
+            await runNitroFromBuildApp();
+            return;
+        }
+        // Vite creates environment-specific plugin instances by default, so state
+        // captured by a Rollup hook is not guaranteed to be visible here. Resolve
+        // the final environment outputs directly when that state is unavailable.
+        const rscBuild = builder.environments.rsc?.config?.build;
+        const ssrBuild = builder.environments.ssr?.config?.build;
+        const clientBuild = builder.environments.client?.config?.build;
+        if (!rscBuild?.outDir || !ssrBuild?.outDir || !clientBuild?.outDir)
+            return;
+        const { buildRscNitro } = await import("./nitro-build.js");
+        const root = path.resolve(rscBuildRoot);
+        await buildRscNitro({
+            root,
+            rendererPath: resolveRscBuildOutputPath(root, rscBuild.outDir, "index.js"),
+            publicDir: resolveRscBuildOutputPath(root, clientBuild.outDir),
+            ssrPath: resolveRscBuildOutputPath(root, ssrBuild.outDir, "index.js"),
+            assetsDir: clientBuild.assetsDir,
+            preset: process.env.NITRO_PRESET || "vercel",
+        });
+    };
     const getColors = () => {
         try {
             const pico = require_("picocolors");
@@ -469,6 +515,7 @@ export default function farmRsc(options = {}) {
                 // Check if user enabled RSC in their config
                 rscEnabled = c.experimental?.serverComponents === true;
                 actionsEnabled = c.experimental?.serverActions === true;
+                bodySizeLimit = resolveFarmServerConfig(c.server).bodySizeLimit;
                 optimizedBoundaryEnabled = c.experimental?.optimizedBoundary === true;
                 logInfo(`RSC enabled: ${rscEnabled}`);
                 logInfo(`Actions enabled: ${actionsEnabled}`);
@@ -481,6 +528,7 @@ export default function farmRsc(options = {}) {
                     return;
                 }
                 const root = c.root ?? process.cwd();
+                assertRscPackageCompatibility(root);
                 if (optimizedBoundaryEnabled) {
                     registerRscNitroRuntimePackage(root, STRATA_PACKAGE, resolveOptimizedBoundaryRuntimeRoot());
                 }
@@ -492,6 +540,11 @@ export default function farmRsc(options = {}) {
                     Object.assign(c, layerResolution.config);
                 }
                 // Read user's directory configuration
+                const api = await resolveFarmAPIConfig(c.api, {
+                    root,
+                    mode: env.command === "build" ? "production" : "development",
+                    env: getResolvedEnv(),
+                });
                 const srcDir = c.srcDir ?? "src";
                 const outDir = c.outDir ?? "dist";
                 const deploymentId = normalizeFarmDeploymentId(options.deploymentId ||
@@ -532,6 +585,7 @@ export default function farmRsc(options = {}) {
                     srcDir,
                     outDir,
                     basePath: c.basePath ?? "/",
+                    apiBasePath: resolveFarmAPIServerBasePath(api),
                     routesDir: options.routesDir,
                     globalCssPath,
                     routeRoots,
@@ -543,6 +597,8 @@ export default function farmRsc(options = {}) {
                     }),
                     deploymentId,
                     debug,
+                    development: env.command === "serve",
+                    clientCachePersistence: generateClientCachePersistenceCode(resolveFarmClientCacheAdapterEntry(root, c.cache)),
                 };
                 logInfo(`srcDir: ${entryContext.srcDir}, outDir: ${entryContext.outDir}`);
                 // Write real entry files so @vitejs/plugin-rsc can use file-based entries.
@@ -553,6 +609,7 @@ export default function farmRsc(options = {}) {
                 await fs.writeFile(entryRscPath, generateRscEntry(entryContext));
                 await fs.writeFile(entrySsrPath, generateSsrEntry(entryContext));
                 await fs.writeFile(entryClientPath, generateClientEntry(entryContext));
+                await fs.writeFile(path.join(entriesDir, "error-fallback.tsx"), generateErrorFallbackEntry());
                 logInfo(`Wrote RSC entries to ${entriesDir}`);
                 // User must add rsc({ entries: { rsc, ssr, client } }) to config.plugins so the RSC plugin
                 // runs for every environment and client build can resolve virtual:vite-rsc/client-references.
@@ -579,6 +636,9 @@ export default function farmRsc(options = {}) {
                 return {
                     appType: "custom",
                     builder: { sharedConfigBuild: true },
+                    define: {
+                        __FARM_API_BASE_URL__: JSON.stringify(api.baseURL),
+                    },
                     ssr: {
                         external: [
                             "react",
@@ -599,7 +659,7 @@ export default function farmRsc(options = {}) {
                         }
                         : {}),
                     resolve: {
-                        dedupe: ["react", "react-dom"],
+                        dedupe: ["react", "react-dom", "react-server-dom-webpack"],
                         alias: [
                             ...Object.entries(layerAliases).map(([find, replacement]) => ({
                                 find,
@@ -708,6 +768,42 @@ export default function farmRsc(options = {}) {
                 return null;
             },
         },
+        {
+            name: "@farm.js/plugin/rsc:automatic-optimized-boundary",
+            enforce: "post",
+            transform(code, id) {
+                if (!rscEnabled || !optimizedBoundaryEnabled)
+                    return null;
+                const environmentName = this.environment?.name;
+                if (environmentName !== "rsc")
+                    return null;
+                const result = transformAutomaticOptimizedBoundaries(code, id);
+                if (!result)
+                    return null;
+                if (debug) {
+                    console.log(`[Farm.js] Added ${result.boundaryCount} automatic optimized-boundary candidate${result.boundaryCount === 1 ? "" : "s"} in ${id}`);
+                }
+                return { code: result.code, map: null };
+            },
+        },
+        {
+            name: "@farm.js/plugin/rsc:route-action-clients",
+            enforce: "pre",
+            transform(code, id) {
+                if (!rscEnabled || !actionsEnabled)
+                    return null;
+                const environmentName = this.environment?.name;
+                if (environmentName !== "client")
+                    return null;
+                const result = transformFarmRouteActionClients(code, id);
+                if (!result)
+                    return null;
+                return {
+                    code: result.code,
+                    map: null,
+                };
+            },
+        },
         {
             name: "@farm.js/plugin/rsc:server-fn-actions",
             enforce: "pre",
@@ -723,38 +819,38 @@ export default function farmRsc(options = {}) {
                 };
             },
         },
-        // Nitro: run after all environments (like @hiogawa/vite-plugin-nitro). If the runtime supports
-        // plugin buildApp order "post", this runs automatically; else use build script (see comment below).
         {
-            name: "@farm.js/plugin/rsc:nitro-build",
+            name: "@farm.js/plugin/rsc:nitro-application-build",
+            enforce: "post",
             apply: "build",
+            // @vitejs/plugin-rsc owns the Vite 6 builder callback. Wrap its final
+            // callback after config composition so Nitro starts only after the RSC,
+            // client, and SSR outputs have all been written.
+            config(config) {
+                const builderConfig = config.builder;
+                const buildApp = builderConfig?.buildApp;
+                if (typeof buildApp !== "function")
+                    return;
+                return {
+                    builder: {
+                        ...builderConfig,
+                        async buildApp(builder) {
+                            await buildApp(builder);
+                            if (!supportsBuildAppHook) {
+                                await runNitroAfterApplicationBuild(builder);
+                            }
+                        },
+                    },
+                };
+            },
+            // Vite 7+ composes application build hooks directly. Keep the Vite 6
+            // wrapper above for the versions where this hook is not dispatched.
             buildApp: {
                 order: "post",
-                handler: async (builder) => {
-                    if (!rscEnabled || !rscBuildRoot || !entryContext)
-                        return;
-                    if (globalThis.__FARM_NITRO_PLUGIN_RAN)
-                        return;
-                    const root = path.resolve(rscBuildRoot);
-                    if (globalThis.__FARM_NITRO_PATHS) {
-                        const { runNitroFromBuildApp } = await import("./vite-plugin-nitro.js");
-                        await runNitroFromBuildApp();
-                        return;
+                async handler(builder) {
+                    if (supportsBuildAppHook) {
+                        await runNitroAfterApplicationBuild(builder);
                     }
-                    const rscEnv = builder.environments?.rsc;
-                    const ssrEnv = builder.environments?.ssr;
-                    const clientEnv = builder.environments?.client;
-                    if (!rscEnv || !ssrEnv || !clientEnv)
-                        return;
-                    const { buildRscNitro } = await import("./nitro-build.js");
-                    await buildRscNitro({
-                        root,
-                        rendererPath: resolveRscBuildOutputPath(root, rscEnv.config.build.outDir, "index.js"),
-                        publicDir: resolveRscBuildOutputPath(root, clientEnv.config.build.outDir),
-                        ssrPath: resolveRscBuildOutputPath(root, ssrEnv.config.build.outDir, "index.js"),
-                        assetsDir: clientEnv.config.build.assetsDir,
-                        preset: process.env.NITRO_PRESET || "vercel",
-                    });
                 },
             },
         },
@@ -827,6 +923,7 @@ import {
   createFarmDeploymentRequestHeaders,
   isFarmDeploymentMismatchResponse,
 } from '@farm.js/core/deployment';
+${serverFnTransportErrorClientRuntime}
 const farmDeploymentId = ${JSON.stringify(entryContext.deploymentId)};
 setServerCallback(async (id, args) => {
   const refs = createTemporaryReferenceSet();
@@ -853,9 +950,7 @@ setServerCallback(async (id, args) => {
   if (!res.ok) throw new Error('Server action failed: ' + res.status);
   const p = await createFromReadableStream(res.body, { temporaryReferences: refs });
   if (p?.returnValue?.ok) return p.returnValue.data;
-  const error = new Error(p?.returnValue?.data?.message || 'Server function failed');
-  error.name = 'ServerActionError';
-  throw error;
+  throw createFarmServerFnTransportError(p?.returnValue?.data);
 });
 `
                         : "";
@@ -923,12 +1018,16 @@ if (document.readyState === 'loading') {
                         const url = req.url || "/";
                         const pathname = url.split("?")[0];
                         const method = req.method || "GET";
+                        // Dotted paths only skip RSC rendering when they map to a real
+                        // file on disk — route segments may legitimately contain dots.
                         if (pathname.startsWith("/@") ||
                             pathname.startsWith("/__") ||
                             pathname.startsWith("/node_modules") ||
                             pathname.startsWith("/src/") ||
                             pathname.startsWith("/api/") ||
-                            (pathname.includes(".") && !pathname.endsWith("/"))) {
+                            (pathname.includes(".") &&
+                                !pathname.endsWith("/") &&
+                                devServableFileExists(pathname, [server.config.publicDir, server.config.root]))) {
                             return next();
                         }
                         const startTime = Date.now();
@@ -955,19 +1054,26 @@ if (document.readyState === 'loading') {
                             globalThis.__FARM_VITE_RSC_LOAD_BOOTSTRAP__ = async () => bootstrapPrefix +
                                 `import("/@react-refresh").then(m=>{m.default.injectIntoGlobalHook(window);window.$RefreshReg$=()=>{};window.$RefreshSig$=()=>type=>type;window.__vite_plugin_react_preamble_installed__=true;return import("/@vite/client");}).then(()=>import(${JSON.stringify(clientEntryUrl)}));`;
                             const base = `http://${req.headers.host || "localhost:3000"}`;
+                            const requestUrl = new URL(url, base);
+                            const isAction = actionsEnabled &&
+                                method === "POST" &&
+                                !isFarmAPIPathname(requestUrl.pathname, entryContext.apiBasePath) &&
+                                !isFarmAPIPathname(requestUrl.pathname);
+                            if (isAction) {
+                                validateServerActionRequest(new Request(requestUrl, {
+                                    method,
+                                    headers: req.headers,
+                                }), entryContext.serverActions);
+                            }
                             let body;
-                            if (method === "POST") {
-                                const chunks = [];
-                                for await (const chunk of req)
-                                    chunks.push(chunk);
-                                body = Buffer.concat(chunks);
-                                // Keep as buffer so request.formData() / request.text() in RSC handler work (multipart must not be UTF-8 decoded)
+                            if (method !== "GET" && method !== "HEAD") {
+                                body = await readNodeRequestBody(req, isAction ? entryContext.serverActions.bodySizeLimit : bodySizeLimit);
                             }
-                            const request = new Request(new URL(url, base), {
+                            const request = new Request(requestUrl, {
                                 method,
                                 headers: req.headers,
-                                body: method === "POST" && body && body.length > 0
-                                    ? body
+                                body: body && body.length > 0
+                                    ? body.buffer.slice(body.byteOffset, body.byteOffset + body.byteLength)
                                     : undefined,
                             });
                             // Load the RSC entry in the "rsc" environment so @vitejs/plugin-rsc transforms run with this.environment.name === "rsc".
@@ -1001,32 +1107,24 @@ if (document.readyState === 'loading') {
                             if (!rscEntry?.default?.fetch)
                                 throw new Error("[Farm.js] Could not load RSC entry in rsc environment");
                             const response = await rscEntry.default.fetch(request);
-                            res.statusCode = response.status;
-                            response.headers.forEach((value, key) => {
-                                if (key.toLowerCase() !== "transfer-encoding")
-                                    res.setHeader(key, value);
-                            });
-                            if (response.body) {
-                                const reader = response.body.getReader();
-                                const pump = async () => {
-                                    while (true) {
-                                        const { done, value } = await reader.read();
-                                        if (done)
-                                            break;
-                                        res.write(Buffer.from(value));
-                                    }
-                                    res.end();
-                                };
-                                await pump();
-                            }
-                            else {
-                                res.end();
-                            }
+                            await sendRscDevelopmentResponse(res, response);
                             const duration = Date.now() - startTime;
                             logResponse(method, pathname, response.status, duration);
                             return;
                         }
                         catch (rscError) {
+                            const rejection = createFarmRequestBodyErrorResponse(rscError) ??
+                                createServerActionRequestErrorResponse(rscError);
+                            if (rejection && !res.headersSent && !res.writableEnded && !res.destroyed) {
+                                await sendRscDevelopmentResponse(res, rejection);
+                                return;
+                            }
+                            if (res.headersSent || res.writableEnded || res.destroyed) {
+                                console.error("[Farm.js] RSC dev response error:", rscError);
+                                if (!res.destroyed)
+                                    res.destroy(rscError instanceof Error ? rscError : new Error(String(rscError)));
+                                return;
+                            }
                             // RSC pipeline failed; fall back to legacy SSR for GET only
                             if (method !== "GET") {
                                 const duration = Date.now() - startTime;
@@ -1110,7 +1208,7 @@ if (document.readyState === 'loading') {
                             const Layout = layoutModule?.default;
                             // Parse URL params (basic dynamic route support)
                             const params = {};
-                            const searchParams = Object.fromEntries(new URLSearchParams(url.split("?")[1] || ""));
+                            const searchParams = searchParamsToObject(new URL(url, `http://${req.headers.host || "localhost:3000"}`).searchParams);
                             // Render the page with middleware data
                             const pageProps = {
                                 params,

package/dist/rsc/nitro-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA+DD,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqMhF"}
+{"version":3,"file":"nitro-build.d.ts","sourceRoot":"","sources":["../../src/rsc/nitro-build.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAwBH;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GAClB,IAAI,CAKN;AAwFD;;;GAGG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GACxD,OAAO,CAAC,IAAI,CAAC,CAgCf;AA0ED,MAAM,MAAM,oBAAoB,GAAG;IACjC,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,wBAAsB,aAAa,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+MhF"}