mnfst-render 0.1.0 → 0.1.2

package/manifest.render.mjs

@@ -5,9 +5,22 @@
 import { readFileSync, mkdirSync, writeFileSync, existsSync, rmSync, statSync, readdirSync, cpSync } from 'node:fs';
 import { join, resolve, dirname, relative, basename } from 'node:path';
 import { createServer } from 'node:http';
+import { createRequire } from 'node:module';
 import { fileURLToPath } from 'node:url';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+
+async function importFromProject(moduleName) {
+  // Ensure dependencies are resolved from the caller's project (cwd),
+  // not from this CLI package's own node_modules location.
+  try {
+    const resolved = require.resolve(moduleName, { paths: [process.cwd()] });
+    return await import(resolved);
+  } catch {
+    return await import(moduleName);
+  }
+}
 
 // --- Config ------------------------------------------------------------------
 
@@ -773,8 +786,8 @@ async function runPrerender(config) {
 
   let browser;
   try {
-    const chromium = await import('@sparticuz/chromium');
-    const pptr = await import('puppeteer-core');
+    const chromium = await importFromProject('@sparticuz/chromium');
+    const pptr = await importFromProject('puppeteer-core');
     const executablePath = await chromium.default.executablePath();
     browser = await pptr.default.launch({
       args: chromium.default.args,
@@ -786,9 +799,12 @@ async function runPrerender(config) {
   } catch (serverlessErr) {
     let puppeteer;
     try {
-      puppeteer = await import('puppeteer');
+      puppeteer = await importFromProject('puppeteer');
     } catch {
-      console.error('prerender: install puppeteer (local) or puppeteer-core + @sparticuz/chromium.');
+      console.error('prerender: missing browser runtime.');
+      console.error('Install one of the following, then rerun:');
+      console.error('  npm i -D puppeteer');
+      console.error('  npm i -D puppeteer-core @sparticuz/chromium');
       process.exit(1);
     }
     browser = await puppeteer.default.launch({ headless: true });
@@ -930,6 +946,50 @@ async function runPrerender(config) {
         });
       });
 
+      // Remove orphan x-for clones that still reference loop-scope vars (e.g. image/index)
+      // outside their template scope. These throw Alpine errors in live static hosting.
+      await page.evaluate(() => {
+        const loopVarRegex = /^\s*(?:\(\s*([A-Za-z_$][\w$]*)(?:\s*,\s*([A-Za-z_$][\w$]*))?\s*\)|([A-Za-z_$][\w$]*))\s+in\s+/;
+        const bindingAttrRegex = /^(?:x-bind:|:|x-text|x-html|x-show|x-if|x-model|x-effect|x-on:|@)/;
+
+        document.querySelectorAll('template[x-for]').forEach((tpl) => {
+          const xFor = (tpl.getAttribute('x-for') || '').trim();
+          const m = xFor.match(loopVarRegex);
+          const itemVar = m ? (m[1] || m[3] || '') : '';
+          const indexVar = m ? (m[2] || '') : '';
+          if (!itemVar && !indexVar) return;
+
+          const first = tpl.content?.firstElementChild;
+          if (!first) return;
+          const tag = first.tagName;
+
+          let next = tpl.nextElementSibling;
+          while (next) {
+            const sameTag = next.tagName === tag;
+            if (!sameTag) break;
+
+            let referencesLoopScope = false;
+            const attrNodes = next.attributes ? Array.from(next.attributes) : [];
+            for (const attr of attrNodes) {
+              if (!bindingAttrRegex.test(attr.name)) continue;
+              const expr = attr.value || '';
+              if (
+                (itemVar && new RegExp(`\\b${itemVar}\\b`).test(expr)) ||
+                (indexVar && new RegExp(`\\b${indexVar}\\b`).test(expr))
+              ) {
+                referencesLoopScope = true;
+                break;
+              }
+            }
+
+            const toRemove = next;
+            next = next.nextElementSibling;
+            if (referencesLoopScope) toRemove.remove();
+            else break;
+          }
+        });
+      });
+
       // Remove elements marked data-dynamic (so they are not in static HTML; client will render them).
       // Skip <template> since we only collapse those above; other elements and their subtree are removed.
       await page.evaluate(() => {

package/package.json

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