mnfst-render 0.3.0 → 0.3.2

package/manifest.render.mjs

@@ -895,25 +895,37 @@ function stripPrerenderedXDataDirectives(html) {
 
 // --- Don't bake Alpine-only state into the snapshot; only $x-driven content should be prerendered.
 //    For any :attr or x-bind:attr whose expression does NOT contain $x, remove the literal attr from the tag
-//    so Alpine re-evaluates on load. Bindings that use $x are left as-is (content stays for SEO).
+//    so Alpine re-evaluates on load. Bindings that use $x are left as-is (content stays for SEO), except
+//    :style / x-bind:style with $x: those must be removed when a baked inline style exists, or Alpine will
+//    overwrite prerendered values (e.g. mask-image) on hydrate when $x is briefly empty in production.
 //    Use (?<!:) so we only strip literal attr=, not :attr= (e.g. class= not :class=).
 //    Never touch <script> tags (loader + injected plugins must be preserved; static HTML still runs them).
 function stripPrerenderDynamicBindings(html) {
   return html.replace(/<(\w+)([^>]*)>/g, (match, tagName, attrsStr) => {
     if (tagName.toLowerCase() === 'script') return match;
     const isAnchor = tagName.toLowerCase() === 'a';
+    let workAttrs = attrsStr;
+    workAttrs = workAttrs.replace(/\s+:style=(?:"([^"]*)"|'([^']*)')/gi, (sub, d, s) => {
+      const val = (d !== undefined ? d : s) || '';
+      return val.indexOf('$x') !== -1 ? '' : sub;
+    });
+    workAttrs = workAttrs.replace(/\s+x-bind:style=(?:"([^"]*)"|'([^']*)')/gi, (sub, d, s) => {
+      const val = (d !== undefined ? d : s) || '';
+      return val.indexOf('$x') !== -1 ? '' : sub;
+    });
+
     const toStrip = new Set();
     const bindingRegex = /(?:^|\s)(?::|x-bind:)(\w+)=(?:"([^"]*)"|'([^']*)')/g;
     let m;
-    while ((m = bindingRegex.exec(attrsStr)) !== null) {
+    while ((m = bindingRegex.exec(workAttrs)) !== null) {
       const attrName = (m[1] || '').toLowerCase();
       // Keep href on anchors so prerendered static navigation stays valid.
       if (attrName === 'class' || attrName === 'style' || (isAnchor && attrName === 'href')) continue;
       const val = (m[2] !== undefined ? m[2] : m[3]) || '';
       if (val.indexOf('$x') === -1) toStrip.add(attrName);
     }
-    if (toStrip.size === 0) return match;
-    let newAttrs = attrsStr;
+    if (toStrip.size === 0 && workAttrs === attrsStr) return match;
+    let newAttrs = workAttrs;
     for (const attr of toStrip) {
       const esc = attr.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
       newAttrs = newAttrs.replace(new RegExp(`\\s*(?<!:)${esc}="[^"]*"`, 'gi'), '');
@@ -1664,6 +1676,8 @@ async function runPrerender(config) {
           return {
             templateCount: templates.length,
             nonCollapsedTemplateCount: templates.filter((t) => t.getAttribute('data-prerender-collapsed') !== '1').length,
+            hint:
+              'entries.staticGenerated is read before the x-for mark pass and is always false; use stage post-xfor-mark for data-prerender-static-generated.',
             entries,
             listDiagnostics,
           };
@@ -1758,6 +1772,26 @@ async function runPrerender(config) {
         });
       });
 
+      if (config.debugPrerender) {
+        const afterMark = await page.evaluate(() => {
+          const rows = [];
+          for (const tpl of document.querySelectorAll('template[x-for]')) {
+            rows.push({
+              xFor: (tpl.getAttribute('x-for') || '').slice(0, 140),
+              collapsed: tpl.getAttribute('data-prerender-collapsed') === '1',
+              staticGenerated: tpl.getAttribute('data-prerender-static-generated') === '1',
+            });
+          }
+          return {
+            templateCount: rows.length,
+            staticMarkedCount: rows.filter((r) => r.staticGenerated).length,
+            collapsedCount: rows.filter((r) => r.collapsed).length,
+            entries: rows.slice(0, 60),
+          };
+        }).catch(() => null);
+        pushDebug({ path: displayPath, stage: 'post-xfor-mark', metrics: afterMark });
+      }
+
       // Strip loop-scope bindings from x-for clones while <template> nodes still exist.
       // (If we remove static templates first, querySelectorAll('template[x-for]') misses them and clones
       // keep x-text/x-bind referencing card/item — Alpine then mutates or errors on the static HTML.)
@@ -1821,10 +1855,35 @@ async function runPrerender(config) {
       });
 
       // Remove static x-for templates once static clones are generated.
-      // This prevents Alpine from rendering duplicate lists at runtime.
+      // Alpine registers a cleanup on <template x-for> that removes every node in _x_lookup when the
+      // template is detached — so tpl.remove() alone deletes all sibling clones (empty grids in output).
+      // Replace each clone with a deep cloneNode first so teardown targets detached nodes; copies stay in DOM.
       await page.evaluate(() => {
-        document.querySelectorAll('template[x-for][data-prerender-static-generated="1"]').forEach((tpl) => {
-          tpl.remove();
+        const A = window.Alpine;
+        const runBatch = typeof A?.mutateDom === 'function' ? (fn) => A.mutateDom(fn) : (fn) => fn();
+        runBatch(() => {
+          document.querySelectorAll('template[x-for][data-prerender-static-generated="1"]').forEach((tpl) => {
+            const parent = tpl.parentNode;
+            if (!parent) {
+              tpl.remove();
+              return;
+            }
+            const first = tpl.content?.firstElementChild;
+            if (!first) {
+              tpl.remove();
+              return;
+            }
+            const tag = first.tagName;
+            const cls = first.getAttribute('class') || '';
+            let n = tpl.nextElementSibling;
+            while (n && n.tagName === tag) {
+              if ((n.getAttribute('class') || '') !== cls) break;
+              const next = n.nextElementSibling;
+              n.replaceWith(n.cloneNode(true));
+              n = next;
+            }
+            tpl.remove();
+          });
         });
       });
 

package/package.json

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