bun-plugin-stx 0.2.133 → 0.2.135

package/dist/{chunk-sqrxjkre.js → chunk-9e56perq.js}

@@ -1007,6 +1007,7 @@ else {
         var fragScripts=[];
         var fragScriptId=0;
         var fragStyles=[];
+        var fragCrosswindHrefs=[];
         var fragCrosswindCSS=null;
         var cleanFrag=html.replace(new RegExp('<scr'+'ipt\\\\b([^>]*)>([\\\\s\\\\S]*?)<\\\\/scr'+'ipt>','gi'),function(m,attrs,code){
           if(code&&code.trim()&&!isSignalsRuntimeScript({hasAttribute:function(name){return name==='data-stx-runtime'&&attrs.indexOf('data-stx-runtime')!==-1}},code)){
@@ -1029,6 +1030,12 @@ else {
           }
           return '';
         });
+        cleanFrag=cleanFrag.replace(new RegExp('<link\\\\b([^>]*)>','gi'),function(m,attrs){
+          if(attrs.indexOf('data-crosswind')===-1)return m;
+          var hrefMatch=attrs.match(/\\bhref=(["'])(.*?)\\1/i);
+          if(hrefMatch&&hrefMatch[2])fragCrosswindHrefs.push(hrefMatch[2]);
+          return '';
+        });
         // Remove old page styles (not crosswind \u2014 that gets merged)
         document.querySelectorAll('style[data-stx-page]').forEach(function(s){s.remove()});
         // Merge crosswind CSS from fragment into existing crosswind style
@@ -1044,6 +1051,19 @@ else {
             document.head.appendChild(cw);
           }
         }
+        fragCrosswindHrefs.forEach(function(href){
+          var absolute=new URL(href,location.href).href;
+          var exists=false;
+          document.querySelectorAll('head link[data-crosswind][href]').forEach(function(link){
+            if(new URL(link.getAttribute('href'),location.href).href===absolute)exists=true;
+          });
+          if(exists)return;
+          var link=document.createElement('link');
+          link.setAttribute('data-crosswind','generated');
+          link.setAttribute('rel','stylesheet');
+          link.setAttribute('href',href);
+          document.head.appendChild(link);
+        });
         // Add new page styles
         fragStyles.forEach(function(s){
           var el=document.createElement('style');

package/dist/serve.js

@@ -9325,7 +9325,7 @@ After installing: bun add bun-plugin-stx`);
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-sqrxjkre.js");
+      const { Router } = await import("./chunk-9e56perq.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)
@@ -9994,6 +9994,21 @@ ${html}`;
                   return new Response(null, { headers });
                 return new Response(content2, { headers });
               }
+              const crosswindAsset = path.match(/^\/_stx\/crosswind\.([a-f0-9]{16})\.css$/);
+              if (crosswindAsset) {
+                const stx = await stxModule;
+                const content2 = stx.getCrosswindServeAsset(crosswindAsset[1]);
+                if (content2 === undefined)
+                  return new Response("Crosswind asset not found", { status: 404 });
+                const headers = {
+                  "Content-Type": "text/css; charset=utf-8",
+                  "Cache-Control": "public, max-age=31536000, immutable",
+                  ...corsHeaders
+                };
+                if (req.method === "HEAD")
+                  return new Response(null, { headers });
+                return new Response(content2, { headers });
+              }
               if (options.onRequest) {
                 const hookResult = await options.onRequest(req);
                 if (hookResult instanceof Response)
@@ -10166,6 +10181,8 @@ ${html}`;
                   const pageLayoutGroup = i18nConfig && i18nLocale ? `i18n:${i18nLocale}` : groupMetaMatch?.[1] || deriveLayoutGroup(pageLayout);
                   let fragment = content;
                   let containerAttrs = "";
+                  let mainContentStart = -1;
+                  let mainContentEnd = -1;
                   const headStyles = [];
                   const headMatch = content.match(/<head\b[^>]*>([\s\S]*?)<\/head>/i);
                   if (headMatch) {
@@ -10187,6 +10204,11 @@ ${html}`;
                       }
                       headStyles.push(styleMatch[0]);
                     }
+                    const crosswindLinkRe = /<link\b[^>]*\bdata-crosswind=(?:"generated"|'generated')[^>]*>/gi;
+                    let crosswindLinkMatch;
+                    while ((crosswindLinkMatch = crosswindLinkRe.exec(headContent)) !== null) {
+                      headStyles.push(crosswindLinkMatch[0]);
+                    }
                   }
                   const mainOpenMatch = fragment.match(/<main\b[^>]*>/i);
                   const mainCloseIdx = fragment.lastIndexOf("</main>");
@@ -10204,13 +10226,24 @@ ${html}`;
                     }
                     containerAttrs = mainOpenMatch[0].replace(/^<main\b/i, "").replace(/\/?>$/, "").trim();
                     const mainStart = mainOpenMatch.index + mainOpenMatch[0].length;
+                    mainContentStart = mainStart;
+                    mainContentEnd = mainCloseIdx;
                     fragment = fragment.slice(mainStart, mainCloseIdx).trim();
                   }
                   const pageSetupScripts = [];
+                  const pageSetupScriptOffsets = new Set;
+                  const appendOutsideMainScript = (match) => {
+                    const offset = match.index;
+                    const insideMain = mainContentStart !== -1 && offset >= mainContentStart && offset < mainContentEnd;
+                    if (insideMain || pageSetupScriptOffsets.has(offset))
+                      return;
+                    pageSetupScriptOffsets.add(offset);
+                    pageSetupScripts.push(match[0]);
+                  };
                   const routeParamsRe = /<script\b[^>]*data-stx-route-params[^>]*>[\s\S]*?<\/script>/gi;
                   let setupMatch;
                   while ((setupMatch = routeParamsRe.exec(content)) !== null) {
-                    pageSetupScripts.push(setupMatch[0]);
+                    appendOutsideMainScript(setupMatch);
                   }
                   const allScriptRe = /<script\b[^>]*data-stx-scoped[^>]*>[\s\S]*?<\/script>/gi;
                   while ((setupMatch = allScriptRe.exec(content)) !== null) {
@@ -10219,11 +10252,11 @@ ${html}`;
                       continue;
                     if (scriptContent.includes("data-stx-reactive") && scriptContent.includes("window.__stx_reactive"))
                       continue;
-                    pageSetupScripts.push(scriptContent);
+                    appendOutsideMainScript(setupMatch);
                   }
                   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]);
+                    appendOutsideMainScript(setupMatch);
                   }
                   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>";

package/package.json

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