@farm.js/core 0.1.0-beta.45 → 0.1.0-beta.47

package/dist/plugin.mjs

@@ -6,7 +6,7 @@ import {
 import "./chunk-RQ633A5I.mjs";
 import {
   farmPlugin
-} from "./chunk-6NCLVPI7.mjs";
+} from "./chunk-MWYVMV3T.mjs";
 import "./chunk-XJTDE4L4.mjs";
 import "./chunk-CAUVJN4X.mjs";
 import "./chunk-AMZZCRQ7.mjs";
@@ -36,15 +36,15 @@ import "./chunk-H53KVQUU.mjs";
 import "./chunk-QKVUNGAH.mjs";
 import "./chunk-HFQ2I2EA.mjs";
 import "./chunk-T4QJQK76.mjs";
-import "./chunk-VHYARVB7.mjs";
+import "./chunk-TIESOJ7Z.mjs";
 import "./chunk-P7QDS5AT.mjs";
 import "./chunk-E6EPN5BT.mjs";
-import "./chunk-MU2QKVYL.mjs";
+import "./chunk-MP2SDRRB.mjs";
 import "./chunk-XJ65E7MB.mjs";
 import "./chunk-FQYDHKKU.mjs";
 import "./chunk-SXWF4QRU.mjs";
 import "./chunk-GIELMNBG.mjs";
-import "./chunk-KEPCW6EI.mjs";
+import "./chunk-U5SPS2HR.mjs";
 import "./chunk-QGOHVJ6J.mjs";
 import "./chunk-5B33VWGX.mjs";
 import "./chunk-YTMDIHQN.mjs";
@@ -63,7 +63,7 @@ import "./chunk-RBRLLZL5.mjs";
 import "./chunk-WZ5QFROO.mjs";
 import "./chunk-7ZMKVETU.mjs";
 import "./chunk-FXG2PS27.mjs";
