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

package/dist/rsc/route-action-transform.js

@@ -0,0 +1,369 @@
+const ROUTE_FACTORY_IMPORT_RE = /\bimport\s+(?:type\s+)?(?:[A-Za-z_$][\w$]*\s*,\s*)?(\{[^}]*\})\s+from\s*["']@farm.js\/core(?:\/routes)?["']\s*;?/g;
+const EXPORTED_ROUTE_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*\(/g;
+const IMPORT_RE = /\bimport\s+(?!type\b)([\s\S]*?)\s+from\s*(["'][^"']+["'])\s*;?/g;
+const IDENTIFIER_RE = /^[A-Za-z_$][\w$]*$/;
+const MODULE_EXT_RE = /\.[cm]?[jt]sx?$/;
+/**
+ * Replace a programmatic route imported by the browser with a small action-only
+ * proxy. Route loaders, components, database imports, and other server code do
+ * not enter the client graph.
+ */
+export function transformFarmRouteActionClients(code, id) {
+    if (!isTransformableModule(id) || !code.includes("createRoute") || !code.includes("actions")) {
+        return null;
+    }
+    const routeFactories = findRouteFactoryImportNames(code);
+    if (routeFactories.size === 0)
+        return null;
+    const routes = findActionRoutes(code, routeFactories, id);
+    if (routes.length === 0)
+        return null;
+    const importStatements = findRuntimeImports(code);
+    const requiredImports = new Set();
+    for (const route of routes) {
+        for (const action of route.actions) {
+            const statement = importStatements.get(action.local);
+            if (!statement) {
+                throw new Error(`[Farm.js] Route "${route.exportName}" action "${action.name}" in ${id} must reference ` +
+                    "a server function imported from another module. Define and export createServerFn in an actions module, then import it into the route.");
+            }
+            requiredImports.add(statement);
+        }
+    }
+    const output = [
+        ...requiredImports,
+        ...routes.map((route) => generateRouteActionProxy(route)),
+        ...findRouteDefaultExports(code, routes),
+    ].join("\n");
+    return {
+        code: `${output}\n`,
+        routes: routes.map((route) => route.exportName),
+    };
+}
+function findRouteFactoryImportNames(code) {
+    const names = new Set();
+    for (const match of code.matchAll(ROUTE_FACTORY_IMPORT_RE)) {
+        const namedImports = (match[1] ?? "").slice(1, -1).split(",");
+        for (const specifier of namedImports) {
+            const normalized = specifier.trim().replace(/^type\s+/, "");
+            const specifierMatch = normalized.match(/^createRoute(?:\s+as\s+([A-Za-z_$][\w$]*))?$/);
+            if (specifierMatch)
+                names.add(specifierMatch[1] ?? "createRoute");
+        }
+    }
+    return names;
+}
+function findActionRoutes(code, factories, id) {
+    const routes = [];
+    for (const match of code.matchAll(EXPORTED_ROUTE_RE)) {
+        const exportName = match[1];
+        const calleeName = match[2];
+        if (!exportName || !calleeName || !factories.has(calleeName))
+            continue;
+        const openParen = (match.index ?? 0) + match[0].length - 1;
+        const closeParen = findMatchingDelimiter(code, openParen, "(", ")");
+        if (closeParen === -1)
+            continue;
+        const args = splitTopLevel(code, openParen + 1, closeParen);
+        if (args.length < 2)
+            continue;
+        const pathSource = readSegment(code, args[0]);
+        if (!isQuotedString(pathSource)) {
+            throw new Error(`[Farm.js] Route "${exportName}" in ${id} must use a static string path before its actions can be imported by a Client Component.`);
+        }
+        const options = readSegment(code, args[1]);
+        if (!options.startsWith("{") || !options.endsWith("}"))
+            continue;
+        const properties = parseObjectProperties(options.slice(1, -1));
+        const actionsSource = properties.get("actions");
+        if (!actionsSource)
+            continue;
+        if (!actionsSource.startsWith("{") || !actionsSource.endsWith("}")) {
+            throw new Error(`[Farm.js] Route "${exportName}" actions in ${id} must be an object literal so Farm can generate its client proxy.`);
+        }
+        const actions = parseActionProperties(actionsSource.slice(1, -1), exportName, id);
+        if (actions.length === 0)
+            continue;
+        const defaultSource = properties.get("defaultAction");
+        const defaultAction = defaultSource
+            ? parseStringValue(defaultSource, exportName, id)
+            : actions[0].name;
+        if (!actions.some((action) => action.name === defaultAction)) {
+            throw new Error(`[Farm.js] Route "${exportName}" defaultAction "${defaultAction}" in ${id} does not match a declared action.`);
+        }
+        routes.push({ exportName, pathSource, actions, defaultAction });
+    }
+    return routes;
+}
+function parseActionProperties(source, routeName, id) {
+    const properties = parseObjectProperties(source, true);
+    const actions = [];
+    for (const [name, value] of properties) {
+        const local = value || name;
+        if (!IDENTIFIER_RE.test(name) || !IDENTIFIER_RE.test(local)) {
+            throw new Error(`[Farm.js] Route "${routeName}" actions in ${id} must use identifier entries such as { update } or { update: updateProduct }.`);
+        }
+        actions.push({ name, local });
+    }
+    return actions;
+}
+function parseObjectProperties(source, allowShorthand = false) {
+    const properties = new Map();
+    for (const segment of splitTopLevel(source, 0, source.length)) {
+        const entry = readSegment(source, segment);
+        if (!entry)
+            continue;
+        if (entry.startsWith("...")) {
+            properties.set(entry, "");
+            continue;
+        }
+        const colon = findTopLevelColon(entry);
+        if (colon === -1) {
+            if (allowShorthand)
+                properties.set(entry, "");
+            continue;
+        }
+        const keySource = entry.slice(0, colon).trim();
+        const value = entry.slice(colon + 1).trim();
+        const key = isQuotedString(keySource) ? unquote(keySource) : keySource;
+        properties.set(key, value);
+    }
+    return properties;
+}
+function findRuntimeImports(code) {
+    const imports = new Map();
+    for (const match of code.matchAll(IMPORT_RE)) {
+        const clause = (match[1] ?? "").trim();
+        const statement = match[0];
+        const namedStart = clause.indexOf("{");
+        const namedEnd = clause.lastIndexOf("}");
+        if (namedStart > -1 && namedEnd > namedStart) {
+            for (const specifier of clause.slice(namedStart + 1, namedEnd).split(",")) {
+                const normalized = specifier.trim().replace(/^type\s+/, "");
+                if (!normalized || specifier.trim().startsWith("type "))
+                    continue;
+                const parts = normalized.split(/\s+as\s+/);
+                const local = parts[1] ?? parts[0];
+                if (local && IDENTIFIER_RE.test(local))
+                    imports.set(local, statement);
+            }
+        }
+        const defaultImport = clause
+            .slice(0, namedStart === -1 ? clause.length : namedStart)
+            .replace(/,$/, "")
+            .trim();
+        if (IDENTIFIER_RE.test(defaultImport))
+            imports.set(defaultImport, statement);
+    }
+    return imports;
+}
+function generateRouteActionProxy(route) {
+    const actions = route.actions
+        .map((action) => `${JSON.stringify(action.name)}: ${action.local}`)
+        .join(", ");
+    const defaultAction = route.actions.find((action) => action.name === route.defaultAction);
+    return `export const ${route.exportName} = Object.freeze({
+  __farmRouteActionTarget: true,
+  path: ${route.pathSource},
+  actions: Object.freeze({ ${actions} }),
+  defaultAction: ${JSON.stringify(route.defaultAction)},
+  action: ${defaultAction.local},
+});`;
+}
+function findRouteDefaultExports(code, routes) {
+    const exports = [];
+    for (const route of routes) {
+        const defaultExport = new RegExp(`\\bexport\\s+default\\s+${escapeRegExp(route.exportName)}\\s*;?`);
+        if (defaultExport.test(code))
+            exports.push(`export default ${route.exportName};`);
+    }
+    return exports;
+}
+function splitTopLevel(source, start, end) {
+    const segments = [];
+    let segmentStart = start;
+    let parens = 0;
+    let braces = 0;
+    let brackets = 0;
+    let quote = null;
+    let escaped = false;
+    let lineComment = false;
+    let blockComment = false;
+    for (let index = start; index < end; index++) {
+        const char = source[index];
+        const next = source[index + 1];
+        if (lineComment) {
+            if (char === "\n" || char === "\r")
+                lineComment = false;
+            continue;
+        }
+        if (blockComment) {
+            if (char === "*" && next === "/") {
+                blockComment = false;
+                index++;
+            }
+            continue;
+        }
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (char === "\\")
+                escaped = true;
+            else if (char === quote)
+                quote = null;
+            continue;
+        }
+        if (char === "/" && next === "/") {
+            lineComment = true;
+            index++;
+            continue;
+        }
+        if (char === "/" && next === "*") {
+            blockComment = true;
+            index++;
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === "(")
+            parens++;
+        else if (char === ")")
+            parens--;
+        else if (char === "{")
+            braces++;
+        else if (char === "}")
+            braces--;
+        else if (char === "[")
+            brackets++;
+        else if (char === "]")
+            brackets--;
+        else if (char === "," && parens === 0 && braces === 0 && brackets === 0) {
+            segments.push([segmentStart, index]);
+            segmentStart = index + 1;
+        }
+    }
+    segments.push([segmentStart, end]);
+    return segments;
+}
+function findTopLevelColon(source) {
+    const segments = splitTopLevel(source, 0, source.length);
+    if (segments.length !== 1)
+        return -1;
+    let parens = 0;
+    let braces = 0;
+    let brackets = 0;
+    let quote = null;
+    let escaped = false;
+    for (let index = 0; index < source.length; index++) {
+        const char = source[index];
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (char === "\\")
+                escaped = true;
+            else if (char === quote)
+                quote = null;
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === "(")
+            parens++;
+        else if (char === ")")
+            parens--;
+        else if (char === "{")
+            braces++;
+        else if (char === "}")
+            braces--;
+        else if (char === "[")
+            brackets++;
+        else if (char === "]")
+            brackets--;
+        else if (char === ":" && parens === 0 && braces === 0 && brackets === 0)
+            return index;
+    }
+    return -1;
+}
+function findMatchingDelimiter(source, openIndex, open, close) {
+    let depth = 0;
+    let quote = null;
+    let lineComment = false;
+    let blockComment = false;
+    let escaped = false;
+    for (let index = openIndex; index < source.length; index++) {
+        const char = source[index];
+        const next = source[index + 1];
+        if (lineComment) {
+            if (char === "\n" || char === "\r")
+                lineComment = false;
+            continue;
+        }
+        if (blockComment) {
+            if (char === "*" && next === "/") {
+                blockComment = false;
+                index++;
+            }
+            continue;
+        }
+        if (quote) {
+            if (escaped)
+                escaped = false;
+            else if (char === "\\")
+                escaped = true;
+            else if (char === quote)
+                quote = null;
+            continue;
+        }
+        if (char === "/" && next === "/") {
+            lineComment = true;
+            index++;
+            continue;
+        }
+        if (char === "/" && next === "*") {
+            blockComment = true;
+            index++;
+            continue;
+        }
+        if (char === "'" || char === '"' || char === "`") {
+            quote = char;
+            continue;
+        }
+        if (char === open)
+            depth++;
+        else if (char === close && --depth === 0)
+            return index;
+    }
+    return -1;
+}
+function readSegment(source, segment) {
+    return source.slice(segment[0], segment[1]).trim();
+}
+function parseStringValue(source, routeName, id) {
+    if (!isQuotedString(source)) {
+        throw new Error(`[Farm.js] Route "${routeName}" defaultAction in ${id} must be a static string.`);
+    }
+    return unquote(source);
+}
+function isQuotedString(value) {
+    return (value.length >= 2 &&
+        ((value.startsWith('"') && value.endsWith('"')) ||
+            (value.startsWith("'") && value.endsWith("'"))));
+}
+function unquote(value) {
+    const quote = value[0];
+    const body = value.slice(1, -1);
+    if (quote === '"')
+        return JSON.parse(value);
+    return body.replace(/\\'/g, "'").replace(/\\\\/g, "\\");
+}
+function isTransformableModule(id) {
+    const cleanId = id.split("?", 1)[0];
+    return MODULE_EXT_RE.test(cleanId) && !/\.d\.[cm]?ts$/.test(cleanId);
+}
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}

