mnfst-render 0.4.1 → 0.4.2

package/manifest.render.mjs

@@ -1683,16 +1683,39 @@ async function runPrerender(config) {
   const puppeteerPaths = [];
   const localeVariantPaths = []; // { pathSeg, basePathSeg, targetLocale }
 
+  // Two-pass categorisation: locale substitution only applies when the locale-neutral base path
+  // (e.g. 'about' for 'fr/about') is itself in the path list and will be Puppeteer-rendered.
+  //
+  // Paths whose data is inherently locale-specific (e.g. 'en/articles/slug', 'fr/articles/slug'
+  // discovered from per-locale data sources) have no locale-neutral counterpart and must be
+  // rendered by Puppeteer directly — their content differs per locale and substitution cannot
+  // produce correct output. This mirrors the framework's own data model: locale-neutral paths
+  // use a shared structure with CSV text overlay; locale-prefixed paths carry per-locale content.
+
+  // Pass 1: collect all locale-neutral path segments (no locale prefix in the first segment).
+  const localeNeutralPathSet = new Set();
+  for (const seg of pathList) {
+    if (!seg || seg === NOT_FOUND_PATH) continue;
+    if (!localeSet.has(seg.split('/')[0])) localeNeutralPathSet.add(seg);
+  }
+
+  // Pass 2: categorise.
   for (const seg of pathList) {
     if (!localeSubstEnabled || seg === NOT_FOUND_PATH || !seg) {
       puppeteerPaths.push(seg);
       continue;
     }
-    const firstPart = seg.split('/')[0];
-    if (localeSet.has(firstPart) && !localeSubstExclude.has(firstPart)) {
-      const basePathSeg = seg.slice(firstPart.length + 1); // strip 'fr/'
-      localeVariantPaths.push({ pathSeg: seg, basePathSeg: basePathSeg || '', targetLocale: firstPart });
+    const fp = seg.split('/')[0];
+    if (!localeSet.has(fp) || localeSubstExclude.has(fp)) {
+      puppeteerPaths.push(seg);
+      continue;
+    }
+    const basePathSeg = seg.slice(fp.length + 1) || '';
+    if (localeNeutralPathSet.has(basePathSeg)) {
+      // Locale-neutral base exists and will be Puppeteer-rendered → safe to substitute.
+      localeVariantPaths.push({ pathSeg: seg, basePathSeg, targetLocale: fp });
     } else {
+      // No locale-neutral base — this path has per-locale content; Puppeteer required.
       puppeteerPaths.push(seg);
     }
   }
@@ -2344,9 +2367,9 @@ async function runPrerender(config) {
       substIndex++;
       const rawHtml = baseHtmlCache.get(basePathSeg);
       if (!rawHtml) {
-        // Base path wasn't rendered — log and skip (shouldn't happen in normal builds)
-        failedPaths.push({ path: '/' + pathSeg, message: `substitution skipped: base path "${basePathSeg || '/'}" not in cache` });
-        process.stderr.write(`prerender: substitution skipped /${pathSeg} (base not found)\n`);
+        // Base path was expected to be Puppeteer-rendered but is absent — its render likely failed.
+        failedPaths.push({ path: '/' + pathSeg, message: `base path "${basePathSeg || '/'}" missing from cache (did its Puppeteer render fail?)` });
+        process.stderr.write(`prerender: skipped /${pathSeg} — base "${basePathSeg || '/'}" not in cache\n`);
         continue;
       }
 

package/package.json

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