mnfst-render 0.4.1 → 0.4.3

package/manifest.render.mjs

@@ -956,6 +956,7 @@ function markPrerenderedManifestComponents(html) {
   return html.replace(/<(x-[a-z][\w-]*)([^>]*)>/gi, (full, tag, attrs) => {
     const a = attrs || '';
     if (/\bdata-pre-rendered\s*=/i.test(a) || /\bdata-processed\s*=/i.test(a)) return full;
+    if (/\bdata-prerender-hydrate\b/i.test(a)) return full; // Inside data-hydrate island — skip
     const spacer = /\S/.test(a) ? ' ' : '';
     return `<${tag}${a}${spacer}data-pre-rendered="1">`;
   });
@@ -1161,14 +1162,24 @@ function loadAllLocaleContentData(manifest, rootDir, locales) {
  */
 function buildSubstitutionPairs(defaultLocaleData, targetLocaleData) {
   const pairs = [];
-  for (const [key, rawDefault] of Object.entries(defaultLocaleData)) {
-    const rawTarget = targetLocaleData[key];
-    if (rawTarget == null || rawDefault == null) continue;
-    const from = String(rawDefault).trim();
-    const to = String(rawTarget).trim();
-    if (!from || from === to) continue;
-    pairs.push([from, to]);
+  function collectPairs(defaultObj, targetObj) {
+    if (!defaultObj || !targetObj) return;
+    for (const key of Object.keys(defaultObj)) {
+      const defaultVal = defaultObj[key];
+      const targetVal = targetObj[key];
+      if (defaultVal && typeof defaultVal === 'object') {
+        // Recurse into nested objects (produced by setNestedKey for dotted CSV keys)
+        collectPairs(defaultVal, targetVal && typeof targetVal === 'object' ? targetVal : {});
+      } else {
+        const from = String(defaultVal ?? '').trim();
+        const to = String(targetVal ?? '').trim();
+        if (!from || from === to) continue;
+        pairs.push([from, to]);
+      }
+    }
   }
+  collectPairs(defaultLocaleData, targetLocaleData);
+  // Sort longest-first so more specific strings are replaced before shorter substrings
   pairs.sort((a, b) => b[0].length - a[0].length);
   return pairs;
 }
@@ -1266,6 +1277,9 @@ function generateLocaleVariantHtml({
   html = stripRedundantImgSrcBindings(html);
   html = stripEmptyInlineMaskStyles(html);
   html = stripResolvedXIconDirectives(html);
+  // markPrerenderedManifestComponents must run BEFORE stripPrerenderHydrateMarkers so it can
+  // detect data-prerender-hydrate markers and skip components inside hydrate islands.
+  html = markPrerenderedManifestComponents(html);
   html = stripPrerenderHydrateMarkers(html);
 
   const fileSegments = pathToFileSegments(pathSeg ? '/' + pathSeg : '/');
@@ -1290,7 +1304,6 @@ function generateLocaleVariantHtml({
     '</head>',
     `${canonicalHreflang}${injectOgLocale ? ogLocale : ''}${routeMeta}${baseMeta}<meta name="manifest:prerendered" content="1">\n<meta name="manifest:router-base-depth" content="${routeDepth}">\n</head>`
   );
-  html = markPrerenderedManifestComponents(html);
 
   return { html, utilityBlocks: pageUtilityBlocks };
 }
@@ -1683,16 +1696,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);
     }
   }
@@ -2272,6 +2308,9 @@ async function runPrerender(config) {
       html = stripRedundantImgSrcBindings(html);
       html = stripEmptyInlineMaskStyles(html);
       html = stripResolvedXIconDirectives(html);
+      // markPrerenderedManifestComponents must run BEFORE stripPrerenderHydrateMarkers so it can
+      // detect data-prerender-hydrate markers and skip components inside hydrate islands.
+      html = markPrerenderedManifestComponents(html);
       html = stripPrerenderHydrateMarkers(html);
       html = rewriteHtmlAssetPaths(html, fileSegments.length);
       const liveBase = config.liveUrl.replace(/\/$/, '');
@@ -2291,7 +2330,6 @@ async function runPrerender(config) {
         '</head>',
         `${canonicalHreflang}${injectOgLocale ? ogLocale : ''}${routeMeta}${baseMeta}${prerenderedMeta}<meta name="manifest:router-base-depth" content="${routeDepth}">\n</head>`
       );
-      html = markPrerenderedManifestComponents(html);
       mkdirSync(outDir, { recursive: true });
       writeFileSync(outFile, html, 'utf8');
       pushDebug({
@@ -2344,9 +2382,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.3",
   "description": "Render Manifest sites to static HTML for SEO",
   "type": "module",
   "bin": {