@farm.js/core 0.1.31 → 0.1.35

package/dist/{chunk-QZCT2CQ4.mjs → chunk-CXEN47J3.mjs}

@@ -17,6 +17,7 @@ async function resolveFarmNotFoundMetadata(layoutModules, notFoundModule) {
     if (typeof layout.generateMetadata === "function") {
       metadata = mergeMetadata(metadata, await layout.generateMetadata({ params: {} }));
     }
+    metadata = await mergeModuleViewport(metadata, layout, { params: {} });
   }
   let own = {};
   let latestTitle;
@@ -28,6 +29,7 @@ async function resolveFarmNotFoundMetadata(layoutModules, notFoundModule) {
       own = mergeMetadata(own, generated);
       if (generated?.title !== void 0) latestTitle = generated.title;
     }
+    own = await mergeModuleViewport(own, notFoundModule, { params: {}, searchParams: {} });
   }
   const title = isRecord(latestTitle) && normalizeContent(latestTitle.absolute) ? latestTitle : own.title;
   return mergeMetadata(metadata, { ...own, title: title ?? FARM_NOT_FOUND_TITLE });
@@ -46,10 +48,67 @@ function mergeMetadata(base, next) {
     twitter: mergeNestedMetadata(base.twitter, next.twitter),
     alternates: mergeNestedMetadata(base.alternates, next.alternates),
     icons: mergeNestedMetadata(base.icons, next.icons),
-    verification: mergeNestedMetadata(base.verification, next.verification)
+    verification: mergeNestedMetadata(base.verification, next.verification),
+    viewport: mergeNestedMetadata(base.viewport, next.viewport)
   };
 }
 __name(mergeMetadata, "mergeMetadata");
+async function mergeModuleViewport(metadata, module, props) {
+  let merged = metadata;
+  if (isRecord(module?.viewport)) {
+    merged = mergeMetadata(merged, { viewport: module.viewport });
+  }
+  if (typeof module?.generateViewport === "function") {
+    const generated = await module.generateViewport(props);
+    if (isRecord(generated)) merged = mergeMetadata(merged, { viewport: generated });
+  }
+  return merged;
+}
+__name(mergeModuleViewport, "mergeModuleViewport");
+var DEFAULT_VIEWPORT = { width: "device-width", initialScale: 1 };
+var VIEWPORT_CONTENT_KEYS = [
+  ["width", "width"],
+  ["height", "height"],
+  ["initialScale", "initial-scale"],
+  ["minimumScale", "minimum-scale"],
+  ["maximumScale", "maximum-scale"],
+  ["userScalable", "user-scalable"],
+  ["viewportFit", "viewport-fit"],
+  ["interactiveWidget", "interactive-widget"]
+];
+function renderViewportHead(viewport) {
+  const marker = ` ${FARM_METADATA_ATTRIBUTE}`;
+  if (typeof viewport === "string") {
+    return `<meta name="viewport" content="${escapeAttribute(viewport)}"${marker}>`;
+  }
+  const resolved = {
+    ...DEFAULT_VIEWPORT,
+    ...isRecord(viewport) ? viewport : {}
+  };
+  const content = VIEWPORT_CONTENT_KEYS.flatMap(([key, name]) => {
+    const value = resolved[key];
+    if (value === void 0 || value === null || value === "") return [];
+    if (typeof value === "boolean") return [`${name}=${value ? "yes" : "no"}`];
+    return [`${name}=${String(value)}`];
+  }).join(", ");
+  const tags = content ? [`<meta name="viewport" content="${escapeAttribute(content)}"${marker}>`] : [];
+  const themeColors = Array.isArray(resolved.themeColor) ? resolved.themeColor : resolved.themeColor === void 0 ? [] : [resolved.themeColor];
+  for (const entry of themeColors) {
+    const color = typeof entry === "string" ? entry : isRecord(entry) ? entry.color : void 0;
+    const content2 = normalizeContent(color);
+    if (!content2) continue;
+    const media = isRecord(entry) ? normalizeContent(entry.media) : void 0;
+    tags.push(
+      `<meta name="theme-color" content="${escapeAttribute(content2)}"${media ? ` media="${escapeAttribute(media)}"` : ""}${marker}>`
+    );
+  }
+  const colorScheme = normalizeContent(resolved.colorScheme);
+  if (colorScheme) {
+    tags.push(`<meta name="color-scheme" content="${escapeAttribute(colorScheme)}"${marker}>`);
+  }
+  return tags.join("\n  ");
+}
+__name(renderViewportHead, "renderViewportHead");
 function mergeMetadataTitle(base, next) {
   if (next === void 0) return base;
   const parentTemplate = isRecord(base) ? normalizeContent(base.template) : void 0;
@@ -209,7 +268,8 @@ function renderMetadataHead(metadata, options = {}) {
     tags: tags.length > 0 ? `
   ${tags.join("\n  ")}` : "",
     hasFavicon,
-    hasExplicitTitle: Boolean(explicitTitle)
+    hasExplicitTitle: Boolean(explicitTitle),
+    viewport: renderViewportHead(resolvedMetadata.viewport)
   };
 }
 __name(renderMetadataHead, "renderMetadataHead");
