@farm.js/core 0.1.0-beta.46 → 0.1.0-beta.48

package/dist/index.mjs

@@ -9,7 +9,7 @@ import {
 } from "./chunk-5ZGPRGWV.mjs";
 import {
   build
-} from "./chunk-V7VDW7IY.mjs";
+} from "./chunk-HEZHCCMF.mjs";
 import "./chunk-SL6HTIOK.mjs";
 import "./chunk-4S3ORGFA.mjs";
 import {
@@ -208,7 +208,7 @@ import {
   createClientPluginManager,
   installChunkErrorRecovery,
   isChunkLoadError
-} from "./chunk-W2O6SKJU.mjs";
+} from "./chunk-3P63LWDM.mjs";
 import {
   analyzeStaticRouteCandidate,
   collectSSGPages,
@@ -227,7 +227,7 @@ import {
   parseRouteRenderingDirective,
   resolveRouteRenderingConfig,
   resolveRouteRenderingConfigFromFile
-} from "./chunk-TQJMU5BP.mjs";
+} from "./chunk-VZKOMD6C.mjs";
 import {
   APITypeGenerator
 } from "./chunk-XJTDE4L4.mjs";
@@ -567,7 +567,7 @@ import {
   runWithFarmSpan
 } from "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-LGCIIMFR.mjs";
+import "./chunk-NKIHYEWC.mjs";
 import {
   createCompressionPlugin,
   createEnvPlugin,

package/dist/internal/build-runtime.cjs

@@ -11400,6 +11400,60 @@ var init_route_manager = __esm({
   }
 });
 
