@farm.js/core 0.1.16 → 0.1.18

package/dist/{chunk-NHHKW2T6.mjs → chunk-GYKJCFTS.mjs}

@@ -6,7 +6,7 @@ import {
   parseRouteSlotFile,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-27JNCYEK.mjs";
+} from "./chunk-EN7WTEAY.mjs";
 import {
   collectSchemaExtensions,
   declareSchemaTables,
@@ -24,7 +24,7 @@ import {
   getDefaultErrorStatusText,
   renderFarmLocaleAlternateLinks,
   resolveDefaultErrorStatus
-} from "./chunk-7ZWL7XOU.mjs";
+} from "./chunk-76DG3LF3.mjs";
 import {
   isFarmPreviewDeploymentEnvironment
 } from "./chunk-BOYNDCZL.mjs";
@@ -99,30 +99,30 @@ import {
   resolveFarmLlmsTxtConfig,
   resolveFarmPerformanceConfig,
   resolveFarmSecurityConfig
-} from "./chunk-Q3MDL7TM.mjs";
+} from "./chunk-ZCNJKLA2.mjs";
 import {
   getPublicFarmImageConfig,
   resolveFarmImageConfig
 } from "./chunk-G2KY33I6.mjs";
 import {
   resolveCronConfig
-} from "./chunk-4L7SZOHZ.mjs";
+} from "./chunk-YHOCRI4H.mjs";
 import {
   resolveServerActionsConfig
 } from "./chunk-QCFFHV5H.mjs";
 import {
   createBundledEnv,
   getResolvedEnv
-} from "./chunk-7HDZYYS4.mjs";
+} from "./chunk-4OOBRCJX.mjs";
 import {
   createFarmMarkdownRouteModuleFromFile,
   loadFarmMdxComponents
-} from "./chunk-KATQ6I56.mjs";
+} from "./chunk-XWAYMDLB.mjs";
 import {
   createFarmMarkdownSourceResponse,
   isFarmMarkdownPageFile,
   normalizeFarmMarkdownRoutePath
-} from "./chunk-LUC2FAGW.mjs";
+} from "./chunk-6VQIKZZO.mjs";
 import {
   resolveFarmMdxComponentsModulePath,
   resolveMdxConfig
@@ -136,10 +136,10 @@ import {
   getFarmMarkdownMirrorPath,
   resolveMarkdownConfig,
   resolveMarkdownMirrorTarget
-} from "./chunk-6SCB2MXB.mjs";
+} from "./chunk-SXHV42UQ.mjs";
 import {
   resolveWorkflowsConfig
-} from "./chunk-MUUZJLCI.mjs";
+} from "./chunk-EGJDUF4Q.mjs";
 import {
   initStorage
 } from "./chunk-UWPLULNK.mjs";
@@ -162,13 +162,13 @@ import {
 } from "./chunk-JLCQGPXE.mjs";
 import {
   MiddlewareManager
-} from "./chunk-B76DT5Y6.mjs";
+} from "./chunk-57J3Y7Y3.mjs";
 import {
   _clearCurrentMiddlewareContext,
   _clearCurrentMiddlewareData,
   _runWithMiddlewareContext,
   _runWithMiddlewareData
-} from "./chunk-NDD2YVGU.mjs";
+} from "./chunk-NRVGEI5I.mjs";
 import {
   _runWithAPIRequestRuntime
 } from "./chunk-R3DS7A2T.mjs";
@@ -177,11 +177,11 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteManager
-} from "./chunk-ZHOIQC6U.mjs";
+} from "./chunk-ATERBVHQ.mjs";
 import {
   findProgrammaticRouteFiles,
   loadProgrammaticRouteManifests
-} from "./chunk-VO5SCWF5.mjs";
+} from "./chunk-BNGS6KJ6.mjs";
 import {
   _runWithFarmI18nRequest,
   _setDefaultFarmI18nRuntime,
@@ -190,7 +190,7 @@ import {
 } from "./chunk-JNGIWIY6.mjs";
 import {
   isFarmAPIPathname
-} from "./chunk-DPZUDPVJ.mjs";
+} from "./chunk-XP777LRD.mjs";
 import {
   resolveFarmAPIServerBasePath
 } from "./chunk-I6XDAKWQ.mjs";
