bun-plugin-stx 0.2.51 → 0.2.57

package/dist/{chunk-0nwya50v.js → chunk-ap5bhr00.js}

@@ -591,6 +591,19 @@ function getRouterScript() {
   var containerSel=o.container;
   var debug=!!o.debug;
   function log(){if(debug&&typeof console!=='undefined'&&console.log)console.log.apply(console,arguments)}
+  function runViewTransition(callback){
+    if(!o.viewTransitions||!document.startViewTransition)return false;
+    try{
+      var transition=document.startViewTransition(callback);
+      var onAbort=function(err){log('[router] view transition aborted:',err&&err.message?err.message:err)};
+      if(transition&&transition.finished&&transition.finished.catch)transition.finished.catch(onAbort);
+      if(transition&&transition.updateCallbackDone&&transition.updateCallbackDone.catch)transition.updateCallbackDone.catch(onAbort);
+      return true;
+    }catch(err){
+      log('[router] view transition unavailable:',err&&err.message?err.message:err);
+      return false;
+    }
+  }
 
   // \u2500\u2500 Progress bar (0\u2192100% at top of viewport) \u2500\u2500
   // Native loading indicator baked into the router. Starts when navigation
@@ -738,6 +751,10 @@ function getRouterScript() {
     return false;
   }
 
+  function shouldUseFragmentResponse(){
+    return containerSel==='main'||containerSel==='[data-stx-content]';
+  }
+
   function navigate(url,pushState,force){
     log('[router] navigate() called:',url,'isNavigating:',isNavigating);
     if(isNavigating)return;
@@ -791,10 +808,13 @@ function getRouterScript() {
     }
 else {
       if(force&&cache[targetPath])delete cache[targetPath];
-      // First fetch as fragment (SPA mode)
-      fetch(url,{headers:{'X-STX-Router':'true','Accept':'text/html'}}).then(function(r){
+      // First fetch as fragment (SPA mode) when the configured container is
+      // the page content. Custom app-shell containers need full documents so
+      // the router does not inject a <main> fragment into the wrong element.
+      var wantsFragment=shouldUseFragmentResponse();
+      fetch(url,{headers:wantsFragment?{'X-STX-Router':'true','Accept':'text/html'}:{'Accept':'text/html'}}).then(function(r){
         if(!r.ok)throw new Error(r.status);
-        var isFragment=r.headers.get('X-STX-Fragment')==='true';
+        var isFragment=wantsFragment&&r.headers.get('X-STX-Fragment')==='true';
         var newLayout=r.headers.get('X-STX-Layout')||'';
         var newGroup=r.headers.get('X-STX-Layout-Group')||'';
         // Layout change? Fetch the FULL page (no X-STX-Router header) and do full document swap
@@ -899,12 +919,18 @@ else {
           }
           executedScriptHashes[h]=1;
           var ns=document.createElement('script');
+          var hasImport=code.indexOf('import ')!==-1;
+          if(hasImport){
+            ns.type='module';
+          }
           // Wrap in block scope to prevent const/let collisions on re-navigation.
           // Without this, navigating away and back throws "Identifier has already
           // been declared" because the previous page's top-level const/let are
-          // still in the global scope.
+          // still in the global scope. Skip the wrap for module scripts \u2014
+          // they get their own scope from ESM, and top-level 'import' is
+          // illegal inside a block, which would throw SyntaxError.
           var isAlreadyScoped=code.trimStart().charAt(0)==='('||code.trimStart().charAt(0)===';'||code.indexOf('window.stx.mount')>-1;
-          ns.textContent=isAlreadyScoped?code:'{'+code+'}';
+          ns.textContent=(hasImport||isAlreadyScoped)?code:'{'+code+'}';
           ns.setAttribute('data-stx-page','');
           document.body.appendChild(ns);
         });
@@ -912,7 +938,7 @@ else {
         // THEN fire stx:load \u2014 now _latestSetup is set and processElement has the right scope
         window.dispatchEvent(new Event('stx:load'));
       }
-      if(o.viewTransitions&&document.startViewTransition){document.startViewTransition(doFragSwap)}
+      if(runViewTransition(doFragSwap)){}
       else{currentContent.style.transition='opacity 0.12s ease-out';currentContent.style.opacity='0';setTimeout(function(){doFragSwap();currentContent.style.opacity='1';setTimeout(function(){currentContent.style.transition=''},150)},120)}
       return;
     }
@@ -1032,6 +1058,9 @@ else {
       document.querySelectorAll('script[data-stx-page]').forEach(function(s){s.remove()});
 
       var scripts=[];
+      function addScript(text, runAlways){
+        scripts.push({text:text,runAlways:!!runAlways});
+      }
       if(isLayoutChange){
         // Layout change: collect ALL scripts from the new document body
         // (layout scripts, component mounts, setup functions \u2014 everything)
@@ -1044,7 +1073,7 @@ else {
             // Skip the signals runtime IIFE \u2014 it's already loaded
             if(text.indexOf("'use strict';var cloakStyle")!==-1)return;
             if(text.indexOf('__stxRouter')!==-1)return;
-            scripts.push(text);
+            addScript(text,true);
           });
         }
         // Also collect setup functions from <head>
@@ -1052,7 +1081,7 @@ else {
           var text=s.textContent||'';
           if(s.hasAttribute('src'))return;
           if(!text.trim())return;
-          if(text.indexOf('__stx_setup_')!==-1)scripts.push(text);
+          if(text.indexOf('__stx_setup_')!==-1)addScript(text,true);
         });
       } else {
         // Same layout: collect scripts from the container
@@ -1060,26 +1089,27 @@ else {
           var text=s.textContent||'';
           if(s.hasAttribute('src'))return;
           if(!text.trim())return;
-          scripts.push(text);
+          addScript(text,true);
         });
-        // Collect setup scripts from <head> AND <body> (outside container).
+        // Collect page scripts from <head> AND <body> (outside container).
         // SSG builds place the setup function in <body> before <main>, not
         // in <head>. Without this, SPA navigation on static sites never
         // runs the setup and reactive data stays empty.
         var seenSetups={};
-        scripts.forEach(function(t){if(t.indexOf('__stx_setup_')!==-1)seenSetups[t.substring(0,80)]=1});
+        scripts.forEach(function(entry){var t=entry.text;if(t.indexOf('__stx_setup_')!==-1)seenSetups[t.substring(0,80)]=1});
         doc.querySelectorAll('script').forEach(function(s){
           var text=s.textContent||'';
           if(s.hasAttribute('src'))return;
           if(!text.trim())return;
-          if(text.indexOf('__stx_setup_')===-1)return;
           // Skip signals runtime and router (they contain __stx_setup references but aren't setup functions)
           if(text.indexOf("'use strict';var cloakStyle")!==-1)return;
           if(text.indexOf('__stxRouter')!==-1)return;
+          if(newContent.contains(s))return;
+          if(text.indexOf('__stx_setup_')===-1&&!s.hasAttribute('data-stx-scoped')&&!s.hasAttribute('data-stx-page'))return;
           var key=text.substring(0,80);
           if(seenSetups[key])return;
           seenSetups[key]=1;
-          scripts.push(text);
+          addScript(text,true);
         });
       }
 
@@ -1109,7 +1139,9 @@ else {
 
       // Execute page scripts FIRST \u2014 they define setup functions and set _latestSetup
       function execScripts(){
-        scripts.forEach(function(text){
+        scripts.forEach(function(entry){
+          var text=typeof entry==='string'?entry:entry.text;
+          var runAlways=typeof entry==='string'?false:entry.runAlways;
           // Skip scripts that were already executed (layout-level partials
           // like theme.stx). Their top-level const/function declarations
           // would throw "Identifier has already been declared" on re-execution.
@@ -1119,7 +1151,7 @@ else {
           var h=hashScript(text);
           var isSetup=text.indexOf('__stx_setup_')!==-1;
           var hasImport=text.indexOf('import ')!==-1;
-          if(!isSetup&&executedScriptHashes[h])return;
+          if(!runAlways&&!isSetup&&executedScriptHashes[h])return;
           executedScriptHashes[h]=1;
           // Wrap scripts with import statements as modules (Bug 3 fix)
           var ns=document.createElement('script');
@@ -1129,8 +1161,11 @@ else {
           // Wrap in block scope to prevent const/let collisions on re-navigation.
           // Top-level const/let in <script> tags are global-scoped in browsers
           // and throw "Identifier has already been declared" on re-execution.
+          // Skip the wrap for module scripts \u2014 they get their own scope from
+          // ESM, and top-level 'import' is illegal inside a block, which
+          // would throw SyntaxError before the script ever runs.
           var alreadyScoped=text.trimStart().charAt(0)==='('||text.trimStart().charAt(0)===';'||text.indexOf('window.stx.mount')>-1;
-          ns.textContent=alreadyScoped?text:'{'+text+'}';
+          ns.textContent=(hasImport||alreadyScoped)?text:'{'+text+'}';
           ns.setAttribute('data-stx-page','');
           document.body.appendChild(ns);
         });
@@ -1146,8 +1181,7 @@ else {
       }
     }
 
-    if(o.viewTransitions&&document.startViewTransition){
-      document.startViewTransition(doSwap);
+    if(runViewTransition(doSwap)){
     }
 else {
       // Fallback fade for browsers without View Transitions API
@@ -1213,8 +1247,9 @@ else {
       var key=cacheKey(href);
       if(cache[key]||prefetching[key])return;
       prefetching[key]=true;
-      fetch(href,{headers:{'X-STX-Router':'true','Accept':'text/html'}}).then(function(r){
-        var isFrag=r.headers.get('X-STX-Fragment')==='true';
+      var wantsFragment=shouldUseFragmentResponse();
+      fetch(href,{headers:wantsFragment?{'X-STX-Router':'true','Accept':'text/html'}:{'Accept':'text/html'}}).then(function(r){
+        var isFrag=wantsFragment&&r.headers.get('X-STX-Fragment')==='true';
         var pLayout=r.headers.get('X-STX-Layout')||'';
         var pGroup=r.headers.get('X-STX-Layout-Group')||'';
         return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout,layoutGroup:pGroup}});
@@ -1315,7 +1350,8 @@ else {
     prefetch:function(url){
       var key=cacheKey(url);
       if(!cache[key]){
-        fetch(url,{headers:{'X-STX-Router':'true'}}).then(function(r){var isFrag=r.headers.get('X-STX-Fragment')==='true';var pLayout=r.headers.get('X-STX-Layout')||'';var pGroup=r.headers.get('X-STX-Layout-Group')||'';return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout,layoutGroup:pGroup}})}).then(function(result){cache[key]=result.html;layoutCache[key]=result.layout;layoutGroupCache[key]=result.layoutGroup}).catch(function(){});
+        var wantsFragment=shouldUseFragmentResponse();
+        fetch(url,{headers:wantsFragment?{'X-STX-Router':'true'}:{'Accept':'text/html'}}).then(function(r){var isFrag=wantsFragment&&r.headers.get('X-STX-Fragment')==='true';var pLayout=r.headers.get('X-STX-Layout')||'';var pGroup=r.headers.get('X-STX-Layout-Group')||'';return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout,layoutGroup:pGroup}})}).then(function(result){cache[key]=result.html;layoutCache[key]=result.layout;layoutGroupCache[key]=result.layoutGroup}).catch(function(){});
       }
     },
     clearCache:function(){for(var k in cache)delete cache[k];for(var lk in layoutCache)delete layoutCache[lk];for(var gk in layoutGroupCache)delete layoutGroupCache[gk]},

package/dist/serve.d.ts

@@ -13,7 +13,11 @@ export declare interface ServeOptions {
   quiet?: boolean
   stxModule?: typeof import('@stacksjs/stx') | Promise<typeof import('@stacksjs/stx')>
   routes?: Record<string, (req: Request) => Response | Promise<Response>>
-  onRequest?: (req: Request) => Response | Promise<Response> | null | undefined
+  onRequest?: (req: Request) =>
+    | Response
+    | null
+    | undefined
+    | Promise<Response | null | undefined>
   middleware?: Record<string, MiddlewareHandler>
   globalMiddleware?: string[]
   middlewareGroups?: Record<string, string[]>

package/dist/serve.js

@@ -8736,6 +8736,16 @@ async function serve(options) {
     cwd: process19.cwd(),
     defaultConfig: defaultStxConfig
   });
+  try {
+    const stxMod = options.stxModule ? options.stxModule : await defaultStxModule;
+    if (stxMod && typeof stxMod.loadStxConfig === "function") {
+      const pluginLoaded = await stxMod.loadStxConfig();
+      if (pluginLoaded?._pluginComponentDirs)
+        stxConfig._pluginComponentDirs = pluginLoaded._pluginComponentDirs;
+      if (pluginLoaded?._pluginPageDirs)
+        stxConfig._pluginPageDirs = pluginLoaded._pluginPageDirs;
+    }
+  } catch {}
   const componentsDir = options.componentsDir ?? stxConfig.componentsDir ?? defaultStxConfig.componentsDir;
   const layoutsDir = options.layoutsDir ?? stxConfig.layoutsDir ?? defaultStxConfig.layoutsDir;
   const partialsDir = options.partialsDir ?? stxConfig.partialsDir ?? defaultStxConfig.partialsDir;
@@ -8959,7 +8969,7 @@ After installing: bun add bun-plugin-stx`);
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-0nwya50v.js");
+      const { Router } = await import("./chunk-ap5bhr00.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs });
       console.log(`[stx] Generated ${router.routes.length} routes \u2192 .stx/routes.ts`);
@@ -9162,7 +9172,9 @@ After installing: bun add bun-plugin-stx`);
       ..."defaultTitle" in stxConfig && { defaultTitle: stxConfig.defaultTitle },
       ..."defaultDescription" in stxConfig && { defaultDescription: stxConfig.defaultDescription },
       ..."defaultImage" in stxConfig && { defaultImage: stxConfig.defaultImage },
-      ..."seo" in stxConfig && { seo: stxConfig.seo }
+      ..."seo" in stxConfig && { seo: stxConfig.seo },
+      ..."_pluginComponentDirs" in stxConfig && { _pluginComponentDirs: stxConfig._pluginComponentDirs },
+      ..."_pluginPageDirs" in stxConfig && { _pluginPageDirs: stxConfig._pluginPageDirs }
     };
     if (config5.ssr === false || stxConfig.ssr === false) {
       return generateSpaShell({
@@ -9332,7 +9344,9 @@ After installing: bun add bun-plugin-stx`);
       ..."defaultTitle" in stxConfig && { defaultTitle: stxConfig.defaultTitle },
       ..."defaultDescription" in stxConfig && { defaultDescription: stxConfig.defaultDescription },
       ..."defaultImage" in stxConfig && { defaultImage: stxConfig.defaultImage },
-      ..."seo" in stxConfig && { seo: stxConfig.seo }
+      ..."seo" in stxConfig && { seo: stxConfig.seo },
+      ..."_pluginComponentDirs" in stxConfig && { _pluginComponentDirs: stxConfig._pluginComponentDirs },
+      ..."_pluginPageDirs" in stxConfig && { _pluginPageDirs: stxConfig._pluginPageDirs }
     };
     let output = templateContent;
     const dependencies = new Set;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.51",
+  "version": "0.2.57",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -61,19 +61,19 @@
   ],
   "scripts": {
     "build": "bun --bun build.ts",
-    "lint": "bunx --bun pickier lint",
-    "lint:fix": "bunx --bun pickier lint --fix",
-    "fresh": "bunx rimraf node_modules/ bun.lock && bun i",
-    "changelog": "bunx changelogen --output CHANGELOG.md",
+    "lint": "bun x --bun pickier lint",
+    "lint:fix": "bun x --bun pickier lint --fix",
+    "fresh": "bun x rimraf node_modules/ bun.lock && bun i",
+    "changelog": "bun x changelogen --output CHANGELOG.md",
     "prepublishOnly": "bun run build",
-    "release": "bun run changelog && bunx bumpp package.json --all",
+    "release": "bun run changelog && bun x bumpp package.json --all",
     "test": "bun test --preload ../../test-utils/happy-dom.ts",
     "test:watch": "bun test --watch --preload ../../test-utils/happy-dom.ts",
     "test:coverage": "bun test --coverage --preload ../../test-utils/happy-dom.ts",
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.51",
-    "stx-router": "0.2.51"
+    "@stacksjs/stx": "0.2.57",
+    "stx-router": "0.2.57"
   }
 }