mnfst-render 0.5.14 → 0.5.16

package/manifest.render.mjs

@@ -609,26 +609,46 @@ function stripDevOnlyContent(html) {
   return out;
 }
 
-// --- Strip plugin scripts injected by the loader during prerender so only the loader tag remains ---
-// When the static page loads, the loader runs once and adds plugins; avoids
-// duplicate script execution (which would cause `const` re-declaration errors).
-// Matches both CDN-minified (.min.js) and self-hosted (.js) plugin URLs.
-// Also strips the loader-injected Alpine script (both defer and non-defer
-// forms) — at runtime the loader re-injects Alpine AFTER plugin registration,
-// and if Chromium serialized an Alpine script tag during the Puppeteer render,
-// leaving it in place would cause Alpine to execute synchronously during HTML
-// parse, before plugins have a chance to register their directives.
-function stripInjectedPluginScripts(html) {
-  const pluginPattern =
-    /<script[^>]*\ssrc=["'][^"']*manifest\.(?:components|router|utilities|data|icons|localization|markdown|code|themes|toasts|tooltips|dropdowns|tabs|slides|resize|colorpicker|tailwind|appwrite\.(?:auth|data|presence))[^"']*\.(?:min\.)?js["'][^>]*>\s*<\/script>/gi;
-  let out = html.replace(pluginPattern, '');
-  const alpinePattern =
-    /<script[^>]*\ssrc=["'][^"']*\/alpinejs@[^"']*["'][^>]*>\s*<\/script>/gi;
-  out = out.replace(alpinePattern, '');
-  const runtimePattern =
-    /<script[^>]*\ssrc=["'][^"']*(?:papaparse@[^"']*\/papaparse\.min\.js|marked\/marked\.min\.js|highlightjs\/cdn-release@[^"']*\/highlight\.min\.js)[^"']*["'][^>]*>\s*<\/script>/gi;
-  out = out.replace(runtimePattern, '');
-  return out;
+// --- Strip scripts injected at runtime during prerender ---
+// The Manifest loader, Alpine, plugins, and third-party libraries inject
+// <script> tags into the DOM during the Puppeteer render.  These must be
+// removed from the serialized HTML so the loader can re-inject them fresh
+// at runtime (otherwise the addScript function finds an existing tag, waits
+// for a load event that already fired, and hangs forever).
+//
+// Approach: diff the prerendered HTML against the ORIGINAL index.html from
+// disk.  Any <script src="..."> whose src does NOT appear in the original
+// file was injected at runtime and must be stripped.  Inline scripts without
+// src are left alone (author-written analytics snippets, etc.).
+//
+// This is future-proof — new framework plugins, Alpine version bumps, and
+// arbitrary third-party scripts (webchat, analytics) are all handled
+// automatically without maintaining a hardcoded allowlist.
+let _originalScriptSrcs = null;
+
+function buildOriginalScriptSrcSet(rootDir) {
+  if (_originalScriptSrcs) return _originalScriptSrcs;
+  _originalScriptSrcs = new Set();
+  const indexPath = join(rootDir, 'index.html');
+  if (!existsSync(indexPath)) return _originalScriptSrcs;
+  const html = readFileSync(indexPath, 'utf8');
+  const srcPattern = /<script[^>]*\ssrc=["']([^"']+)["'][^>]*>/gi;
+  let m;
+  while ((m = srcPattern.exec(html)) !== null) {
+    _originalScriptSrcs.add(m[1]);
+  }
+  return _originalScriptSrcs;
+}
+
+function stripInjectedPluginScripts(html, rootDir) {
+  const originals = buildOriginalScriptSrcSet(rootDir);
+  // Remove every <script src="...">...</script> whose src is NOT in the
+  // original index.html.  This catches all loader-injected plugins, Alpine,
+  // runtime libraries (js-yaml, marked, highlight, etc.), and any third-party
+  // scripts added dynamically during the render.
+  return html.replace(/<script[^>]*\ssrc=["']([^"']+)["'][^>]*>\s*<\/script>/gi,
+    (full, src) => originals.has(src) ? full : ''
+  );
 }
 
 function stripRuntimeTailwindArtifacts(html) {
@@ -1385,7 +1405,7 @@ function generateLocaleVariantHtml({
 
   // Standard Node.js post-processing (same sequence as processPath)
   html = stripDevOnlyContent(html);
-  html = stripInjectedPluginScripts(html);
+  html = stripInjectedPluginScripts(html, config.root);
   if (tailwindBuilt) html = stripRuntimeTailwindArtifacts(html);
 
   const pageUtilityBlocks = [];
@@ -2722,13 +2742,14 @@ async function runPrerender(config) {
         runBatch(() => {
           document.querySelectorAll('template[x-for][data-prerender-static-generated="1"]').forEach((tpl) => {
             if (tpl.hasAttribute('data-hydrate') || tpl.closest('[data-hydrate]')) return;
-            // Keep templates whose x-for iterates over $x data — these are data-driven
-            // lists that need Alpine to re-render at runtime (e.g. for locale changes,
-            // filtering).  Remove the STATIC CLONES so Alpine's re-render from the
-            // template doesn't produce duplicates, but the template itself stays.
+            // $x-driven x-for: keep the template so Alpine can re-render the
+            // list at runtime (locale switching, filtering, etc.), but remove
+            // the static clones — Alpine creates fresh clones on init and does
+            // NOT adopt existing DOM nodes, so leaving them produces duplicates.
+            // Individual article/pricing pages still have full baked content
+            // (via x-text/x-html); the x-for list is only the index/grid view.
             const xFor = (tpl.getAttribute('x-for') || '');
             if (xFor.includes('$x')) {
-              // Remove static clones (siblings with same tag+class as template's first child)
               const first = tpl.content?.firstElementChild;
               if (first) {
                 const tag = first.tagName;
@@ -2860,7 +2881,7 @@ async function runPrerender(config) {
         pushDebug({ path: displayPath, stage: 'pre-serialize', metrics: post });
       }
       html = stripDevOnlyContent(html);
-      html = stripInjectedPluginScripts(html);
+      html = stripInjectedPluginScripts(html, config.root);
       if (tailwindBuilt) {
         html = stripRuntimeTailwindArtifacts(html);
       }

package/package.json

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