package/dist/rsc/server-fn-transform.js

@@ -1,5 +1,5 @@
 const SERVER_FUNCTION_FACTORY_IMPORT_RE = /\bimport\s+(?:type\s+)?(?:[A-Za-z_$][\w$]*\s*,\s*)?(\{[^}]*\})\s+from\s*["']@farm.js\/core(?:\/(?:server-fn|server-query))?["']\s*;?/g;
-const EXPORT_SERVER_FUNCTION_FACTORY_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*\(/g;
+const EXPORT_SERVER_FUNCTION_FACTORY_RE = /\bexport\s+(?:const|let|var)\s+([A-Za-z_$][\w$]*)\s*=\s*([A-Za-z_$][\w$]*)\s*(?:<[^<>]*(?:<[^<>]*>[^<>]*)*>)?\s*\(/g;
 const MODULE_EXT_RE = /\.[cm]?[jt]sx?$/;
 const DECLARATION_RE = /(^|\n)\s*["']([^"']+)["']\s*;?/g;
 export function transformFarmServerFns(code, id) {

package/dist/rsc/test-fixture-dependencies.d.ts

@@ -0,0 +1,2 @@
+export declare function linkRscFixtureDependencies(root: string): void;
+//# sourceMappingURL=test-fixture-dependencies.d.ts.map

package/dist/rsc/test-fixture-dependencies.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"test-fixture-dependencies.d.ts","sourceRoot":"","sources":["../../src/rsc/test-fixture-dependencies.ts"],"names":[],"mappings":"AAaA,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAY7D"}

package/dist/rsc/test-fixture-dependencies.js

@@ -0,0 +1,23 @@
+import { existsSync, mkdirSync, realpathSync, symlinkSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+const RSC_FIXTURE_PACKAGES = [
+    "react",
+    "react-dom",
+    "react-server-dom-webpack",
+    "@vitejs/plugin-rsc",
+];
+const repositoryRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../../../..");
+export function linkRscFixtureDependencies(root) {
+    for (const packageName of RSC_FIXTURE_PACKAGES) {
+        const source = [
+            path.join(repositoryRoot, "node_modules", packageName),
+            path.join(repositoryRoot, "examples/rsc-demo/node_modules", packageName),
+        ].find((candidate) => existsSync(candidate));
+        if (!source)
+            throw new Error(`Missing RSC fixture dependency: ${packageName}`);
+        const target = path.join(root, "node_modules", packageName);
+        mkdirSync(path.dirname(target), { recursive: true });
+        symlinkSync(realpathSync(source), target, process.platform === "win32" ? "junction" : "dir");
+    }
+}

package/dist/rsc/types.d.ts

@@ -54,6 +54,8 @@ export interface EntryContext {
     outDir: string;
     /** Base URL path, e.g. '/' */
     basePath: string;
+    /** Resolved same-origin mount for canonical /api routes. */
+    apiBasePath?: string;
     /** Route files subdirectory within srcDir */
     routesDir?: string;
     /** Root-relative Vite URL for an existing global stylesheet. */
@@ -72,6 +74,13 @@ export interface EntryContext {
     deploymentId: string;
     /** Whether debug mode is enabled */
     debug: boolean;
+    /** True only for the Vite serve command, never for a production build. */
+    development?: boolean;
+    /** Generated import/init fragments for `cache.client.adapter` persistence. */
+    clientCachePersistence?: {
+        imports: string;
+        init: string;
+    };
 }
 /**
  * Matched route information from the file-based router.

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/rsc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,yDAAyD;IACzD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,2CAA2C;QAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IAEjB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,uFAAuF;IACvF,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IAEH,yCAAyC;IACzC,cAAc,EAAE,OAAO,CAAC;IAExB,wDAAwD;IACxD,aAAa,EAAE,+BAA+B,CAAC;IAE/C,8EAA8E;IAC9E,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,KAAK,EAAE,OAAO,CAAC;CAChB;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAE/B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,0DAA0D;IAC1D,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC;IAEzB,wFAAwF;IACxF,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAEjC,yEAAyE;IACzE,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QACZ,EAAE,EAAE,OAAO,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;KACf,CAAC;IAEF,6CAA6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB,QAAQ,CAAC,OAAO,EAAE;YAChB,qCAAqC;YACrC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAEhC,6CAA6C;YAC7C,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhE,kDAAkD;YAClD,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC5D,CAAC;KACH;CACF"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/rsc/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,+BAA+B,EAChC,MAAM,sCAAsC,CAAC;AAE9C;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,yDAAyD;IACzD,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAExC,+EAA+E;IAC/E,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;;;OAIG;IACH,OAAO,CAAC,EAAE;QACR,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,wCAAwC;QACxC,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,2CAA2C;QAC3C,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IAEF;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;IAEzB;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,0CAA0C;IAC1C,MAAM,EAAE,MAAM,CAAC;IAEf,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IAEjB,4DAA4D;IAC5D,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,6CAA6C;IAC7C,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,gEAAgE;IAChE,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,uFAAuF;IACvF,UAAU,CAAC,EAAE,KAAK,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CAAC;IAEH,yCAAyC;IACzC,cAAc,EAAE,OAAO,CAAC;IAExB,wDAAwD;IACxD,aAAa,EAAE,+BAA+B,CAAC;IAE/C,8EAA8E;IAC9E,YAAY,EAAE,MAAM,CAAC;IAErB,oCAAoC;IACpC,KAAK,EAAE,OAAO,CAAC;IAEf,0EAA0E;IAC1E,WAAW,CAAC,EAAE,OAAO,CAAC;IAEtB,8EAA8E;IAC9E,sBAAsB,CAAC,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5D;AAED;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAE/B,gEAAgE;IAChE,OAAO,EAAE,MAAM,CAAC;IAEhB,yDAAyD;IACzD,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,0DAA0D;IAC1D,IAAI,EAAE,KAAK,CAAC,YAAY,CAAC;IAEzB,wFAAwF;IACxF,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC;IAEjC,yEAAyE;IACzE,QAAQ,CAAC,EAAE;QACT,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IAEF,0DAA0D;IAC1D,WAAW,CAAC,EAAE;QACZ,EAAE,EAAE,OAAO,CAAC;QACZ,IAAI,EAAE,OAAO,CAAC;KACf,CAAC;IAEF,6CAA6C;IAC7C,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,UAAU;QAClB,QAAQ,CAAC,OAAO,EAAE;YAChB,qCAAqC;YACrC,OAAO,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YAEhC,6CAA6C;YAC7C,UAAU,CAAC,CAAC,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAEhE,kDAAkD;YAClD,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;SAC5D,CAAC;KACH;CACF"}

package/dist/rsc/vite-plugin-nitro.d.ts

@@ -1,15 +1,28 @@
 /**
- * Vite plugin to run Nitro after RSC build (single "vite build", no post script).
- * Implements the Nitro RSC deployment pipeline:
- * - Step 1: Force per-environment output dirs to .nitro/vite/dist/${name} so Nitro can locate artifacts.
- * - Step 2: Capture the server (RSC) Rollup bundle in writeBundle.
- * - Step 3: Find the SSR entry chunk from the bundle.
- * - Step 4: Compute renderer path and pass to Nitro with client publicDir.
+ * Vite plugin for the Nitro RSC deployment pipeline. It forces per-environment
+ * output dirs (`Step 1`), captures the server (RSC) Rollup bundle in `writeBundle`
+ * (`Step 2`), and exposes `runNitroFromBuildApp()`, which builds Nitro from the
+ * captured outputs once all environments have finished writing.
+ *
+ * Farm's RSC builder invokes `runNitroFromBuildApp()` after every environment
+ * has written its output, so a single `vite build` still produces the
+ * deployment bundle.
+ *
+ * The plugin no longer triggers Nitro itself from a Rollup hook: the previous
+ * `buildEnd` trigger fired before its own environment's `prepareOutDir`/`writeBundle`,
+ * so on a rebuild it observed the previous build's stale outputs and built Nitro
+ * against them (and set `__FARM_NITRO_PLUGIN_RAN`, suppressing the proper run).
+ * Removing it keeps Nitro from running against stale artifacts while the post-app
+ * hook preserves the one-command build contract.
+ *
+ * - Step 1: Force per-environment output dirs to `.nitro/vite/dist/${name}` so Nitro can locate artifacts.
+ * - Step 2: Capture the server (RSC) Rollup bundle in `writeBundle`.
  *
  * @example
  * ```ts
- * import nitro from '@farm.js/plugin/rsc/vite-plugin-nitro'
+ * import { defineConfig, nitro } from '@farm.js/plugin/rsc'
  * export default defineConfig({
+ *   srcDir: 'src',
  *   plugins: [rsc(), react(), nitro({ server: { environmentName: 'rsc' }, config: { preset: 'vercel' } })],
  * })
  * ```

package/dist/rsc/vite-plugin-nitro.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin-nitro.d.ts","sourceRoot":"","sources":["../../src/rsc/vite-plugin-nitro.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAenC,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE;QACP,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,4DAA4D;QAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAWD,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAoHtE;AAED,kFAAkF;AAClF,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CA+C1D"}
+{"version":3,"file":"vite-plugin-nitro.d.ts","sourceRoot":"","sources":["../../src/rsc/vite-plugin-nitro.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAenC,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE;QACP,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,4DAA4D;QAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,MAAM,CAAC,EAAE;QACP,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,kEAAkE;IAClE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAID,MAAM,CAAC,OAAO,UAAU,KAAK,CAAC,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAqEtE;AAED,kFAAkF;AAClF,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAkC1D"}

package/dist/rsc/vite-plugin-nitro.js

@@ -1,15 +1,28 @@
 /**
- * Vite plugin to run Nitro after RSC build (single "vite build", no post script).
- * Implements the Nitro RSC deployment pipeline:
- * - Step 1: Force per-environment output dirs to .nitro/vite/dist/${name} so Nitro can locate artifacts.
- * - Step 2: Capture the server (RSC) Rollup bundle in writeBundle.
- * - Step 3: Find the SSR entry chunk from the bundle.
- * - Step 4: Compute renderer path and pass to Nitro with client publicDir.
+ * Vite plugin for the Nitro RSC deployment pipeline. It forces per-environment
+ * output dirs (`Step 1`), captures the server (RSC) Rollup bundle in `writeBundle`
+ * (`Step 2`), and exposes `runNitroFromBuildApp()`, which builds Nitro from the
+ * captured outputs once all environments have finished writing.
+ *
+ * Farm's RSC builder invokes `runNitroFromBuildApp()` after every environment
+ * has written its output, so a single `vite build` still produces the
+ * deployment bundle.
+ *
+ * The plugin no longer triggers Nitro itself from a Rollup hook: the previous
+ * `buildEnd` trigger fired before its own environment's `prepareOutDir`/`writeBundle`,
+ * so on a rebuild it observed the previous build's stale outputs and built Nitro
+ * against them (and set `__FARM_NITRO_PLUGIN_RAN`, suppressing the proper run).
+ * Removing it keeps Nitro from running against stale artifacts while the post-app
+ * hook preserves the one-command build contract.
+ *
+ * - Step 1: Force per-environment output dirs to `.nitro/vite/dist/${name}` so Nitro can locate artifacts.
+ * - Step 2: Capture the server (RSC) Rollup bundle in `writeBundle`.
  *
  * @example
  * ```ts
- * import nitro from '@farm.js/plugin/rsc/vite-plugin-nitro'
+ * import { defineConfig, nitro } from '@farm.js/plugin/rsc'
  * export default defineConfig({
+ *   srcDir: 'src',
  *   plugins: [rsc(), react(), nitro({ server: { environmentName: 'rsc' }, config: { preset: 'vercel' } })],
  * })
  * ```
@@ -18,9 +31,6 @@ import path from "path";
 import { buildRscNitro } from "./nitro-build.js";
 import { waitForRscOutputs } from "./nitro-build.js";
 import { resolveRscBuildOutputPath } from "./build-paths.js";
-let nitroRunScheduled = false;
-/** Stored RSC (server) bundle from writeBundle so we can find the entry chunk. */
-let serverBundle = null;
 const NITRO_VITE_DIST = ".nitro/vite/dist";
 export default function nitro(options = {}) {
     const serverEnvName = options.server?.environmentName ?? "rsc";
@@ -29,12 +39,15 @@ export default function nitro(options = {}) {
     let rscOutDir = path.join(NITRO_VITE_DIST, "rsc");
     let ssrOutDir = path.join(NITRO_VITE_DIST, "ssr");
     let clientOutDir = path.join(NITRO_VITE_DIST, "client");
-    let baseOutDir = NITRO_VITE_DIST;
+    let clientAssetsDir = "assets";
     return {
         name: "vite-plugin-nitro",
         apply: "build",
         // Step 1: Force per-environment output dirs so Nitro can locate artifacts.
         config() {
+            delete globalThis.__FARM_NITRO_SERVER_BUNDLE;
+            delete globalThis.__FARM_NITRO_PATHS;
+            delete globalThis.__FARM_NITRO_BUILD_PROMISE;
             return {
                 environments: {
                     rsc: { build: { outDir: path.join(NITRO_VITE_DIST, "rsc") } },
@@ -50,20 +63,23 @@ export default function nitro(options = {}) {
                 rscOutDir = envs.rsc.build.outDir;
                 ssrOutDir = envs.ssr.build.outDir;
                 clientOutDir = envs.client.build.outDir;
-                const dir = path.dirname(rscOutDir);
-                baseOutDir = path.isAbsolute(dir) ? path.relative(resolvedRoot, dir) || "." : dir;
             }
             else {
-                baseOutDir = options.outDir ?? "dist";
+                const baseOutDir = options.outDir ?? "dist";
                 rscOutDir = path.join(baseOutDir, "rsc");
                 ssrOutDir = path.join(baseOutDir, "ssr");
                 clientOutDir = path.join(baseOutDir, "client");
             }
+            const clientBuildAssetsDir = envs?.client?.build?.assetsDir;
+            clientAssetsDir =
+                typeof clientBuildAssetsDir === "string" && clientBuildAssetsDir
+                    ? clientBuildAssetsDir
+                    : "assets";
         },
         // Step 2: Capture the server (RSC) Rollup bundle when that environment writes.
         writeBundle(_options, bundle) {
             if (this.environment?.name === serverEnvName) {
-                serverBundle = bundle;
+                delete globalThis.__FARM_NITRO_BUILD_PROMISE;
                 globalThis.__FARM_NITRO_SERVER_BUNDLE = bundle;
                 globalThis.__FARM_NITRO_PATHS = {
                     root: resolvedRoot,
@@ -72,59 +88,10 @@ export default function nitro(options = {}) {
                     clientOutDir,
                     serverEntryName,
                     preset: options.config?.preset ?? process.env.NITRO_PRESET ?? "vercel",
+                    clientAssetsDir,
                 };
             }
         },
-        // Run Nitro once all env outputs exist (after step 5). buildEnd runs after each env; only run when all exist.
-        async buildEnd() {
-            if (nitroRunScheduled)
-                return;
-            const root = path.resolve(resolvedRoot);
-            const { existsSync } = await import("fs");
-            await new Promise((r) => setTimeout(r, 800));
-            const baseOutDir = rscOutDir.includes(".nitro/vite/dist")
-                ? NITRO_VITE_DIST
-                : path.isAbsolute(path.dirname(rscOutDir))
-                    ? path.relative(root, path.dirname(rscOutDir)) || "."
-                    : path.dirname(rscOutDir);
-            const rscOk = existsSync(resolveRscBuildOutputPath(root, baseOutDir, "rsc", "index.js"));
-            const ssrOk = existsSync(resolveRscBuildOutputPath(root, baseOutDir, "ssr", "index.js"));
-            const clientOk = existsSync(resolveRscBuildOutputPath(root, baseOutDir, "client", "assets"));
-            if (!rscOk || !ssrOk || !clientOk)
-                return;
-            nitroRunScheduled = true;
-            const preset = options.config?.preset ?? process.env.NITRO_PRESET ?? "vercel";
-            const run = async () => {
-                await waitForRscOutputs(root, baseOutDir, { timeoutMs: 20_000 }).catch(() => {
-                    // Outputs already verified; proceed (nitro-build stubs manifest if missing)
-                });
-                let rendererPath = resolveRscBuildOutputPath(root, rscOutDir, "index.js");
-                if (serverBundle) {
-                    const serverEntryChunks = [];
-                    for (const chunk of Object.values(serverBundle)) {
-                        if (chunk.type === "chunk" && chunk.isEntry && chunk.fileName) {
-                            serverEntryChunks.push(chunk);
-                        }
-                    }
-                    const selected = serverEntryName
-                        ? serverEntryChunks.find((c) => (c.name ?? c.fileName) === serverEntryName)
-                        : serverEntryChunks[0];
-                    if (selected?.fileName) {
-                        rendererPath = resolveRscBuildOutputPath(root, rscOutDir, selected.fileName);
-                    }
-                }
-                await buildRscNitro({
-                    root,
-                    rendererPath,
-                    publicDir: resolveRscBuildOutputPath(root, clientOutDir),
-                    ssrPath: resolveRscBuildOutputPath(root, ssrOutDir, "index.js"),
-                    assetsDir: undefined,
-                    preset,
-                });
-                globalThis.__FARM_NITRO_PLUGIN_RAN = true;
-            };
-            await run();
-        },
     };
 }
 /** Called by RSC plugin buildApp (post) to run Nitro with the captured bundle. */
@@ -133,6 +100,24 @@ export async function runNitroFromBuildApp() {
     const bundle = globalThis.__FARM_NITRO_SERVER_BUNDLE;
     if (!paths)
         return;
+    const existing = globalThis.__FARM_NITRO_BUILD_PROMISE;
+    if (existing) {
+        await existing;
+        return;
+    }
+    const run = runCapturedNitroBuild(paths, bundle);
+    globalThis.__FARM_NITRO_BUILD_PROMISE = run;
+    try {
+        await run;
+    }
+    catch (error) {
+        if (globalThis.__FARM_NITRO_BUILD_PROMISE === run) {
+            delete globalThis.__FARM_NITRO_BUILD_PROMISE;
+        }
+        throw error;
+    }
+}
+async function runCapturedNitroBuild(paths, bundle) {
     const root = paths.root;
     const preset = paths.preset;
     const baseOutDir = path.dirname(paths.rscOutDir);
@@ -157,7 +142,7 @@ export async function runNitroFromBuildApp() {
         rendererPath,
         publicDir: resolveRscBuildOutputPath(root, paths.clientOutDir),
         ssrPath: resolveRscBuildOutputPath(root, paths.ssrOutDir, "index.js"),
-        assetsDir: undefined,
+        assetsDir: paths.clientAssetsDir ?? "assets",
         preset,
     });
 }