bun-plugin-stx 0.2.66 → 0.2.69

package/dist/{chunk-wv4bcqba.js → chunk-sm4gbwrd.js}

@@ -583,10 +583,11 @@ function getRouterScript() {
   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;
@@ -646,6 +647,40 @@ function getRouterScript() {
   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:)
@@ -713,6 +748,12 @@ function getRouterScript() {
     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';
     var clean=String(layout).replace(/\\\\/g,'/');
@@ -756,6 +797,9 @@ function getRouterScript() {
   }
 
   function navigate(url,pushState,force){
+    // 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);
@@ -788,6 +832,9 @@ function getRouterScript() {
     function done(){isNavigating=false;document.body.classList.remove(o.loadingClass);finishProgress()}
 
     if(o.cache&&cache[targetPath]&&!force){
+      // 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
         log('[router] cache hit but layout changed \u2014 fetching full page');
@@ -807,7 +854,7 @@ function getRouterScript() {
       done();
     }
 else {
-      if(force&&cache[targetPath])delete cache[targetPath];
+      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.
@@ -833,7 +880,7 @@ else {
       }).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;layoutGroupCache[targetPath]=result.layoutGroup}
+        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);
@@ -1207,6 +1254,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;
@@ -1233,7 +1281,7 @@ else {
     e.preventDefault();
     e.stopPropagation();
     log('[router] navigating to:',href);
-    navigate(href);
+    navigate(withCurrentLocale(href));
   },true);
 
   // \u2500\u2500 Back/forward \u2500\u2500
@@ -1247,7 +1295,7 @@ else {
       if(!e.target||!e.target.closest)return;
       var link=e.target.closest('[data-stx-link]');
       if(!link)return;
-      var href=link.getAttribute('href');
+      var href=withCurrentLocale(link.getAttribute('href'));
       var key=cacheKey(href);
       if(cache[key]||prefetching[key])return;
       prefetching[key]=true;
@@ -1258,7 +1306,7 @@ else {
         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[key]=result.html;layoutCache[key]=result.layout;layoutGroupCache[key]=result.layoutGroup}
+        if(o.cache)setCache(key,result.html,result.layout,result.layoutGroup);
       }).catch(function(){}).finally(function(){delete prefetching[key]});
     },true);
   }
@@ -1355,15 +1403,16 @@ else {
       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){cache[key]=result.html;layoutCache[key]=result.layout;layoutGroupCache[key]=result.layoutGroup}).catch(function(){});
+        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];for(var lk in layoutCache)delete layoutCache[lk];for(var gk in layoutGroupCache)delete layoutGroupCache[gk]},
+    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;

package/dist/serve.d.ts

