@uniweb/runtime 1.2.5 → 1.2.6

package/dist/ssr.js

@@ -495,9 +495,19 @@ function documentTitle(pageTitle, siteName) {
   const title = String(pageTitle);
   return siteName ? `${title} | ${siteName}` : title;
 }
+const startPages = /* @__PURE__ */ new WeakMap();
+function recordStartPage(website) {
+  if (website && !startPages.has(website)) startPages.set(website, website.activePage);
+}
+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;
@@ -656,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);
   }
@@ -735,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: {
@@ -1191,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") {
@@ -1244,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);