-import "./chunk-FLGRRGVU.mjs";
+import "./chunk-KTV3UWGE.mjs";
 import "./chunk-CGILA3WO.mjs";
 export {
   FarmRuntimeShutdownError,

package/dist/server.cjs

@@ -14828,6 +14828,7 @@ __export(server_exports2, {
   sqliteStorage: () => sqliteStorage,
   startDevServer: () => startDevServer,
   storageCacheAdapter: () => storageCacheAdapter,
+  toRootRelativeUrlPath: () => toRootRelativeUrlPath,
   toViteModuleId: () => toViteModuleId,
   unstable_cache: () => unstable_cache,
   updateTag: () => updateTag,
@@ -14957,6 +14958,14 @@ function resolveAppPath(root, ...paths) {
   return import_path.default.resolve(root, ...paths);
 }
 __name(resolveAppPath, "resolveAppPath");
+function toRootRelativeUrlPath(absolutePath, projectRoot) {
+  if (absolutePath === projectRoot) return "";
+  if (absolutePath.startsWith(`${projectRoot}/`) || absolutePath.startsWith(`${projectRoot}\\`)) {
+    return absolutePath.slice(projectRoot.length).replace(/\\/g, "/");
+  }
+  return void 0;
+}
+__name(toRootRelativeUrlPath, "toRootRelativeUrlPath");
 function toViteModuleId(filePath, root) {
   if (!import_path.default.isAbsolute(filePath)) return filePath;
   const relativePath2 = import_path.default.relative(root, filePath);
@@ -17123,9 +17132,8 @@ var _RouteManager = class _RouteManager {
       return this.clientManifestCache.manifest;
     }
     const toUrlPath = /* @__PURE__ */ __name((absolutePath) => {
-      if (absolutePath === normalizedProjectRoot || absolutePath.startsWith(`${normalizedProjectRoot}${import_path5.default.sep}`)) {
-        return absolutePath.slice(normalizedProjectRoot.length);
-      }
+      const rootRelative = toRootRelativeUrlPath(absolutePath, normalizedProjectRoot);
+      if (rootRelative !== void 0) return rootRelative;
       if (import_path5.default.isAbsolute(absolutePath)) {
         const normalized = absolutePath.replace(/\\/g, "/");
         return normalized.startsWith("/") ? `/@fs${normalized}` : `/@fs/${normalized}`;
@@ -17821,6 +17829,57 @@ __name(safeGlobFiles, "safeGlobFiles");
 // src/server/renderer.ts
 var fs3 = __toESM(require("fs"));
 var path11 = __toESM(require("path"));
+
+// 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;
+}
+__name(stripContentsWrappers, "stripContentsWrappers");
+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);
+}
+__name(extractFarmFullDocument, "extractFarmFullDocument");
+function opensFarmFullDocument(markup) {
+  const inner = stripContentsWrappers(markup);
+  return /^<!doctype/i.test(inner) || /^<html[\s>]/i.test(inner);
+}
+__name(opensFarmFullDocument, "opensFarmFullDocument");
+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}`;
+}
+__name(composeFarmFullDocument, "composeFarmFullDocument");
+
+// src/server/renderer.ts
 var import_stream = require("stream");
 
 // src/middleware/server.ts
@@ -21175,7 +21234,7 @@ _setFarmThemeServerSnapshotResolver(() => {
 });
 
 // package.json
-var version = "0.1.0-beta.45";
+var version = "0.1.0-beta.47";
 
 // src/version.ts
 var FARM_VERSION = version;
@@ -21284,6 +21343,16 @@ function warnSuppressedAsyncHydrationOnce(modulePath) {
   );
 }
 __name(warnSuppressedAsyncHydrationOnce, "warnSuppressedAsyncHydrationOnce");
+var fullDocumentRoutes = /* @__PURE__ */ new Set();
+var warnedFullDocumentLayout = false;
+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.`
+  );
+}
+__name(warnFarmFullDocumentLayout, "warnFarmFullDocumentLayout");
 function hasRequestHeader(req, name2) {
   const value = req.headers[name2.toLowerCase()];
   return Array.isArray(value) ? value.length > 0 : Boolean(value);
@@ -22119,7 +22188,7 @@ var _ServerRenderer = class _ServerRenderer {
       );
       const clientLayouts = layouts.map((layout2, index) => ({
         pattern: layout2.pattern,
-        modulePath: layout2.modulePath.startsWith(this.config.root) ? layout2.modulePath.slice(this.config.root.length) : layout2.modulePath,
+        modulePath: toRootRelativeUrlPath(layout2.modulePath, this.config.root) ?? layout2.modulePath,
         shouldHydrate: layoutHydrationMetadata[index]?.shouldHydrate === true,
         islandStrategy: layoutHydrationMetadata[index]?.islandStrategy ?? null
       }));
@@ -22695,7 +22764,7 @@ var _ServerRenderer = class _ServerRenderer {
       const routeSlots = (req.__FARM_ROUTE_SLOTS__ || []).map(
         (slot) => ({
           ...slot,
-          modulePath: typeof slot.modulePath === "string" && slot.modulePath.startsWith(this.config.root) ? slot.modulePath.slice(this.config.root.length) : slot.modulePath
+          modulePath: typeof slot.modulePath === "string" ? toRootRelativeUrlPath(slot.modulePath, this.config.root) ?? slot.modulePath : slot.modulePath
         })
       );
       const deferredProps = prepareDeferredData({
@@ -22703,7 +22772,7 @@ var _ServerRenderer = class _ServerRenderer {
         slots: routeSlots
       });
       const pagePath = req.__FARM_PAGE_PATH__;
-      const relativePath2 = pagePath ? pagePath.startsWith(this.config.root) ? pagePath.slice(this.config.root.length) : pagePath : "/src/app/page.tsx";
+      const relativePath2 = pagePath ? toRootRelativeUrlPath(pagePath, this.config.root) ?? pagePath : "/src/app/page.tsx";
       const deploymentId = this.getDeploymentId();
       const bootstrapScript = `<script>
 window.__FARM_PROPS__ = ${serializeInlineValue2(deferredProps.data.page)};
@@ -22737,7 +22806,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}
@@ -22758,6 +22847,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
   <script type="module" src="/@farm/client.js"></script>
 </body>
 </html>`;
+      }
       emitFarmEvent({
         type: "render.stream.shellReady",
         route,
@@ -22780,7 +22870,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) => {
@@ -22799,7 +22890,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
       let didError = false;
       const pagePath = req.__FARM_PAGE_PATH__;
       const isClientComponent = req.__FARM_IS_CLIENT_COMPONENT__ === true;
-      const relativePath2 = pagePath ? pagePath.startsWith(this.config.root) ? pagePath.slice(this.config.root.length) : pagePath : "/src/app/page.tsx";
+      const relativePath2 = pagePath ? toRootRelativeUrlPath(pagePath, this.config.root) ?? pagePath : "/src/app/page.tsx";
       const manifest = options.routeManifest ?? this.routeManager.generateClientManifest(this.config.root);
       const clientManifest = {
         clientEntry: "/@farm/client.js",
@@ -22847,7 +22938,7 @@ ${getFarmI18nClientSnapshot() ? `window.__FARM_I18N__ = ${serializeInlineValue2(
       const routeSlotPayload = (req.__FARM_ROUTE_SLOTS__ || []).map(
         (slot) => ({
           ...slot,
-          modulePath: typeof slot.modulePath === "string" && slot.modulePath.startsWith(this.config.root) ? slot.modulePath.slice(this.config.root.length) : slot.modulePath
+          modulePath: typeof slot.modulePath === "string" ? toRootRelativeUrlPath(slot.modulePath, this.config.root) ?? slot.modulePath : slot.modulePath
         })
       );
       const deferredProps = prepareDeferredData({
@@ -22927,6 +23018,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) {
@@ -22934,6 +23026,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);
@@ -23132,6 +23231,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>
@@ -32372,6 +32489,7 @@ __name(assertFunction, "assertFunction");
   sqliteStorage,
   startDevServer,
   storageCacheAdapter,
+  toRootRelativeUrlPath,
   toViteModuleId,
   unstable_cache,
   updateTag,