@stacksjs/actions 0.70.44 → 0.70.53

package/dist/{chunk-7bpdkc40.js → chunk-sp5cjdhd.js}

@@ -1,15 +1,31 @@
 // @bun
-import"./chunk-xg9xscqz.js";import"./chunk-96b7fcmd.js";import U from"fs";import Z from"path";import Q from"fs";import j from"path";import F from"path";import D from"fs";import L from"path";import T from"fs";import H from"path";function S(G,B){let I=["// Auto-generated by STX - do not edit",'declare module "stx/routes" {',"  interface RouteMap {"];for(let J of G){let K=[];for(let V of J.params){let X=J.pattern.includes(`:${V}*`)?"string[]":"string";K.push(`${V}: ${X}`)}let O=K.join("; ");I.push(`    '${J.pattern}': { ${O} }`)}I.push("  }","}",""),Q.mkdirSync(B,{recursive:!0}),Q.writeFileSync(j.join(B,"route-types.d.ts"),I.join(`
-`))}function b(G,B,I){let J=process.cwd(),K=j.relative(J,I),O=["components","layouts","partials"],V=G.filter((W)=>!O.some((Y)=>W.pattern.startsWith(`/${Y}/`)||W.pattern===`/${Y}`)),X=["// Auto-generated by stx \u2014 do not edit",`// Source: ${K||"pages"}/`,"","export const routes = ["];for(let W of V){let Y=j.relative(J,W.filePath).replace(/\\/g,"/"),M=JSON.stringify(W.params),R=W.layout?`, layout: '${j.relative(J,W.layout).replace(/\\/g,"/")}'`:"";X.push(`  { pattern: '${W.pattern}', filePath: '${Y}', isDynamic: ${W.isDynamic}, params: ${M}${R} },`)}X.push("] as const",""),X.push("export type RouteName = typeof routes[number]['pattern']",""),Q.mkdirSync(B,{recursive:!0}),Q.writeFileSync(j.join(B,"routes.ts"),X.join(`
-`))}function v(G,B){let J=F.relative(B,G).replace(/\.(stx|md)$/,"");if(J=J.split(F.sep).join("/"),J==="index")return"/";if(J.endsWith("/index"))J=J.slice(0,-6);return J=J.replace(/\[\[([^\]]+)\]\]/g,":$1?"),J=J.replace(/\[([^\]]+)\]/g,":$1"),J=J.replace(/:\.\.\.([^/]+)/g,":$1*"),`/${J}`}function w(G){let B=[],I=G.replace(/[.+^${}()|[\]\\]/g,"\\$&");return I=I.replace(/\/:([^/]+)\?/g,(J,K)=>{return B.push(K),"(?:/([^/]+))?"}),I=I.replace(/:([^/]+)\*/g,(J,K)=>{return B.push(K),"(.+)"}),I=I.replace(/:([^/]+)/g,(J,K)=>{return B.push(K),"([^/]+)"}),I=`^${I}$`,{regex:new RegExp(I),params:B}}function m(G,B){let I=G===""?"/":G;for(let J of B){let K=I.match(J.regex);if(K){let O={};return J.params.forEach((V,X)=>{O[V]=K[X+1]}),{route:J,params:O}}}return null}function P(G,B){let I=[],J=L.dirname(G);while(J.startsWith(B)||J===B){let K=L.join(J,"_layout.stx");if(D.existsSync(K))I.unshift(K);if(J===B)break;J=L.dirname(J)}return I}function N(G,B){let I=[];if(!U.existsSync(G))return I;let J=U.readdirSync(G,{withFileTypes:!0});for(let K of J){let O=Z.join(G,K.name);if(K.isDirectory()){if(K.name.startsWith("."))continue;I.push(...N(O,B))}else if(K.isFile()){let V=Z.extname(K.name);if(B.includes(V)){if(K.name.startsWith("_")&&K.name!=="_layout.stx")continue;if(K.name==="_layout.stx")continue;I.push(O)}}}return I}class C{routes;pagesDir;config;constructor(G,B={}){this.config=B,this.pagesDir=Z.resolve(G,B.pagesDir||"pages");let I=B.extensions||[".stx"],J=N(this.pagesDir,I);this.routes=J.map((O)=>{let V=v(O,this.pagesDir),{regex:X,params:W}=w(V),Y=B.layouts!==!1?P(O,this.pagesDir):[];return{pattern:V,regex:X,params:W,filePath:O,isDynamic:W.length>0,layout:Y.length>0?Y[Y.length-1]:void 0}}),this.routes.sort((O,V)=>{if(!O.isDynamic&&V.isDynamic)return-1;if(O.isDynamic&&!V.isDynamic)return 1;let X=O.pattern.split("/").length,W=V.pattern.split("/").length;if(X!==W)return W-X;return O.pattern.localeCompare(V.pattern)});let K=Z.join(G,".stx");S(this.routes,K),b(this.routes,K,this.pagesDir)}match(G){let B=G===""?"/":G;for(let I of this.routes){let J=B.match(I.regex);if(J){let K={};return I.params.forEach((O,V)=>{K[O]=J[V+1]}),{route:I,params:K}}}return null}resolve(G,B){let I=this.routes.find((K)=>K.pattern===G||K.filePath.includes(G));if(!I)return"#not-found";let J=I.pattern;if(B)for(let[K,O]of Object.entries(B))J=J.replace(`:${K}`,encodeURIComponent(O));return J}addRoute(G){this.routes.push(G),this.routes.sort((B,I)=>{if(!B.isDynamic&&I.isDynamic)return-1;if(B.isDynamic&&!I.isDynamic)return 1;return B.pattern.localeCompare(I.pattern)})}getLayout(G){return G.layout??null}}function i(G,B){return new C(G,B)}function o(G,B){let I=[`${B}.stx`,"error.stx"];for(let J of I){let K=Z.join(G,J);if(U.existsSync(K))return K}return null}function t(G,B){return G.map((I)=>{let J=Z.relative(B,I.filePath),K=I.isDynamic?" (dynamic)":"";return`${I.pattern} \u2192 ${J}${K}`})}var $={},_="";function r(G){_=G.replace(/\/$/,"")}function a(G,B,I={}){$[G]={path:B,name:G,params:I}}function e(G){for(let[B,I]of Object.entries(G))if(typeof I==="string")$[B]={path:I,name:B};else $[B]={...I,name:B}}function BB(G,B={},I=!1){let J=$[G];if(!J)return console.warn(`Route [${G}] not defined.`),"#undefined-route";let K={...J.params,...B},O=J.path;O=O.replace(/:(\w+)/g,(X,W)=>{let Y=K[W];if(Y===void 0)return console.warn(`Missing parameter [${W}] for route [${G}].`),`:${W}`;return delete K[W],encodeURIComponent(String(Y))});let V=Object.entries(K);if(V.length>0){let X=V.map(([W,Y])=>`${encodeURIComponent(W)}=${encodeURIComponent(String(Y))}`).join("&");O+=(O.includes("?")?"&":"?")+X}return I&&_?`${_}${O}`:O}function GB(){for(let G of Object.keys($))delete $[G];_=""}function KB(G,B={}){return{type:"redirect",path:G,options:{replace:B.replace??!1,external:B.external??!1,redirectCode:B.redirectCode??302}}}function OB(G){return{type:"abort",error:typeof G==="string"?{statusCode:500,message:G}:G}}function VB(G,B={}){return{handler:G,mode:B.mode??"universal"}}function z(G){let B={};if(!G)return B;let I=G.split(";");for(let J of I){let[K,...O]=J.split("=");if(K){let V=K.trim(),X=O.join("=").trim();if(V)B[V]=decodeURIComponent(X)}}return B}function E(G,B,I={}){let J=`${encodeURIComponent(G)}=${encodeURIComponent(B)}`;if(I.expires){let K=typeof I.expires==="number"?new Date(Date.now()+I.expires*1000):I.expires;J+=`; Expires=${K.toUTCString()}`}if(I.path)J+=`; Path=${I.path}`;if(I.domain)J+=`; Domain=${I.domain}`;if(I.secure)J+="; Secure";if(I.httpOnly)J+="; HttpOnly";if(I.sameSite)J+=`; SameSite=${I.sameSite}`;return J}function k(G,B){let I=G.headers.get("cookie")||"",J=z(I);return{get(K){return J[K]},set(K,O,V={}){J[K]=O,B.append("Set-Cookie",E(K,O,V))},delete(K){delete J[K],B.append("Set-Cookie",E(K,"",{expires:new Date(0),path:"/"}))},getAll(){return{...J}}}}function x(){return{get(G){if(typeof document>"u")return;return z(document.cookie)[G]},set(G,B,I={}){if(typeof document>"u")return;document.cookie=E(G,B,I)},delete(G){if(typeof document>"u")return;document.cookie=E(G,"",{expires:new Date(0),path:"/"})},getAll(){if(typeof document>"u")return{};return z(document.cookie)}}}function y(){let G=typeof window<"u"&&typeof window.localStorage<"u";return{get(B){if(!G)return null;try{return window.localStorage.getItem(B)}catch{return null}},set(B,I){if(!G)return;try{window.localStorage.setItem(B,I)}catch{}},remove(B){if(!G)return;try{window.localStorage.removeItem(B)}catch{}},isAvailable(){return G}}}var A=new Map;function q(G,B){A.set(G,B)}function f(G){return A.get(G)}function WB(G){return A.has(G)}function XB(){A.clear()}function YB(){return Array.from(A.keys())}async function ZB(G,B="middleware"){let I=H.resolve(G,B);if(!T.existsSync(I))return;let J=T.readdirSync(I);for(let K of J){if(!K.endsWith(".ts")&&!K.endsWith(".js"))continue;if(K.includes(".test.")||K.includes(".spec."))continue;let O=K.replace(/\.(ts|js)$/,""),V=H.join(I,K);try{let W=(await import(V)).default;if(W&&typeof W.handler==="function")q(O,W);else if(typeof W==="function")q(O,{handler:W,mode:"universal"})}catch(X){console.warn(`Failed to load middleware '${O}' from ${V}:`,X)}}}function g(G){let B={};if(!G)return B;let I=new URLSearchParams(G);for(let[J,K]of I)B[J]=K;return B}function $B(G,B,I,J=""){return{path:G,params:B,query:g(J),fullPath:J?`${G}?${J}`:G,meta:I}}function jB(G,B,I){let J=typeof window>"u",K=!J,O=new Headers;return{to:G,from:B,isClient:K,isServer:J,cookies:J&&I?k(I,O):x(),storage:y(),state:{},request:I,responseHeaders:O}}async function AB(G,B){let I=Array.isArray(G)?G:[G],J=B.isServer;for(let K of I){let O=f(K);if(!O){console.warn(`Middleware '${K}' not found`);continue}if(O.mode==="server"&&!J)continue;if(O.mode==="client"&&J)continue;try{let V=await O.handler(B);if(V){if(V.type==="redirect")return{passed:!1,redirect:V,state:B.state,responseHeaders:B.responseHeaders};if(V.type==="abort")return{passed:!1,abort:V,state:B.state,responseHeaders:B.responseHeaders}}}catch(V){return console.error(`Error in middleware '${K}':`,V),{passed:!1,abort:{type:"abort",error:{statusCode:500,message:V instanceof Error?V.message:"Middleware error"}},state:B.state,responseHeaders:B.responseHeaders}}}return{passed:!0,state:B.state,responseHeaders:B.responseHeaders}}function QB(){return`
+import{a as b,b as v}from"./chunk-dbz9dp2h.js";import"./chunk-xg9xscqz.js";import"./chunk-4qzb8g3z.js";import T from"fs";import $ from"path";import _ from"fs";import G from"path";import q from"path";import x from"fs";import L from"path";import N from"fs";import C from"path";function w(I,B){let J=["// Auto-generated by STX - do not edit",'declare module "stx/routes" {',"  interface RouteMap {"];for(let K of I){let O=[];for(let V of K.params){let Y=K.pattern.includes(`:${V}*`)?"string[]":"string";O.push(`${V}: ${Y}`)}let W=O.join("; ");J.push(`    '${K.pattern}': { ${W} }`)}J.push("  }","}",""),_.mkdirSync(B,{recursive:!0}),_.writeFileSync(G.join(B,"route-types.d.ts"),J.join(`
+`))}function D(I,B,J){let K=process.cwd(),O=G.relative(K,J),W=["components","layouts","partials"],V=I.filter((X)=>!W.some((Z)=>X.pattern.startsWith(`/${Z}/`)||X.pattern===`/${Z}`)),Y=["// Auto-generated by stx \u2014 do not edit",`// Source: ${O||"pages"}/`,"","export const routes = ["];for(let X of V){let Z=G.relative(K,X.filePath).replace(/\\/g,"/"),z=JSON.stringify(X.params),j=X.layout?`, layout: '${G.relative(K,X.layout).replace(/\\/g,"/")}'`:"";Y.push(`  { pattern: '${X.pattern}', filePath: '${Z}', isDynamic: ${X.isDynamic}, params: ${z}${j} },`)}Y.push("] as const",""),Y.push("export type RouteName = typeof routes[number]['pattern']",""),_.mkdirSync(B,{recursive:!0}),_.writeFileSync(G.join(B,"routes.ts"),Y.join(`
+`))}function P(I,B){let K=q.relative(B,I).replace(/\.(stx|md)$/,"");if(K=K.split(q.sep).join("/"),K==="index")return"/";if(K.endsWith("/index"))K=K.slice(0,-6);return K=K.replace(/\[\[([^\]]+)\]\]/g,":$1?"),K=K.replace(/\[([^\]]+)\]/g,":$1"),K=K.replace(/:\.\.\.([^/]+)/g,":$1*"),`/${K}`}function k(I){let B=[],J=I.replace(/[.+^${}()|[\]\\]/g,"\\$&");return J=J.replace(/\/:([^/]+)\?/g,(K,O)=>{return B.push(O),"(?:/([^/]+))?"}),J=J.replace(/:([^/]+)\*/g,(K,O)=>{return B.push(O),"(.+)"}),J=J.replace(/:([^/]+)/g,(K,O)=>{return B.push(O),"([^/]+)"}),J=`^${J}$`,{regex:new RegExp(J),params:B}}function o(I,B){let J=I===""?"/":I;for(let K of B){let O=J.match(K.regex);if(O){let W={};return K.params.forEach((V,Y)=>{W[V]=O[Y+1]}),{route:K,params:W}}}return null}function y(I,B){let J=[],K=L.dirname(I);while(K.startsWith(B)||K===B){let O=L.join(K,"_layout.stx");if(x.existsSync(O))J.unshift(O);if(K===B)break;K=L.dirname(K)}return J}function R(I,B){let J=[];if(!T.existsSync(I))return J;let K=T.readdirSync(I,{withFileTypes:!0});for(let O of K){let W=$.join(I,O.name);if(O.isDirectory()){if(O.name.startsWith("."))continue;J.push(...R(W,B))}else if(O.isFile()){let V=$.extname(O.name);if(B.includes(V)){if(O.name.startsWith("_")&&O.name!=="_layout.stx")continue;if(O.name==="_layout.stx")continue;J.push(W)}}}return J}class S{routes;pagesDir;pagesDirs;config;constructor(I,B={}){this.config=B;let J=B.pagesDirs&&B.pagesDirs.length>0?B.pagesDirs:[B.pagesDir||"pages"];this.pagesDirs=J.map((V)=>$.resolve(I,V)),this.pagesDir=this.pagesDirs[0];let K=B.extensions||[".stx"],O=new Set;this.routes=[];for(let V of this.pagesDirs){let Y=R(V,K);for(let X of Y){let Z=P(X,V);if(O.has(Z))continue;O.add(Z);let{regex:z,params:j}=k(Z),F=B.layouts!==!1?y(X,V):[];this.routes.push({pattern:Z,regex:z,params:j,filePath:X,isDynamic:j.length>0,layout:F.length>0?F[F.length-1]:void 0})}}this.routes.sort((V,Y)=>{if(!V.isDynamic&&Y.isDynamic)return-1;if(V.isDynamic&&!Y.isDynamic)return 1;let X=V.pattern.split("/").length,Z=Y.pattern.split("/").length;if(X!==Z)return Z-X;return V.pattern.localeCompare(Y.pattern)});let W=$.join(I,".stx");w(this.routes,W),D(this.routes,W,this.pagesDir)}match(I){let B=I===""?"/":I;for(let J of this.routes){let K=B.match(J.regex);if(K){let O={};return J.params.forEach((W,V)=>{O[W]=K[V+1]}),{route:J,params:O}}}return null}resolve(I,B){let J=this.routes.find((O)=>O.pattern===I||O.filePath.includes(I));if(!J)return"#not-found";let K=J.pattern;if(B)for(let[O,W]of Object.entries(B))K=K.replace(`:${O}`,encodeURIComponent(W));return K}addRoute(I){this.routes.push(I),this.routes.sort((B,J)=>{if(!B.isDynamic&&J.isDynamic)return-1;if(B.isDynamic&&!J.isDynamic)return 1;return B.pattern.localeCompare(J.pattern)})}getLayout(I){return I.layout??null}}function a(I,B){return new S(I,B)}function e(I,B){let J=[`${B}.stx`,"error.stx"];for(let K of J){let O=$.join(I,K);if(T.existsSync(O))return O}return null}function BB(I,B){return I.map((J)=>{let K=$.relative(B,J.filePath),O=J.isDynamic?" (dynamic)":"";return`${J.pattern} \u2192 ${K}${O}`})}var A={},E="";function IB(I){E=I.replace(/\/$/,"")}function JB(I,B,J={}){A[I]={path:B,name:I,params:J}}function KB(I){for(let[B,J]of Object.entries(I))if(typeof J==="string")A[B]={path:J,name:B};else A[B]={...J,name:B}}function OB(I,B={},J=!1){let K=A[I];if(!K)return console.warn(`Route [${I}] not defined.`),"#undefined-route";let O={...K.params,...B},W=K.path;W=W.replace(/:(\w+)/g,(Y,X)=>{let Z=O[X];if(Z===void 0)return console.warn(`Missing parameter [${X}] for route [${I}].`),`:${X}`;return delete O[X],encodeURIComponent(String(Z))});let V=Object.entries(O);if(V.length>0){let Y=V.map(([X,Z])=>`${encodeURIComponent(X)}=${encodeURIComponent(String(Z))}`).join("&");W+=(W.includes("?")?"&":"?")+Y}return J&&E?`${E}${W}`:W}function VB(){for(let I of Object.keys(A))delete A[I];E=""}function YB(I,B={}){return{type:"redirect",path:I,options:{replace:B.replace??!1,external:B.external??!1,redirectCode:B.redirectCode??302}}}function ZB(I){return{type:"abort",error:typeof I==="string"?{statusCode:500,message:I}:I}}function $B(I,B={}){return{handler:I,mode:B.mode??"universal"}}function H(I){let B={};if(!I)return B;let J=I.split(";");for(let K of J){let[O,...W]=K.split("=");if(O){let V=O.trim(),Y=W.join("=").trim();if(V)B[V]=decodeURIComponent(Y)}}return B}function U(I,B,J={}){let K=`${encodeURIComponent(I)}=${encodeURIComponent(B)}`;if(J.expires){let O=typeof J.expires==="number"?new Date(Date.now()+J.expires*1000):J.expires;K+=`; Expires=${O.toUTCString()}`}if(J.path)K+=`; Path=${J.path}`;if(J.domain)K+=`; Domain=${J.domain}`;if(J.secure)K+="; Secure";if(J.httpOnly)K+="; HttpOnly";if(J.sameSite)K+=`; SameSite=${J.sameSite}`;return K}function f(I,B){let J=I.headers.get("cookie")||"",K=H(J);return{get(O){return K[O]},set(O,W,V={}){K[O]=W,B.append("Set-Cookie",U(O,W,V))},delete(O){delete K[O],B.append("Set-Cookie",U(O,"",{expires:new Date(0),path:"/"}))},getAll(){return{...K}}}}function g(){return{get(I){if(typeof document>"u")return;return H(document.cookie)[I]},set(I,B,J={}){if(typeof document>"u")return;document.cookie=U(I,B,J)},delete(I){if(typeof document>"u")return;document.cookie=U(I,"",{expires:new Date(0),path:"/"})},getAll(){if(typeof document>"u")return{};return H(document.cookie)}}}function h(){let I=typeof window<"u"&&typeof window.localStorage<"u";return{get(B){if(!I)return null;try{return window.localStorage.getItem(B)}catch{return null}},set(B,J){if(!I)return;try{window.localStorage.setItem(B,J)}catch{}},remove(B){if(!I)return;try{window.localStorage.removeItem(B)}catch{}},isAvailable(){return I}}}var Q=new Map;function M(I,B){Q.set(I,B)}function c(I){return Q.get(I)}function AB(I){return Q.has(I)}function GB(){Q.clear()}function QB(){return Array.from(Q.keys())}async function jB(I,B="middleware"){let J=C.resolve(I,B);if(!N.existsSync(J))return;let K=N.readdirSync(J);for(let O of K){if(!O.endsWith(".ts")&&!O.endsWith(".js"))continue;if(O.includes(".test.")||O.includes(".spec."))continue;let W=O.replace(/\.(ts|js)$/,""),V=C.join(J,O);try{let X=(await import(V)).default;if(X&&typeof X.handler==="function")M(W,X);else if(typeof X==="function")M(W,{handler:X,mode:"universal"})}catch(Y){console.warn(`Failed to load middleware '${W}' from ${V}:`,Y)}}}function d(I){let B={};if(!I)return B;let J=new URLSearchParams(I);for(let[K,O]of J)B[K]=O;return B}function _B(I,B,J,K=""){return{path:I,params:B,query:d(K),fullPath:K?`${I}?${K}`:I,meta:J}}function EB(I,B,J){let K=typeof window>"u",O=!K,W=new Headers;return{to:I,from:B,isClient:O,isServer:K,cookies:K&&J?f(J,W):g(),storage:h(),state:{},request:J,responseHeaders:W}}async function UB(I,B){let J=Array.isArray(I)?I:[I],K=B.isServer;for(let O of J){let W=c(O);if(!W){console.warn(`Middleware '${O}' not found`);continue}if(W.mode==="server"&&!K)continue;if(W.mode==="client"&&K)continue;try{let V=await W.handler(B);if(V){if(V.type==="redirect")return{passed:!1,redirect:V,state:B.state,responseHeaders:B.responseHeaders};if(V.type==="abort")return{passed:!1,abort:V,state:B.state,responseHeaders:B.responseHeaders}}}catch(V){return console.error(`Error in middleware '${O}':`,V),{passed:!1,abort:{type:"abort",error:{statusCode:500,message:V instanceof Error?V.message:"Middleware error"}},state:B.state,responseHeaders:B.responseHeaders}}}return{passed:!0,state:B.state,responseHeaders:B.responseHeaders}}function zB(){return`
 ;(function(){
   'use strict';
-  if(window.__stxRouter)return;
+  var ROUTER_REV=3;
+  if(window.__stxRouter&&window.__stxRouter.__rev===ROUTER_REV)return;
 
   // \u2500\u2500 Configuration \u2500\u2500
-  var defaults={container:'main',loadingClass:'stx-navigating',viewTransitions:true,cache:true,scrollToTop:true,prefetch:true,progress:true,progressColor:'#78dce8',progressHeight:'2px',interceptAllLinks:false};
+  var defaults={container:'main',loadingClass:'stx-navigating',viewTransitions:true,cache:true,scrollToTop:true,prefetch:true,progress:true,progressColor:'#78dce8',progressHeight:'2px',interceptAllLinks:false,prefetchCacheMax:50};
   var o=Object.assign({},defaults,window.__stxRouterConfig||{},window.STX_ROUTER_OPTIONS||{});
   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
@@ -52,6 +68,40 @@ import"./chunk-xg9xscqz.js";import"./chunk-96b7fcmd.js";import U from"fs";import
   var prefetching={};
   var isNavigating=false;
 
+  // LRU bookkeeping for cache/layoutCache/layoutGroupCache. Pre-fix
+  // (stacksjs/stx#1719) these were plain objects with no eviction, so
+  // hover-prefetch on a sidebar of 200 internal links retained ~10MB
+  // of HTML strings for the page's lifetime. cacheOrder is a most-
+  // recently-used-last list of keys; setCache pushes new entries and
+  // evicts the oldest when length exceeds o.prefetchCacheMax (default
+  // 50). touchCache promotes a key on cache-hit. We use a plain array
+  // rather than a Map to keep the diff localized and the runtime
+  // hand-minified shape consistent.
+  var cacheOrder=[];
+  function setCache(key,html,layout,group){
+    if(!(key in cache))cacheOrder.push(key);
+    cache[key]=html;
+    layoutCache[key]=layout;
+    layoutGroupCache[key]=group;
+    while(cacheOrder.length>o.prefetchCacheMax){
+      var oldest=cacheOrder.shift();
+      delete cache[oldest];
+      delete layoutCache[oldest];
+      delete layoutGroupCache[oldest];
+    }
+  }
+  function touchCache(key){
+    var i=cacheOrder.indexOf(key);
+    if(i>=0){cacheOrder.splice(i,1);cacheOrder.push(key)}
+  }
+  function evictCache(key){
+    var i=cacheOrder.indexOf(key);
+    if(i>=0)cacheOrder.splice(i,1);
+    delete cache[key];
+    delete layoutCache[key];
+    delete layoutGroupCache[key];
+  }
+
   // Extract top-level CSS blocks (rules AND @media blocks with nested braces).
   // The old regex ([^{}]+{[^{}]*}) silently dropped @media blocks because
   // it couldn't handle nested braces \u2014 causing responsive classes (lg:, md:)
@@ -101,6 +151,7 @@ import"./chunk-xg9xscqz.js";import"./chunk-96b7fcmd.js";import U from"fs";import
   // Layout group detection \u2014 layouts in the same group share a <main> container.
   // Only truly different layout groups trigger a full page reload.
   var layoutCache={};
+  var layoutGroupCache={};
   // Track executed script hashes to prevent redeclaration errors on navigation.
   // Layout-level scripts (theme, nav setup) execute on initial page load and
   // should NOT re-execute when navigating to another page with the same layout.
@@ -114,33 +165,63 @@ import"./chunk-xg9xscqz.js";import"./chunk-96b7fcmd.js";import U from"fs";import
     var text=s.textContent||'';
     if(text.trim()&&!s.hasAttribute('src'))executedScriptHashes[hashScript(text)]=1;
   });
-  function getLayoutGroup(layout){
+  function cacheKey(url){
+    var u=new URL(url,location.origin);
+    return u.pathname+u.search;
+  }
+  // Keep SPA fetches inside the active locale (/en/... when viewing English).
+  function withCurrentLocale(href){
+    var d=window.__stxI18n;
+    if(d&&typeof d.localizeHref==='function')return d.localizeHref(href);
+    return href;
+  }
+  function defaultLayoutGroup(layout){
     if(!layout)return 'app';
-    if(layout.indexOf('auth')!==-1||layout.indexOf('guest')!==-1)return 'auth';
-    return 'app';
+    var clean=String(layout).replace(/\\\\/g,'/');
+    var parts=clean.split('/').filter(Boolean);
+    var idx=parts.lastIndexOf('layouts');
+    var part=idx>=0?parts[idx+1]:parts[parts.length-1];
+    return part?part.replace(/\\.stx$/i,''):'app';
+  }
+  function getCurrentLayoutGroup(){
+    var meta=document.querySelector('meta[name="stx-layout-group"]');
+    if(meta&&meta.getAttribute('content'))return meta.getAttribute('content');
+    var layout=document.querySelector('meta[name="stx-layout"]');
+    return defaultLayoutGroup(layout?layout.getAttribute('content'):'');
+  }
+  function getDocLayoutGroup(doc,layout){
+    var meta=doc&&doc.querySelector?doc.querySelector('meta[name="stx-layout-group"]'):null;
+    return meta&&meta.getAttribute('content')?meta.getAttribute('content'):defaultLayoutGroup(layout||'');
   }
-  function checkLayoutChange(newLayout,targetUrl){
+  function checkLayoutChange(newLayout,targetUrl,newGroup){
     var currentLayout=document.querySelector('meta[name="stx-layout"]');
     var curLayoutName=currentLayout?currentLayout.getAttribute('content'):'';
-    var curGroup=getLayoutGroup(curLayoutName);
-    var newGroup=getLayoutGroup(newLayout);
-    console.log('[router] layout check: current='+curLayoutName+'('+curGroup+') new='+(newLayout||'')+'('+newGroup+')');
+    var curGroup=getCurrentLayoutGroup();
+    var nextGroup=newGroup||defaultLayoutGroup(newLayout);
+    log('[router] layout check: current='+curLayoutName+'('+curGroup+') new='+(newLayout||'')+'('+nextGroup+')');
     // Different layout GROUP (e.g. app \u2192 auth): full reload
-    if(curGroup!==newGroup){
-      console.log('[router] layout group change:',curGroup,'\u2192',newGroup,'\u2014 full reload to:',targetUrl);
+    if(curGroup!==nextGroup){
+      log('[router] layout group change:',curGroup,'\u2192',nextGroup,'\u2014 full reload to:',targetUrl);
       return true;
     }
     // Same group but different SPECIFIC layout (e.g. layouts/app \u2192 layouts/coach):
     // full body swap so nav, sidebar, and other layout-level elements update
     if(curLayoutName && newLayout && curLayoutName!==newLayout){
-      console.log('[router] layout name change:',curLayoutName,'\u2192',newLayout,'\u2014 full body swap');
+      log('[router] layout name change:',curLayoutName,'\u2192',newLayout,'\u2014 full body swap');
       return true;
     }
     return false;
   }
 
+  function shouldUseFragmentResponse(){
+    return containerSel==='main'||containerSel==='[data-stx-content]';
+  }
+
   function navigate(url,pushState,force){
-    console.log('[router] navigate() called:',url,'isNavigating:',isNavigating);
+    // Lang-picker passes force=true with an already-localized path (/en/...).
+    // Re-localizing would map it back to the *current* locale and no-op.
+    if(!force) url=withCurrentLocale(url);
+    log('[router] navigate() called:',url,'isNavigating:',isNavigating);
     if(isNavigating)return;
     var t=new URL(url,location.origin);
 
@@ -153,27 +234,36 @@ import"./chunk-xg9xscqz.js";import"./chunk-96b7fcmd.js";import U from"fs";import
       return;
     }
 
-    if(t.href===location.href&&!t.hash&&!force)return;
+    // Skip if user clicks a link to the page they're already on. We
+    // deliberately allow popstate (pushState===false) through because
+    // the browser has already updated location.href to the popped
+    // entry \u2014 without this allowance, hitting back would early-return
+    // and the visible page content would be left frozen on the
+    // forward-navigation page.
+    if(pushState!==false&&t.href===location.href&&!t.hash&&!force)return;
 
     isNavigating=true;
     document.body.classList.add(o.loadingClass);
     startProgress();
 
     var targetHref=t.href;
-    var targetPath=t.pathname;
+    var targetPath=cacheKey(url);
     var targetHash=t.hash;
 
     function done(){isNavigating=false;document.body.classList.remove(o.loadingClass);finishProgress()}
 
     if(o.cache&&cache[targetPath]&&!force){
-      if(checkLayoutChange(layoutCache[targetPath],url)){
+      // Cache hit \u2192 promote in LRU order so this entry survives eviction
+      // longer than other entries that haven't been touched.
+      touchCache(targetPath);
+      if(checkLayoutChange(layoutCache[targetPath],url,layoutGroupCache[targetPath])){
         // Layout changed \u2014 fetch full page and do full document swap
-        console.log('[router] cache hit but layout changed \u2014 fetching full page');
+        log('[router] cache hit but layout changed \u2014 fetching full page');
         fetch(url,{headers:{'Accept':'text/html'}}).then(function(r){
           if(!r.ok)throw new Error(r.status);
           return r.text();
         }).then(function(html){
-          console.log('[router] full page fetched from cache path, len:',html.length);
+          log('[router] full page fetched from cache path, len:',html.length);
           swap(html,targetPath,pushState,targetHash);
         }).catch(function(err){
           console.error('[router] full page fetch error:',err);
@@ -185,29 +275,33 @@ import"./chunk-xg9xscqz.js";import"./chunk-96b7fcmd.js";import U from"fs";import
       done();
     }
 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){
+      if(force&&cache[targetPath])evictCache(targetPath);
+      // 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
-        if(isFragment&&checkLayoutChange(newLayout,url)){
-          console.log('[router] layout change \u2014 fetching full page for document swap');
+        if(isFragment&&checkLayoutChange(newLayout,url,newGroup)){
+          log('[router] layout change \u2014 fetching full page for document swap');
           return fetch(url,{headers:{'Accept':'text/html'}}).then(function(fullRes){
-            console.log('[router] full page fetched:',fullRes.status,'ok:',fullRes.ok);
+            log('[router] full page fetched:',fullRes.status,'ok:',fullRes.ok);
             if(!fullRes.ok)throw new Error(fullRes.status);
             return fullRes.text().then(function(html){
-              console.log('[router] full page html length:',html.length);
-              return{html:html,isFragment:false,layout:newLayout};
+              log('[router] full page html length:',html.length);
+              return{html:html,isFragment:false,layout:newLayout,layoutGroup:newGroup};
             });
           });
         }
-        return r.text().then(function(html){return{html:html,isFragment:isFragment,layout:newLayout}});
+        return r.text().then(function(html){return{html:html,isFragment:isFragment,layout:newLayout,layoutGroup:newGroup}});
       }).then(function(result){
         if(!result)return;
         if(result.isFragment)result.html='<!--stx-fragment-->'+result.html;
-        if(o.cache){cache[targetPath]=result.html;layoutCache[targetPath]=result.layout}
+        if(o.cache)setCache(targetPath,result.html,result.layout,result.layoutGroup);
         swap(result.html,targetPath,pushState,targetHash);
       }).catch(function(err){
         console.error('[router] fetch error:',err);
@@ -220,8 +314,8 @@ else {
     var isFragment=html.indexOf('<!--stx-fragment-->')===0;
     if(isFragment)html=html.slice('<!--stx-fragment-->'.length);
     var currentContent=getContainer();
-    console.log('[router] swap: isFragment='+isFragment+' container='+!!currentContent+' htmlLen='+html.length);
-    if(!currentContent){console.log('[router] no container \u2014 falling back');location.href=url;return}
+    log('[router] swap: isFragment='+isFragment+' container='+!!currentContent+' tag='+(currentContent&&currentContent.tagName)+' selector='+containerSel+' htmlLen='+html.length);
+    if(!currentContent){log('[router] no container \u2014 falling back');location.href=url;return}
 
     // Fragment mode: server returned just the page content (no document wrapper)
     if(isFragment){
@@ -276,25 +370,47 @@ else {
         else if(hash){var el=document.querySelector(hash);if(el)el.scrollIntoView({behavior:'smooth'})}
         window.dispatchEvent(new CustomEvent('stx:navigate',{detail:{url:url}}));
         // Execute page scripts FIRST \u2014 they define setup functions and set _latestSetup
-        console.log('[router] frag scripts:', fragScripts.length);
+        log('[router] frag scripts:', fragScripts.length);
         document.querySelectorAll('script[data-stx-page]').forEach(function(s){s.remove()});
         fragScripts.forEach(function(code){
-          console.log('[router] exec script len:', code.length, 'has __stx_setup:', code.indexOf('__stx_setup')>-1);
-          var ns=document.createElement('script');
-          // 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.
+          log('[router] exec script len:', code.length, 'has __stx_setup:', code.indexOf('__stx_setup')>-1);
+          // Skip scripts that were already executed (layout-level partials
+          // like theme.stx, stores.stx, nav.stx). Their top-level const/let
+          // declarations would throw "Identifier has already been declared"
+          // on re-execution. Setup functions (__stx_setup_) must always
+          // re-execute because each page has its own setup.
+          var h=hashScript(code);
+          var isSetup=code.indexOf('__stx_setup_')!==-1;
+          // Compute isAlreadyScoped first so the dedup check can exempt
+          // self-contained IIFE scripts. data-stx-scoped scope IIFEs
+          // (the (function(){ ... })() shape) must re-execute on every
+          // navigation. They own their own scope and won't collide
+          // with prior runs, AND _cleanupContainer deleted their
+          // entry from window.stx._scopes on the way out. Without
+          // this exemption, navigating away and back leaves the page
+          // leaf with no scope registered: bindIf/@event never re-bind
+          // and all :if branches stay visible at once.
+          // Mirrors the full-doc swap path's runAlways escape below.
           var isAlreadyScoped=code.trimStart().charAt(0)==='('||code.trimStart().charAt(0)===';'||code.indexOf('window.stx.mount')>-1;
-          ns.textContent=isAlreadyScoped?code:'{'+code+'}';
+          if(!isSetup&&!isAlreadyScoped&&executedScriptHashes[h]){
+            log('[router] skipping already-executed script (hash dedup)');
+            return;
+          }
+          executedScriptHashes[h]=1;
+          var ns=document.createElement('script');
+          var hasImport=code.indexOf('import ')!==-1;
+          if(hasImport){
+            ns.type='module';
+          }
+          ns.textContent=(hasImport||isAlreadyScoped)?code:'{'+code+'}';
           ns.setAttribute('data-stx-page','');
           document.body.appendChild(ns);
         });
-        console.log('[router] scripts done. _latestSetup:', !!window.stx._latestSetup);
+        log('[router] scripts done. _latestSetup:', !!window.stx._latestSetup);
         // 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;
     }
@@ -362,12 +478,14 @@ else {
       if(newBody){
         var newMeta=doc.querySelector('meta[name="stx-layout"]');
         var curMeta=document.querySelector('meta[name="stx-layout"]');
-        var curGroup=getLayoutGroup(curMeta?curMeta.getAttribute('content'):'');
-        var newGroup=getLayoutGroup(newMeta?newMeta.getAttribute('content'):'');
-        isLayoutChange=curGroup!==newGroup;
+        var curLayout=curMeta?curMeta.getAttribute('content'):'';
+        var newLayout=newMeta?newMeta.getAttribute('content'):'';
+        var curGroup=getCurrentLayoutGroup();
+        var newGroup=getDocLayoutGroup(doc,newLayout);
+        isLayoutChange=curGroup!==newGroup||(curLayout&&newLayout&&curLayout!==newLayout);
       }
       if(isLayoutChange&&newBody){
-        console.log('[router] full body swap for layout change');
+        log('[router] full body swap for layout change');
         // Replace entire body content \u2014 layout chrome and all
         var bodyHTML=newBody.innerHTML.replace(new RegExp('<scr'+'ipt\\\\b[^>]*>[\\\\s\\\\S]*?<\\\\/scr'+'ipt\\\\s*>','gi'),'');
         document.body.innerHTML=bodyHTML;
@@ -378,6 +496,10 @@ else {
         var freshMeta=doc.querySelector('meta[name="stx-layout"]');
         if(oldMeta&&freshMeta)oldMeta.setAttribute('content',freshMeta.getAttribute('content')||'');
         else if(freshMeta){var m=document.createElement('meta');m.name='stx-layout';m.content=freshMeta.getAttribute('content')||'';document.head.appendChild(m)}
+        var oldGroupMeta=document.querySelector('meta[name="stx-layout-group"]');
+        var freshGroupMeta=doc.querySelector('meta[name="stx-layout-group"]');
+        if(oldGroupMeta&&freshGroupMeta)oldGroupMeta.setAttribute('content',freshGroupMeta.getAttribute('content')||'');
+        else if(freshGroupMeta){var gm=document.createElement('meta');gm.name='stx-layout-group';gm.content=freshGroupMeta.getAttribute('content')||'';document.head.appendChild(gm)}
         // Update container reference for script execution below
         currentContent=document.querySelector(containerSel)||document.querySelector('main')||document.body;
       } else {
@@ -408,6 +530,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)
@@ -420,7 +545,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>
@@ -428,7 +553,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
@@ -436,26 +561,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);
         });
       }
 
@@ -485,7 +611,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.
@@ -495,7 +623,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');
@@ -505,8 +633,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);
         });
@@ -522,8 +653,7 @@ else {
       }
     }
 
-    if(o.viewTransitions&&document.startViewTransition){
-      document.startViewTransition(doSwap);
+    if(runViewTransition(doSwap)){
     }
 else {
       // Fallback fade for browsers without View Transitions API
@@ -545,6 +675,7 @@ else {
     if(href.startsWith('http')||href.startsWith('#')||href.startsWith('mailto:')||href.startsWith('tel:')||href.startsWith('javascript:'))return false;
     if(link.target==='_blank')return false;
     if(link.hasAttribute('data-stx-no-router')||link.hasAttribute('data-no-router')||link.hasAttribute('download'))return false;
+    if(href.startsWith('?'))return true;
     if(href===location.pathname)return false;
     if(!getContainer())return false;
     return true;
@@ -565,13 +696,13 @@ else {
     }
     if(!link){return}
     var href=link.getAttribute('href');
-    console.log('[router] click intercepted:',href,'container:',!!getContainer(),'defaultPrevented:',e.defaultPrevented);
-    if(!href||href.startsWith('http')||href.startsWith('#')||href.startsWith('mailto:')||href.startsWith('tel:')){console.log('[router] skipped:',href);return}
+    log('[router] click intercepted:',href,'container:',!!getContainer(),'defaultPrevented:',e.defaultPrevented);
+    if(!href||href.startsWith('http')||href.startsWith('#')||href.startsWith('mailto:')||href.startsWith('tel:')){log('[router] skipped:',href);return}
     if(link.target==='_blank'||link.hasAttribute('download'))return;
     e.preventDefault();
     e.stopPropagation();
-    console.log('[router] navigating to:',href);
-    navigate(href);
+    log('[router] navigating to:',href);
+    navigate(withCurrentLocale(href));
   },true);
 
   // \u2500\u2500 Back/forward \u2500\u2500
@@ -585,16 +716,19 @@ else {
       if(!e.target||!e.target.closest)return;
       var link=e.target.closest('[data-stx-link]');
       if(!link)return;
-      var href=link.getAttribute('href');
-      if(cache[href]||prefetching[href])return;
-      prefetching[href]=true;
-      fetch(href,{headers:{'X-STX-Router':'true','Accept':'text/html'}}).then(function(r){
-        var isFrag=r.headers.get('X-STX-Fragment')==='true';
+      var href=withCurrentLocale(link.getAttribute('href'));
+      var key=cacheKey(href);
+      if(cache[key]||prefetching[key])return;
+      prefetching[key]=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')||'';
-        return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout}});
+        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){
-        if(o.cache){cache[href]=result.html;layoutCache[href]=result.layout}
-      }).catch(function(){}).finally(function(){delete prefetching[href]});
+        if(o.cache)setCache(key,result.html,result.layout,result.layoutGroup);
+      }).catch(function(){}).finally(function(){delete prefetching[key]});
     },true);
   }
 
