@farm.js/core 0.1.0-beta.50 → 0.1.0-beta.52

package/dist/index.mjs

@@ -9,7 +9,7 @@ import {
 } from "./chunk-5ZGPRGWV.mjs";
 import {
   build
-} from "./chunk-6YIZDTX7.mjs";
+} from "./chunk-BTFOMBWK.mjs";
 import "./chunk-SL6HTIOK.mjs";
 import "./chunk-4S3ORGFA.mjs";
 import {
@@ -144,7 +144,7 @@ import {
 } from "./chunk-SALMKQXH.mjs";
 import {
   useServerQuery
-} from "./chunk-ZAW3D2TI.mjs";
+} from "./chunk-M2DI67UZ.mjs";
 import {
   useBlocker,
   useNavigation,
@@ -179,7 +179,7 @@ import {
   completeFarmServerQueryAction,
   fetchServerQuery,
   prefetchServerQuery
-} from "./chunk-HSHA3H3U.mjs";
+} from "./chunk-3E2WRUR2.mjs";
 import {
   SPARouter,
   getRouter,
@@ -208,7 +208,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-QTAJIJJJ.mjs";
+} from "./chunk-XMUPYG2D.mjs";
 import {
   analyzeStaticRouteCandidate,
   collectSSGPages,
@@ -227,7 +227,7 @@ import {
   parseRouteRenderingDirective,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-GM43ZLTS.mjs";
+} from "./chunk-JK6YAQ3E.mjs";
 import {
   APITypeGenerator
 } from "./chunk-XJTDE4L4.mjs";
@@ -568,7 +568,7 @@ import {
   runWithFarmSpan
 } from "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-DDE3BBDN.mjs";
+import "./chunk-TW74WBSB.mjs";
 import {
   createCompressionPlugin,
   createEnvPlugin,

package/dist/internal/build-runtime.cjs

@@ -14918,7 +14918,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.50";
+    version = "0.1.0-beta.52";
   }
 });
 
@@ -20856,6 +20856,13 @@ var init_after = __esm({
 });
 
 // src/dev-static.ts
