@farm.js/core 0.1.19 → 0.1.21

package/dist/{chunk-WZXN4R5Y.mjs → chunk-53G3OLTA.mjs}

@@ -6,7 +6,7 @@ import {
   parseRouteSlotFile,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-2ANEVVF7.mjs";
+} from "./chunk-NRS46D4L.mjs";
 import {
   collectSchemaExtensions,
   declareSchemaTables,
@@ -48,6 +48,10 @@ import {
   _setDefaultFarmThemeConfig,
   getTheme
 } from "./chunk-WBIH66JK.mjs";
+import {
+  generateFarmDocsAdapterClientRuntime,
+  getFarmDocsAdapterConfigModule
+} from "./chunk-VVBO3QH7.mjs";
 import {
   resolveFarmDocsFontAssets,
   toFarmDocsPublicFontAssets
@@ -65,7 +69,7 @@ import {
 } from "./chunk-JBSVKMC5.mjs";
 import {
   normalizeRouteRules
-} from "./chunk-7WPA7GBZ.mjs";
+} from "./chunk-GHFS7RUB.mjs";
 import {
   getFarmAppDirectories,
   getFarmLayerAliases,
@@ -162,7 +166,7 @@ import {
 } from "./chunk-JLCQGPXE.mjs";
 import {
   MiddlewareManager
-} from "./chunk-57J3Y7Y3.mjs";
+} from "./chunk-TIKNUAU7.mjs";
 import {
   _clearCurrentMiddlewareContext,
   _clearCurrentMiddlewareData,
@@ -177,11 +181,11 @@ import {
 } from "./chunk-IOEH4VWN.mjs";
 import {
   APIRouteManager
-} from "./chunk-ATERBVHQ.mjs";
+} from "./chunk-CQHFU55R.mjs";
 import {
   findProgrammaticRouteFiles,
   loadProgrammaticRouteManifests
-} from "./chunk-BNGS6KJ6.mjs";
+} from "./chunk-YOYF2E4U.mjs";
 import {
   _runWithFarmI18nRequest,
   _setDefaultFarmI18nRuntime,
@@ -208,7 +212,7 @@ import {
   normalizeFarmRouteRuntimeConfig,
   resolveFarmRouteRuleRuntimeConfig,
   resolveFarmRouteRuntimeConfig
-} from "./chunk-FS7FLPOG.mjs";
+} from "./chunk-2J7W2WND.mjs";
 import {
   clearRequestContext,
   copyRequestContext,
@@ -227,8 +231,10 @@ import {
   createCliColors
 } from "./chunk-I2BHUNBU.mjs";
 import {
+  invalidateFailedFarmDevModules,
+  loadFarmDevModule,
   toFileModuleUrl
-} from "./chunk-7GNWGLWB.mjs";
+} from "./chunk-43FMW62B.mjs";
 import {
   isFarmI18nCatalogFile,
   resolveFarmI18nConfig,
@@ -258,7 +264,7 @@ import {
 } from "./chunk-Z2RZJZIZ.mjs";
 import {
   FARM_VERSION
-} from "./chunk-2GNATDDE.mjs";
+} from "./chunk-PKO4FCTL.mjs";
 import {
   resolveFarmTrailingSlashRedirect,
   setFarmTrailingSlashPreference
@@ -277,7 +283,7 @@ import {
   mergeMetadata,
   renderMetadataHead,
   resolveFarmNotFoundMetadata
-} from "./chunk-YS3TRKCG.mjs";
+} from "./chunk-2M435BUE.mjs";
 import {
   FARM_DEPLOYMENT_ID_HEADER,
   createFarmDeploymentCookie,
@@ -2388,7 +2394,7 @@ var _RouteManager = class _RouteManager {
         const mdxConfig = resolveMdxConfig(this.config.mdx);
         const components = await loadFarmMdxComponents(mdxConfig, {
           root: this.config.root,
-          loadModule: this.viteServer ? (componentModulePath) => this.viteServer.ssrLoadModule(componentModulePath) : void 0
+          loadModule: this.viteServer ? (componentModulePath) => loadFarmDevModule(this.viteServer, componentModulePath) : void 0
         });
         return await createFarmMarkdownRouteModuleFromFile(modulePath, {
           components,
@@ -2396,7 +2402,7 @@ var _RouteManager = class _RouteManager {
         });
       }
       if (this.viteServer) {
-        const module = await this.viteServer.ssrLoadModule(modulePath);
+        const module = await loadFarmDevModule(this.viteServer, modulePath);
         return module;
       } else {
         const module = await import(
@@ -2421,7 +2427,7 @@ var _RouteManager = class _RouteManager {
         return createLayoutModuleFromProgrammaticLayout(programmaticLayout);
       }
       if (this.viteServer) {
-        const module = await this.viteServer.ssrLoadModule(modulePath);
+        const module = await loadFarmDevModule(this.viteServer, modulePath);
         return module;
       } else {
         const module = await import(
@@ -2695,7 +2701,7 @@ var _RouteManager = class _RouteManager {
   async loadProgrammaticRoutesModule(filePath) {
     if (this.viteServer) {
       const viteRoot = this.viteServer.config?.root || this.config.root || process.cwd();
-      return await this.viteServer.ssrLoadModule(toViteModuleId(filePath, viteRoot));
+      return await loadFarmDevModule(this.viteServer, toViteModuleId(filePath, viteRoot));
     }
     return await import(
       /* @vite-ignore */
@@ -3012,18 +3018,29 @@ function collectDevStylesheetUrls(modules, alreadyLinked = ALREADY_LINKED) {
 __name(collectDevStylesheetUrls, "collectDevStylesheetUrls");
 
 // src/server/full-document.ts
-function stripContentsWrappers(markup) {
-  let out = markup.replace(/^\s+/, "");
-  const opener = /^<div\b[^>]*style="display\s*:\s*contents"[^>]*>/i;
+var CONTENTS_WRAPPER = /^<div\b[^>]*style="display\s*:\s*contents"[^>]*>/i;
+var HOISTED_HEAD_ELEMENT = /^(?:<(?:meta|link|base)\b[^>]*>|<title\b[^>]*>[\s\S]*?<\/title>)/i;
+function peelDocumentPrefix(markup) {
+  let inner = markup.replace(/^\s+/, "");
+  let hoisted = "";
   let match;
-  while (match = opener.exec(out)) {
-    out = out.slice(match[0].length).replace(/^\s+/, "");
+  while (match = CONTENTS_WRAPPER.exec(inner) ?? HOISTED_HEAD_ELEMENT.exec(inner)) {
+    if (!/^<div/i.test(match[0])) hoisted += match[0];
+    inner = inner.slice(match[0].length).replace(/^\s+/, "");
   }
-  return out;
+  return { inner, hoisted };
 }
-__name(stripContentsWrappers, "stripContentsWrappers");
+__name(peelDocumentPrefix, "peelDocumentPrefix");
+function restoreHoistedHead(document, hoisted) {
+  if (!hoisted) return document;
+  if (/<head[\s>]/i.test(document)) {
+    return document.replace(/<head\b[^>]*>/i, (open) => open + hoisted);
+  }
+  return document.replace(/<html\b[^>]*>/i, (open) => `${open}<head>${hoisted}</head>`);
+}
+__name(restoreHoistedHead, "restoreHoistedHead");
 function extractFarmFullDocument(markup) {
-  const inner = stripContentsWrappers(markup);
+  const { inner, hoisted } = peelDocumentPrefix(markup);
   if (!/^<!doctype/i.test(inner) && !/^<html[\s>]/i.test(inner)) return null;
   const start = markup.search(/<!doctype|<html[\s>]/i);
   const lower = markup.toLowerCase();
@@ -3041,14 +3058,15 @@ function extractFarmFullDocument(markup) {
   if (streamedTail) {
     document = document.replace(/<\/body>/i, () => `${streamedTail}</body>`);
   }
-  return document;
+  return restoreHoistedHead(document, hoisted);
 }
 __name(extractFarmFullDocument, "extractFarmFullDocument");
-function opensFarmFullDocument(markup) {
-  const inner = stripContentsWrappers(markup);
-  return /^<!doctype/i.test(inner) || /^<html[\s>]/i.test(inner);
+function classifyFarmDocumentPrefix(markup) {
+  const { inner } = peelDocumentPrefix(markup);
+  if (/^<!doctype/i.test(inner) || /^<html[\s>]/i.test(inner)) return "document";
+  return inner === "" ? "pending" : "fragment";
 }
-__name(opensFarmFullDocument, "opensFarmFullDocument");
+__name(classifyFarmDocumentPrefix, "classifyFarmDocumentPrefix");
 function ensureFarmDocumentHead(markup) {
   if (/<head[\s>]/i.test(markup)) return markup;
   return markup.replace(/<html([^>]*)>/i, (_match, attributes) => {
@@ -4601,6 +4619,7 @@ function warnSuppressedAsyncHydrationOnce(modulePath, reason) {
 }
 __name(warnSuppressedAsyncHydrationOnce, "warnSuppressedAsyncHydrationOnce");
 var fullDocumentRoutes = /* @__PURE__ */ new Set();
+var documentLayouts = /* @__PURE__ */ new WeakMap();
 function hasRequestHeader(req, name) {
   const value = req.headers[name.toLowerCase()];
   return Array.isArray(value) ? value.length > 0 : Boolean(value);
@@ -4791,7 +4810,7 @@ var _ServerRenderer = class _ServerRenderer {
     if (this.config.notFound?.component?.trim()) {
       resolveFarmNotFoundComponentPath(this.config, getFarmAppDirectories(this.config));
     }
-    const loaded = isReactRenderer(this.config.renderer) ? await import("./renderer/react/server.mjs") : this.viteServer ? await this.viteServer.ssrLoadModule(this.config.renderer.server) : await import(pathToFileURL2(
+    const loaded = isReactRenderer(this.config.renderer) ? await import("./renderer/react/server.mjs") : this.viteServer ? await loadFarmDevModule(this.viteServer, this.config.renderer.server) : await import(pathToFileURL2(
       resolveFarmRendererModule(
         this.config.root || process.cwd(),
         this.config.renderer.server
@@ -5903,7 +5922,7 @@ var _ServerRenderer = class _ServerRenderer {
             path9.resolve(this.config.root, provider.component.module),
             this.config.root
           ) : provider.component.module;
-          const providerModule = this.viteServer ? await this.viteServer.ssrLoadModule(providerModuleId) : await importRuntimeModule(
+          const providerModule = this.viteServer ? await loadFarmDevModule(this.viteServer, providerModuleId) : await importRuntimeModule(
             provider.component.module.startsWith(".") ? pathToFileURL2(path9.resolve(this.config.root, provider.component.module)).href : provider.component.module
           );
           ProviderComponent = providerModule[provider.component.export || "default"];
@@ -6530,10 +6549,43 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
       clearMiddlewareData?.();
     }
   }
+  /**
+   * Whether the root layout returns its own `<html>` document, checked as the client's layout
+   * boundary checks it: call a plain synchronous layout and look at what it returns. Knowing
+   * this up front keeps a route's first request on the buffered path too; a layout this cannot
+   * call (async, a class, or one using hooks) falls back to detection from the stream.
+   */
+  async rootLayoutRendersDocument() {
+    if (typeof this.routeManager.getLayouts !== "function") return false;
+    const rootLayout = this.routeManager.getLayouts().get("/");
+    if (!rootLayout) return false;
+    try {
+      const Layout = (await this.routeManager.loadLayoutModule(rootLayout.modulePath)).default;
+      if (typeof Layout !== "function" || Layout.prototype?.isReactComponent || Layout.constructor?.name === "AsyncFunction") {
+        return false;
+      }
+      const cached = documentLayouts.get(Layout);
+      if (cached !== void 0) return cached;
+      let rendersDocument = false;
+      try {
+        const rendered = Layout({
+          children: null,
+          params: {}
+        });
+        rendersDocument = this.rendererRuntime.isValidElement(rendered) && rendered.type === "html";
+      } catch {
+        rendersDocument = false;
+      }
+      documentLayouts.set(Layout, rendersDocument);
+      return rendersDocument;
+    } catch {
+      return false;
+    }
+  }
   async renderWithSSR(element, req, res, clearMiddlewareData, options = {}) {
     const renderToPipeableStream = this.rendererRuntime.renderToPipeableStream;
     const fullDocumentRouteKey = options.observabilityRoute || req.__FARM_ROUTE__ || req.url || "/";
-    if (!renderToPipeableStream || fullDocumentRoutes.has(fullDocumentRouteKey)) {
+    if (!renderToPipeableStream || fullDocumentRoutes.has(fullDocumentRouteKey) || await this.rootLayoutRendersDocument()) {
       return this.renderBufferedSSR(element, req, res, clearMiddlewareData, options);
     }
     return new Promise((resolve5, reject) => {
@@ -6709,14 +6761,18 @@ window.__FARM_I18N__ = ${getFarmI18nClientSnapshot() ? serializeInlineValue(getF
           staticShellParts?.push(securedShell);
           let firstChunk = true;
           let checkedFullDocument = false;
+          let documentPrefix = "";
           const cspNonceRewriter = cspNonce ? createFarmCspNonceRewriter(cspNonce) : void 0;
           const cspStreamDecoder = cspNonceRewriter ? new TextDecoder() : void 0;
           const recordRenderedChunk = /* @__PURE__ */ __name((chunkText) => {
             if (!chunkText) return;
             if (!checkedFullDocument) {
-              checkedFullDocument = true;
-              if (opensFarmFullDocument(chunkText)) {
-                fullDocumentRoutes.add(fullDocumentRouteKey);
+              documentPrefix += chunkText;
+              const prefix = classifyFarmDocumentPrefix(documentPrefix);
+              if (prefix !== "pending") {
+                checkedFullDocument = true;
+                documentPrefix = "";
+                if (prefix === "document") fullDocumentRoutes.add(fullDocumentRouteKey);
               }
             }
             htmlParts.push(chunkText);
@@ -9179,33 +9235,6 @@ function mergeFarmProductionViteConfig(farmConfig, userConfig = {}) {
 }
 __name(mergeFarmProductionViteConfig, "mergeFarmProductionViteConfig");
 
-// src/docs/adapter-client.ts
-function generateFarmDocsAdapterClientRuntime(reactModule) {
-  if (!reactModule) {
-    return `
-async function hydrateFarmDocsAdapterRuntime() {
-  return false;
-}
-`;
-  }
-  return `
-async function hydrateFarmDocsAdapterRuntime() {
-  const runtime = window.__FARM_DOCS_ADAPTER__;
-  if (!runtime) return false;
-  const FarmDocsAdapterReact = await import(${JSON.stringify(reactModule)});
-  if (typeof FarmDocsAdapterReact.hydrateFarmDocs !== "function") {
-    throw new Error("The configured Farm docs adapter does not export hydrateFarmDocs().");
-  }
-  FarmDocsAdapterReact.hydrateFarmDocs({
-    config: runtime.config || {},
-    data: runtime.data,
-  });
-  return true;
-}
-`;
-}
-__name(generateFarmDocsAdapterClientRuntime, "generateFarmDocsAdapterClientRuntime");
-
 // src/theme/vite.ts
 var FARM_DARK_VARIANT = '@custom-variant dark (&:where([data-theme="dark"], [data-theme="dark"] *));';
 function createFarmThemeCssPlugin(input, basePath = "/") {
@@ -9324,7 +9353,7 @@ function loadFarmWorkflowsDevRuntime() {
 }
 __name(loadFarmWorkflowsDevRuntime, "loadFarmWorkflowsDevRuntime");
 function loadFarmDevtoolsSnapshotRuntime() {
-  return import("./devtools-FY5R7TQ4.mjs");
+  return import("./devtools-MTB5SA2B.mjs");
 }
 __name(loadFarmDevtoolsSnapshotRuntime, "loadFarmDevtoolsSnapshotRuntime");
 function loadFarmDevtoolsUIRuntime() {
@@ -9941,6 +9970,9 @@ function farmPlugin(options = {}, initialPluginManager) {
         // directory the production client build emits.
         ...options.publicDir ? { publicDir: options.publicDir } : {},
         define: getEnvDefines(options, configEnv),
+        // Keep development module ownership explicit; the RSC plugin adds its
+        // environment only when enabled. Production environment setup is unchanged.
+        ...!isBuild ? { environments: { client: {}, ssr: {} } } : {},
         resolve: {
           alias: { ...layerAliases, ...sourceAlias }
         },
@@ -10130,9 +10162,7 @@ function farmPlugin(options = {}, initialPluginManager) {
       ["add", "change", "unlink"].forEach((ev) => {
         server.watcher.on(ev, (file) => {
           if (ev === "add") {
-            for (const mod of server.moduleGraph.idToModuleMap.values()) {
-              if (mod.ssrError) server.moduleGraph.invalidateModule(mod);
-            }
+            invalidateFailedFarmDevModules(server);
           }
           const normalizedFile = file.replace(/\\/g, "/");
           const configChanged = isFarmConfigFile(file, farmConfig.root) || layerConfigFiles.has(normalizedFile);
@@ -10212,14 +10242,14 @@ function farmPlugin(options = {}, initialPluginManager) {
         discoveredWorkflows = await discoverFarmWorkflows(
           { ...farmConfig, workflows: workflowConfig },
           {
-            loadModule: /* @__PURE__ */ __name(async (filePath) => server.ssrLoadModule(filePath), "loadModule")
+            loadModule: /* @__PURE__ */ __name(async (filePath) => loadFarmDevModule(server, filePath), "loadModule")
           }
         );
         if (discoveredWorkflows.length > 0) {
           workflowHandler = createFarmWorkflowRequestHandler({
             workflows: discoveredWorkflows,
             config: workflowConfig,
-            loadModule: /* @__PURE__ */ __name(async (workflow) => server.ssrLoadModule(workflow.filePath), "loadModule"),
+            loadModule: /* @__PURE__ */ __name(async (workflow) => loadFarmDevModule(server, workflow.filePath), "loadModule"),
             server: farmConfig.server
           });
           logger.success(`\u2705 Discovered ${discoveredWorkflows.length} Farm workflow task(s)`);
@@ -10293,16 +10323,14 @@ function farmPlugin(options = {}, initialPluginManager) {
           farmConfig.srcDir
         ),
         loadModule: /* @__PURE__ */ __name(async (specifier) => {
-          const resolved = await server.pluginContainer.resolveId(specifier, void 0, {
-            ssr: true
-          });
+          const resolved = await server.environments.ssr.pluginContainer.resolveId(specifier);
           if (specifier === farmConfig.docs.adapter?.server && resolved?.id) {
             return import(
               /* @vite-ignore */
               pathToFileURL3(resolved.id).href
             );
           }
-          return server.ssrLoadModule(resolved?.id ?? specifier);
+          return loadFarmDevModule(server, resolved?.id ?? specifier);
         }, "loadModule")
       }) : farmDocsDevRuntime.createFarmDocsHandler(farmConfig.docs, {
         root: farmConfig.root,
@@ -10340,7 +10368,7 @@ function farmPlugin(options = {}, initialPluginManager) {
         }
         const docsRenderer = resolveFarmRenderer((farmApp?.getConfig() ?? options).renderer);
         const [rendererRuntime, layoutModules] = await Promise.all([
-          isReactRenderer(docsRenderer) ? import("./renderer/react/server.mjs") : server.ssrLoadModule(docsRenderer.server),
+          isReactRenderer(docsRenderer) ? import("./renderer/react/server.mjs") : loadFarmDevModule(server, docsRenderer.server),
           Promise.all(
             layoutEntries.map((layout) => routeManager.loadLayoutModule(layout.modulePath))
           )
@@ -11584,7 +11612,8 @@ ${generatedDevIndicatorsClientRuntime}`,
           resolvedConfig?.basePath ?? "/",
           generateClientCachePersistenceCode(
             resolveFarmClientCacheAdapterEntry(root, resolvedConfig?.cache)
-          )
+          ),
+          isReactRenderer(renderer) ? getFarmDocsAdapterConfigModule(docs) : void 0
         );
       }
       if (id === "/@farm/server") {
@@ -11750,7 +11779,7 @@ export const manifest = getManifest();
       );
       return;
     }` : "";
-        const hmrCode = !shouldEmitFarmClientRootHmr(currentConfig.renderer) ? "" : `
+        const hmrCode = transformOptions?.ssr || !shouldEmitFarmClientRootHmr(currentConfig.renderer) ? "" : `
 if (import.meta.hot) {
   import.meta.hot.accept((newModule) => {
     ${isolatedHmrUpdate}
@@ -12395,7 +12424,7 @@ function parseRouteModuleSchema2(schema, value, label, routePath) {
   }
 }
 __name(parseRouteModuleSchema2, "parseRouteModuleSchema");
-function generateClientCode(integrationProviders = [], documentNavigationMatchers = [], docsSearchClientRuntime = EMPTY_FARM_DOCS_SEARCH_CLIENT_RUNTIME, devtoolsClientRuntime = "", plugins = [], root = process.cwd(), srcDir = "src", publicRuntimeConfig = void 0, docsAdapterReact, renderer = REACT_RENDERER, isolatedHydrationEnabled = false, trailingSlash = false, basePath = "/", clientCachePersistence = { imports: "", init: "" }) {
+function generateClientCode(integrationProviders = [], documentNavigationMatchers = [], docsSearchClientRuntime = EMPTY_FARM_DOCS_SEARCH_CLIENT_RUNTIME, devtoolsClientRuntime = "", plugins = [], root = process.cwd(), srcDir = "src", publicRuntimeConfig = void 0, docsAdapterReact, renderer = REACT_RENDERER, isolatedHydrationEnabled = false, trailingSlash = false, basePath = "/", clientCachePersistence = { imports: "", init: "" }, docsConfigModule) {
   const providerClientCode = generateFarmIntegrationProviderClientCode(
     integrationProviders,
     root,
@@ -12410,7 +12439,10 @@ function generateClientCode(integrationProviders = [], documentNavigationMatcher
   const rendererClientImports = isReactRenderer(renderer) ? `import React from 'react'
 import { hydrateRoot, createRoot } from 'react-dom/client'` : `import React, { hydrateRoot, createRoot } from ${JSON.stringify(renderer.client)}`;
   const isolatedHydrationImport = isolatedHydrationEnabled ? `import { createFarmIsolatedHydrationRuntime, createFarmServerPageBoundary, wrapFarmIsolatedClientGraph } from '@farm.js/core/internal/isolated-boundary'` : "";
-  const docsAdapterImportBlock = generateFarmDocsAdapterClientRuntime(docsAdapterReact);
+  const docsAdapterImportBlock = generateFarmDocsAdapterClientRuntime(
+    docsAdapterReact,
+    docsConfigModule
+  );
   const isolatedHydrationRuntime = isolatedHydrationEnabled ? `const farmIsolatedHydrationRuntime = createFarmIsolatedHydrationRuntime({
   ReactRuntime: React,
   hydrateRoot,
@@ -14208,7 +14240,6 @@ export {
   createFarmSourceAlias,
   mergeFarmViteConfig,
   mergeFarmProductionViteConfig,
-  generateFarmDocsAdapterClientRuntime,
   createFarmThemeCssPlugin,
   farmI18nClientBridgePlugin,
   farmServerOnlyEntriesPlugin,