bun-plugin-stx 0.2.289 → 0.2.291

package/dist/{chunk-2qeayf8n.js → chunk-hzb7bk1k.js}

@@ -1821,6 +1821,13 @@ else {
         log('[router] full body swap for layout change');
         // Replace entire body content \u2014 layout chrome and all
         var bodyHTML=newBody.innerHTML;
+        // The outgoing chrome's components are destroyed with it (#1958).
+        // They are no longer re-run on every navigation, so they live as long
+        // as their layout does, and _cleanupContainer above only covered the
+        // container: their onDestroy and their scopes waited for the next
+        // navigation's orphan sweep, and their effects were never disposed.
+        // Before the swap, while the old markup is still here to walk.
+        if(window.stx&&window.stx._cleanupContainer)window.stx._cleanupContainer(document.body);
         document.body.innerHTML=bodyHTML;
         // Copy body attributes (class, data-stx, etc.)
         Array.from(newBody.attributes).forEach(function(attr){document.body.setAttribute(attr.name,attr.value)});
@@ -1906,6 +1913,18 @@ else {
           if(isSignalsRuntimeScript(s,text))return;
           if(text.indexOf('__stxRouter')!==-1)return;
           if(newContent.contains(s))return;
+          // Code only, as prepareRoutedBodyScripts takes it. A layout island's
+          // type="stx/island" script is hydrated by its own trigger, and one
+          // collected here was set up on every navigation, the trigger or not.
+          var scriptType=(s.getAttribute('type')||'').trim().toLowerCase();
+          if(scriptType&&scriptType!=='text/javascript'&&scriptType!=='application/javascript'&&scriptType!=='module')return;
+          // A component with no scope root has no root for the owner check,
+          // so its script is marked data-stx-instance instead. Out here it
+          // belongs to the layout chrome, which this swap leaves in place with
+          // its instance running; running it again set up a second one, and a
+          // stx.mount wrapper re-run from here mounted onto the container, the
+          // incoming page's content (#1958). Fragments leave these out.
+          if(s.hasAttribute('data-stx-instance'))return;
           if(text.indexOf('__stx_setup_')===-1&&!s.hasAttribute('data-stx-scoped')&&!s.hasAttribute('data-stx-page')&&!s.hasAttribute('data-stx-route-params'))return;
           var key=text.substring(0,80);
           if(seenSetups[key])return;

package/dist/serve.d.ts

@@ -226,6 +226,7 @@ export declare interface ServeOptions {
   renderCacheVary?: 'request' | 'source'
   cssCacheLimit?: number
   prewarmRenderCache?: boolean | number
+  imageWarmupGraceMs?: number
   publicDir?: string
   quiet?: boolean
   autoIncrementPort?: boolean | number

package/dist/serve.js

@@ -8805,6 +8805,7 @@ async function runPageMiddleware(options) {
 }
 
 // src/serve.ts
+var INSTANCE_SCRIPT_OPEN_TAG = /^<script\b[^>]*\sdata-stx-(?:owner|instance)(?=[\s=/>])/i;
 var ENGINE_PACKAGE_ENTRIES = [
   ["@stacksjs", "ts-css", "dist", "engine", "index.js"],
   ["@stacksjs", "ts-css", "src", "engine", "index.ts"]
@@ -9204,6 +9205,20 @@ async function serve(options) {
   const placeholdersReady = new Promise((resolve13) => {
     markPlaceholdersReady = resolve13;
   });
+  let placeholdersAreReady = false;
+  const imageWarmupGraceMs = Math.max(0, options.imageWarmupGraceMs ?? 1000);
+  function awaitImageWarmup() {
+    if (placeholdersAreReady || imageWarmupGraceMs === 0)
+      return;
+    return new Promise((resolve13) => {
+      const timer = setTimeout(resolve13, imageWarmupGraceMs);
+      timer.unref?.();
+      placeholdersReady.then(() => {
+        clearTimeout(timer);
+        resolve13();
+      });
+    });
+  }
   const stxModule = options.stxModule ? Promise.resolve(options.stxModule) : defaultStxModule;
   const imageDeliveryOutputDir = stateDir(process19.cwd(), "image-delivery");
   const imageDeliveryRoot = nodePath.join(imageDeliveryOutputDir, "_stx", "images");
@@ -9685,7 +9700,7 @@ function __stxOverlay(errs){
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-2qeayf8n.js");
+      const { Router } = await import("./chunk-hzb7bk1k.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)
@@ -9971,7 +9986,7 @@ function __stxOverlay(errs){
     } else {
       output = output.replace(/<template[^>]*>/gi, "").replace(/<\/template>/gi, "");
     }
-    if (ENABLE_HTML_CACHE && !context.__stx_skip_cache && !skipCacheHint && !isMutating && isRenderableCacheCandidate(output)) {
+    if (ENABLE_HTML_CACHE && !context.__stx_skip_cache && !skipCacheHint && !isMutating && isRenderableCacheCandidate(output) && placeholdersAreReady) {
       const signature = await buildTemplateSignature(filePath, dependencies);
       htmlCache.set(htmlCacheKey(filePath, reqCtx), { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
     }
@@ -10273,7 +10288,9 @@ ${block}`;
         reusePort: options.reusePort ?? false,
         idleTimeout: production ? 30 : 0,
         async fetch(req, server) {
-          await placeholdersReady;
+          const warmup = awaitImageWarmup();
+          if (warmup)
+            await warmup;
           return compressResponse(req, await (async () => {
             const url = new URL(req.url);
             let path = url.pathname;
@@ -10697,6 +10714,8 @@ ${block}`;
                       const insideMain = mainContentStart !== -1 && offset >= mainContentStart && offset < mainContentEnd;
                       if (insideMain || pageSetupScriptOffsets.has(offset))
                         return;
+                      if (mainContentStart !== -1 && INSTANCE_SCRIPT_OPEN_TAG.test(match[0]))
+                        return;
                       pageSetupScriptOffsets.add(offset);
                       pageSetupScripts.push(match[0]);
                     };
@@ -10989,6 +11008,7 @@ ${trailingPageScripts.join(`
       if (deliveryResult.status === "fulfilled" && deliveryResult.value.count > 0 && !production)
         console.log(`[stx] optimized ${deliveryResult.value.count} image(s) for responsive delivery`);
     } catch {} finally {
+      placeholdersAreReady = true;
       markPlaceholdersReady();
     }
   })();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.289",
+  "version": "0.2.291",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",