+// src/server/full-document.ts
+function stripContentsWrappers(markup) {
+  let out = markup.replace(/^\s+/, "");
+  const opener = /^<div\b[^>]*style="display\s*:\s*contents"[^>]*>/i;
+  let match;
+  while (match = opener.exec(out)) {
+    out = out.slice(match[0].length).replace(/^\s+/, "");
+  }
+  return out;
+}
+function extractFarmFullDocument(markup) {
+  const inner = stripContentsWrappers(markup);
+  if (!/^<!doctype/i.test(inner) && !/^<html[\s>]/i.test(inner)) return null;
+  const start = markup.search(/<!doctype|<html[\s>]/i);
+  const closeIndex = markup.toLowerCase().lastIndexOf("</html>");
+  if (start < 0 || closeIndex < 0) return null;
+  return markup.slice(start, closeIndex + "</html>".length);
+}
+function opensFarmFullDocument(markup) {
+  const inner = stripContentsWrappers(markup);
+  return /^<!doctype/i.test(inner) || /^<html[\s>]/i.test(inner);
+}
+function composeFarmFullDocument(documentHtml, assets) {
+  let html = documentHtml;
+  if (assets.htmlAttributes) {
+    html = html.replace(
+      /<html\b([^>]*)>/i,
+      (_match, attrs) => `<html${attrs}${assets.htmlAttributes}>`
+    );
+  }
+  if (!/\sid=["']root["']/i.test(html)) {
+    html = html.replace(/<body\b([^>]*)>/i, '<body$1><div id="root">').replace(/<\/body>/i, "</div></body>");
+  }
+  if (assets.headAssets) {
+    html = html.replace(/<\/head>/i, () => `  ${assets.headAssets}
+</head>`);
+  }
+  if (assets.bodyFooter) {
+    html = html.replace(/<\/body>/i, () => `  ${assets.bodyFooter}
+</body>`);
+  }
+  return /^\s*<!doctype/i.test(html) ? html : `<!DOCTYPE html>
+${html}`;
+}
+var init_full_document = __esm({
+  "src/server/full-document.ts"() {
+    "use strict";
+    __name(stripContentsWrappers, "stripContentsWrappers");
+    __name(extractFarmFullDocument, "extractFarmFullDocument");
+    __name(opensFarmFullDocument, "opensFarmFullDocument");
+    __name(composeFarmFullDocument, "composeFarmFullDocument");
+  }
+});
+
 // src/middleware/server.ts
 function getGlobalMiddlewareStore(key) {
   const state = globalThis;
@@ -14858,7 +14912,7 @@ var init_server3 = __esm({
 var version;
 var init_package = __esm({
   "package.json"() {
-    version = "0.1.0-beta.46";
+    version = "0.1.0-beta.48";
   }
 });
 
@@ -15030,6 +15084,13 @@ function warnSuppressedAsyncHydrationOnce(modulePath) {
     `${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.`
   );
 }
+function warnFarmFullDocumentLayout() {
+  if (warnedFullDocumentLayout) return;
+  warnedFullDocumentLayout = true;
+  logger.warn(
+    `A root layout returned a full <html> document. Farm.js owns the document shell, so a layout should return a fragment (its children) \u2014 like the docs example \u2014 and let the framework provide <html>/<head>/<body>. The document has been composed into the response, but returning a fragment avoids the ambiguity and keeps dev and production identical.`
+  );
+}
 function hasRequestHeader(req, name2) {
   const value = req.headers[name2.toLowerCase()];
   return Array.isArray(value) ? value.length > 0 : Boolean(value);
@@ -15168,13 +15229,14 @@ function createRouteStateProps(input) {
     context: input.pluginExposedContext.size > 0 ? { data: input.pluginExposedContext } : void 0
   };
 }
-var fs3, path13, import_stream, import_node_url6, cachedClerkProvider, importRuntimeModule, warnedSuppressedAsyncHydrationModules, _ServerRenderer, ServerRenderer;
+var fs3, path13, import_stream, import_node_url6, cachedClerkProvider, importRuntimeModule, warnedSuppressedAsyncHydrationModules, fullDocumentRoutes, warnedFullDocumentLayout, _ServerRenderer, ServerRenderer;
 var init_renderer2 = __esm({
   "src/server/renderer.ts"() {
     "use strict";
     fs3 = __toESM(require("fs"));
     path13 = __toESM(require("path"));
     init_utils();
+    init_full_document();
     init_client_component();
     import_stream = require("stream");
     init_server();
@@ -15209,6 +15271,9 @@ var init_renderer2 = __esm({
     importRuntimeModule = new Function("specifier", "return import(specifier);");
     warnedSuppressedAsyncHydrationModules = /* @__PURE__ */ new Set();
     __name(warnSuppressedAsyncHydrationOnce, "warnSuppressedAsyncHydrationOnce");
+    fullDocumentRoutes = /* @__PURE__ */ new Set();
+    warnedFullDocumentLayout = false;
+    __name(warnFarmFullDocumentLayout, "warnFarmFullDocumentLayout");
     __name(hasRequestHeader, "hasRequestHeader");
     __name(serializeInlineValue2, "serializeInlineValue");
     __name(escapeHtmlAttribute2, "escapeHtmlAttribute");
@@ -16524,7 +16589,27 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
             this.config.basePath,
             getTheme()
           );
-          const html = `<!DOCTYPE html>
+          const fullDocument = extractFarmFullDocument(content);
+          let html;
+          if (fullDocument) {
+            warnFarmFullDocumentLayout();
+            html = composeFarmFullDocument(fullDocument, {
+              htmlAttributes: `${i18nSnapshot ? ` dir="${i18nSnapshot.direction}"` : ""}${themeDocument.attributes}`,
+              headAssets: [
+                themeDocument.head,
+                `<meta name="farm-deployment-id" content="${escapeHtmlAttribute2(deploymentId)}">`,
+                metaTags,
+                alternateTags,
+                renderFarmFontDevHead(this.config.root || process.cwd()),
+                `<link rel="stylesheet" href="/src/app/globals.css">`,
+                `<script type="module" src="/@vite/client"></script>`,
+                rendererHydrationScript,
+                bootstrapScript
+              ].filter(Boolean).join("\n  "),
+              bodyFooter: [deferredScript, `<script type="module" src="/@farm/client.js"></script>`].filter(Boolean).join("\n  ")
+            });
+          } else {
+            html = `<!DOCTYPE html>
 <html lang="${escapeHtmlAttribute2(i18nSnapshot?.locale || "en")}"${i18nSnapshot ? ` dir="${i18nSnapshot.direction}"` : ""}${themeDocument.attributes}>
 <head>
   ${themeDocument.head}
@@ -16545,6 +16630,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
   <script type="module" src="/@farm/client.js"></script>
 </body>
 </html>`;
+          }
           emitFarmEvent({
             type: "render.stream.shellReady",
             route,
@@ -16567,7 +16653,8 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
       }
       async renderWithSSR(element, req, res, clearMiddlewareData, options = {}) {
         const renderToPipeableStream2 = this.rendererRuntime.renderToPipeableStream;
-        if (!renderToPipeableStream2) {
+        const fullDocumentRouteKey = options.observabilityRoute || req.__FARM_ROUTE__ || req.url || "/";
+        if (!renderToPipeableStream2 || fullDocumentRoutes.has(fullDocumentRouteKey)) {
           return this.renderBufferedSSR(element, req, res, clearMiddlewareData, options);
         }
         return new Promise((resolve8, reject) => {
@@ -16714,6 +16801,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
               htmlParts.push(shell);
               staticShellParts?.push(shell);
               let firstChunk = true;
+              let checkedFullDocument = false;
               const writableStream = new import_stream.Writable({
                 write(chunk, encoding, callback) {
                   if (firstChunk && process.env.FARM_VERBOSE) {
@@ -16721,6 +16809,13 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
                     firstChunk = false;
                   }
                   const chunkText = Buffer.isBuffer(chunk) ? chunk.toString() : String(chunk);
+                  if (!checkedFullDocument) {
+                    checkedFullDocument = true;
+                    if (opensFarmFullDocument(chunkText)) {
+                      fullDocumentRoutes.add(fullDocumentRouteKey);
+                      warnFarmFullDocumentLayout();
+                    }
+                  }
                   htmlParts.push(chunkText);
                   if (staticShellParts && !staticShellClosed) {
                     const dynamicIndex = findPPRDynamicChunkIndex(chunkText);
@@ -16919,6 +17014,24 @@ ${i18nSnapshot ? `window.__FARM_I18N__ = ${serializeInlineValue2(i18nSnapshot)};
           getTheme()
         );
         const rendererHydrationScript = this.rendererRuntime.generateHydrationScript?.() || "";
+        const fullDocument = extractFarmFullDocument(content);
+        if (fullDocument) {
+          warnFarmFullDocumentLayout();
+          return composeFarmFullDocument(fullDocument, {
+            htmlAttributes: `${i18nSnapshot ? ` dir="${i18nSnapshot.direction}"` : ""}${themeDocument.attributes}`,
+            headAssets: [
+              themeDocument.head,
+              `<meta name="farm-deployment-id" content="${escapeHtmlAttribute2(this.getDeploymentId())}">`,
+              alternateLinks,
+              fontHead,
+              `<link rel="stylesheet" href="/src/app/globals.css" />`,
+              `<script type="module" src="/@vite/client"></script>`,
+              rendererHydrationScript,
+              integrationManifestScript
+            ].filter(Boolean).join("\n  "),
+            bodyFooter: clientScript.trim()
+          });
+        }
         return `<!DOCTYPE html>
 <html lang="${escapeHtmlAttribute2(i18nSnapshot?.locale || "en")}"${i18nSnapshot ? ` dir="${i18nSnapshot.direction}"` : ""}${themeDocument.attributes}>
 <head>