@@ -258,7 +258,7 @@ import {
 } from "./chunk-Z2RZJZIZ.mjs";
 import {
   FARM_VERSION
-} from "./chunk-IL5RWYK7.mjs";
+} from "./chunk-3XG26Z3J.mjs";
 import {
   resolveFarmTrailingSlashRedirect,
   setFarmTrailingSlashPreference
@@ -294,7 +294,7 @@ import {
   createFarmCacheKey,
   getFarmDataCache,
   normalizeRevalidatePath
-} from "./chunk-IGO2HEV7.mjs";
+} from "./chunk-F6SJAKFJ.mjs";
 import {
   configureFarmObservability,
   emitFarmEvent,
@@ -1432,7 +1432,7 @@ function resolveImportedModule(importerPath, specifier, root) {
     return { path: resolveImportedModuleSourcePath(importerPath, specifier, root), local: true };
   }
   const aliased = resolveProjectAliasSourcePath(specifier, root);
-  if (aliased !== void 0) return { path: aliased, local: true };
+  if (aliased) return { path: aliased, local: true };
   return { path: resolvePackageModuleSourcePath(importerPath, specifier, root), local: false };
 }
 __name(resolveImportedModule, "resolveImportedModule");
@@ -1448,11 +1448,12 @@ function resolveProjectAliasSourcePath(specifier, root) {
     if (!match || alias.prefix.length > match.alias.prefix.length) match = { alias, captured };
   }
   if (!match) return void 0;