@@ -687,16 +821,19 @@ else {
     navigate:navigate,
     navigateTo:navigate,
     prefetch:function(url){
-      if(!cache[url]){
-        fetch(url,{headers:{'X-STX-Router':'true'}}).then(function(r){var isFrag=r.headers.get('X-STX-Fragment')==='true';return r.text().then(function(html){return isFrag?'<!--stx-fragment-->'+html:html})}).then(function(html){cache[url]=html}).catch(function(){});
+      var key=cacheKey(url);
+      if(!cache[key]){
+        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){setCache(key,result.html,result.layout,result.layoutGroup)}).catch(function(){});
       }
     },
-    clearCache:function(){for(var k in cache)delete cache[k]},
+    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];cacheOrder.length=0},
     cache:cache,
     swap:swap,
     updateNav:updateNav
   };
 
+  router.__rev=ROUTER_REV;
   window.__stxRouter=router;
   window.stxRouter=router;
   if(window.stx)window.stx.router=router;
@@ -711,4 +848,4 @@ else {
 
   if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',init);else init();
 })();
-`}export{r as setAppUrl,AB as runMiddleware,BB as route,P as resolveLayoutChain,GB as resetRoutes,q as registerMiddleware,w as patternToRegex,KB as navigateTo,m as matchRoute,ZB as loadMiddlewareFromDirectory,WB as hasMiddleware,QB as getRouterScript,YB as getMiddlewareNames,f as getMiddleware,S as generateRouteTypes,b as generateRouteManifest,t as formatRoutes,o as findErrorPage,v as filePathToPattern,e as defineRoutes,a as defineRoute,VB as defineMiddleware,y as createStorageManager,k as createServerCookieManager,i as createRouter,$B as createRouteLocation,jB as createMiddlewareContext,x as createClientCookieManager,XB as clearMiddleware,OB as abortNavigation,C as Router};
+`}export{IB as setAppUrl,UB as runMiddleware,OB as route,y as resolveLayoutChain,VB as resetRoutes,M as registerMiddleware,k as patternToRegex,YB as navigateTo,o as matchRoute,jB as loadMiddlewareFromDirectory,AB as hasMiddleware,zB as getRouterScript,QB as getMiddlewareNames,c as getMiddleware,w as generateRouteTypes,D as generateRouteManifest,BB as formatRoutes,e as findErrorPage,P as filePathToPattern,v as extractLayoutMetadata,b as deriveLayoutGroup,KB as defineRoutes,JB as defineRoute,$B as defineMiddleware,h as createStorageManager,f as createServerCookieManager,a as createRouter,_B as createRouteLocation,EB as createMiddlewareContext,g as createClientCookieManager,GB as clearMiddleware,ZB as abortNavigation,S as Router};