@@ -1,3 +1,17 @@
+/**
+ * Build the candidate regexes for a dynamic route file (stacksjs/stx#1927).
+ *
+ * `fileRouteBase` is the route path with the file extension already
+ * stripped (e.g. `judges/[id]/profile/index`). Returns one regex per
+ * acceptable URL shape:
+ *   - the literal path with `[param]` → `([^/]+)`
+ *   - the same with a trailing `/index` removed, so
+ *     `judges/[id]/profile/index` also matches `judges/35/profile`
+ *     (without this, nested dynamic routes 404 on hard reload)
+ *   - both of the above again with a leading `pages/` stripped, for
+ *     projects that nest routable views under `pages/`
+ */
+export declare function buildDynamicRouteRegexes(fileRouteBase: string): RegExp[];
 export declare function bundleBrowserAsset(entrypoint: string): Promise<Response>;
 /**
  * Start the STX development server

package/dist/serve.js

@@ -7039,6 +7039,7 @@ class Logger3 {
   }
 }
 var logger3 = new Logger3("stacks");
+
 class BunfigError2 extends Error {
   timestamp;
   context;
@@ -8693,6 +8694,21 @@ var defaultGeneratedDir4 = resolve12(process20.cwd(), "src/generated");
 
 // src/serve.ts
 var defaultStxModule = import("@stacksjs/stx");
+function buildDynamicRouteRegexes(fileRouteBase) {
+  const toPattern = (p) => p.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
+  const patterns = [new RegExp(`^${toPattern(fileRouteBase)}$`)];
+  const noIndex = fileRouteBase.replace(/\/index$/, "");
+  if (noIndex !== fileRouteBase)
+    patterns.push(new RegExp(`^${toPattern(noIndex)}$`));
+  if (fileRouteBase.startsWith("pages/")) {
+    const pretty = fileRouteBase.slice(6);
+    patterns.push(new RegExp(`^${toPattern(pretty)}$`));
+    const prettyNoIndex = pretty.replace(/\/index$/, "");
+    if (prettyNoIndex !== pretty)
+      patterns.push(new RegExp(`^${toPattern(prettyNoIndex)}$`));
+  }
+  return patterns;
+}
 var defaultStxConfig = {
   partialsDir: "partials",
   componentsDir: "components",
@@ -8766,22 +8782,25 @@ async function bundleBrowserAsset(entrypoint) {
       status: 500,
       headers: {
         "Content-Type": "text/plain; charset=utf-8",
-        "Cache-Control": "no-cache"
+        "Cache-Control": "no-store"
       }
     });
   }
   return new Response(await result.outputs[0].text(), {
     headers: {
       "Content-Type": "application/javascript",
-      "Cache-Control": "no-cache"
+      "Cache-Control": "no-store"
     }
   });
 }
 async function serve(options) {
   const stxConfig = await loadConfig6({
     name: "stx",
+    alias: ["ui"],
     cwd: process19.cwd(),
-    defaultConfig: defaultStxConfig
+    defaultConfig: defaultStxConfig,
+    checkEnv: false,
+    verbose: false
   });
   try {
     const stxMod = options.stxModule ? options.stxModule : await defaultStxModule;
@@ -8816,8 +8835,10 @@ After installing: bun add bun-plugin-stx`);
   }
   const routes = new Map;
   let sourceFiles = null;
+  let discoveredPagePaths = null;
   let assetsInitialized = false;
   const htmlCache = new Map;
+  const ENABLE_HTML_CACHE = false;
   const crosswindCssCache = new Map;
   const hmrClients = new Set;
   const hmrEncoder = new TextEncoder;
@@ -8988,6 +9009,31 @@ After installing: bun add bun-plugin-stx`);
   const authRedirectTo = authConfig?.redirectTo ?? "/login";
   const authHome = authConfig?.home ?? "/";
   const extraProtectedPrefixes = authConfig?.protectedPaths ?? [];
+  let activeServeLocale = null;
+  let activeServeSearch = "";
+  function injectServeLocaleContext(context) {
+    if (!activeServeLocale)
+      return;
+    const loc = activeServeLocale;
+    context.locale = loc;
+    context.t = (key, values) => {
+      const translate = globalThis.t;
+      return typeof translate === "function" ? translate(key, values, loc) : key;
+    };
+  }
+  function injectServeRequestContext(context) {
+    if (!activeServeSearch)
+      return;
+    context.__stxServeSearch = activeServeSearch;
+    globalThis.__stxServeSearch = activeServeSearch;
+  }
+  function htmlCacheKey(filePath) {
+    const loc = i18nConfig ? activeServeLocale ?? i18nConfig.defaultLocale : "";
+    const search = activeServeSearch || "";
+    if (!loc && !search)
+      return filePath;
+    return `${filePath}\x00${loc}\x00${search}`;
+  }
   const builtInMiddleware = authConfig === null ? {} : {
     auth: (_req, ctx) => {
       const tok = ctx.cookies[authCookieName];
@@ -9024,6 +9070,37 @@ After installing: bun add bun-plugin-stx`);
     return out;
   }
   const globalMiddlewareNames = options.globalMiddleware ?? [];
+  function stxViewFileToRoutePath(filePath) {
+    const normalized = filePath.replace(/\\/g, "/");
+    for (const pattern of patterns) {
+      const normPattern = pattern.replace(/\\/g, "/").replace(/\/$/, "");
+      if (!normalized.startsWith(`${normPattern}/`))
+        continue;
+      let rel = normalized.slice(normPattern.length + 1).replace(/\.(stx|md|html)$/, "");
+      if (rel.includes("["))
+        return null;
+      if (rel === "index" || rel === "")
+        return "/";
+      if (rel.endsWith("/index"))
+        rel = rel.slice(0, -6) || "index";
+      return rel === "index" ? "/" : `/${rel}`;
+    }
+    return null;
+  }
+  function rebuildDiscoveredPagePaths(files) {
+    const known = new Set(["/"]);
+    for (const filePath of files) {
+      const routePath = stxViewFileToRoutePath(filePath);
+      if (routePath)
+        known.add(routePath);
+    }
+    const pages = options.site?.pages;
+    if (pages) {
+      for (const p of Object.keys(pages))
+        known.add(p.startsWith("/") ? p : `/${p}`);
+    }
+    discoveredPagePaths = known;
+  }
   async function discoverFiles() {
     if (sourceFiles !== null)
       return sourceFiles;
@@ -9059,14 +9136,16 @@ After installing: bun add bun-plugin-stx`);
       }
     }
     sourceFiles = files;
+    rebuildDiscoveredPagePaths(files);
     pageMiddlewareByPath.clear();
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-wv4bcqba.js");
+      const { Router } = await import("./chunk-sm4gbwrd.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`);
+      if (!options.quiet)
+        console.log(`[stx] Generated ${router.routes.length} routes \u2192 .stx/routes.ts`);
     } catch (e) {}
     return files;
   }
@@ -9161,7 +9240,9 @@ After installing: bun add bun-plugin-stx`);
         crosswindUserConfigPromise = loadConfig6({
           name: "crosswind",
           cwd: process19.cwd(),
-          defaultConfig: {}
+          defaultConfig: {},
+          checkEnv: false,
+          verbose: false
         });
       }
       const userConfig = await crosswindUserConfigPromise;
@@ -9229,10 +9310,14 @@ After installing: bun add bun-plugin-stx`);
     }
   }
   async function processTemplate(filePath) {
-    const cachedEntry = htmlCache.get(filePath);
-    if (cachedEntry && await templateSignatureFresh(cachedEntry.signature))
-      return cachedEntry.html;
     const content = await Bun.file(filePath).text();
+    const skipCacheHint = /(?:^|[^\w$])__stx_skip_cache\s*=\s*true/.test(content);
+    if (ENABLE_HTML_CACHE && !skipCacheHint) {
+      const cacheKey = htmlCacheKey(filePath);
+      const cachedEntry = htmlCache.get(cacheKey);
+      if (cachedEntry && await templateSignatureFresh(cachedEntry.signature))
+        return cachedEntry.html;
+    }
     const serverScriptRegex = /<script\b([^>]*)\bserver\b[^>]*>([\s\S]*?)<\/script>/gi;
     const serverScripts = [];
     let scriptMatch;
@@ -9246,6 +9331,8 @@ After installing: bun add bun-plugin-stx`);
     };
     const { processDirectives, extractVariables, defaultConfig: defaultConfig4, generateSpaShell, injectRouterScript, resetHead } = await stxModule;
     resetHead();
+    injectServeLocaleContext(context);
+    injectServeRequestContext(context);
     for (const scriptBody of serverScripts) {
       await extractVariables(scriptBody, context, filePath);
     }
@@ -9278,7 +9365,7 @@ After installing: bun add bun-plugin-stx`);
     let output = templateContent;
     const dependencies = new Set;
     output = await processDirectives(output, context, filePath, config5, dependencies);
-    output = await injectRouterScript(output);
+    output = await injectRouterScript(output, getRouterInjectOptions());
     const directiveTemplateRe = /@for|:for|@if|:if|x-for|x-if/;
     const hasDirectiveTemplates = /<template\s[^>]*(?:@for|:for|@if|:if|x-for|x-if)/.test(output);
     if (hasDirectiveTemplates) {
@@ -9292,9 +9379,9 @@ After installing: bun add bun-plugin-stx`);
     } else {
       output = output.replace(/<template[^>]*>/gi, "").replace(/<\/template>/gi, "");
     }
-    if (!context.__stx_skip_cache) {
+    if (ENABLE_HTML_CACHE && !context.__stx_skip_cache && !skipCacheHint) {
       const signature = await buildTemplateSignature(filePath, dependencies);
-      htmlCache.set(filePath, { html: output, signature });
+      htmlCache.set(htmlCacheKey(filePath), { html: output, signature });
     }
     return output;
   }
@@ -9378,25 +9465,7 @@ After installing: bun add bun-plugin-stx`);
         }
       }
       const fileRouteBase = relativeFilePath.replace(/\.(stx|md|html)$/, "");
-      const routePattern = fileRouteBase.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
-      const regexPatterns = [
-        new RegExp(`^${routePattern}$`)
-      ];
-      const fileRouteNoIndex = fileRouteBase.replace(/\/index$/, "");
-      if (fileRouteNoIndex !== fileRouteBase) {
-        const noIndexPattern = fileRouteNoIndex.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
-        regexPatterns.push(new RegExp(`^${noIndexPattern}$`));
-      }
-      if (fileRouteBase.startsWith("pages/")) {
-        const prettyBase = fileRouteBase.slice(6);
-        const prettyPattern = prettyBase.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
-        regexPatterns.push(new RegExp(`^${prettyPattern}$`));
-        const prettyNoIndex = prettyBase.replace(/\/index$/, "");
-        if (prettyNoIndex !== prettyBase) {
-          const prettyNoIndexPattern = prettyNoIndex.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
-          regexPatterns.push(new RegExp(`^${prettyNoIndexPattern}$`));
-        }
-      }
+      const regexPatterns = buildDynamicRouteRegexes(fileRouteBase);
       for (const regex of regexPatterns) {
         const match = normalizedPath.match(regex);
         if (match) {
@@ -9429,6 +9498,7 @@ After installing: bun add bun-plugin-stx`);
     }
     const { processDirectives, extractVariables, defaultConfig: defaultConfig4, injectRouterScript: injectRouter, resetHead: resetHeadDyn } = await stxModule;
     resetHeadDyn();
+    injectServeLocaleContext(context);
     for (const scriptBody of dynServerScripts) {
       await extractVariables(scriptBody, context, filePath);
     }
@@ -9468,7 +9538,7 @@ After installing: bun add bun-plugin-stx`);
 ${output}`;
       }
     }
-    output = await injectRouter(output);
+    output = await injectRouter(output, getRouterInjectOptions());
     const directiveTemplateRe2 = /@for|:for|@if|:if|x-for|x-if/;
     output = output.replace(/<template(?:\s[^>]*)?>|<\/template>/gi, (match) => {
       if (directiveTemplateRe2.test(match))
@@ -9506,6 +9576,28 @@ ${output}`;
     }
     return { locale: i18nConfig.defaultLocale, path: pathname };
   }
+  function getRouterInjectOptions() {
+    return {
+      router: {
+        interceptAllLinks: true,
+        container: "main",
+        ...siteConfig?.router ?? {},
+        ...stxConfig.router ?? {}
+      }
+    };
+  }
+  function ensureRouterConfig(html) {
+    const routerOpts = getRouterInjectOptions().router;
+    const block = `<script>window.__stxRouterConfig=${JSON.stringify(routerOpts)};</script>
+`;
+    const configTagRe = /<script>window\.__stxRouterConfig=\{[^<]*\}<\/script>\s*/i;
+    if (configTagRe.test(html))
+      return html.replace(configTagRe, block);
+    if (/<\/body>/i.test(html))
+      return html.replace(/<\/body>/i, `${block}</body>`);
+    return `${html}
+${block}`;
+  }
   async function applyI18nToResponse(res, locale, normalizedPath) {
     if (!siteStxPromise)
       return res;
@@ -9536,8 +9628,8 @@ ${output}`;
         html = `${groupMeta}
 ${html}`;
     }
-    if (i18nConfig && locale !== i18nConfig.defaultLocale && siteConfig?.pages) {
-      const knownPaths = new Set(Object.keys(siteConfig.pages));
+    const knownPaths = discoveredPagePaths ?? new Set;
+    if (i18nConfig && locale !== i18nConfig.defaultLocale && knownPaths.size > 0) {
       html = html.replace(/<a\b([^>]*?)\bhref="(\/[^"]*)"([^>]*)>/gi, (full, before, href, after) => {
         if (href.startsWith("//"))
           return full;
@@ -9556,6 +9648,7 @@ ${html}`;
     }
     if (i18nConfig && stx.applyTranslations)
       html = stx.applyTranslations(html, i18nConfig, locale);
