@farm.js/core 0.1.0-beta.23 → 0.1.0-beta.24

package/dist/{app-DA6ospIq.d.mts → app-DrFCUMHY.d.mts}

@@ -142,6 +142,7 @@ declare class RouteManager {
             shouldHydrate: boolean;
             isClientComponent: boolean;
             islandStrategy: FarmIslandStrategy | null;
+            suppressedAsyncHydration?: true;
             search?: ProgrammaticRouteSearchClientOptions;
             segments: Array<{
                 segment: string;

package/dist/{app-CTFnOJaI.d.ts → app-pwvKG2B1.d.ts}

@@ -142,6 +142,7 @@ declare class RouteManager {
             shouldHydrate: boolean;
             isClientComponent: boolean;
             islandStrategy: FarmIslandStrategy | null;
+            suppressedAsyncHydration?: true;
             search?: ProgrammaticRouteSearchClientOptions;
             segments: Array<{
                 segment: string;

package/dist/{chunk-TX54PXAJ.mjs → chunk-HVJHNKSP.mjs}

@@ -178,7 +178,7 @@ import {
 } from "./chunk-RHIFZZUI.mjs";
 import {
   FARM_VERSION
-} from "./chunk-5NOVWCFL.mjs";
+} from "./chunk-WO466YX5.mjs";
 import {
   FARM_DEPLOYMENT_ID_HEADER,
   createFarmDeploymentCookie,
@@ -1114,6 +1114,37 @@ function stripUseClientDirective(content) {
   return content.replace(/^\s*(["'])use client\1\s*;?\s*/, "");
 }
 __name(stripUseClientDirective, "stripUseClientDirective");
+function hasAsyncDefaultExport(content) {
+  if (!content) return false;
+  const tokens = tokenizeModuleSource(content);
+  for (let index = 0; index < tokens.length - 2; index++) {
+    const token = tokens[index];
+    if (token.kind !== "identifier" || token.value !== "export") continue;
+    if (tokens[index - 1]?.value === ".") continue;
+    if (tokens[index + 1]?.value !== "default") continue;
+    const exported = tokens[index + 2];
+    if (exported.kind === "identifier" && exported.value === "async") {
+      return true;
+    }
+    if (exported.kind === "identifier" && !["function", "class"].includes(exported.value) && tokens[index + 3]?.value !== "(" && isAsyncLocalDeclaration(tokens, exported.value)) {
+      return true;
+    }
+  }
+  return false;
+}
+__name(hasAsyncDefaultExport, "hasAsyncDefaultExport");
+function isAsyncLocalDeclaration(tokens, name) {
+  for (let index = 0; index < tokens.length - 2; index++) {
+    if (tokens[index].value === "async" && tokens[index + 1]?.value === "function" && tokens[index + 2]?.value === name) {
+      return true;
+    }
+    if (tokens[index].value === name && tokens[index + 1]?.value === "=" && tokens[index + 2]?.value === "async") {
+      return true;
+    }
+  }
+  return false;
+}
+__name(isAsyncLocalDeclaration, "isAsyncLocalDeclaration");
 function parseClientModuleMetadata(content, inspectIslandExport) {
   if (!content) {
     return {
@@ -1169,6 +1200,14 @@ function inspectClientModuleMetadata(resolvedPath, root, visited, inspectIslandE
     }
   }
   const shouldHydrate = parsed.hasHydrateExport || importsClientBoundary;
+  if (shouldHydrate && hasAsyncDefaultExport(content)) {
+    return {
+      isClientComponent: false,
+      shouldHydrate: false,
+      islandStrategy: null,
+      suppressedAsyncHydration: true
+    };
+  }
   return {
     isClientComponent: false,
     shouldHydrate,
@@ -1806,6 +1845,7 @@ var _RouteManager = class _RouteManager {
         shouldHydrate: metadata.shouldHydrate,
         isClientComponent: metadata.isClientComponent,
         islandStrategy: metadata.islandStrategy,
+        suppressedAsyncHydration: metadata.suppressedAsyncHydration,
         search: getProgrammaticRouteSearchClientOptions(programmaticPage?.search),
         segments: entry.route.segments.map((seg) => ({
           segment: seg.segment,
@@ -3639,6 +3679,15 @@ __name(DefaultNotFoundPage, "DefaultNotFoundPage");
 // src/server/renderer.ts
 var cachedClerkProvider = null;
 var importRuntimeModule = new Function("specifier", "return import(specifier);");
+var warnedSuppressedAsyncHydrationModules = /* @__PURE__ */ new Set();
+function warnSuppressedAsyncHydrationOnce(modulePath) {
+  if (warnedSuppressedAsyncHydrationModules.has(modulePath)) return;
+  warnedSuppressedAsyncHydrationModules.add(modulePath);
+  logger.warn(
+    `${modulePath} is an async server component that imports client components. React cannot hydrate async components in the browser, so this route stays server-rendered and its client imports are not interactive. Move the interactive UI into a "use client" child rendered by a synchronous page, or enable experimental server components support.`
+  );
+}
+__name(warnSuppressedAsyncHydrationOnce, "warnSuppressedAsyncHydrationOnce");
 function hasRequestHeader(req, name) {
   const value = req.headers[name.toLowerCase()];
   return Array.isArray(value) ? value.length > 0 : Boolean(value);
@@ -4313,6 +4362,9 @@ var _ServerRenderer = class _ServerRenderer {
         })
       );
       const shouldHydrate = moduleMetadata.shouldHydrate;
+      if (moduleMetadata.suppressedAsyncHydration) {
+        warnSuppressedAsyncHydrationOnce(route.modulePath);
+      }
       const layoutHydrationMetadata = layouts.map((layout) => {
         const manifestEntry = routeManifest.layouts.find(
           (entry) => entry.pattern === layout.pattern
@@ -4810,7 +4862,7 @@ var _ServerRenderer = class _ServerRenderer {
     }
   }
   async renderWithSSR(element, req, res, clearMiddlewareData, options = {}) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const streamStartTime = Date.now();
       const observabilityRoute = options.observabilityRoute || req.__FARM_ROUTE__ || req.url || "/";
       const deploymentId = this.getDeploymentId();
@@ -5010,7 +5062,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue(g
                 route: observabilityRoute,
                 durationMs: Date.now() - streamStartTime
               });
-              resolve5();
+              resolve6();
             }
           });
           res.write(shell);
@@ -6029,12 +6081,40 @@ function collectLegacyTypeArtifacts(root, srcDir, stalePaths) {
 __name(collectLegacyTypeArtifacts, "collectLegacyTypeArtifacts");
 
 // src/vite.ts
+import * as fs5 from "fs";
+import * as path12 from "path";
+
+// src/dev-static.ts
 import * as fs4 from "fs";
-import * as path11 from "path";
+import * as path9 from "path";
+function devServableFileExists(pathname, baseDirs) {
+  let decodedPathname;
+  try {
+    decodedPathname = decodeURIComponent(pathname);
+  } catch {
+    return false;
+  }
+  const relativePathname = decodedPathname.replace(/^\/+/, "");
+  if (!relativePathname) return false;
+  for (const baseDir of baseDirs) {
+    if (typeof baseDir !== "string" || baseDir.length === 0) continue;
+    const resolvedBase = path9.resolve(baseDir);
+    const candidate = path9.resolve(resolvedBase, relativePathname);
+    if (!candidate.startsWith(resolvedBase + path9.sep)) continue;
+    try {
+      if (fs4.existsSync(candidate) && fs4.statSync(candidate).isFile()) {
+        return true;
+      }
+    } catch {
+    }
+  }
+  return false;
+}
+__name(devServableFileExists, "devServableFileExists");
 
 // src/image-vite.ts
 import { readFile as readFile4 } from "fs/promises";
-import path9 from "path";
+import path10 from "path";
 import { imageSize as imageSize2 } from "image-size";
 var FARM_IMAGE_ID_PREFIX = "\0farm:image:";
 var STATIC_IMAGE_RE = /\.(?:avif|gif|jpe?g|png|webp)$/i;
@@ -6102,7 +6182,7 @@ async function createBlurDataURL(bytes) {
 __name(createBlurDataURL, "createBlurDataURL");
 
 // src/server/vite-config.ts
-import path10 from "path";
+import path11 from "path";
 var FARM_CLIENT_ENTRY_PATTERN = "**/{page,layout,loading,error,not-found,default}.{js,jsx,ts,tsx}";
 var FARM_CLIENT_OPTIMIZE_DEPS_INCLUDE = [
   "react",
@@ -6120,9 +6200,9 @@ var FARM_CLIENT_OPTIMIZE_DEPS_INCLUDE = [
   "@farm.js/core/server-query/client"
 ];
 function createFarmClientOptimizeDepsEntries(projectRoot, appDirectories) {
-  const resolvedProjectRoot = path10.resolve(projectRoot);
+  const resolvedProjectRoot = path11.resolve(projectRoot);
   return appDirectories.map((appDirectory) => {
-    const relativeAppDirectory = path10.relative(resolvedProjectRoot, path10.resolve(appDirectory)).replace(/\\/g, "/");
+    const relativeAppDirectory = path11.relative(resolvedProjectRoot, path11.resolve(appDirectory)).replace(/\\/g, "/");
     const prefix = relativeAppDirectory || ".";
     return `${prefix}/${FARM_CLIENT_ENTRY_PATTERN}`;
   });
@@ -6146,7 +6226,7 @@ function createFarmClientOptimizeDepsConfig(entries) {
 __name(createFarmClientOptimizeDepsConfig, "createFarmClientOptimizeDepsConfig");
 function createFarmSourceAlias(projectRoot, srcDir = "src") {
   return {
-    "@": path10.resolve(projectRoot, srcDir)
+    "@": path11.resolve(projectRoot, srcDir)
   };
 }
 __name(createFarmSourceAlias, "createFarmSourceAlias");
@@ -6454,11 +6534,11 @@ function isPotentialProgrammaticRouteSourceFile(normalizedFile, srcDirSlug) {
 }
 __name(isPotentialProgrammaticRouteSourceFile, "isPotentialProgrammaticRouteSourceFile");
 function fileContainsProgrammaticPageRoute(file) {
-  if (!fs4.existsSync(file)) {
+  if (!fs5.existsSync(file)) {
     return false;
   }
   try {
-    return scanProgrammaticPagePaths(fs4.readFileSync(file, "utf8")).length > 0;
+    return scanProgrammaticPagePaths(fs5.readFileSync(file, "utf8")).length > 0;
   } catch {
     return false;
   }
@@ -6466,7 +6546,7 @@ function fileContainsProgrammaticPageRoute(file) {
 __name(fileContainsProgrammaticPageRoute, "fileContainsProgrammaticPageRoute");
 function rewriteEarlySsrRelativeImports(options) {
   const cleanId = options.id.split("?", 1)[0];
-  if (!path11.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
+  if (!path12.isAbsolute(cleanId) || cleanId.replace(/\\/g, "/").includes("/node_modules/")) {
     return null;
   }
   const replacements = [];
@@ -6486,7 +6566,7 @@ function rewriteEarlySsrRelativeImports(options) {
     const suffixIndex = source.value.search(/[?#]/);
     const sourcePath = suffixIndex === -1 ? source.value : source.value.slice(0, suffixIndex);
     const suffix = suffixIndex === -1 ? "" : source.value.slice(suffixIndex);
-    const resolvedPath = path11.resolve(path11.dirname(cleanId), sourcePath);
+    const resolvedPath = path12.resolve(path12.dirname(cleanId), sourcePath);
     replacements.push({
       start: source.start,
       end: source.end,
@@ -6565,7 +6645,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         ...layerRoots.length ? {
           server: {
             fs: {
-              allow: [path11.resolve(options.root || process.cwd()), ...layerRoots]
+              allow: [path12.resolve(options.root || process.cwd()), ...layerRoots]
             }
           }
         } : {}
@@ -6596,13 +6676,13 @@ function farmPlugin(options = {}, initialPluginManager) {
         },
         server
       );
-      const globalsCSSPath = path11.join(server.config.root, "src/app/globals.css");
-      if (!fs4.existsSync(globalsCSSPath)) {
-        const appDir = path11.join(server.config.root, "src/app");
-        if (!fs4.existsSync(appDir)) {
-          fs4.mkdirSync(appDir, { recursive: true });
+      const globalsCSSPath = path12.join(server.config.root, "src/app/globals.css");
+      if (!fs5.existsSync(globalsCSSPath)) {
+        const appDir = path12.join(server.config.root, "src/app");
+        if (!fs5.existsSync(appDir)) {
+          fs5.mkdirSync(appDir, { recursive: true });
         }
-        fs4.writeFileSync(globalsCSSPath, defaultGlobalCSS);
+        fs5.writeFileSync(globalsCSSPath, defaultGlobalCSS);
       }
       await farmApp.initialize();
       const farmConfig = farmApp.getConfig();
@@ -6621,10 +6701,10 @@ function farmPlugin(options = {}, initialPluginManager) {
         });
       }
       const sourceRoots = getFarmSourceRoots(farmConfig);
-      server.watcher.add(sourceRoots.map((source) => path11.join(source.root, source.srcDir)));
+      server.watcher.add(sourceRoots.map((source) => path12.join(source.root, source.srcDir)));
       if (farmConfig.i18n.enabled) {
         server.watcher.add(
-          farmConfig.i18n.messages.includes("{locale}") ? path11.dirname(farmConfig.i18n.messages) : farmConfig.i18n.messages
+          farmConfig.i18n.messages.includes("{locale}") ? path12.dirname(farmConfig.i18n.messages) : farmConfig.i18n.messages
         );
       }
       const workflowConfig = farmConfig.workflows;
@@ -6634,7 +6714,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         ...farmDocsDevRuntime?.getFarmDocsRouteTypeEntries(farmConfig.docs) ?? []
       ], "getExtraRouteTypes");
       const appDirSlugs = sourceRoots.map(
-        (source) => path11.join(source.root, source.srcDir, "app").replace(/\\/g, "/")
+        (source) => path12.join(source.root, source.srcDir, "app").replace(/\\/g, "/")
       );
       const generateTypeArtifacts = /* @__PURE__ */ __name(async (reason, selection = ALL_TYPE_ARTIFACTS, log = false) => {
         try {
@@ -6674,7 +6754,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       }, "generateTypeArtifacts");
       await generateTypeArtifacts("startup");
       const srcDirSlugs = sourceRoots.map(
-        (source) => path11.join(source.root, source.srcDir).replace(/\\/g, "/")
+        (source) => path12.join(source.root, source.srcDir).replace(/\\/g, "/")
       );
       const layerConfigFiles = new Set(
         farmConfig.layers.map((layer) => layer.configFile?.replace(/\\/g, "/")).filter((file) => Boolean(file))
@@ -6792,7 +6872,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       await apiRouteManager.discoverRoutes();
       let discoveredWorkflows = [];
       const hasWorkflowDirectory = workflowConfig.enabled && workflowConfig.dirs.some(
-        (dir) => fs4.existsSync(path11.isAbsolute(dir) ? dir : path11.join(farmConfig.root, dir))
+        (dir) => fs5.existsSync(path12.isAbsolute(dir) ? dir : path12.join(farmConfig.root, dir))
       );
       if (hasWorkflowDirectory) {
         const { createFarmWorkflowRequestHandler, discoverFarmWorkflows } = await loadFarmWorkflowsDevRuntime();
@@ -7026,12 +7106,12 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             }
           }
           const farmDocsFontPath = farmDocsFontAssets.get(requestPathname);
-          if ((requestMethod === "GET" || requestMethod === "HEAD") && farmDocsFontPath && fs4.existsSync(farmDocsFontPath)) {
+          if ((requestMethod === "GET" || requestMethod === "HEAD") && farmDocsFontPath && fs5.existsSync(farmDocsFontPath)) {
             res.statusCode = 200;
             res.setHeader("Content-Type", "font/woff2");
             res.setHeader("Cache-Control", "public, max-age=31536000, immutable");
             if (requestMethod === "HEAD") res.end();
-            else fs4.createReadStream(farmDocsFontPath).pipe(res);
+            else fs5.createReadStream(farmDocsFontPath).pipe(res);
             return;
           }
           if (requestMethod === "GET" && (requestPathname === FARM_DEVTOOLS_PATH || requestPathname === `${FARM_DEVTOOLS_PATH}.json`)) {
@@ -7129,7 +7209,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                 return null;
               }
               return {
-                source: await fs4.promises.readFile(sourcePath, "utf8"),
+                source: await fs5.promises.readFile(sourcePath, "utf8"),
                 filePath: sourcePath
               };
             }, "resolveSource")
@@ -7464,9 +7544,17 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             res.end(JSON.stringify({ error: "API route not found", pathname: pathname2 }));
             return;
           }
-          if (req.url?.startsWith("/@") || req.url?.startsWith("/node_modules") || requestPathname.includes(".") && !requestPathname.endsWith(".html")) {
+          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 (req.url?.startsWith("/__farm/page-data")) {
             const urlObj = new URL(req.url, `http://${req.headers.host || "localhost:3000"}`);
             const targetPath = urlObj.searchParams.get("path") || "/";
@@ -8172,8 +8260,8 @@ if (import.meta.hot) {
         }
         logger.info(`Found ${ssgPages.length} SSG pages, ${ssrRoutes.length} SSR routes`);
         logger.info("Pre-rendering SSG pages...");
-        const outDir = path11.join(server?.config.root || process.cwd(), options.outDir || "dist");
-        const clientDir = path11.join(outDir, "client");
+        const outDir = path12.join(server?.config.root || process.cwd(), options.outDir || "dist");
+        const clientDir = path12.join(outDir, "client");
         for (const page of ssgPages) {
           try {
             const staticRequest = new Request(new URL(page.urlPath, "http://farm.static"));
@@ -8225,9 +8313,9 @@ if (import.meta.hot) {
   <script type="module" src="/assets/client.js"></script>
 </body>
 </html>`;
-              const outputPath = page.urlPath === "/" ? path11.join(clientDir, "index.html") : path11.join(clientDir, page.urlPath + ".html");
-              fs4.mkdirSync(path11.dirname(outputPath), { recursive: true });
-              fs4.writeFileSync(outputPath, fullHtml);
+              const outputPath = page.urlPath === "/" ? path12.join(clientDir, "index.html") : path12.join(clientDir, page.urlPath + ".html");
+              fs5.mkdirSync(path12.dirname(outputPath), { recursive: true });
+              fs5.writeFileSync(outputPath, fullHtml);
               const revalidateInfo = page.revalidate ? ` (revalidate: ${page.revalidate}s)` : "";
               logger.success(`  \u2713 ${page.urlPath}${revalidateInfo}`);
             });
@@ -8235,8 +8323,8 @@ if (import.meta.hot) {
             logger.error(`  \u2717 ${page.urlPath}: ${error}`);
           }
         }
-        const manifestPath = path11.join(outDir, "__ssg_manifest.json");
-        fs4.writeFileSync(
+        const manifestPath = path12.join(outDir, "__ssg_manifest.json");
+        fs5.writeFileSync(
           manifestPath,
           JSON.stringify(
             ssgPages.map((p) => ({
@@ -8271,9 +8359,9 @@ if (import.meta.hot) {
       }
       const currentFarmConfig = farmApp?.getConfig();
       const normalizedFile = file.replace(/\\/g, "/");
-      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path11.join(source.root, source.srcDir).replace(/\\/g, "/")).find((sourceRoot) => normalizedFile.startsWith(`${sourceRoot}/`)) || null : null;
+      const currentSrcRoot = currentFarmConfig ? getFarmSourceRoots(currentFarmConfig).map((source) => path12.join(source.root, source.srcDir).replace(/\\/g, "/")).find((sourceRoot) => normalizedFile.startsWith(`${sourceRoot}/`)) || null : null;
       if (currentSrcRoot && normalizedFile.startsWith(`${currentSrcRoot}/`) && isProgrammaticRoutesFileName(normalizedFile)) {
-        logUpdate("PAGE", `updated ${path11.basename(file)}`);
+        logUpdate("PAGE", `updated ${path12.basename(file)}`);
         for (const mod of modules) {
           server2.moduleGraph.invalidateModule(mod);
         }
@@ -9459,6 +9547,19 @@ async function tryHydrateImportedPage(
     const PageComponent = pageModule?.default;
     if (!PageComponent) return false;
 
+    if (
+      typeof PageComponent === 'function' &&
+      PageComponent.constructor &&
+      PageComponent.constructor.name === 'AsyncFunction'
+    ) {
+      console.warn(
+        '[Farm.js] Skipping hydration for ' + modulePath +
+        ': async server components cannot run in the browser. ' +
+        'Server-rendered HTML is preserved; move interactive UI into a "use client" child of a synchronous page.'
+      );
+      return false;
+    }
+
     currentPageComponent = PageComponent;
     currentPageProps = await buildRouteComponentProps(
       pageModule,
@@ -10012,7 +10113,7 @@ function generateClientManifest(bundle) {
 __name(generateClientManifest, "generateClientManifest");
 async function defineConfig(config = {}) {
   const tailwindcss = (await import("@tailwindcss/vite")).default;
-  const appRoot = path11.resolve(config.root || process.cwd());
+  const appRoot = path12.resolve(config.root || process.cwd());
   if (config.extends?.length) {
     const { config: layeredConfig } = await import("./layers-VWVDTPUZ.mjs").then(
       ({ resolveFarmLayers }) => resolveFarmLayers(config, {
@@ -10257,4 +10358,4 @@ export {
   farmPlugin,
   defineConfig
 };
-//# sourceMappingURL=chunk-TX54PXAJ.mjs.map
+//# sourceMappingURL=chunk-HVJHNKSP.mjs.map