@uniweb/runtime 1.2.4 → 1.2.6

package/dist/ssr.js

@@ -9,7 +9,6 @@ import { DEFAULT_ICON_BASE, iconUrl } from "@uniweb/core/icon-corpus";
 import { buildTheme, FONT_LINKS_MARKER, buildSectionOverrides } from "@uniweb/theming";
 import "@uniweb/core/services";
 import "@uniweb/core/tracker";
-import { pageMarkdownUrls } from "@uniweb/projections/markdown-urls";
 import { escapeHtml } from "@uniweb/core/page-shell";
 import { escapeHtml as escapeHtml2, foundationCssUrl, pageShell } from "@uniweb/core/page-shell";
 import DataStore, { deriveCacheKey as deriveCacheKey$1 } from "@uniweb/core/datastore";
@@ -496,23 +495,19 @@ function documentTitle(pageTitle, siteName) {
   const title = String(pageTitle);
   return siteName ? `${title} | ${siteName}` : title;
 }
-const urlsOfPages = /* @__PURE__ */ new WeakMap();
-function pageHeadMeta(page) {
-  return { ...page.getHeadMeta(), markdown: markdownUrlOf(page) };
+const startPages = /* @__PURE__ */ new WeakMap();
+function recordStartPage(website) {
+  if (website && !startPages.has(website)) startPages.set(website, website.activePage);
 }
-function markdownUrlOf(page) {
-  const website = page?.website;
-  if (!website) return null;
-  let urls = urlsOfPages.get(website.pages);
-  if (!urls) {
-    urls = pageMarkdownUrls({ pages: website.getContentPages(), config: website.config });
-    urlsOfPages.set(website.pages, urls);
-  }
-  return urls.get(page.route) ?? null;
+function restoreStartPage(website) {
+  if (startPages.has(website)) website.activePage = startPages.get(website);
 }
 function resolvePage(website, route) {
   return website.getPage(route);
 }
+function resolveRequestedPage(website, route) {
+  return website.resolveRoute(route).kind === "rewrite" ? void 0 : resolvePage(website, route);
+}
 const VALID_CONTEXTS = ["light", "medium", "dark"];
 function getWrapperProps(block) {
   const theme = block.themeName;
@@ -671,6 +666,7 @@ function initPrerender(content, foundation, extensionsOrOptions, maybeOptions) {
   } } = options;
   onProgress("Initializing runtime...");
   const uniweb = createUniweb(content, foundation, extensions);
+  recordStartPage(uniweb.activeWebsite);
   if (content.config?.base && uniweb.activeWebsite?.setBasePath) {
     uniweb.activeWebsite.setBasePath(content.config.base);
   }
@@ -750,7 +746,7 @@ function classifyRenderError(err) {
   };
 }
 function renderPage(page, website) {
-  website.setActivePage(page.route);
+  if (page !== website.getNotFoundPage()) website.setActivePage(page.route);
   if (page.hasContent?.() && page.getBodyBlocks().length === 0) {
     return {
       error: {
@@ -820,7 +816,7 @@ ${options.sectionOverrideCSS}
   return result;
 }
 function writeHeadMeta(html, page) {
-  const meta = typeof page?.getHeadMeta === "function" ? pageHeadMeta(page) : { description: page?.description || null };
+  const meta = typeof page?.getHeadMeta === "function" ? page.getHeadMeta() : { description: page?.description || null };
   const end = html.indexOf("</head>");
   if (!meta || end === -1) return html;
   const og = meta.og || {};
@@ -853,8 +849,6 @@ function writeHeadMeta(html, page) {
   for (const { hreflang, url } of meta.alternates || []) {
     written.push(`<link rel="alternate" hreflang="${escapeHtml(hreflang)}" href="${escapeHtml(url)}">`);
   }
-  head = head.replace(/<link\b(?=[^>]*\brel=["']alternate["'])(?=[^>]*\btype=["']text\/markdown["'])[^>]*>\s*/gi, "");
-  if (meta.markdown) written.push(`<link rel="alternate" type="text/markdown" href="${escapeHtml(meta.markdown)}">`);
   return `${head}${written.join("\n")}
 ${html.slice(end)}`;
 }
@@ -1208,7 +1202,8 @@ async function loadPageData({ website, route, fetch: fetch2, dev = false, locale
     );
   }
   website.makeCurrent();
-  const resolved = typeof route === "string" ? resolvePage(website, route) : route;
+  const named = typeof route === "string" ? resolveRequestedPage(website, route) : route;
+  const resolved = named ?? (typeof route === "string" ? website.getNotFoundPage() : null);
   if (!resolved) return [];
   const page = typeof resolved.getRenderableSelf === "function" ? resolved.getRenderableSelf() : resolved;
   if (typeof page.getBodyBlocks !== "function") {
@@ -1261,10 +1256,13 @@ function createPageRenderer({ website, shell }) {
       website.forgetData();
       hydrateDataStore(website, fetchedData);
     }
-    const resolved = typeof target === "string" ? resolvePage(website, target) : target;
+    const named = typeof target === "string" ? resolveRequestedPage(website, target) : target;
+    const resolved = named ?? (typeof target === "string" ? website.getNotFoundPage() : null);
     if (!resolved) return { outcome: "notFound", html: null, page: null, error: null };
     const page = typeof resolved.getRenderableSelf === "function" ? resolved.getRenderableSelf() : resolved;
-    const missing = page?.notFound === true;
+    const missing = !named || page?.notFound === true;
+    restoreStartPage(website);
+    if (typeof target === "string") website.setActivePage(target);
     let result;
     try {
       result = renderPage(page, website);