mnfst-render 0.4.2 → 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 };
 }
@@ -2295,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(/\/$/, '');
@@ -2314,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({

package/package.json

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