@@ -481,6 +541,8 @@ export {
   FARM_METADATA_ATTRIBUTE,
   resolveFarmNotFoundMetadata,
   mergeMetadata,
+  mergeModuleViewport,
+  renderViewportHead,
   addMetadataImageReference,
   addMetadataMarkdownAlternate,
   renderMetadataHead,

package/dist/{chunk-WNLBF77X.cjs → chunk-D227TIEN.cjs}

@@ -1,14 +1,15 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
 
-var _chunk5OVTOKGHcjs = require('./chunk-5OVTOKGH.cjs');
+var _chunkFFFW3OQ7cjs = require('./chunk-FFFW3OQ7.cjs');
 
 
 var _chunkR5A5KNVXcjs = require('./chunk-R5A5KNVX.cjs');
 
 
 
-var _chunkSWN467MPcjs = require('./chunk-SWN467MP.cjs');
+
+var _chunkC4SPBWFMcjs = require('./chunk-C4SPBWFM.cjs');
 
 
 var _chunkJ7FSKED3cjs = require('./chunk-J7FSKED3.cjs');
@@ -16,7 +17,7 @@ var _chunkJ7FSKED3cjs = require('./chunk-J7FSKED3.cjs');
 
 
 
-var _chunk3LUF2PE2cjs = require('./chunk-3LUF2PE2.cjs');
+var _chunkEK4QAEFZcjs = require('./chunk-EK4QAEFZ.cjs');
 
 
 
@@ -30,7 +31,7 @@ var _chunkQBK2AA4Ucjs = require('./chunk-QBK2AA4U.cjs');
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
 // src/client/metadata-reconciler.ts
-var MANAGED_ATTRIBUTE = _chunk3LUF2PE2cjs.FARM_METADATA_ATTRIBUTE;
+var MANAGED_ATTRIBUTE = _chunkEK4QAEFZcjs.FARM_METADATA_ATTRIBUTE;
 var OWNED_SELECTORS = [
   'meta[name="description"]',
   'meta[name="keywords"]',
@@ -65,11 +66,21 @@ function removeAll(selector) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, removeAll, "removeAll");
 function applyFarmMetadataToDocument(metadata, pathname) {
-  document.title = _chunk3LUF2PE2cjs.resolveMetadataTitle.call(void 0, _optionalChain([metadata, 'optionalAccess', _ => _.title])) || "Farm.js App";
-  const rendered = _chunk3LUF2PE2cjs.renderMetadataHead.call(void 0, metadata, { pathname });
+  document.title = _chunkEK4QAEFZcjs.resolveMetadataTitle.call(void 0, _optionalChain([metadata, 'optionalAccess', _ => _.title])) || "Farm.js App";
+  const rendered = _chunkEK4QAEFZcjs.renderMetadataHead.call(void 0, metadata, { pathname });
   const template = document.createElement("template");
   template.innerHTML = rendered.tags;
+  const viewport = document.createElement("template");
+  viewport.innerHTML = rendered.viewport;
   removeAll(OWNED_SELECTORS);
+  const charset = document.head.querySelector("meta[charset]");
+  for (const element of Array.from(viewport.content.children).reverse()) {
+    const name = element.getAttribute("name");
+    if (name && document.head.querySelector(`meta[name="${name}"]:not([${MANAGED_ATTRIBUTE}])`)) {
+      continue;
+    }
+    document.head.insertBefore(element, charset ? charset.nextSibling : document.head.firstChild);
+  }
   removeAll(PAGE_JSON_LD_SELECTOR);
   if (_optionalChain([metadata, 'optionalAccess', _2 => _2.icons])) removeAll(ICON_SELECTORS);
   if (_optionalChain([metadata, 'optionalAccess', _3 => _3.manifest])) removeAll(MANIFEST_SELECTOR);
@@ -216,11 +227,12 @@ var _SPARouter = class _SPARouter {
       viewTransition = false,
       refresh = false
     } = options;
-    const url = _chunkSWN467MPcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
+    const url = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
+    if (_chunkC4SPBWFMcjs.isFarmBlockedNavigationURL.call(void 0, url)) return;
     const pathname = url.pathname;
     const search = url.search;
     const fullPath = pathname + search;
-    if (_chunkSWN467MPcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin) || _chunk5OVTOKGHcjs.isFarmLocaleChangeHref.call(void 0, url.toString()) || this.options.shouldUseDocumentNavigation(pathname)) {
+    if (_chunkC4SPBWFMcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin) || _chunkFFFW3OQ7cjs.isFarmLocaleChangeHref.call(void 0, url.toString()) || this.options.shouldUseDocumentNavigation(pathname)) {
       this.cancelActiveNavigation();
       if (replace) window.location.replace(url.toString());
       else window.location.assign(url.toString());
@@ -324,9 +336,9 @@ var _SPARouter = class _SPARouter {
    */
   async prefetch(href) {
     if (this.destroyed) return;
-    if (_chunk5OVTOKGHcjs.isFarmLocaleChangeHref.call(void 0, href)) return;
-    const url = _chunkSWN467MPcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
-    if (_chunkSWN467MPcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin)) return;
+    if (_chunkFFFW3OQ7cjs.isFarmLocaleChangeHref.call(void 0, href)) return;
+    const url = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href);
+    if (_chunkC4SPBWFMcjs.isFarmExternalNavigationURL.call(void 0, url, window.location.origin)) return;
     if (this.options.shouldUseDocumentNavigation(url.pathname)) return;
     const fullPath = url.pathname + url.search;
     const interceptFrom = window.location.pathname + window.location.search;
@@ -485,7 +497,7 @@ var _SPARouter = class _SPARouter {
     this.writePageState(action, readPageState(), href, false);
   }
   async commitNavigation(options) {
-    const historyUrl = _chunkSWN467MPcjs.resolveFarmNavigationURL.call(void 0, 
+    const historyUrl = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, 
       options.pageData.canonicalPath || options.fullPath,
       window.location.href
     );
@@ -507,13 +519,13 @@ var _SPARouter = class _SPARouter {
       window.history.pushState(historyState, "", historyPath);
     }
     this.currentHistoryIndex = nextHistoryIndex;
-    const resolvedHistoryUrl = _chunkSWN467MPcjs.resolveFarmNavigationURL.call(void 0, historyPath, window.location.href);
+    const resolvedHistoryUrl = _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, historyPath, window.location.href);
     this.currentHistoryPath = resolvedHistoryUrl.pathname + resolvedHistoryUrl.search;
     this.currentHistoryHash = resolvedHistoryUrl.hash;
     this.currentInterceptFrom = historyState[FARM_INTERCEPT_FROM_KEY];
     notifyRouterHistoryChange();
     this.updateDocumentMetadata(options.pageData.metadata);
-    _chunk5OVTOKGHcjs._hydrateFarmI18n.call(void 0, options.pageData.i18n);
+    _chunkFFFW3OQ7cjs._hydrateFarmI18n.call(void 0, options.pageData.i18n);
     if (this.onNavigate) {
       await this.onNavigate(options.pageData);
     }
@@ -745,7 +757,7 @@ var _SPARouter = class _SPARouter {
       }
       if (!this.isCurrentNavigation(navigation, clientNavigation)) return;
       this.updateDocumentMetadata(pageData.metadata);
-      _chunk5OVTOKGHcjs._hydrateFarmI18n.call(void 0, pageData.i18n);
+      _chunkFFFW3OQ7cjs._hydrateFarmI18n.call(void 0, pageData.i18n);
       if (this.onNavigate) {
         await this.onNavigate(pageData);
       }
@@ -860,7 +872,7 @@ var _SPARouter = class _SPARouter {
   }
   writePageState(action, state, href, notify = true) {
     if (typeof window === "undefined") return;
-    const url = href ? _chunkSWN467MPcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href).toString() : window.location.href;
+    const url = href ? _chunkC4SPBWFMcjs.resolveFarmNavigationURL.call(void 0, href, window.location.href).toString() : window.location.href;
     const parsedUrl = new URL(url);
     const nextPath = parsedUrl.pathname + parsedUrl.search;
     const historyPath = nextPath + parsedUrl.hash;

package/dist/{chunk-ROUTX2E5.cjs → chunk-DBNKI4NF.cjs}

@@ -1,5 +1,9 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
 
+
+var _chunkWWFTAUFGcjs = require('./chunk-WWFTAUFG.cjs');
+
+
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
 // src/client/isolated-boundary.ts
@@ -109,6 +113,11 @@ function createFarmIsolatedClientBoundary(ReactRuntime, Component, moduleReferen
   }
   _chunkS3JO3N4Hcjs.__name.call(void 0, FarmIsolatedClientBoundary, "FarmIsolatedClientBoundary");
   FarmIsolatedClientBoundary.displayName = `FarmIsolated(${Component.displayName || Component.name || exportName})`;
+  _chunkWWFTAUFGcjs.markFarmClientReference.call(void 0, FarmIsolatedClientBoundary, {
+    reference: moduleReference,
+    exportName,
+    Component
+  });
   return FarmIsolatedClientBoundary;
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmIsolatedClientBoundary, "createFarmIsolatedClientBoundary");
@@ -300,7 +309,7 @@ function createFarmIsolatedHydrationRuntime(options) {
   _chunkS3JO3N4Hcjs.__name.call(void 0, hydrate, "hydrate");
   function updateModule(reference, module) {
     const originals = module.__farm_client_boundary_originals__;
-    let updated = 0;
+    let updated = _chunkWWFTAUFGcjs.updateFarmServerTreeModule.call(void 0, reference, module);
     for (const [container, record] of roots) {
       if (record.reference !== reference) continue;
       const Component = _optionalChain([originals, 'optionalAccess', _15 => _15[record.exportName]]);
@@ -355,7 +364,7 @@ function createFarmIsolatedHydrationRuntime(options) {
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmIsolatedHydrationRuntime, "createFarmIsolatedHydrationRuntime");
 function createFarmServerPageBoundary(ReactRuntime, runtime) {
-  return /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, function FarmServerPage(props) {
+  return /* @__PURE__ */ _chunkS3JO3N4Hcjs.__name.call(void 0, function FarmServerPage({ as = "div", ...props }) {
     const ref = ReactRuntime.useRef(null);
     const html = props.dangerouslySetInnerHTML.__html;
     ReactRuntime.useLayoutEffect(() => {
@@ -376,7 +385,7 @@ function createFarmServerPageBoundary(ReactRuntime, runtime) {
         });
       };
     }, [html]);
-    return ReactRuntime.createElement("div", { ...props, ref });
+    return ReactRuntime.createElement(as, { ...props, ref });
   }, "FarmServerPage");
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, createFarmServerPageBoundary, "createFarmServerPageBoundary");

package/dist/{chunk-J3LOGE4T.cjs → chunk-DQQOKWYA.cjs}

@@ -1,21 +1,21 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});
 
-var _chunkRG3ZOTG5cjs = require('./chunk-RG3ZOTG5.cjs');
+var _chunkAI7QMY7Ocjs = require('./chunk-AI7QMY7O.cjs');
 
 
-var _chunk5ZSWG4UXcjs = require('./chunk-5ZSWG4UX.cjs');
+var _chunkUXFQ3UDAcjs = require('./chunk-UXFQ3UDA.cjs');
 
 
 var _chunkS3JO3N4Hcjs = require('./chunk-S3JO3N4H.cjs');
 
 // src/headers.ts
 function headers() {
-  return new Headers(_chunk5ZSWG4UXcjs.getCurrentRequest.call(void 0, ).headers);
+  return new Headers(_chunkUXFQ3UDAcjs.getCurrentRequest.call(void 0, ).headers);
 }
 _chunkS3JO3N4Hcjs.__name.call(void 0, headers, "headers");
 function cookies() {
-  const cookieHeader = _chunk5ZSWG4UXcjs.getCurrentRequest.call(void 0, ).headers.get("cookie") || "";
-  const parsed = _chunkRG3ZOTG5cjs.parseRequestCookieHeader.call(void 0, cookieHeader);
+  const cookieHeader = _chunkUXFQ3UDAcjs.getCurrentRequest.call(void 0, ).headers.get("cookie") || "";
+  const parsed = _chunkAI7QMY7Ocjs.parseRequestCookieHeader.call(void 0, cookieHeader);
   return {
     get(name) {
       return parsed.find((cookie) => cookie.name === name);