bun-plugin-stx 0.2.280 → 0.2.283

package/dist/{chunk-cm8d5hgw.js → chunk-kn8qad4k.js}

@@ -890,7 +890,7 @@ function getRouterScript() {
     return blocks;
   }
 
-  function mergeCrosswindCSS(existing,incoming){
+  function mergeCss(existing,incoming){
     var blocks=extractCssBlocks(incoming);
     var newBlocks=[];
     for(var bi=0;bi<blocks.length;bi++){
@@ -1420,8 +1420,8 @@ else {
         var fragScripts=[];
         var fragScriptId=0;
         var fragStyles=[];
-        var fragCrosswindHrefs=[];
-        var fragCrosswindCSS=null;
+        var fragCssHrefs=[];
+        var fragCss=null;
         var fragExternalScripts=[];
         var cleanFrag=html.replace(new RegExp('<scr'+'ipt\\\\b([^>]*)>([\\\\s\\\\S]*?)<\\\\/scr'+'ipt>','gi'),function(m,attrs,code){
           // A data block is not code, and everything below this line assumes it
@@ -1462,43 +1462,43 @@ else {
           return '';
         });
         cleanFrag=cleanFrag.replace(new RegExp('<sty'+'le\\\\b([^>]*)>([\\\\s\\\\S]*?)<\\\\/sty'+'le>','gi'),function(m,attrs,css){
-          if(attrs.indexOf('data-crosswind')!==-1){
-            fragCrosswindCSS=css;
+          if(attrs.indexOf('data-css')!==-1){
+            fragCss=css;
           }else{
             fragStyles.push({attrs:attrs,css:css});
           }
           return '';
         });
         cleanFrag=cleanFrag.replace(new RegExp('<link\\\\b([^>]*)>','gi'),function(m,attrs){
-          if(attrs.indexOf('data-crosswind')===-1)return m;
+          if(attrs.indexOf('data-css')===-1)return m;
           var hrefMatch=attrs.match(/\\bhref=(["'])(.*?)\\1/i);
-          if(hrefMatch&&hrefMatch[2])fragCrosswindHrefs.push(hrefMatch[2]);
+          if(hrefMatch&&hrefMatch[2])fragCssHrefs.push(hrefMatch[2]);
           return '';
         });
-        // Remove old page styles (not crosswind \u2014 that gets merged)
+        // Remove old page styles (not css \u2014 that gets merged)
         document.querySelectorAll('style[data-stx-page]').forEach(function(s){s.remove()});
-        // Merge crosswind CSS from fragment into existing crosswind style
-        if(fragCrosswindCSS){
-          var curCrosswind=document.querySelector('head style[data-crosswind]');
-          if(curCrosswind){
-            var merged=mergeCrosswindCSS(curCrosswind.textContent||'',fragCrosswindCSS);
-            if(merged)curCrosswind.textContent=merged;
+        // Merge css CSS from fragment into existing css style
+        if(fragCss){
+          var curCss=document.querySelector('head style[data-css]');
+          if(curCss){
+            var merged=mergeCss(curCss.textContent||'',fragCss);
+            if(merged)curCss.textContent=merged;
           }else{
             var cw=document.createElement('style');
-            cw.setAttribute('data-crosswind','generated');
-            cw.textContent=fragCrosswindCSS;
+            cw.setAttribute('data-css','generated');
+            cw.textContent=fragCss;
             document.head.appendChild(cw);
           }
         }
-        fragCrosswindHrefs.forEach(function(href){
+        fragCssHrefs.forEach(function(href){
           var absolute=new URL(href,location.href).href;
           var exists=false;
-          document.querySelectorAll('head link[data-crosswind][href]').forEach(function(link){
+          document.querySelectorAll('head link[data-css][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('data-css','generated');
           link.setAttribute('rel','stylesheet');
           link.setAttribute('href',href);
           document.head.appendChild(link);
@@ -1668,20 +1668,20 @@ else {
       var curStyles=document.querySelectorAll('head style');
       var newStyles=doc.querySelectorAll('head style');
 
-      // Merge crosswind styles instead of replacing \u2014 persistent elements
+      // Merge css styles instead of replacing \u2014 persistent elements
       // (nav, footer) outside <main> still need their utility classes
-      var curCrosswind=document.querySelector('head style[data-crosswind]');
-      var newCrosswind=null;
-      newStyles.forEach(function(s){if(s.getAttribute('data-crosswind'))newCrosswind=s});
+      var curCss=document.querySelector('head style[data-css]');
+      var newCss=null;
+      newStyles.forEach(function(s){if(s.getAttribute('data-css'))newCss=s});
 
-      if(curCrosswind&&newCrosswind){
-        var merged=mergeCrosswindCSS(curCrosswind.textContent||'',newCrosswind.textContent||'');
-        if(merged)curCrosswind.textContent=merged;
+      if(curCss&&newCss){
+        var merged=mergeCss(curCss.textContent||'',newCss.textContent||'');
+        if(merged)curCss.textContent=merged;
       }
 
       var incoming=[];
       newStyles.forEach(function(s){
-        if(!keepIds[s.id]&&!s.getAttribute('data-crosswind')){
+        if(!keepIds[s.id]&&!s.getAttribute('data-css')){
           var ns=document.createElement('style');
           ns.textContent=s.textContent;
           ns.setAttribute('data-stx-incoming','');
@@ -1690,17 +1690,17 @@ else {
         }
       });
 
-      // If no existing crosswind but new page has one, add it
-      if(!curCrosswind&&newCrosswind){
+      // If no existing css but new page has one, add it
+      if(!curCss&&newCss){
         var ns=document.createElement('style');
-        ns.textContent=newCrosswind.textContent;
-        ns.setAttribute('data-crosswind',newCrosswind.getAttribute('data-crosswind'));
+        ns.textContent=newCss.textContent;
+        ns.setAttribute('data-css',newCss.getAttribute('data-css'));
         document.head.appendChild(ns);
       }
 
-      // Remove old styles (except persistent ones, crosswind, and incoming)
+      // Remove old styles (except persistent ones, css, and incoming)
       curStyles.forEach(function(s){
-        if(!keepIds[s.id]&&!s.hasAttribute('data-stx-incoming')&&!s.hasAttribute('data-crosswind'))s.remove();
+        if(!keepIds[s.id]&&!s.hasAttribute('data-stx-incoming')&&!s.hasAttribute('data-css'))s.remove();
       });
 
       incoming.forEach(function(s){s.removeAttribute('data-stx-incoming')});

package/dist/serve.d.ts

@@ -224,7 +224,7 @@ export declare interface ServeOptions {
   watchDirs?: string[]
   renderCache?: boolean
   renderCacheVary?: 'request' | 'source'
-  crosswindCacheLimit?: number
+  cssCacheLimit?: number
   prewarmRenderCache?: boolean | number
   publicDir?: string
   quiet?: boolean
@@ -257,7 +257,7 @@ export declare interface ServeOptions {
   }
 }
 /**
- * The slice of Crosswind this server calls, taken from the package's own types
+ * The slice of Css this server calls, taken from the package's own types
  * rather than restated here.
  *
  * `CSSGenerator` has to be a constructor type, because it is `new`-ed below.
@@ -267,4 +267,4 @@ export declare interface ServeOptions {
  * what made this hard to see in the first place (see the deleted
  * `cwcss-crosswind.d.ts`). `typeof import` cannot drift from the real engine.
  */
-declare type CrosswindEngine = Pick<typeof import('@cwcss/crosswind'), 'CSSGenerator' | 'config'>;
+declare type CssEngine = Pick<typeof import('@stacksjs/ts-css/engine'), 'CSSGenerator' | 'config'>;

package/dist/serve.js

@@ -8718,7 +8718,7 @@ var defaultConfigDir4 = /* @__PURE__ */ resolve12(process20.cwd(), "config");
 var defaultGeneratedDir4 = /* @__PURE__ */ resolve12(process20.cwd(), "src/generated");
 
 // src/serve.ts
-import { BUILD_ID_HEADER, extractPageResponseStatus, findContainerRegion, FRAGMENT_CACHE_CONTROL, getBuildId, mergeCrosswindConfig, readResponseHeaders, readResponseStatus, SPA_NAV_HEADER, spaNavVaryHeaders, stateDir, stateDirName } from "@stacksjs/stx";
+import { BUILD_ID_HEADER, extractPageResponseStatus, findContainerRegion, FRAGMENT_CACHE_CONTROL, getBuildId, mergeCssConfig, readResponseHeaders, readResponseStatus, SPA_NAV_HEADER, spaNavVaryHeaders, stateDir, stateDirName } from "@stacksjs/stx";
 import { buildCodeFrame, locateFailureLine } from "@stacksjs/stx/build-message";
 import { clearBundleFailures, getBundleFailures } from "@stacksjs/stx/client-script-bundler";
 import { actionRedirectResponse, compressResponse, runPageAction as sharedRunPageAction } from "@stacksjs/stx";
@@ -8805,6 +8805,14 @@ async function runPageMiddleware(options) {
 }
 
 // src/serve.ts
+var ENGINE_PACKAGE_ENTRIES = [
+  ["@stacksjs", "ts-css", "dist", "engine", "index.js"],
+  ["@stacksjs", "ts-css", "src", "engine", "index.ts"]
+];
+var ENGINE_SPECIFIERS = [
+  "@stacksjs/ts-css/engine",
+  "@stacksjs/ts-css/dist/engine/index.js"
+];
 var defaultStxModule = import("@stacksjs/stx");
 var REACTIVE_TEMPLATE_DIRECTIVE_RE = /@for|:for|@if|:if|@else|:else|x-for|x-if|x-else/;
 function extractServerScriptsFromTemplate(content) {
@@ -9224,7 +9232,7 @@ After installing: bun add bun-plugin-stx`);
   const htmlCache = new Map;
   const ENABLE_HTML_CACHE = options.renderCache === true;
   const RENDER_CACHE_VARY = options.renderCacheVary ?? "request";
-  const crosswindCssCache = boundedCache(options.crosswindCacheLimit ?? 512);
+  const cssCssCache = boundedCache(options.cssCacheLimit ?? 512);
   const hmrClients = new Set;
   const hmrEncoder = new TextEncoder;
   function broadcastHmr(event) {
@@ -9340,7 +9348,7 @@ function __stxOverlay(errs){
             sourceFiles = null;
           routes.clear();
           htmlCache.clear();
-          crosswindCssCache.clear();
+          cssCssCache.clear();
           resolvedStxModule?.clearDevCaches?.();
           resolvedStxModule?.clearStoreCache?.();
           resolvedStxModule?.clearComposableCache?.();
@@ -9677,7 +9685,7 @@ function __stxOverlay(errs){
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-cm8d5hgw.js");
+      const { Router } = await import("./chunk-kn8qad4k.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)
@@ -9718,49 +9726,52 @@ function __stxOverlay(errs){
     }
     return sig;
   }
-  let crosswindModule = null;
-  let crosswindLoadAttempted = false;
-  let crosswindUserConfigPromise = null;
-  async function loadCrosswind() {
-    if (crosswindLoadAttempted)
-      return crosswindModule;
-    crosswindLoadAttempted = true;
+  let cssModule = null;
+  let cssLoadAttempted = false;
+  let cssUserConfigPromise = null;
+  async function loadCssEngine() {
+    if (cssLoadAttempted)
+      return cssModule;
+    cssLoadAttempted = true;
     let dir = process19.cwd();
     while (dir !== nodePath.dirname(dir)) {
       for (const store of ["node_modules", "pantry"]) {
-        for (const entry of ["dist/index.js", "src/index.ts"]) {
-          const candidate = nodePath.join(dir, store, "@cwcss", "crosswind", entry);
+        for (const entry of ENGINE_PACKAGE_ENTRIES) {
+          const candidate = nodePath.join(dir, store, ...entry);
           try {
             if (!await Bun.file(candidate).exists())
               continue;
             const mod = await import(candidate);
             if (mod?.CSSGenerator) {
-              crosswindModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
-              return crosswindModule;
+              cssModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
+              return cssModule;
             }
           } catch {}
         }
       }
       dir = nodePath.dirname(dir);
     }
+    for (const specifier of ENGINE_SPECIFIERS) {
+      try {
+        const mod = await import(specifier);
+        if (mod?.CSSGenerator) {
+          cssModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
+          return cssModule;
+        }
+      } catch {}
+    }
     try {
-      const mod = await import("./chunk-h1h4nv6w.js");
-      crosswindModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
-      return crosswindModule;
+      const localPath = nodePath.join(process19.env.HOME || "", "Code/Tools/crosswind/packages/toolkit/src/engine/index.ts");
+      const mod = await import(localPath);
+      cssModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
+      return cssModule;
     } catch {
-      try {
-        const localPath = nodePath.join(process19.env.HOME || "", "Code/Tools/crosswind/packages/crosswind/src/index.ts");
-        const mod = await import(localPath);
-        crosswindModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
-        return crosswindModule;
-      } catch {
-        return null;
-      }
+      return null;
     }
   }
-  async function generateCrosswindCSS(htmlContent) {
+  async function generateCss(htmlContent) {
     try {
-      const cw = await loadCrosswind();
+      const cw = await loadCssEngine();
       if (!cw)
         return "";
       const classRegex = /class\s*=\s*["']([^"']+)["']/gi;
@@ -9790,23 +9801,23 @@ function __stxOverlay(errs){
       }
       if (classes.size === 0)
         return "";
-      if (!crosswindUserConfigPromise) {
-        crosswindUserConfigPromise = loadConfig6({
-          name: "crosswind",
+      if (!cssUserConfigPromise) {
+        cssUserConfigPromise = loadConfig6({
+          name: "css",
           cwd: process19.cwd(),
           defaultConfig: {},
           checkEnv: false,
           verbose: false
         });
       }
-      const userConfig = await crosswindUserConfigPromise;
-      const merged = mergeCrosswindConfig(cw.config, userConfig);
+      const userConfig = await cssUserConfigPromise;
+      const merged = mergeCssConfig(cw.config, userConfig);
       const generatorConfig = merged.config;
       const { includePreflight, minify, tokenCSS } = merged;
       for (const cls of merged.safelist)
         classes.add(cls);
       const cacheKey = [...classes].sort().join(" ");
-      const cached = crosswindCssCache.read(cacheKey);
+      const cached = cssCssCache.read(cacheKey);
       if (cached !== undefined)
         return cached;
       const generator = new cw.CSSGenerator(generatorConfig);
@@ -9849,9 +9860,9 @@ function __stxOverlay(errs){
           shortcutCSS += `@media (prefers-color-scheme: dark) { .dark .${name} { ${darkDecls.join(" ")} } }
 `;
       }
-      return crosswindCssCache.remember(cacheKey, tokenCSS + baseCss + shortcutCSS);
+      return cssCssCache.remember(cacheKey, tokenCSS + baseCss + shortcutCSS);
     } catch (error) {
-      console.warn("Failed to generate Crosswind CSS:", error);
+      console.warn("Failed to generate Css CSS:", error);
       return "";
     }
   }
@@ -10434,12 +10445,12 @@ ${block}`;
                     }
                   });
                 }
-                const crosswindAsset = path.match(/^\/_stx\/crosswind\.([a-f0-9]{16})\.css$/);
-                if (crosswindAsset) {
+                const cssAsset = path.match(/^\/_stx\/css\.([a-f0-9]{16})\.css$/);
+                if (cssAsset) {
                   const stx = await stxModule;
-                  const content2 = stx.getCrosswindServeAsset(crosswindAsset[1]);
+                  const content2 = stx.getCssServeAsset(cssAsset[1]);
                   if (content2 === undefined)
-                    return new Response("Crosswind asset not found", { status: 404 });
+                    return new Response("Css asset not found", { status: 404 });
                   const headers = {
                     "Content-Type": "text/css; charset=utf-8",
                     "Cache-Control": "public, max-age=31536000, immutable",
@@ -10634,24 +10645,24 @@ ${block}`;
                       let styleMatch;
                       const styleRe = /<style\b[^>]*>[\s\S]*?<\/style>/gi;
                       while ((styleMatch = styleRe.exec(headContent)) !== null) {
-                        if (styleMatch[0].includes("data-crosswind")) {
+                        if (styleMatch[0].includes("data-css")) {
                           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>`);
+                              headStyles.push(`<style data-css="fragment">${utilities}</style>`);
                             }
                           }
                           continue;
                         }
                         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 cssLinkRe = /<link\b[^>]*\bdata-css=(?:"generated"|'generated')[^>]*>/gi;
+                      let cssLinkMatch;
+                      while ((cssLinkMatch = cssLinkRe.exec(headContent)) !== null) {
+                        headStyles.push(cssLinkMatch[0]);
                       }
                     }
                     const containerSelector = stxConfig?.router?.container || "main";

package/package.json

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