npm - mnfst-render - Versions diffs - 0.5.4 → 0.5.6 - Mend

mnfst-render 0.5.4 → 0.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/manifest.render.mjs +72 -17
package/package.json +1 -1

package/manifest.render.mjs CHANGED Viewed

@@ -1356,7 +1356,7 @@ function generateLocaleVariantHtml({
   html = stripEmptyInlineMaskStyles(html);
   html = stripResolvedXIconDirectives(html);
   // markPrerenderedManifestComponents must run BEFORE stripPrerenderHydrateMarkers so it can
-  // detect data-prerender-hydrate markers and skip components inside hydrate islands.
+  // detect data-hydrate markers and skip components inside hydrate islands.
   html = markPrerenderedManifestComponents(html);
   const fileSegments = pathToFileSegments(pathSeg ? '/' + pathSeg : '/');
@@ -1787,6 +1787,11 @@ async function runPrerender(config) {
   const browserRecycleEvery = Math.max(0, pre.browserRecycleEvery ?? 40);
   let pagesSinceRecycle = 0;
   const recycleLock = { busy: false };
+  // Workers block on this promise before touching `browser`.  While a recycle
+  // is in progress it's a pending promise; once the new browser is up it
+  // resolves and workers can proceed.  This prevents "browser not ready"
+  // errors from racing retries during recycle.
+  let browserReadyPromise = Promise.resolve();
   const pathTotal = pathList.length;
   const failedPaths = [];
   const debugRows = [];
@@ -1878,11 +1883,11 @@ async function runPrerender(config) {
           : defaultLocale || 'en'
         : defaultLocale || 'en';
-    // Refuse to newPage() against a closed browser (happens briefly during
-    // recycle); the worker loop will retry.
-    if (!browser || !browser.connected) {
-      throw new Error('browser not ready');
-    }
+    // Wait for any in-progress browser recycle to complete before touching
+    // `browser`.  This transparently handles the window between the old
+    // browser being closed and the new one being launched — workers block
+    // here instead of throwing "browser not ready".
+    await browserReadyPromise;
     const page = await browser.newPage();
     try {
       // Align <html lang> with the URL being prerendered before any app script runs.
@@ -2234,13 +2239,36 @@ async function runPrerender(config) {
       });
       // Strip x-markdown from elements that already have baked content.
-      // The markdown plugin hides elements with opacity:0 on init, then re-fetches and re-renders.
-      // For prerendered pages the content is already baked — removing x-markdown prevents the
-      // runtime plugin from re-processing (and temporarily hiding) the static content.
+      // The markdown plugin hides elements with opacity:0 on init, then re-fetches
+      // and re-renders.  For prerendered pages the content is already baked —
+      // removing x-markdown prevents the runtime plugin from re-processing (and
+      // temporarily hiding) the static content.
+      //
+      // We ALSO clear any leftover `opacity: 0` inline style the plugin set
+      // before/while rendering.  On dynamic expressions that initially evaluate
+      // empty (e.g. article content keyed off `$route` before `$x.articles` has
+      // loaded), the plugin sets opacity to 0 and may never restore it to 1 if
+      // the effect re-fires with an empty value.  The end state in the
+      // serialized HTML has rendered content but opacity:0 — invisible in
+      // production.  Since we're also removing x-markdown (so the runtime
+      // plugin doesn't re-hide the element), leaving the inline style would
+      // permanently hide authored content.
       await page.evaluate(() => {
         document.querySelectorAll('[x-markdown]').forEach((el) => {
           if (!el.textContent.trim() && !el.innerHTML.trim()) return;
           el.removeAttribute('x-markdown');
+          // Clean up opacity-0 + transition inline styles the plugin left behind.
+          const style = el.getAttribute('style') || '';
+          if (style) {
+            const cleaned = style
+              .replace(/\bopacity\s*:\s*0(?:\.\d+)?\s*;?/gi, '')
+              .replace(/\btransition\s*:\s*opacity[^;]*;?/gi, '')
+              .replace(/;\s*;/g, ';')
+              .replace(/^\s*;\s*|\s*;\s*$/g, '')
+              .trim();
+            if (cleaned) el.setAttribute('style', cleaned);
+            else el.removeAttribute('style');
+          }
         });
       });
@@ -2399,7 +2427,7 @@ async function runPrerender(config) {
       // $url, $auth, or iterates over getter names (filtered*, results, searchResults). See docs prerender + local.data.
       await page.evaluate(() => {
         document.querySelectorAll('template[x-for]').forEach((tpl) => {
-          if (tpl.hasAttribute('data-prerender-hydrate') || tpl.closest('[data-prerender-hydrate]')) {
+          if (tpl.hasAttribute('data-hydrate') || tpl.closest('[data-hydrate]')) {
             tpl.removeAttribute('data-prerender-collapsed');
             tpl.removeAttribute('data-prerender-static-generated');
             return;
@@ -2480,7 +2508,7 @@ async function runPrerender(config) {
       await page.evaluate(() => {
         const loopVarRx = /^\s*(?:\(\s*([A-Za-z_$][\w$]*)(?:\s*,\s*([A-Za-z_$][\w$]*))?\s*\)|([A-Za-z_$][\w$]*))\s+in\s+/;
         document.querySelectorAll('template[x-for][data-prerender-static-generated="1"]').forEach((tpl) => {
-          if (tpl.hasAttribute('data-prerender-hydrate') || tpl.closest('[data-prerender-hydrate]')) return;
+          if (tpl.hasAttribute('data-hydrate') || tpl.closest('[data-hydrate]')) return;
           const xFor = (tpl.getAttribute('x-for') || '').trim();
           const m = xFor.match(loopVarRx);
           const itemVar = m ? (m[1] || m[3] || '') : '';
@@ -2494,7 +2522,7 @@ async function runPrerender(config) {
             // Only process clones that contain data-hydrate descendants
             if (
               !n.hasAttribute('x-data') &&
-              (n.hasAttribute('data-prerender-hydrate') || n.querySelector('[data-prerender-hydrate]'))
+              (n.hasAttribute('data-hydrate') || n.querySelector('[data-hydrate]'))
             ) {
               try {
                 const A = window.Alpine;
@@ -2536,7 +2564,7 @@ async function runPrerender(config) {
           const nodes = [el, ...Array.from(el.querySelectorAll('*'))];
           for (const node of nodes) {
             // Skip elements inside data-hydrate islands — their bindings must remain live
-            if (node.hasAttribute('data-prerender-hydrate') || node.closest('[data-prerender-hydrate]')) continue;
+            if (node.hasAttribute('data-hydrate') || node.closest('[data-hydrate]')) continue;
             const attrs = node.attributes ? Array.from(node.attributes) : [];
             for (const attr of attrs) {
               if (!bindingAttrRegex.test(attr.name)) continue;
@@ -2574,7 +2602,7 @@ async function runPrerender(config) {
         };
         document.querySelectorAll('template[x-for]').forEach((tpl) => {
-          if (tpl.hasAttribute('data-prerender-hydrate') || tpl.closest('[data-prerender-hydrate]')) return;
+          if (tpl.hasAttribute('data-hydrate') || tpl.closest('[data-hydrate]')) return;
           const xFor = (tpl.getAttribute('x-for') || '').trim();
           const m = xFor.match(loopVarRegex);
           const itemVar = m ? (m[1] || m[3] || '') : '';
@@ -2603,7 +2631,7 @@ async function runPrerender(config) {
         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) => {
-            if (tpl.hasAttribute('data-prerender-hydrate') || tpl.closest('[data-prerender-hydrate]')) return;
+            if (tpl.hasAttribute('data-hydrate') || tpl.closest('[data-hydrate]')) return;
             const parent = tpl.parentNode;
             if (!parent) {
               tpl.remove();
@@ -2816,14 +2844,23 @@ async function runPrerender(config) {
       if (pagesSinceRecycle < browserRecycleEvery) return;
       if (recycleLock.busy) return;
       recycleLock.busy = true;
+      // Wait for all in-flight workers to finish their current page BEFORE
+      // we gate `browserReadyPromise`, so workers already mid-processPath
+      // don't deadlock awaiting a promise we haven't yet started.
+      await waitUntilZero();
+      // Now gate newPage() calls from any worker that enters processPath
+      // after this point.
+      let resolveReady;
+      browserReadyPromise = new Promise((r) => { resolveReady = r; });
       try {
-        // Wait for all in-flight workers to finish their current page.
-        await waitUntilZero();
         process.stdout.write(`prerender: recycling browser (processed ${pagesSinceRecycle} pages)\n`);
         try { await browser.close(); } catch (_) {}
         browser = await launchBrowser();
         pagesSinceRecycle = 0;
       } finally {
+        // Release the gate first so any waiting workers can proceed, then
+        // clear the recycle lock so the outer while loop stops pausing.
+        try { resolveReady(); } catch (_) {}
         recycleLock.busy = false;
         const r = recycleGate.resume;
         recycleGate.resume = null;
@@ -2835,12 +2872,19 @@ async function runPrerender(config) {
       while (true) {
         // Pause if a recycle is underway.
         if (recycleLock.busy) await waitForResume();
+        // Also wait for any pending browser readiness (e.g. another worker
+        // started a recycle while we were processing).
+        await browserReadyPromise;
         const i = index++;
         if (i >= puppeteerPaths.length) return;
         const pathSeg = puppeteerPaths[i];
         let attempt = 0;
         while (true) {
+          // Re-check recycle state at the start of every retry iteration.
+          if (recycleLock.busy) await waitForResume();
+          await browserReadyPromise;
           const failureCountBefore = failedPaths.length;
           activeWorkers++;
           try {
@@ -2849,6 +2893,17 @@ async function runPrerender(config) {
                 if (seg !== NOT_FOUND_PATH) baseHtmlCache.set(seg || '', html);
               },
             });
+          } catch (err) {
+            // Unexpected exception escaped processPath (e.g. browser died
+            // mid-call).  Record as a failure so the retry logic can handle
+            // it gracefully instead of tearing down the whole worker.
+            failedPaths.push({
+              path: pathSeg === '' ? '/' : '/' + pathSeg,
+              message: err && err.message ? err.message : String(err),
+            });
+            if (failedPaths.length <= 10) {
+              process.stderr.write(`prerender: worker exception on ${pathSeg || '/'}: ${failedPaths[failedPaths.length - 1].message}\n`);
+            }
           } finally {
             activeWorkers--;
             if (activeWorkers === 0 && recycleGate.waitForZero) {

package/package.json CHANGED Viewed

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