mnfst-render 0.5.39 → 0.5.40

package/manifest.render.mjs

@@ -317,12 +317,69 @@ function loadConfig(rootDir) {
 }
 
 function normalizeLocaleRouteExclude(val) {
+  const clean = (s) => String(s).trim().replace(/^\/+|\/+$/g, '');
   if (val == null) return [];
-  if (Array.isArray(val)) return val.map((s) => String(s).trim()).filter(Boolean);
-  if (typeof val === 'string') return val.split(',').map((s) => s.trim()).filter(Boolean);
+  if (Array.isArray(val)) return val.map(clean).filter(Boolean);
+  if (typeof val === 'string') return val.split(',').map(clean).filter(Boolean);
   return [];
 }
 
+/**
+ * Shared predicate: true when route segment `seg` (no leading slash) falls
+ * under one of the excluded prefixes — prefix-matched on whole segments, so
+ * "docs" excludes "docs" itself and "docs/group/article" but not "docsite".
+ * Used by locale route expansion, link prefixing, and (mirrored in
+ * mnfst-publish) the publisher's expected-file computation.
+ */
+function isLocaleRouteExcluded(seg, localeRouteExclude) {
+  if (!seg || !localeRouteExclude || !localeRouteExclude.length) return false;
+  const clean = String(seg).replace(/^\/+|\/+$/g, '');
+  for (const prefix of localeRouteExclude) {
+    if (clean === prefix || clean.startsWith(prefix + '/')) return true;
+  }
+  return false;
+}
+
+/**
+ * Expand discovered route segments into the full path list to render:
+ * every locale-neutral route as-is, plus a `<locale>/<route>` variant for
+ * every non-default locale (and for the default locale itself, under its
+ * own slug, when there's more than one locale) — except routes under an
+ * excluded prefix (localeRouteExclude), which are never locale-prefixed.
+ * Pure/side-effect-free so it can be unit tested without Puppeteer.
+ */
+function expandLocaleRoutePaths({ routeSegments, locales, defaultLocale, localeRouteExclude }) {
+  const localeList = locales || [];
+  const localeSet = new Set(localeList.map((l) => String(l).toLowerCase()));
+  const localeNeutralSegments = routeSegments.filter((seg) => {
+    if (!seg) return true;
+    const first = seg.split('/')[0].toLowerCase();
+    return !localeSet.has(first);
+  });
+  const paths = new Set();
+  paths.add('');
+  for (const seg of routeSegments) paths.add(seg);
+  for (const locale of localeList.slice(1)) {
+    paths.add(locale);
+    for (const seg of localeNeutralSegments) {
+      if (!seg) continue;
+      if (isLocaleRouteExcluded(seg, localeRouteExclude)) continue;
+      paths.add(`${locale}/${seg}`);
+    }
+  }
+  // Default locale also under its slug (e.g. /en/, /en/page-1) so linking is
+  // symmetric with other locales; canonical points to root.  Skip this when
+  // there's only one locale — the duplicates serve no purpose and bloat the
+  // output (every page would be written twice: at root AND under /en/).
+  if (defaultLocale && localeList.length > 1) {
+    paths.add(defaultLocale);
+    for (const seg of localeNeutralSegments) {
+      if (seg !== '' && !isLocaleRouteExcluded(seg, localeRouteExclude)) paths.add(`${defaultLocale}/${seg}`);
+    }
+  }
+  return paths;
+}
+
 function resolveConfig() {
   const cli = parseArgs();
   const cwd = process.cwd();
@@ -1567,7 +1624,6 @@ function buildSubstitutionPairs(defaultLocaleData, targetLocaleData) {
 function prefixLocaleInternalLinks(html, locale, locales, localeRouteExclude) {
   if (!locale || !locales || !locales.length) return html;
   const localeSet = new Set(locales);
-  const excludeSet = new Set(localeRouteExclude || []);
 
   // Match <a ... href="..." ...>  — capture the href value
   return html.replace(
@@ -1588,7 +1644,7 @@ function prefixLocaleInternalLinks(html, locale, locales, localeRouteExclude) {
       if (/\.(css|js|json|svg|png|jpg|jpeg|gif|ico|woff2?|ttf|eot|pdf|xml|txt)$/i.test(href)) return full;
 
       // Respect localeRouteExclude — these routes stay locale-neutral
-      if (excludeSet.has(firstSeg)) return full;
+      if (isLocaleRouteExcluded(withoutSlash, localeRouteExclude)) return full;
 
       // Prefix with locale
       return `${prefix}/${locale}${href}${suffix}`;
@@ -3214,35 +3270,11 @@ async function runPrerender(config) {
       if (!segSet.has(p)) { routeSegments.push(p); segSet.add(p); }
     }
   }
-  const localeSet = new Set(locales.map((l) => String(l).toLowerCase()));
-  const localeNeutralSegments = routeSegments.filter((seg) => {
-    if (!seg) return true;
-    const first = seg.split('/')[0].toLowerCase();
-    return !localeSet.has(first);
-  });
-  const paths = new Set();
-  paths.add('');
-
-  for (const seg of routeSegments) {
-    paths.add(seg);
-  }
-  for (const locale of locales.slice(1)) {
-    paths.add(locale);
-    for (const seg of localeNeutralSegments) {
-      if (!seg) continue;
-      paths.add(`${locale}/${seg}`);
-    }
-  }
-  // Default locale also under its slug (e.g. /en/, /en/page-1) so linking is
-  // symmetric with other locales; canonical points to root.  Skip this when
-  // there's only one locale — the duplicates serve no purpose and bloat the
-  // output (every page would be written twice: at root AND under /en/).
-  if (defaultLocale && locales.length > 1) {
-    paths.add(defaultLocale);
-    for (const seg of localeNeutralSegments) {
-      if (seg !== '') paths.add(`${defaultLocale}/${seg}`);
-    }
-  }
+  // Expand routeSegments into the full path list: locale-neutral routes as-is,
+  // plus a `<locale>/<route>` variant per locale (skipping localeRouteExclude
+  // prefixes). Factored into a pure function so it's unit-testable without
+  // Puppeteer — see expandLocaleRoutePaths.
+  const paths = expandLocaleRoutePaths({ routeSegments, locales, defaultLocale, localeRouteExclude: config.localeRouteExclude });
 
   const NOT_FOUND_PATH = '__prerender_404__'; // URL path that matches no route so router shows x-route="!*" (404)
   const pathList = [...paths, NOT_FOUND_PATH];
@@ -3355,7 +3387,10 @@ async function runPrerender(config) {
   // Configurable via manifest.prerender.browserRecycleEvery.
   const browserRecycleEvery = Math.max(0, pre.browserRecycleEvery ?? 40);
   // Bounds on the recycle handshake and on a single page render.  A stuck
-  // page must never pin the whole run: each is capped, logged and stepped over.
+  // page must never pin the whole run: each is capped, logged and stepped
+  // over — and a page that hits the ceiling forces a browser recycle, since
+  // a wedged page.evaluate() may have poisoned the shared browser process.
+  // pageTimeout is configurable via manifest.prerender.pageTimeout; 0 disables.
   const drainTimeoutMs = Math.max(0, pre.recycleDrainTimeout ?? 60000);
   const recycleTimeoutMs = Math.max(0, pre.recycleTimeout ?? 180000);
   const pageTimeoutMs = Math.max(0, pre.pageTimeout ?? Math.max(120000, (config.wait ?? 30000) * 4));
@@ -4814,6 +4849,11 @@ async function runPrerender(config) {
             if (!finished) {
               attemptToken.abandoned = true;
               attemptToken.failure = { path: displayPath, message: `page render exceeded ${pageTimeoutMs}ms` };
+              // A timed-out page is presumed to have wedged the browser (e.g.
+              // a hung page.evaluate on a dead Chrome process) — force a
+              // recycle once this path is done, even if a later retry
+              // "succeeds" by reusing the same possibly-poisoned browser.
+              recycleGate.requestRecycle();
             }
           } catch (err) {
             // Unexpected exception escaped processPath (e.g. browser died mid-call).
@@ -4988,4 +5028,11 @@ if (_isDirectEntry) {
 }
 
 // Exports for the CLI bin script and for unit testing.
-export { main, markPrerenderedManifestComponents };
+export {
+  main,
+  markPrerenderedManifestComponents,
+  normalizeLocaleRouteExclude,
+  isLocaleRouteExcluded,
+  expandLocaleRoutePaths,
+  prefixLocaleInternalLinks,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mnfst-render",
-  "version": "0.5.39",
+  "version": "0.5.40",
   "description": "Render Manifest sites to static HTML for SEO",
   "type": "module",
   "bin": {