-  return resolveSourceCandidate(
+  const resolved = resolveSourceCandidate(
     match.alias.targets.map(
       (target) => path.normalize(match.alias.wildcard ? target.replace("*", match.captured) : target)
     )
   );
+  return resolved && /\.d\.[cm]?ts$/.test(resolved) ? null : resolved;
 }
 __name(resolveProjectAliasSourcePath, "resolveProjectAliasSourcePath");
 function matchProjectImportAlias(alias, specifier) {
@@ -2841,7 +2842,7 @@ var _RouteManager = class _RouteManager {
   }
   toRoutePathname(pathname) {
     const i18n = this.getI18nConfig();
-    return i18n ? stripFarmLocaleFromPathname(pathname, i18n) : pathname;
+    return i18n ? stripFarmLocaleFromPathname(pathname, i18n) : stripFarmBasePath(pathname, this.config.basePath);
   }
   localizeRedirectDestination(destination, locale) {
     if (!locale || !destination.startsWith("/") || destination.startsWith("//")) {
@@ -4653,7 +4654,7 @@ function createPPRRefreshScript() {
 __name(createPPRRefreshScript, "createPPRRefreshScript");
 function createPreHydrationClickQueueScript() {
   const selector = JSON.stringify(FARM_ISLAND_REPLAYABLE_SELECTOR);
-  return `<script>(function(){if(window.__FARM_PREHYDRATION_CLICK_QUEUE__)return;var queue=[];window.__FARM_PREHYDRATION_CLICK_QUEUE__=queue;window.__FARM_HYDRATED__=false;document.documentElement.dataset.farmHydrated="false";function isModified(event){return !!(event.metaKey||event.altKey||event.ctrlKey||event.shiftKey)}function inHydrated(node){return !!(node&&node.closest&&node.closest('[data-farm-island-hydrated="true"]'))}function closestQueuedTarget(target){while(target&&target!==document.documentElement){if(target.matches&&target.matches(${selector}))return target;target=target.parentElement}return null}function announce(target,kind){document.dispatchEvent(new CustomEvent("farm:island-interaction",{detail:{target:target,kind:kind||null}}))}function hold(event,target,kind){if(queue.some(function(item){return item.target===target}))return;queue.push({target:target,kind:kind,createdAt:Date.now()});announce(target,kind);event.preventDefault();event.stopImmediatePropagation()}document.addEventListener("click",function(event){if(window.__FARM_HYDRATED__)return;if(event.defaultPrevented||event.button!==0||isModified(event))return;var target=closestQueuedTarget(event.target);if(!target||target.closest&&target.closest("a[href]")||inHydrated(target))return;hold(event,target,"click")},true);document.addEventListener("submit",function(event){if(window.__FARM_HYDRATED__)return;if(event.defaultPrevented)return;var form=event.target;if(!form||form.nodeName!=="FORM"||inHydrated(form))return;hold(event,form,"submit")},true);function observe(event){if(window.__FARM_HYDRATED__)return;var target=event.target;if(!(target&&target.closest)||inHydrated(target))return;announce(target,null)}document.addEventListener("pointerdown",observe,true);document.addEventListener("focusin",observe,true);})();</script>`;
+  return `<script>(function(){if(window.__FARM_PREHYDRATION_CLICK_QUEUE__)return;var queue=[];window.__FARM_PREHYDRATION_CLICK_QUEUE__=queue;window.__FARM_HYDRATED__=false;document.documentElement.dataset.farmHydrated="false";function isModified(event){return !!(event.metaKey||event.altKey||event.ctrlKey||event.shiftKey)}function inHydrated(node){return !!(node&&node.closest&&node.closest('[data-farm-island-hydrated="true"]'))}function closestQueuedTarget(target){while(target&&target!==document.documentElement){if(target.matches&&target.matches(${selector}))return target;target=target.parentElement}return null}function announce(target,kind){document.dispatchEvent(new CustomEvent("farm:island-interaction",{detail:{target:target,kind:kind||null}}))}function hold(event,target,kind){if(!queue.some(function(item){return item.target===target})){queue.push({target:target,kind:kind,createdAt:Date.now()});announce(target,kind)}event.preventDefault();event.stopImmediatePropagation()}document.addEventListener("click",function(event){if(window.__FARM_HYDRATED__)return;if(event.defaultPrevented||event.button!==0||isModified(event))return;var target=closestQueuedTarget(event.target);if(!target||target.closest&&target.closest("a[href]")||inHydrated(target))return;hold(event,target,"click")},true);document.addEventListener("submit",function(event){if(window.__FARM_HYDRATED__)return;if(event.defaultPrevented)return;var form=event.target;if(!form||form.nodeName!=="FORM"||inHydrated(form))return;hold(event,form,"submit")},true);function observe(event){if(window.__FARM_HYDRATED__)return;var target=event.target;if(!(target&&target.closest)||inHydrated(target))return;announce(target,null)}document.addEventListener("pointerdown",observe,true);document.addEventListener("focusin",observe,true);})();</script>`;
 }
 __name(createPreHydrationClickQueueScript, "createPreHydrationClickQueueScript");
 function createDocumentFooter(options) {
@@ -9115,6 +9116,68 @@ function mergeFarmViteConfig(farmConfig, userConfig = {}) {
   };
 }
 __name(mergeFarmViteConfig, "mergeFarmViteConfig");
+function mergeExternal(farmValue, userValue) {
+  if (farmValue === void 0) return userValue;
+  if (userValue === void 0) return farmValue;
+  if (farmValue === true || userValue === true) return true;
+  return Array.from(/* @__PURE__ */ new Set([...farmValue, ...userValue]));
+}
+__name(mergeExternal, "mergeExternal");
+function mergeFarmProductionViteConfig(farmConfig, userConfig = {}) {
+  const {
+    plugins: _plugins,
+    root: _root,
+    base: _base,
+    mode: _mode,
+    appType: _appType,
+    publicDir: _publicDir,
+    build: userBuild = {},
+    css: userCss,
+    define: userDefine,
+    esbuild: userEsbuild,
+    ...shared
+  } = userConfig;
+  const {
+    outDir: _outDir,
+    emptyOutDir: _emptyOutDir,
+    ssr: _ssr,
+    ssrEmitAssets: _ssrEmitAssets,
+    write: _write,
+    lib: _lib,
+    watch: _watch,
+    rollupOptions: userRollupOptions,
+    rolldownOptions: userRolldownOptions,
+    ...userBuildOptions
+  } = userBuild;
+  const {
+    input: _input,
+    output: _output,
+    ...userBundlerOptions
+  } = {
+    ...userRollupOptions,
+    ...userRolldownOptions
+  };
+  const merged = mergeFarmViteConfig(farmConfig, shared);
+  return {
+    ...merged,
+    build: {
+      ...userBuildOptions,
+      ...farmConfig.build,
+      rollupOptions: {
+        ...userBundlerOptions,
+        ...farmConfig.build?.rollupOptions
+      }
+    },
+    css: farmConfig.css || userCss ? { ...farmConfig.css, ...userCss } : void 0,
+    define: farmConfig.define || userDefine ? { ...userDefine, ...farmConfig.define } : void 0,
+    esbuild: typeof userEsbuild === "object" && farmConfig.esbuild !== false ? { ...userEsbuild, ...farmConfig.esbuild } : farmConfig.esbuild ?? userEsbuild,
+    ssr: {
+      ...merged.ssr,
+      external: mergeExternal(farmConfig.ssr?.external, userConfig.ssr?.external)
+    }
+  };
+}
+__name(mergeFarmProductionViteConfig, "mergeFarmProductionViteConfig");
 
 // src/docs/adapter-client.ts
 function generateFarmDocsAdapterClientRuntime(reactModule) {
@@ -9261,7 +9324,7 @@ function loadFarmWorkflowsDevRuntime() {
 }
 __name(loadFarmWorkflowsDevRuntime, "loadFarmWorkflowsDevRuntime");
 function loadFarmDevtoolsSnapshotRuntime() {
-  return import("./devtools-IU7LKZOH.mjs");
+  return import("./devtools-UFVTMQX5.mjs");
 }
 __name(loadFarmDevtoolsSnapshotRuntime, "loadFarmDevtoolsSnapshotRuntime");
 function loadFarmDevtoolsUIRuntime() {
@@ -9910,8 +9973,8 @@ function farmPlugin(options = {}, initialPluginManager) {
       }, "emitPluginError");
       farmApp = new FarmApp(
         {
-          root: server.config.root,
-          ...options
+          ...options,
+          root: resolveDevelopmentRoot(options.root, server.config.root)
         },
         server
       );
@@ -10498,7 +10561,8 @@ window.__FARM_MANIFEST__ = ${inlineValue({
               () => middlewareManager.execute(req, res)
             );
           }, "runAppMiddlewareForContentRoute");
-          if (openAPIManager && options.openapi?.specRoute && requestPathname === options.openapi.specRoute) {
+          const openAPIRequestPathname = openAPIManager ? stripFarmBasePath(requestPathname, farmConfig.basePath) : requestPathname;
+          if (openAPIManager && options.openapi?.specRoute && openAPIRequestPathname === options.openapi.specRoute) {
             if (await runAppMiddlewareForContentRoute()) return;
             if (requestMethod !== "GET" && requestMethod !== "HEAD") {
               res.statusCode = 405;
@@ -10515,7 +10579,7 @@ window.__FARM_MANIFEST__ = ${inlineValue({
             res.end(requestMethod === "HEAD" ? void 0 : body);
             return;
           }
-          if (openAPIManager && requestPathname === options.openapi?.route) {
+          if (openAPIManager && openAPIRequestPathname === options.openapi?.route) {
             if (await runAppMiddlewareForContentRoute()) return;
             const docsHandler = openAPIManager.getDocsRouteHandler(parsedRequestUrl.origin);
             return docsHandler(req, res);
@@ -10993,6 +11057,21 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                 headers: request2.headers,
                 signal: request2.signal
               });
+              let middlewareMap = /* @__PURE__ */ new Map();
+              let middlewareContext = /* @__PURE__ */ new Map();
+              if (middlewareManager?.hasMiddleware()) {
+                const targetNodeRequest = createPageDataMiddlewareRequest(req, targetRequestUrl);
+                const handled = await runFarmMiddlewareWithNavigation(
+                  farmApp.getServerRenderer(),
+                  targetRequest,
+                  targetNodeRequest,
+                  res,
+                  () => middlewareManager.execute(targetNodeRequest, res)
+                );
+                if (handled) return;
+                middlewareMap = targetNodeRequest.__FARM_MIDDLEWARE_DATA__ ?? middlewareMap;
+                middlewareContext = targetNodeRequest.__FARM_MIDDLEWARE_CONTEXT__ ?? middlewareContext;
+              }
               await farmApp.getServerRenderer().runWithRequestContext(targetRequest, async () => {
                 const routeManager3 = farmApp.getRouteManager();
                 if (pm) {
@@ -11066,7 +11145,8 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                     {
                       params,
                       searchParams: Promise.resolve(searchParams),
-                      path: targetUrl.pathname
+                      path: targetUrl.pathname,
+                      middleware: middlewareMap.size > 0 ? { data: middlewareMap } : void 0
                     },
                     routeContext
                   ),
@@ -11154,27 +11234,34 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                   parseFarmLayoutChainHeader(request2.headers.get("x-farm-layout-chain")),
                   destinationLayoutPatterns
                 );
-                const fragmentHtml = await farmApp.getServerRenderer().renderNavigationFragment({
-                  PageComponent: routeModule.default,
-                  LoadingComponent: loadingModule?.default,
-                  pageProps: routeProps,
-                  params,
-                  layouts: layouts.map((layout, index) => ({
-                    pattern: layout.pattern,
-                    module: layoutModules[index]
-                  })),
-                  layoutStartIndex,
-                  slots: routeSlots.map((slot) => ({
-                    name: slot.name,
-                    ownerPattern: slot.ownerPattern,
-                    containerId: slot.containerId,
-                    module: slot.renderModule,
-                    props: slot.props
-                  })),
-                  pageShouldHydrate: shouldHydrate,
-                  layoutShouldHydrate: shouldHydrateLayout,
-                  islandStrategy: hydrationIslandStrategy
-                });
+                const renderer = farmApp.getServerRenderer();
+                const fragmentHtml = await _runWithMiddlewareData(
+                  middlewareMap,
+                  () => _runWithMiddlewareContext(
+                    middlewareContext,
+                    () => renderer.renderNavigationFragment({
+                      PageComponent: routeModule.default,
+                      LoadingComponent: loadingModule?.default,
+                      pageProps: routeProps,
+                      params,
+                      layouts: layouts.map((layout, index) => ({
+                        pattern: layout.pattern,
+                        module: layoutModules[index]
+                      })),
+                      layoutStartIndex,
+                      slots: routeSlots.map((slot) => ({
+                        name: slot.name,
+                        ownerPattern: slot.ownerPattern,
+                        containerId: slot.containerId,
+                        module: slot.renderModule,
+                        props: slot.props
+                      })),
+                      pageShouldHydrate: shouldHydrate,
+                      layoutShouldHydrate: shouldHydrateLayout,
+                      islandStrategy: hydrationIslandStrategy
+                    })
+                  )
+                );
                 const pageData = {
                   props: {
                     params: routeProps.params,
@@ -11184,7 +11271,9 @@ window.__FARM_MANIFEST__ = ${inlineValue({
                     ...routeProps.__farmCanonicalPath ? {
                       __farmCanonicalPath: routeProps.__farmCanonicalPath
                     } : {},
-                    ...routeProps.__farmRoutePropsResolved ? { __farmRoutePropsResolved: true } : {}
+                    ...routeProps.__farmRoutePropsResolved ? { __farmRoutePropsResolved: true } : {},
+                    // The same serialized shape a full load embeds in __FARM_PROPS__.
+                    ...middlewareMap.size > 0 ? { middleware: { data: Object.fromEntries(middlewareMap) } } : {}
                   },
                   canonicalPath: routeProps.__farmCanonicalPath,
                   modulePath: toUrlPath(route.modulePath),
@@ -11934,6 +12023,26 @@ function runFarmMiddlewareWithNavigation(renderer, middlewareRequest, req, res,
   });
 }
 __name(runFarmMiddlewareWithNavigation, "runFarmMiddlewareWithNavigation");
+function createPageDataMiddlewareRequest(req, target) {
+  const targetNodeRequest = Object.create(req);
+  targetNodeRequest.url = `${target.pathname}${target.search}`;
+  targetNodeRequest.originalUrl = targetNodeRequest.url;
+  targetNodeRequest.method = "GET";
+  return targetNodeRequest;
+}
+__name(createPageDataMiddlewareRequest, "createPageDataMiddlewareRequest");
+function resolveDevelopmentRoot(farmRoot, viteRoot) {
+  if (!farmRoot) return viteRoot;
+  if (path16.resolve(farmRoot) === path16.resolve(viteRoot)) return farmRoot;
+  try {
+    if (fs9.realpathSync(farmRoot) === fs9.realpathSync(viteRoot)) {
+      return path16.resolve(viteRoot);
+    }
+  } catch {
+  }
+  return farmRoot;
+}
+__name(resolveDevelopmentRoot, "resolveDevelopmentRoot");
 function isFarmClientVirtualId(id) {
   const pathname = id.split("?", 1)[0];
   return pathname === "/@farm/client" || pathname === "/@farm/client.js";
@@ -11949,16 +12058,18 @@ function generateProgrammaticRouteModule(moduleId, root, renderer = REACT_RENDER
     return generateProgrammaticApiRouteModule(parsed.routePath, routeFile);
   }
   return `
-import {
-  createElement as __farmCreateElement,
-  Suspense as __farmSuspense,
-} from ${JSON.stringify(renderer.server)};
+import * as __farmRendererRuntime from ${JSON.stringify(renderer.server)};
 import {
   createLayoutModuleFromProgrammaticLayout as __farmCreateLayoutRouteModule,
   createRouteModuleFromProgrammaticPage as __farmCreatePageRouteModule,
 } from "@farm.js/core/routes";
 import * as __farmRoutesModule from ${JSON.stringify(routeFile)};
 
+const __farmCreateElement = __farmRendererRuntime.createElement;
+const __farmSuspense = __farmRendererRuntime.Suspense;
+// Optional hook: only renderers that need it export markFunctionComponent.
+const __farmMarkFunctionComponent = Reflect.get(__farmRendererRuntime, "markFunctionComponent");
+
 const __farmIsRouteDefinition = (value) => (
   value &&
   typeof value === "object" &&
@@ -12012,6 +12123,7 @@ const __farmRouteModule = __farmRoute.kind === "layout"
   : __farmCreatePageRouteModule(__farmRoute, {
       createElement: __farmCreateElement,
       Suspense: __farmSuspense,
+      markFunctionComponent: __farmMarkFunctionComponent,
     });
 
 export const metadata = __farmRouteModule.metadata;
@@ -13621,6 +13733,11 @@ async function hydrate() {
       pendingPageHydrationController = hydrationController;
       await hydrateFarmIsolatedClientBoundaries(rootContainer, hydrationController.signal);
       if (hydrationController.signal.aborted) return;
+      // The rest of the document is static server HTML with nothing to hydrate, so
+      // stop holding its clicks and submits once the load-strategy islands are live.
+      // Deferred islands capture their own interactions, and held targets outside an
+      // island are not replayed into DOM no client code owns.
+      markFarmHydrated();
       return;
     }` : ""}
     if (!shouldHydrate) {
@@ -14079,6 +14196,7 @@ export {
   createFarmClientOptimizeDepsConfig,
   createFarmSourceAlias,
   mergeFarmViteConfig,
+  mergeFarmProductionViteConfig,
   generateFarmDocsAdapterClientRuntime,
   createFarmThemeCssPlugin,
   farmI18nClientBridgePlugin,