+    html = ensureRouterConfig(html);
     const headers = new Headers(res.headers);
     headers.delete("content-length");
     return new Response(html, {
@@ -9584,411 +9677,421 @@ ${html}`;
             if (stripped.path !== url.pathname) {
               const rewritten = new URL(req.url);
               rewritten.pathname = stripped.path;
-              req = new Request(rewritten, req);
+              const headers = new Headers(req.headers);
+              headers.set("x-stx-locale", stripped.locale);
+              req = new Request(rewritten, { headers, method: req.method, body: req.body, redirect: req.redirect, duplex: "half" });
               path = stripped.path;
+            } else if (i18nLocale) {
+              const headers = new Headers(req.headers);
+              headers.set("x-stx-locale", i18nLocale);
+              req = new Request(req, { headers });
             }
           }
           const _i18nResp = await (async () => {
-            if (req.method === "OPTIONS") {
-              return new Response(null, { headers: corsHeaders });
-            }
-            if (path === "/_stx/hmr") {
-              let controller;
-              let keepalive;
-              const stream = new ReadableStream({
-                start(c) {
-                  controller = c;
-                  hmrClients.add(c);
-                  c.enqueue(hmrEncoder.encode(`data: {"type":"connected"}
+            activeServeLocale = i18nLocale;
+            activeServeSearch = url.search;
+            try {
+              if (req.method === "OPTIONS") {
+                return new Response(null, { headers: corsHeaders });
+              }
+              if (path === "/_stx/hmr") {
+                let controller;
+                let keepalive;
+                const stream = new ReadableStream({
+                  start(c) {
+                    controller = c;
+                    hmrClients.add(c);
+                    c.enqueue(hmrEncoder.encode(`data: {"type":"connected"}
 
 `));
-                  keepalive = setInterval(() => {
-                    try {
-                      c.enqueue(hmrEncoder.encode(`: keepalive
+                    keepalive = setInterval(() => {
+                      try {
+                        c.enqueue(hmrEncoder.encode(`: keepalive
 
 `));
-                    } catch {}
-                  }, 15000);
-                },
-                cancel() {
-                  if (keepalive)
-                    clearInterval(keepalive);
-                  if (controller)
-                    hmrClients.delete(controller);
-                }
-              });
-              return new Response(stream, {
-                headers: {
-                  "Content-Type": "text/event-stream",
-                  "Cache-Control": "no-cache, no-transform",
-                  Connection: "keep-alive",
-                  "X-Accel-Buffering": "no"
-                }
-              });
-            }
-            if (options.onRequest) {
-              const customResponse = await options.onRequest(req);
-              if (customResponse)
-                return customResponse;
-            }
-            const route = resolveRouteMiddleware(path);
-            const extraNames = extraProtectedPrefixes.some((p) => path === p || path.startsWith(p.endsWith("/") ? p : `${p}/`)) ? ["auth"] : [];
-            const requested = [...globalMiddlewareNames, ...route.names, ...extraNames];
-            if (requested.length > 0) {
-              const expanded = expandMiddlewareNames(requested);
-              const cookies = parseCookies(req);
-              const ctx = {
-                path,
-                url,
-                params: route.params,
-                cookies,
-                redirect: (to, status = 302) => {
-                  const sep = to.includes("?") ? "&" : "?";
-                  const next = encodeURIComponent(path + (url.search || ""));
-                  return new Response(null, {
-                    status,
-                    headers: { Location: `${to}${sep}next=${next}` }
-                  });
-                }
-              };
-              for (const entry of expanded) {
-                const colon = entry.indexOf(":");
-                const name = colon === -1 ? entry : entry.slice(0, colon);
-                const args = colon === -1 ? [] : entry.slice(colon + 1).split(",");
-                const handler = middlewareRegistry[name];
-                if (!handler) {
-                  console.warn(`[stx serve] unknown middleware "${name}" on ${path}`);
-                  continue;
-                }
-                const result = await handler(req, ctx, ...args);
-                if (result instanceof Response)
-                  return result;
+                      } catch {}
+                    }, 15000);
+                  },
+                  cancel() {
+                    if (keepalive)
+                      clearInterval(keepalive);
+                    if (controller)
+                      hmrClients.delete(controller);
+                  }
+                });
+                return new Response(stream, {
+                  headers: {
+                    "Content-Type": "text/event-stream",
+                    "Cache-Control": "no-cache, no-transform",
+                    Connection: "keep-alive",
+                    "X-Accel-Buffering": "no"
+                  }
+                });
               }
-            }
-            if (options.routes) {
-              const routeHandler = options.routes[path];
-              if (routeHandler) {
-                return routeHandler(req);
+              if (options.onRequest) {
+                const customResponse = await options.onRequest(req);
+                if (customResponse)
+                  return customResponse;
               }
-            }
-            if (path.startsWith("/_stx/component/")) {
-              const componentName = decodeURIComponent(path.slice("/_stx/component/".length));
-              if (componentName) {
-                try {
-                  const { processDirectives, defaultConfig: defaultConfig4 } = await stxModule;
-                  const componentTemplate = `<${componentName} />`;
-                  const componentOpts = {
-                    ...defaultConfig4,
-                    ...componentsDir && { componentsDir },
-                    ...layoutsDir && { layoutsDir },
-                    ...partialsDir && { partialsDir },
-                    autoShell: false
-                  };
-                  const html = await processDirectives(componentTemplate, {}, `${componentsDir}/${componentName}.stx`, componentOpts, new Set);
-                  return new Response(html, {
-                    headers: { "Content-Type": "text/html; charset=utf-8", ...corsHeaders }
-                  });
-                } catch (e) {
-                  return new Response(`<div class="stx-async-error">${e.message}</div>`, {
-                    status: 500,
-                    headers: { "Content-Type": "text/html; charset=utf-8", ...corsHeaders }
-                  });
+              const route = resolveRouteMiddleware(path);
+              const extraNames = extraProtectedPrefixes.some((p) => path === p || path.startsWith(p.endsWith("/") ? p : `${p}/`)) ? ["auth"] : [];
+              const requested = [...globalMiddlewareNames, ...route.names, ...extraNames];
+              if (requested.length > 0) {
+                const expanded = expandMiddlewareNames(requested);
+                const cookies = parseCookies(req);
+                const ctx = {
+                  path,
+                  url,
+                  params: route.params,
+                  cookies,
+                  redirect: (to, status = 302) => {
+                    const sep = to.includes("?") ? "&" : "?";
+                    const next = encodeURIComponent(path + (url.search || ""));
+                    return new Response(null, {
+                      status,
+                      headers: { Location: `${to}${sep}next=${next}` }
+                    });
+                  }
+                };
+                for (const entry of expanded) {
+                  const colon = entry.indexOf(":");
+                  const name = colon === -1 ? entry : entry.slice(0, colon);
+                  const args = colon === -1 ? [] : entry.slice(colon + 1).split(",");
+                  const handler = middlewareRegistry[name];
+                  if (!handler) {
+                    console.warn(`[stx serve] unknown middleware "${name}" on ${path}`);
+                    continue;
+                  }
+                  const result = await handler(req, ctx, ...args);
+                  if (result instanceof Response)
+                    return result;
                 }
               }
-            }
-            if (path.startsWith("/api/data/") && req.method === "POST") {
-              try {
-                const tableName = path.replace("/api/data/", "").split("/")[0];
-                if (!tableName) {
-                  return new Response(JSON.stringify({ error: "Table name required" }), {
-                    status: 400,
-                    headers: { "Content-Type": "application/json", ...corsHeaders }
-                  });
+              if (options.routes) {
+                const routeHandler = options.routes[path];
+                if (routeHandler) {
+                  return routeHandler(req);
                 }
-                if (!/^[a-zA-Z_]\w*$/.test(tableName)) {
-                  return new Response(JSON.stringify({ error: "Invalid table name" }), {
-                    status: 400,
-                    headers: { "Content-Type": "application/json", ...corsHeaders }
-                  });
+              }
+              if (path.startsWith("/_stx/component/")) {
+                const componentName = decodeURIComponent(path.slice("/_stx/component/".length));
+                if (componentName) {
+                  try {
+                    const { processDirectives, defaultConfig: defaultConfig4 } = await stxModule;
+                    const componentTemplate = `<${componentName} />`;
+                    const componentOpts = {
+                      ...defaultConfig4,
+                      ...componentsDir && { componentsDir },
+                      ...layoutsDir && { layoutsDir },
+                      ...partialsDir && { partialsDir },
+                      autoShell: false
+                    };
+                    const html = await processDirectives(componentTemplate, {}, `${componentsDir}/${componentName}.stx`, componentOpts, new Set);
+                    return new Response(html, {
+                      headers: { "Content-Type": "text/html; charset=utf-8", ...corsHeaders }
+                    });
+                  } catch (e) {
+                    return new Response(`<div class="stx-async-error">${e.message}</div>`, {
+                      status: 500,
+                      headers: { "Content-Type": "text/html; charset=utf-8", ...corsHeaders }
+                    });
+                  }
                 }
-                const body = await req.json();
-                const { Database } = await import("bun:sqlite");
-                const dbPath = nodePath.resolve(process19.cwd(), "database/stacks.sqlite");
-                const db = new Database(dbPath);
+              }
+              if (path.startsWith("/api/data/") && req.method === "POST") {
                 try {
-                  const tableInfo = db.query(`PRAGMA table_info("${tableName}")`).all();
-                  const validColumns = tableInfo.map((c) => c.name).filter((n) => n !== "id" && n !== "created_at" && n !== "updated_at");
-                  const columns = [];
-                  const placeholders = [];
-                  const values = [];
-                  for (const col of validColumns) {
-                    if (body[col] !== undefined && body[col] !== "") {
-                      columns.push(col);
-                      placeholders.push("?");
-                      values.push(body[col]);
-                    }
-                  }
-                  const now = new Date().toISOString();
-                  if (tableInfo.some((c) => c.name === "created_at")) {
-                    columns.push("created_at");
-                    placeholders.push("?");
-                    values.push(now);
-                  }
-                  if (tableInfo.some((c) => c.name === "updated_at")) {
-                    columns.push("updated_at");
-                    placeholders.push("?");
-                    values.push(now);
+                  const tableName = path.replace("/api/data/", "").split("/")[0];
+                  if (!tableName) {
+                    return new Response(JSON.stringify({ error: "Table name required" }), {
+                      status: 400,
+                      headers: { "Content-Type": "application/json", ...corsHeaders }
+                    });
                   }
-                  if (columns.length === 0) {
-                    return new Response(JSON.stringify({ error: "No valid fields provided" }), {
+                  if (!/^[a-zA-Z_]\w*$/.test(tableName)) {
+                    return new Response(JSON.stringify({ error: "Invalid table name" }), {
                       status: 400,
                       headers: { "Content-Type": "application/json", ...corsHeaders }
                     });
                   }
-                  const query = `INSERT INTO "${tableName}" (${columns.join(", ")}) VALUES (${placeholders.join(", ")})`;
-                  const stmt = db.prepare(query);
-                  const result = stmt.run(...values);
-                  return new Response(JSON.stringify({
-                    success: true,
-                    id: result.lastInsertRowid,
-                    message: "Record created successfully"
-                  }), {
-                    status: 201,
-                    headers: { "Content-Type": "application/json", ...corsHeaders }
-                  });
-                } catch (error) {
-                  console.error("API Error:", error);
-                  return new Response(JSON.stringify({
-                    error: error.message || "Failed to create record"
-                  }), {
-                    status: 500,
-                    headers: { "Content-Type": "application/json", ...corsHeaders }
-                  });
-                } finally {
-                  db.close();
-                }
-              } catch {}
-            }
-            if (path === "/index")
-              path = "/";
-            if (path === "/") {
-              const indexContent = await getRoute("/");
-              if (!indexContent) {
-                const homeContent = await getRoute("/home");
-                if (homeContent) {
-                  return new Response(null, {
-                    status: 302,
-                    headers: {
-                      Location: "/home",
-                      ...corsHeaders
+                  const body = await req.json();
+                  const { Database } = await import("bun:sqlite");
+                  const dbPath = nodePath.resolve(process19.cwd(), "database/stacks.sqlite");
+                  const db = new Database(dbPath);
+                  try {
+                    const tableInfo = db.query(`PRAGMA table_info("${tableName}")`).all();
+                    const validColumns = tableInfo.map((c) => c.name).filter((n) => n !== "id" && n !== "created_at" && n !== "updated_at");
+                    const columns = [];
+                    const placeholders = [];
+                    const values = [];
+                    for (const col of validColumns) {
+                      if (body[col] !== undefined && body[col] !== "") {
+                        columns.push(col);
+                        placeholders.push("?");
+                        values.push(body[col]);
+                      }
                     }
-                  });
+                    const now = new Date().toISOString();
+                    if (tableInfo.some((c) => c.name === "created_at")) {
+                      columns.push("created_at");
+                      placeholders.push("?");
+                      values.push(now);
+                    }
+                    if (tableInfo.some((c) => c.name === "updated_at")) {
+                      columns.push("updated_at");
+                      placeholders.push("?");
+                      values.push(now);
+                    }
+                    if (columns.length === 0) {
+                      return new Response(JSON.stringify({ error: "No valid fields provided" }), {
+                        status: 400,
+                        headers: { "Content-Type": "application/json", ...corsHeaders }
+                      });
+                    }
+                    const query = `INSERT INTO "${tableName}" (${columns.join(", ")}) VALUES (${placeholders.join(", ")})`;
+                    const stmt = db.prepare(query);
+                    const result = stmt.run(...values);
+                    return new Response(JSON.stringify({
+                      success: true,
+                      id: result.lastInsertRowid,
+                      message: "Record created successfully"
+                    }), {
+                      status: 201,
+                      headers: { "Content-Type": "application/json", ...corsHeaders }
+                    });
+                  } catch (error) {
+                    console.error("API Error:", error);
+                    return new Response(JSON.stringify({
+                      error: error.message || "Failed to create record"
+                    }), {
+                      status: 500,
+                      headers: { "Content-Type": "application/json", ...corsHeaders }
+                    });
+                  } finally {
+                    db.close();
+                  }
+                } catch {}
+              }
+              if (path === "/index")
+                path = "/";
+              if (path === "/") {
+                const indexContent = await getRoute("/");
+                if (!indexContent) {
+                  const homeContent = await getRoute("/home");
+                  if (homeContent) {
+                    return new Response(null, {
+                      status: 302,
+                      headers: {
+                        Location: "/home",
+                        ...corsHeaders
+                      }
+                    });
+                  }
                 }
               }
-            }
-            const content = await getRoute(path);
-            if (content) {
-              const isSpaNav = req.headers.get("X-STX-Router") === "true";
-              if (isSpaNav) {
-                const layoutMatch = content.match(/<!-- stx-layout: ([^ ]+) -->/);
-                const pageLayout = layoutMatch ? layoutMatch[1] : "default";
-                const pageLayoutGroup = deriveLayoutGroup(pageLayout);
-                let fragment = content;
-                const headStyles = [];
-                const headMatch = content.match(/<head\b[^>]*>([\s\S]*?)<\/head>/i);
-                if (headMatch) {
-                  const headContent = headMatch[1];
-                  let styleMatch;
-                  const styleRe = /<style\b[^>]*>[\s\S]*?<\/style>/gi;
-                  while ((styleMatch = styleRe.exec(headContent)) !== null) {
-                    if (styleMatch[0].includes("data-crosswind")) {
-                      const cssContent = styleMatch[0].replace(/<style[^>]*>/, "").replace(/<\/style>/, "");
-                      const hiddenRule = cssContent.indexOf("[hidden]");
-                      if (hiddenRule !== -1) {
-                        const afterPreflight = cssContent.indexOf("}", hiddenRule) + 1;
-                        const utilities = cssContent.slice(afterPreflight).trim();
-                        if (utilities) {
-                          headStyles.push(`<style data-crosswind="fragment">${utilities}</style>`);
+              const content = await getRoute(path);
+              if (content) {
+                const isSpaNav = req.headers.get("X-STX-Router") === "true";
+                if (isSpaNav) {
+                  const layoutMatch = content.match(/<!-- stx-layout: ([^ ]+) -->/);
+                  const pageLayout = layoutMatch ? layoutMatch[1] : "default";
+                  const groupMetaMatch = content.match(/<meta\b[^>]*name=["']stx-layout-group["'][^>]*content=["']([^"']+)["'][^>]*>/i);
+                  const pageLayoutGroup = i18nConfig && i18nLocale ? `i18n:${i18nLocale}` : groupMetaMatch?.[1] || deriveLayoutGroup(pageLayout);
+                  let fragment = content;
+                  const headStyles = [];
+                  const headMatch = content.match(/<head\b[^>]*>([\s\S]*?)<\/head>/i);
+                  if (headMatch) {
+                    const headContent = headMatch[1];
+                    let styleMatch;
+                    const styleRe = /<style\b[^>]*>[\s\S]*?<\/style>/gi;
+                    while ((styleMatch = styleRe.exec(headContent)) !== null) {
+                      if (styleMatch[0].includes("data-crosswind")) {
+                        const cssContent = styleMatch[0].replace(/<style[^>]*>/, "").replace(/<\/style>/, "");
+                        const hiddenRule = cssContent.indexOf("[hidden]");
+                        if (hiddenRule !== -1) {
+                          const afterPreflight = cssContent.indexOf("}", hiddenRule) + 1;
+                          const utilities = cssContent.slice(afterPreflight).trim();
+                          if (utilities) {
+                            headStyles.push(`<style data-crosswind="fragment">${utilities}</style>`);
+                          }
                         }
+                        continue;
                       }
-                      continue;
+                      headStyles.push(styleMatch[0]);
                     }
-                    headStyles.push(styleMatch[0]);
                   }
-                }
-                const mainOpenMatch = fragment.match(/<main\b[^>]*>/i);
-                const mainCloseIdx = fragment.lastIndexOf("</main>");
-                if (mainOpenMatch && mainCloseIdx !== -1) {
-                  const bodyMatch = content.match(/<body\b[^>]*>/i);
-                  if (bodyMatch) {
-                    const bodyStart = bodyMatch.index + bodyMatch[0].length;
-                    const mainIdx = mainOpenMatch.index;
-                    const beforeMain = content.slice(bodyStart, mainIdx);
-                    let bodyStyleMatch;
-                    const bodyStyleRe = /<style\b[^>]*>[\s\S]*?<\/style>/gi;
-                    while ((bodyStyleMatch = bodyStyleRe.exec(beforeMain)) !== null) {
-                      headStyles.push(bodyStyleMatch[0]);
+                  const mainOpenMatch = fragment.match(/<main\b[^>]*>/i);
+                  const mainCloseIdx = fragment.lastIndexOf("</main>");
+                  if (mainOpenMatch && mainCloseIdx !== -1) {
+                    const bodyMatch = content.match(/<body\b[^>]*>/i);
+                    if (bodyMatch) {
+                      const bodyStart = bodyMatch.index + bodyMatch[0].length;
+                      const mainIdx = mainOpenMatch.index;
+                      const beforeMain = content.slice(bodyStart, mainIdx);
+                      let bodyStyleMatch;
+                      const bodyStyleRe = /<style\b[^>]*>[\s\S]*?<\/style>/gi;
+                      while ((bodyStyleMatch = bodyStyleRe.exec(beforeMain)) !== null) {
+                        headStyles.push(bodyStyleMatch[0]);
+                      }
                     }
+                    const mainStart = mainOpenMatch.index + mainOpenMatch[0].length;
+                    fragment = fragment.slice(mainStart, mainCloseIdx).trim();
                   }
-                  const mainStart = mainOpenMatch.index + mainOpenMatch[0].length;
-                  fragment = fragment.slice(mainStart, mainCloseIdx).trim();
-                }
-                const pageSetupScripts = [];
-                const allScriptRe = /<script\b[^>]*data-stx-scoped[^>]*>[\s\S]*?<\/script>/gi;
-                let setupMatch;
-                while ((setupMatch = allScriptRe.exec(content)) !== null) {
-                  const scriptContent = setupMatch[0];
-                  if (scriptContent.includes("__stx_early_mounts"))
-                    continue;
-                  if (scriptContent.includes("data-stx-reactive") && scriptContent.includes("window.__stx_reactive"))
-                    continue;
-                  pageSetupScripts.push(scriptContent);
-                }
-                const bridgeInitRe = /<script\b[^>]*data-stx-reactive[^>]*>(?![\s\S]*window\.__stx_reactive)[\s\S]*?<\/script>/gi;
-                while ((setupMatch = bridgeInitRe.exec(content)) !== null) {
-                  pageSetupScripts.push(setupMatch[0]);
-                }
-                fragment = fragment.replace(/<script data-stx-scoped>\s*;?\(function\(\)\s*\{[\s\S]*?<\/script>/g, "");
-                const clearStale = "<script data-stx-page>if(window.stx)window.stx._latestSetup=null;</script>";
-                fragment = `${headStyles.join(`
+                  const pageSetupScripts = [];
+                  const allScriptRe = /<script\b[^>]*data-stx-scoped[^>]*>[\s\S]*?<\/script>/gi;
+                  let setupMatch;
+                  while ((setupMatch = allScriptRe.exec(content)) !== null) {
+                    const scriptContent = setupMatch[0];
+                    if (scriptContent.includes("__stx_early_mounts"))
+                      continue;
+                    if (scriptContent.includes("data-stx-reactive") && scriptContent.includes("window.__stx_reactive"))
+                      continue;
+                    pageSetupScripts.push(scriptContent);
+                  }
+                  const bridgeInitRe = /<script\b[^>]*data-stx-reactive[^>]*>(?![\s\S]*window\.__stx_reactive)[\s\S]*?<\/script>/gi;
+                  while ((setupMatch = bridgeInitRe.exec(content)) !== null) {
+                    pageSetupScripts.push(setupMatch[0]);
+                  }
+                  fragment = fragment.replace(/<script data-stx-scoped>\s*;?\(function\(\)\s*\{[\s\S]*?<\/script>/g, "");
+                  const clearStale = "<script data-stx-page>if(window.stx)window.stx._latestSetup=null;</script>";
+                  fragment = `${headStyles.join(`
 `)}
 ${fragment}
 ${clearStale}
 ${pageSetupScripts.join(`
 `)}`;
-                return new Response(fragment, {
+                  return new Response(fragment, {
+                    headers: {
+                      "Content-Type": "text/html; charset=utf-8",
+                      "X-STX-Fragment": "true",
+                      "X-STX-Layout": pageLayout,
+                      "X-STX-Layout-Group": pageLayoutGroup,
+                      "Cache-Control": "no-store",
+                      ...corsHeaders
+                    }
+                  });
+                }
+                let cleaned = content;
+                let runtimeCount = 0;
+                cleaned = content.replace(/<script data-stx-scoped>\(function\(\)\{'use strict';var cloakStyle[\s\S]*?<\/script>/g, (match) => {
+                  runtimeCount++;
+                  return runtimeCount === 1 ? match : "";
+                });
+                return new Response(injectHmrClient(cleaned), {
                   headers: {
                     "Content-Type": "text/html; charset=utf-8",
-                    "X-STX-Fragment": "true",
-                    "X-STX-Layout": pageLayout,
-                    "X-STX-Layout-Group": pageLayoutGroup,
-                    "Cache-Control": "no-cache",
+                    "Cache-Control": "no-store",
                     ...corsHeaders
                   }
                 });
               }
-              let cleaned = content;
-              let runtimeCount = 0;
-              cleaned = content.replace(/<script data-stx-scoped>\(function\(\)\{'use strict';var cloakStyle[\s\S]*?<\/script>/g, (match) => {
-                runtimeCount++;
-                return runtimeCount === 1 ? match : "";
-              });
-              return new Response(injectHmrClient(cleaned), {
-                headers: {
-                  "Content-Type": "text/html; charset=utf-8",
-                  "Cache-Control": "no-cache",
-                  ...corsHeaders
-                }
-              });
-            }
-            const contentWithExt = await getRoute(`${path}.html`);
-            if (contentWithExt) {
-              return new Response(injectHmrClient(contentWithExt), {
-                headers: {
-                  "Content-Type": "text/html; charset=utf-8",
-                  "Cache-Control": "no-cache",
-                  ...corsHeaders
-                }
-              });
-            }
-            if (path.startsWith("/chunk-") || path.endsWith(".js") || path.endsWith(".css")) {
-              try {
-                const buildFile = Bun.file(`.stx${path}`);
-                if (await buildFile.exists()) {
-                  const ext = path.split(".").pop()?.toLowerCase();
-                  const contentType = ext === "css" ? "text/css" : ext === "js" ? "application/javascript" : "text/plain";
-                  return new Response(buildFile, {
-                    headers: {
-                      "Content-Type": contentType,
-                      "Cache-Control": "no-cache"
-                    }
-                  });
-                }
-              } catch {}
-            }
-            if (path.startsWith("/assets/") || path.startsWith("/resources/assets/")) {
-              await ensureAssets();
-              let assetPathname;
-              try {
-                assetPathname = decodeURIComponent(path);
-              } catch {
-                return new Response("Invalid asset path", { status: 400 });
+              const contentWithExt = await getRoute(`${path}.html`);
+              if (contentWithExt) {
+                return new Response(injectHmrClient(contentWithExt), {
+                  headers: {
+                    "Content-Type": "text/html; charset=utf-8",
+                    "Cache-Control": "no-store",
+                    ...corsHeaders
+                  }
+                });
               }
-              if (!isSafeAssetPath(assetPathname))
-                return new Response("Invalid asset path", { status: 400 });
-              for (const assetPath of assetRequestPaths(assetPathname)) {
+              if (path.startsWith("/chunk-") || path.endsWith(".js") || path.endsWith(".css")) {
                 try {
-                  const filePath = nodePath.resolve(process19.cwd(), `.${assetPath}`);
-                  const file = Bun.file(filePath);
-                  if (await file.exists()) {
-                    const ext = getAssetExtension(assetPath);
-                    if (isBundledAssetExtension(ext))
-                      return bundleBrowserAsset(filePath);
-                    return new Response(file, {
+                  const buildFile = Bun.file(`.stx${path}`);
+                  if (await buildFile.exists()) {
+                    const ext = path.split(".").pop()?.toLowerCase();
+                    const contentType = ext === "css" ? "text/css" : ext === "js" ? "application/javascript" : "text/plain";
+                    return new Response(buildFile, {
                       headers: {
-                        "Content-Type": staticContentTypes[ext || ""] || "application/octet-stream",
-                        "Cache-Control": "no-cache"
+                        "Content-Type": contentType,
+                        "Cache-Control": "no-store"
                       }
                     });
                   }
+                } catch {}
+              }
+              if (path.startsWith("/assets/") || path.startsWith("/resources/assets/")) {
+                await ensureAssets();
+                let assetPathname;
+                try {
+                  assetPathname = decodeURIComponent(path);
                 } catch {
-                  continue;
+                  return new Response("Invalid asset path", { status: 400 });
                 }
-              }
-            }
-            if ((req.method === "GET" || req.method === "HEAD") && path !== "/") {
-              const publicRoot = nodePath.resolve(process19.cwd(), publicDir);
-              let safePathname;
-              try {
-                safePathname = decodeURIComponent(path);
-              } catch {
-                safePathname = path;
-              }
-              if (!safePathname.includes("\x00")) {
-                const resolvedPath = nodePath.resolve(publicRoot, `.${safePathname}`);
-                const isInsidePublicRoot = resolvedPath === publicRoot || resolvedPath.startsWith(`${publicRoot}${nodePath.sep}`);
-                if (isInsidePublicRoot) {
+                if (!isSafeAssetPath(assetPathname))
+                  return new Response("Invalid asset path", { status: 400 });
+                for (const assetPath of assetRequestPaths(assetPathname)) {
                   try {
-                    const file = Bun.file(resolvedPath);
+                    const filePath = nodePath.resolve(process19.cwd(), `.${assetPath}`);
+                    const file = Bun.file(filePath);
                     if (await file.exists()) {
-                      const stat4 = await file.stat().catch(() => null);
-                      if (stat4 && !stat4.isDirectory()) {
-                        const ext = resolvedPath.split(".").pop()?.toLowerCase();
-                        return new Response(file, {
-                          headers: {
-                            "Content-Type": staticContentTypes[ext || ""] || "application/octet-stream",
-                            "Cache-Control": "no-cache"
-                          }
-                        });
-                      }
+                      const ext = getAssetExtension(assetPath);
+                      if (isBundledAssetExtension(ext))
+                        return bundleBrowserAsset(filePath);
+                      return new Response(file, {
+                        headers: {
+                          "Content-Type": staticContentTypes[ext || ""] || "application/octet-stream",
+                          "Cache-Control": "no-store"
+                        }
+                      });
                     }
-                  } catch {}
+                  } catch {
+                    continue;
+                  }
                 }
               }
-            }
-            if (path === "/favicon.ico") {
-              return new Response(null, { status: 204 });
-            }
-            const files = await discoverFiles();
-            const availableRoutes = [];
-            for (const filePath of files) {
-              let normalizedPath = filePath.replace(/^\.\//, "").replace(/\\/g, "/");
-              for (const pattern of patterns) {
-                const normalizedPattern = pattern.replace(/\\/g, "/").replace(/\/$/, "");
-                if (normalizedPath.startsWith(`${normalizedPattern}/`)) {
-                  normalizedPath = normalizedPath.slice(normalizedPattern.length + 1);
-                  break;
+              if ((req.method === "GET" || req.method === "HEAD") && path !== "/") {
+                const publicRoot = nodePath.resolve(process19.cwd(), publicDir);
+                let safePathname;
+                try {
+                  safePathname = decodeURIComponent(path);
+                } catch {
+                  safePathname = path;
+                }
+                if (!safePathname.includes("\x00")) {
+                  const resolvedPath = nodePath.resolve(publicRoot, `.${safePathname}`);
+                  const isInsidePublicRoot = resolvedPath === publicRoot || resolvedPath.startsWith(`${publicRoot}${nodePath.sep}`);
+                  if (isInsidePublicRoot) {
+                    try {
+                      const file = Bun.file(resolvedPath);
+                      if (await file.exists()) {
+                        const stat4 = await file.stat().catch(() => null);
+                        if (stat4 && !stat4.isDirectory()) {
+                          const ext = resolvedPath.split(".").pop()?.toLowerCase();
+                          return new Response(file, {
+                            headers: {
+                              "Content-Type": staticContentTypes[ext || ""] || "application/octet-stream",
+                              "Cache-Control": "no-store"
+                            }
+                          });
+                        }
+                      }
+                    } catch {}
+                  }
                 }
               }
-              let route2 = normalizedPath.replace(/\.(stx|md|html)$/, "");
-              if (route2.startsWith("pages/")) {
-                route2 = route2.slice(6);
+              if (path === "/favicon.ico") {
+                return new Response(null, { status: 204 });
               }
-              availableRoutes.push(`<li><a href="/${route2}">/${route2}</a></li>`);
-            }
-            const routesList = availableRoutes.join(`
+              const files = await discoverFiles();
+              const availableRoutes = [];
+              for (const filePath of files) {
+                let normalizedPath = filePath.replace(/^\.\//, "").replace(/\\/g, "/");
+                for (const pattern of patterns) {
+                  const normalizedPattern = pattern.replace(/\\/g, "/").replace(/\/$/, "");
+                  if (normalizedPath.startsWith(`${normalizedPattern}/`)) {
+                    normalizedPath = normalizedPath.slice(normalizedPattern.length + 1);
+                    break;
+                  }
+                }
+                let route2 = normalizedPath.replace(/\.(stx|md|html)$/, "");
+                if (route2.startsWith("pages/")) {
+                  route2 = route2.slice(6);
+                }
+                availableRoutes.push(`<li><a href="/${route2}">/${route2}</a></li>`);
+              }
+              const routesList = availableRoutes.join(`
 `);
-            return new Response(injectHmrClient(`
+              return new Response(injectHmrClient(`
         <!DOCTYPE html>
         <html>
           <head>
@@ -10016,9 +10119,13 @@ ${pageSetupScripts.join(`
           </body>
         </html>
       `), {
-              status: 404,
-              headers: { "Content-Type": "text/html; charset=utf-8" }
-            });
+                status: 404,
+                headers: { "Content-Type": "text/html; charset=utf-8" }
+              });
+            } finally {
+              activeServeLocale = null;
+              activeServeSearch = "";
+            }
           })();
           return applyI18nToResponse(_i18nResp, i18nLocale ?? (i18nConfig?.defaultLocale ?? "en"), path);
         }
@@ -10092,5 +10199,6 @@ if (import.meta.main) {
 }
 export {
   serve,
-  bundleBrowserAsset
+  bundleBrowserAsset,
+  buildDynamicRouteRegexes
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.66",
+  "version": "0.2.69",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -73,7 +73,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.66",
-    "stx-router": "0.2.66"
+    "@stacksjs/stx": "0.2.69",
+    "stx-router": "0.2.69"
   }
 }