mnfst-render 0.1.8 → 0.2.0

package/manifest.render.mjs

@@ -313,31 +313,55 @@ function discoverDataPaths(manifest, rootDir, wildcardBases = [], locales = [])
     return wildcardBases.some((base) => rest.startsWith(base + '/'));
   }
 
-  function addFilePaths(value) {
+  function expandCandidates(rawPath, sourceKey) {
+    const p = String(rawPath || '').replace(/^\/+|\/+$/g, '');
+    if (!p) return [];
+    const candidates = [p];
+    if (wildcardBases.length === 0) return candidates;
+    if (!sourceKey || !wildcardBases.includes(sourceKey)) return candidates;
+    const parts = p.split('/');
+    const hasLocalePrefix = parts.length > 1 && localeSet.has(parts[0].toLowerCase());
+    if (hasLocalePrefix) {
+      const locale = parts[0];
+      const rest = parts.slice(1).join('/');
+      if (rest && !rest.startsWith(sourceKey + '/')) candidates.push(`${locale}/${sourceKey}/${rest}`);
+    } else if (!p.startsWith(sourceKey + '/')) {
+      candidates.push(`${sourceKey}/${p}`);
+    }
+    return candidates;
+  }
+
+  function addFilePaths(value, sourceKey) {
     if (typeof value !== 'string' || !value.startsWith('/')) return;
     const filePath = join(rootDir, value.slice(1));
     if (filePath.endsWith('.yaml') || filePath.endsWith('.yml')) {
       parseYamlPaths(filePath).forEach((p) => {
-        if (shouldIncludeDataPath(p)) paths.add('/' + p);
+        for (const c of expandCandidates(p, sourceKey)) {
+          if (shouldIncludeDataPath(c)) paths.add('/' + c);
+        }
       });
     } else if (filePath.endsWith('.json')) {
       parseJsonPaths(filePath).forEach((p) => {
         const normalized = p.startsWith('/') ? p.slice(1) : p;
-        if (shouldIncludeDataPath(normalized)) paths.add('/' + normalized);
+        for (const c of expandCandidates(normalized, sourceKey)) {
+          if (shouldIncludeDataPath(c)) paths.add('/' + c);
+        }
       });
     } else if (filePath.endsWith('.csv')) {
       parseCsvPaths(filePath).forEach((p) => {
         const normalized = p.startsWith('/') ? p.slice(1) : p;
-        if (shouldIncludeDataPath(normalized)) paths.add('/' + normalized);
+        for (const c of expandCandidates(normalized, sourceKey)) {
+          if (shouldIncludeDataPath(c)) paths.add('/' + c);
+        }
       });
     }
   }
 
-  for (const value of Object.values(data)) {
-    if (typeof value === 'string') addFilePaths(value);
+  for (const [sourceKey, value] of Object.entries(data)) {
+    if (typeof value === 'string') addFilePaths(value, sourceKey);
     else if (value && typeof value === 'object') {
       for (const v of Object.values(value)) {
-        if (typeof v === 'string') addFilePaths(v);
+        if (typeof v === 'string') addFilePaths(v, sourceKey);
       }
     }
   }
@@ -540,9 +564,8 @@ function runTailwindCliForPrerender(rootDir, outputDir, pre) {
   const outputBasename = basename(outputDir);
   const defaultContent = [
     '**/*.html',
-    '**/*.{js,mjs,css}',
-    '**/*.json',
     '!**/node_modules/**',
+    '!**/dist/**',
     `!**/${outputBasename}/**`,
   ];
   const contentGlobs = Array.isArray(pre?.tailwindContent) && pre.tailwindContent.length > 0
@@ -679,12 +702,14 @@ function stripPrerenderedXDataDirectives(html) {
 function stripPrerenderDynamicBindings(html) {
   return html.replace(/<(\w+)([^>]*)>/g, (match, tagName, attrsStr) => {
     if (tagName.toLowerCase() === 'script') return match;
+    const isAnchor = tagName.toLowerCase() === 'a';
     const toStrip = new Set();
     const bindingRegex = /(?:^|\s)(?::|x-bind:)(\w+)=(?:"([^"]*)"|'([^']*)')/g;
     let m;
     while ((m = bindingRegex.exec(attrsStr)) !== null) {
       const attrName = (m[1] || '').toLowerCase();
-      if (attrName === 'class' || attrName === 'style') continue;
+      // 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);
     }
@@ -1084,8 +1109,12 @@ async function main() {
       await new Promise((res) => staticServer.close(res));
     }
   }
-  const secs = ((Date.now() - startedAt) / 1000).toFixed(1);
-  process.stdout.write(`prerender: total time ${secs}s\n`);
+  const elapsedMs = Date.now() - startedAt;
+  const totalSeconds = Math.floor(elapsedMs / 1000);
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+  process.stdout.write(`prerender: total time ${hours}h ${minutes}m ${seconds}s\n`);
 }
 
 async function runPrerender(config) {
@@ -1258,6 +1287,24 @@ async function runPrerender(config) {
         });
       }).catch(() => { });
 
+      // Ensure $route-dependent expressions are recalculated after locale/data stores settle.
+      // This helps localized dynamic pages (e.g. /ko/articles/slug) compute prev/next links correctly.
+      await page.evaluate(() => {
+        try {
+          const to = window.ManifestRoutingNavigation?.getCurrentRoute?.() ?? window.location.pathname;
+          window.dispatchEvent(new CustomEvent('manifest:route-change', {
+            detail: {
+              from: to,
+              to,
+              normalizedPath: (typeof to === 'string' && to !== '/') ? to.replace(/^\/|\/$/g, '') : '/'
+            }
+          }));
+          window.dispatchEvent(new PopStateEvent('popstate'));
+        } catch {
+          // no-op
+        }
+      }).catch(() => { });
+
       // Optional extra delay so in-page async (e.g. fetch() in x-init for client logos) can complete before snapshot.
       if (config.waitAfterIdle > 0) {
         await new Promise((r) => setTimeout(r, config.waitAfterIdle));

package/package.json

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