+function shouldBypassFarmRouterForDottedPath(pathname, routeManager, baseDirs) {
+  if (!pathname.includes(".") || pathname.endsWith(".html")) return false;
+  const matchesAppRoute = Boolean(
+    routeManager?.matchRoute(pathname)?.route || routeManager?.matchMetadataRoute(pathname) || routeManager?.matchMetadataImage(pathname)
+  );
+  return !matchesAppRoute || devServableFileExists(pathname, baseDirs);
+}
 function devServableFileExists(pathname, baseDirs) {
   let decodedPathname;
   try {
@@ -20885,10 +20892,45 @@ var init_dev_static = __esm({
     "use strict";
     fs10 = __toESM(require("fs"));
     path29 = __toESM(require("path"));
+    __name(shouldBypassFarmRouterForDottedPath, "shouldBypassFarmRouterForDottedPath");
     __name(devServableFileExists, "devServableFileExists");
   }
 });
 
+// src/server-query-boundary.ts
+function findClientServerFnViolation(code, id) {
+  if (id.startsWith("\0") || id.startsWith("virtual:") || id.includes("node_modules")) return null;
+  if (!code.includes("@farm.js/core")) return null;
+  for (const match of code.matchAll(FARM_CORE_IMPORT_RE)) {
+    const specifiers = match[1];
+    for (const factory of SERVER_FN_FACTORIES) {
+      if (!new RegExp(`(?:^|[\\s{,])${factory}(?:[\\s},]|$)`).test(specifiers)) continue;
+      if (new RegExp(`(?<![\\w$.])${factory}\\s*(?:<[^>]*>)?\\s*\\(`).test(code)) {
+        return { factory };
+      }
+    }
+  }
+  return null;
+}
+function formatServerFnBoundaryError(violation, id) {
+  return [
+    `${violation.factory} handlers run only on the server, but ${id} is being bundled into the client.`,
+    `Importing a ${violation.factory} module from client code executes the server handler (and its Node-only imports) in the browser.`,
+    `Either enable the server-function transform (add @farm.js/plugin/rsc and set experimental.serverActions: true in farm.config.ts) so client imports become server references,`,
+    `or keep the query on the server: call it from server components, or expose an API route and use createAPIClient from the client.`
+  ].join("\n");
+}
+var SERVER_FN_FACTORIES, FARM_CORE_IMPORT_RE;
+var init_server_query_boundary = __esm({
+  "src/server-query-boundary.ts"() {
+    "use strict";
+    SERVER_FN_FACTORIES = ["createServerQuery", "createServerFn"];
+    FARM_CORE_IMPORT_RE = /import\s*(?!type\b)(?:[\w$]+\s*,\s*)?\{([^}]*)\}\s*from\s*(["'])@farm\.js\/core(?:\/[\w./-]+)?\2/g;
+    __name(findClientServerFnViolation, "findClientServerFnViolation");
+    __name(formatServerFnBoundaryError, "formatServerFnBoundaryError");
+  }
+});
+
 // src/image-vite.ts
 function farmImageImportsPlugin() {
   return {
@@ -27648,13 +27690,11 @@ window.__FARM_MANIFEST__ = ${inlineValue({
           if (req.url?.startsWith("/@") || req.url?.startsWith("/node_modules")) {
             return next();
           }
-          if (requestPathname.includes(".") && !requestPathname.endsWith(".html")) {
-            const matchesAppRoute = Boolean(
-              farmApp?.getRouteManager()?.matchRoute(requestPathname)?.route
-            );
-            if (!matchesAppRoute || devServableFileExists(requestPathname, [server.config.publicDir, server.config.root])) {
-              return next();
-            }
+          if (shouldBypassFarmRouterForDottedPath(requestPathname, farmApp?.getRouteManager(), [
+            server.config.publicDir,
+            server.config.root
+          ])) {
+            return next();
           }
           if (req.url?.startsWith("/__farm/page-data")) {
             const urlObj = new URL(req.url, `http://${req.headers.host || "localhost:3000"}`);
@@ -28308,6 +28348,15 @@ export const manifest = getManifest();
       }
     },
     async transform(code, id, transformOptions) {
+      if (!transformOptions?.ssr) {
+        const currentConfig = farmApp?.getConfig() ?? options;
+        if (currentConfig.experimental?.serverActions !== true) {
+          const violation = findClientServerFnViolation(code, id);
+          if (violation) {
+            this.error(formatServerFnBoundaryError(violation, id));
+          }
+        }
+      }
       if (typeof imageImports.transform === "function") {
         const imageModule = await imageImports.transform.call(this, code, id, transformOptions);
         if (imageModule) return imageModule;
@@ -30531,6 +30580,7 @@ var init_vite2 = __esm({
     init_deferred();
     init_after();
     init_dev_static();
+    init_server_query_boundary();
     init_deployment();
     init_image_config();
     init_image_vite();
@@ -32659,16 +32709,45 @@ var FARM_SSR_PACKAGE_IMPORT = "#farm-ssr-entry";
 var FARM_SSR_OUTPUT_DIR = "farm-ssr";
 var FARM_CLIENT_BUILD_TARGET = ["es2020", "edge88", "firefox78", "chrome87", "safari14"];
 function resolveNitroRuntimeDependency(root, specifier) {
+  return (0, import_module2.createRequire)(resolveNitroPackageEntry(root)).resolve(specifier).split(import_path13.default.sep).join("/");
+}
+__name(resolveNitroRuntimeDependency, "resolveNitroRuntimeDependency");
+function createPrerenderRuntimeResolverPlugin(root, resolveNitroEntry = resolveNitroPackageEntry) {
+  let nitroEntry;
+  return {
+    name: "farm-prerender-runtime-resolver",
+    async resolveId(id, _importer, options) {
+      if (options.custom?.farmPrerenderRuntimeResolve) return null;
+      if (id.startsWith("\0") || id.startsWith(".") || id.startsWith("#") || id.startsWith("virtual:") || import_path13.default.isAbsolute(id) || NODE_BUILTIN_MODULES.has(id)) {
+        return null;
+      }
+      if (nitroEntry === void 0) {
+        try {
+          nitroEntry = resolveNitroEntry(root);
+        } catch {
+          nitroEntry = null;
+        }
+      }
+      if (!nitroEntry) return null;
+      return this.resolve(id, nitroEntry, {
+        ...options,
+        skipSelf: true,
+        custom: { ...options.custom, farmPrerenderRuntimeResolve: true }
+      });
+    }
+  };
+}
+__name(createPrerenderRuntimeResolverPlugin, "createPrerenderRuntimeResolverPlugin");
+function resolveNitroPackageEntry(root) {
   const projectRequire = (0, import_module2.createRequire)(import_path13.default.join(root, "package.json"));
   let runtimeRequire = projectRequire;
   try {
     runtimeRequire = (0, import_module2.createRequire)(projectRequire.resolve("@farm.js/core"));
   } catch {
   }
-  const nitroEntry = runtimeRequire.resolve("nitro");
-  return (0, import_module2.createRequire)(nitroEntry).resolve(specifier).split(import_path13.default.sep).join("/");
+  return runtimeRequire.resolve("nitro");
 }
-__name(resolveNitroRuntimeDependency, "resolveNitroRuntimeDependency");
+__name(resolveNitroPackageEntry, "resolveNitroPackageEntry");
 function cloneConfigValue(value, seen = /* @__PURE__ */ new WeakMap()) {
   if (value === null || typeof value !== "object") return value;
   if (seen.has(value)) return seen.get(value);
@@ -38934,6 +39013,15 @@ export default async function farmNitroEventHandler(event) {
       delete prerendererConfig.entry;
     });
   }
+  nitroInstance.hooks.hook("prerender:init", (prerenderer) => {
+    prerenderer.hooks.hook("rollup:before", (_prerenderNitro, rollupConfig) => {
+      const configuredPlugins = rollupConfig.plugins;
+      rollupConfig.plugins = [
+        ...Array.isArray(configuredPlugins) ? configuredPlugins : configuredPlugins ? [configuredPlugins] : [],
+        createPrerenderRuntimeResolverPlugin(config.root)
+      ];
+    });
+  });
   await nitro.prepare(nitroInstance);
   await nitro.copyPublicAssets(nitroInstance);
   if (prerenderRoutes.length > 0 && canReusePrebuiltSSR) {