mnfst-render 0.3.6 → 0.3.8

package/manifest.render.mjs

@@ -252,6 +252,13 @@ function loadConfig(rootDir) {
   return manifest;
 }
 
+function normalizeLocaleRouteExclude(val) {
+  if (val == null) return [];
+  if (Array.isArray(val)) return val.map((s) => String(s).trim()).filter(Boolean);
+  if (typeof val === 'string') return val.split(',').map((s) => s.trim()).filter(Boolean);
+  return [];
+}
+
 function resolveConfig() {
   const cli = parseArgs();
   const cwd = process.cwd();
@@ -274,6 +281,10 @@ function resolveConfig() {
     output: resolve(root, cli.output ?? pre.output ?? 'website'),
     root,
     routerBase: pre.routerBase ?? null,
+    /** Logical path prefixes (after locale) that skip sticky locale prefix; see manifest:locale-route-exclude */
+    localeRouteExclude: normalizeLocaleRouteExclude(
+      pre.localeRouteExclude ?? pre.localeStickyExclude
+    ),
     locales: pre.locales,
     redirects: Array.isArray(pre.redirects) ? pre.redirects : [],
     wait: cli.wait ?? pre.wait ?? null,
@@ -853,19 +864,26 @@ function depthFromOutputRoot(outputDir, filePath) {
   return rel.split(sep).filter(Boolean).length;
 }
 
-/** Inject stylesheet link with correct relative href for static hosting (after prerender wrote files). */
-function postProcessInjectStylesheetLink(outputDir, filename) {
+/** Root-absolute path for prerender bundles (same URL from every page depth; supports manifest:router-base). */
+function buildRootAssetPath(routerBasePath, filename) {
+  const base = String(routerBasePath || '').replace(/^\/+|\/+$/g, '');
+  const name = String(filename || '').replace(/^\/+/, '');
+  const path = base ? `${base}/${name}` : name;
+  return '/' + path.replace(/\/{2,}/g, '/');
+}
+
+/** Inject stylesheet link with root-absolute href (avoids ../ resolving under locale segments like /en/page/). */
+function postProcessInjectStylesheetLink(outputDir, filename, routerBasePath) {
   const cssPath = join(outputDir, filename);
   if (!existsSync(cssPath)) return;
   const stat = statSync(cssPath);
   if (stat.size === 0) return;
 
+  const href = buildRootAssetPath(routerBasePath, filename);
+  const tag = `<link rel="stylesheet" href="${href}">`;
   const files = walkHtmlFiles(outputDir);
   for (const file of files) {
     let html = readFileSync(file, 'utf8');
-    const depth = depthFromOutputRoot(outputDir, file);
-    const prefix = depth ? '../'.repeat(depth) : '';
-    const tag = `<link rel="stylesheet" href="${prefix}${filename}">`;
     html = injectBeforeHeadClose(html, tag);
     writeFileSync(file, html, 'utf8');
   }
@@ -956,14 +974,15 @@ function stripRedundantImgSrcBindings(html) {
  * prerender-baked markup (stripped :style, expanded lists, etc.). Tag opens with data-pre-rendered
  * are skipped by manifest.components.processor — required for static prerender output to hydrate correctly.
  */
-// Prerender inlined Iconify SVG under <i x-icon="iterator.icon">; drop x-icon so Alpine does not evaluate module/item.
+// Prerender inlined Iconify SVG under <i x-icon="iterator.icon">; clear x-icon value so Alpine does not evaluate
+// loop/item expressions while the attribute remains for CSS (e.g. inline layout that keys off [x-icon]).
 function stripResolvedXIconDirectives(html) {
   return html.replace(/<i\b([^>]*)>([\s\S]*?)<\/i>/gi, (full, attrs, inner) => {
     if (!/\sx-icon\s*=/i.test(attrs)) return full;
     if (!/<svg\b/i.test(inner) || !/\bdata-icon\s*=/i.test(inner)) return full;
     const cleaned = attrs
-      .replace(/\s+x-icon\s*=\s*"[^"]*"/gi, '')
-      .replace(/\s+x-icon\s*=\s*'[^']*'/gi, '')
+      .replace(/\s+x-icon\s*=\s*"[^"]*"/gi, ' x-icon=""')
+      .replace(/\s+x-icon\s*=\s*'[^']*'/gi, ' x-icon=""')
       .trim();
     const sp = cleaned ? ' ' : '';
     return `<i${sp}${cleaned}>${inner}</i>`;
@@ -1006,6 +1025,10 @@ function stripEmptyInlineMaskStyles(html) {
 // All project assets are copied into output, so root-relative paths become relative within output.
 // Do NOT rewrite href on <a> tags (navigation links); only rewrite link/script/img so router gets clean paths.
 
+function isPrerenderBundleAssetPath(pathAfterSlash) {
+  return /(^|\/)prerender\.(tailwind|utilities)\.css$/.test(pathAfterSlash);
+}
+
 function rewriteHtmlAssetPaths(html, depthWithinOutput) {
   const prefix = depthWithinOutput > 0 ? '../'.repeat(depthWithinOutput) : '';
   if (!prefix) return html;
@@ -1015,9 +1038,10 @@ function rewriteHtmlAssetPaths(html, depthWithinOutput) {
     const tag = htmlBeforeMatch.slice(lastOpen + 1).match(/^(\w+)/);
     return tag && tag[1].toLowerCase() === 'a';
   }
-  let out = html.replace(/(\s(href|src)=["'])\/(?!\/)/g, (match, lead, attr, offset, fullString) => {
+  let out = html.replace(/(\s(href|src)=["'])\/(?!\/)([^'"]*)/g, (match, lead, _attr, rest, offset, fullString) => {
     if (isAnchorTag(fullString.slice(0, offset))) return match;
-    return lead + prefix;
+    if (isPrerenderBundleAssetPath(rest)) return match;
+    return lead + prefix + rest;
   });
   out = out.replace(/(\s(href|src)=["'])(\.\.\/)+/g, (match, lead, attr, dots, offset, fullString) => {
     if (isAnchorTag(fullString.slice(0, offset))) return match;
@@ -1026,6 +1050,17 @@ function rewriteHtmlAssetPaths(html, depthWithinOutput) {
   return out;
 }
 
+// Alpine x-data drives radio state; baked checked="" from the live DOM (e.g. yearly) fights monthly defaults.
+function stripPrerenderBakedRadioCheckedForXModel(html) {
+  return html.replace(/<input\b([^>]*)>/gi, (full, attrs) => {
+    if (!/\btype\s*=\s*["']radio["']/i.test(attrs)) return full;
+    if (!/\bx-model\s*=/i.test(attrs)) return full;
+    const next = attrs.replace(/\s+checked(?:\s*=\s*["'][^"']*["']|\s*=\s*[^\s>]+)?/gi, '');
+    if (next === attrs) return full;
+    return `<input${next}>`;
+  });
+}
+
 // --- Canonical and hreflang (per-page injection) ---
 
 function buildCanonicalAndHreflang(pathSeg, locales, defaultLocale, base) {
@@ -1861,6 +1896,10 @@ async function runPrerender(config) {
                   node.removeAttribute(name);
                   continue;
                 }
+                if (name === 'x-icon') {
+                  node.setAttribute('x-icon', '');
+                  continue;
+                }
                 let boundAttr = '';
                 if (name.startsWith(':')) boundAttr = name.slice(1);
                 else if (name.startsWith('x-bind:')) boundAttr = name.slice('x-bind:'.length);
@@ -2027,7 +2066,10 @@ async function runPrerender(config) {
         for (const b of extracted.blocks) utilityBlocks.push(b);
       }
       if (tailwindBuilt) {
-        html = injectBeforeHeadClose(html, '<link rel="stylesheet" href="/prerender.tailwind.css">');
+        html = injectBeforeHeadClose(
+          html,
+          `<link rel="stylesheet" href="${buildRootAssetPath(routerBasePath, 'prerender.tailwind.css')}">`
+        );
       }
       html = stripDuplicatedLoopDirectives(html);
       html = stripPrerenderedXDataDirectives(html);
@@ -2035,6 +2077,7 @@ async function runPrerender(config) {
       const xData = { manifest, content };
       html = resolveHeadXBindings(html, xData);
       html = stripPrerenderDynamicBindings(html);
+      html = stripPrerenderBakedRadioCheckedForXModel(html);
       html = stripRedundantImgSrcBindings(html);
       html = stripEmptyInlineMaskStyles(html);
       html = stripResolvedXIconDirectives(html);
@@ -2045,9 +2088,17 @@ async function runPrerender(config) {
       const injectOgLocale = ogLocale && hasOtherOgMeta(html);
       if (injectOgLocale) html = stripOgLocaleFromHead(html);
       const baseMeta = routerBasePath !== null ? `<meta name="manifest:router-base" content="${String(routerBasePath).replace(/"/g, '&quot;')}">\n` : '';
+      const routeEx = config.localeRouteExclude || [];
+      const routeMeta =
+        routeEx.length > 0
+          ? `<meta name="manifest:locale-route-exclude" content="${JSON.stringify(routeEx).replace(/"/g, '&quot;')}">\n`
+          : '';
       const routeDepth = fileSegments.length;
       const prerenderedMeta = `<meta name="manifest:prerendered" content="1">\n`;
-      html = html.replace('</head>', `${canonicalHreflang}${injectOgLocale ? ogLocale : ''}${baseMeta}${prerenderedMeta}<meta name="manifest:router-base-depth" content="${routeDepth}">\n</head>`);
+      html = html.replace(
+        '</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');
@@ -2108,7 +2159,7 @@ async function runPrerender(config) {
     if (utilMerged.trim()) {
       writeFileSync(join(outputResolved, 'prerender.utilities.css'), `${utilMerged}\n`, 'utf8');
       process.stdout.write('prerender: wrote prerender.utilities.css (Manifest custom utilities)\n');
-      postProcessInjectStylesheetLink(outputResolved, 'prerender.utilities.css');
+      postProcessInjectStylesheetLink(outputResolved, 'prerender.utilities.css', routerBasePath || '');
     }
   }
 

package/package.json

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