bun-plugin-stx 0.2.303 → 0.2.304

package/dist/{chunk-awcgpf66.js → chunk-ahmasn2t.js}

@@ -209,11 +209,16 @@ class Router {
     this.routes = [];
     for (const dir of this.pagesDirs) {
       const files = scanDirectory(dir, extensions);
+      const localPatterns = new Map;
       for (const filePath of files) {
         const pattern = filePathToPattern(filePath, dir);
-        if (seenPatterns.has(pattern))
+        const identity = config.pagesDirs ? pattern.replace(/:[\w]+/g, ":param") : pattern;
+        if (config.pagesDirs && localPatterns.has(identity))
+          throw new Error(`Conflicting layer pages for ${pattern}: ${localPatterns.get(identity)} and ${filePath}`);
+        localPatterns.set(identity, filePath);
+        if (seenPatterns.has(identity))
           continue;
-        seenPatterns.add(pattern);
+        seenPatterns.add(identity);
         const { regex, params } = patternToRegex(pattern);
         const layouts = config.layouts !== false ? resolveLayoutChain(filePath, dir) : [];
         this.routes.push({
@@ -653,6 +658,17 @@ function getRouterScript() {
   var debug=!!o.debug;
   function log(){if(debug&&typeof console!=='undefined'&&console.log)console.log.apply(console,arguments)}
 
+  // Replace, never merge: absent payloads must forget the outgoing page's data.
+  // Run at the committed swap, not during prefetch or a superseded navigation.
+  function hydrateServerData(html){
+    window.__STX_RUNTIME_CONFIG__={};
+    var configMatch=html.match(/<script\\b[^>]*\\bdata-stx-runtime-config\\b[^>]*>([\\s\\S]*?)<\\/script>/i);
+    if(configMatch){try{var configValues=JSON.parse(configMatch[1]);if(configValues&&typeof configValues==='object'&&!Array.isArray(configValues))window.__STX_RUNTIME_CONFIG__=configValues}catch(e){}}
+    window.__STX_DATA__={};
+    var match=html.match(/<script\\b[^>]*\\bdata-stx-server-data\\b[^>]*>([\\s\\S]*?)<\\/script>/i);
+    if(match){try{var values=JSON.parse(match[1]);if(values&&typeof values==='object'&&!Array.isArray(values))window.__STX_DATA__=values}catch(e){}}
+  }
+
   // \u2500\u2500 Build skew (stacksjs/stx#1772) \u2500\u2500
   // The build that rendered THIS document, and therefore the build the runtime
   // executing right now came from. Under bun --watch a save restarts the server,
@@ -1541,6 +1557,7 @@ else {
         return Promise.resolve(false);
       }
       function doFragSwap(){
+        hydrateServerData(html);
         // Extract scripts from fragment before injecting HTML
         var fragScripts=[];
         var fragScriptId=0;
@@ -1971,6 +1988,10 @@ else {
         if(incomingSetupName)document.body.setAttribute('data-stx',incomingSetupName);
       }
 
+      // Teardown (including outgoing layout chrome) has finished. Its destroy
+      // callbacks must not be able to invalidate the incoming page's snapshot.
+      hydrateServerData(html);
+
       // \u2500\u2500 Load new external <head> scripts \u2500\u2500
       var loadedSrcs={};
       document.querySelectorAll('head script[src]').forEach(function(s){loadedSrcs[s.src]=1});

package/dist/serve.js

@@ -9193,6 +9193,8 @@ async function serve(options) {
     const stxMod = options.stxModule ? options.stxModule : await defaultStxModule;
     if (stxMod && typeof stxMod.loadStxConfig === "function") {
       const pluginLoaded = await stxMod.loadStxConfig();
+      if (pluginLoaded?.runtimeConfig)
+        stxConfig.runtimeConfig = pluginLoaded.runtimeConfig;
       if (pluginLoaded?._pluginComponentDirs)
         stxConfig._pluginComponentDirs = pluginLoaded._pluginComponentDirs;
       if (pluginLoaded?._pluginPageDirs)
@@ -9709,7 +9711,7 @@ function __stxOverlay(errs){
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-awcgpf66.js");
+      const { Router } = await import("./chunk-ahmasn2t.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)
@@ -9935,6 +9937,7 @@ function __stxOverlay(errs){
     const context = {
       __filename: filePath,
       __dirname: nodePath.dirname(filePath),
+      __stx_options: stxConfig,
       __stx_runtime_head: {}
     };
     const { processDirectives, extractVariables, defaultConfig: defaultConfig4, generateSpaShell, injectRouterScript } = await stxModule;
@@ -9958,6 +9961,7 @@ function __stxOverlay(errs){
       buildMode: "serve",
       ssr: stxConfig.ssr ?? defaultStxConfig.ssr ?? true,
       app: stxConfig.app || {},
+      runtimeConfig: stxConfig.runtimeConfig,
       ..."strict" in stxConfig && { strict: stxConfig.strict },
       ..."router" in stxConfig && { router: stxConfig.router },
       ..."debug" in stxConfig && { debug: stxConfig.debug },
@@ -10131,6 +10135,7 @@ function __stxOverlay(errs){
     const { processDirectives, extractVariables, defaultConfig: defaultConfig4, injectRouterScript: injectRouter } = await stxModule;
     injectServeLocaleContext(context);
     injectServeRequestContext(context, reqCtx);
+    context.__stx_options = stxConfig;
     for (const scriptBody of dynServerScripts) {
       await extractVariables(scriptBody, context, filePath);
     }
@@ -10147,6 +10152,7 @@ function __stxOverlay(errs){
       buildMode: "serve",
       ssr: stxConfig.ssr ?? defaultStxConfig.ssr ?? true,
       app: stxConfig.app || {},
+      runtimeConfig: stxConfig.runtimeConfig,
       ..."strict" in stxConfig && { strict: stxConfig.strict },
       ..."router" in stxConfig && { router: stxConfig.router },
       ..."debug" in stxConfig && { debug: stxConfig.debug },

package/package.json

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