bun-plugin-stx 0.2.418 → 0.2.420

package/dist/serve.js

@@ -8716,7 +8716,7 @@ var defaultConfigDir4 = /* @__PURE__ */ resolve12(process20.cwd(), "config");
 var defaultGeneratedDir4 = /* @__PURE__ */ resolve12(process20.cwd(), "src/generated");
 
 // src/serve.ts
-import { BUILD_ID_HEADER, decodeTitleEntities, extractPageResponseStatus, findContainerRegion, FRAGMENT_CACHE_CONTROL, getBuildId, mergeCssConfig, readResponseHeaders, readResponseStatus, SPA_NAV_HEADER, spaNavVaryHeaders, stateDir, stateDirName } from "@stacksjs/stx";
+import { BUILD_ID_HEADER, decodeTitleEntities, extractPageResponseStatus, findContainerRegion, FRAGMENT_CACHE_CONTROL, getBuildId, mergeCssConfig, readResponseHeaders, readResponseStatus, renderFontCSS, 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";
@@ -9005,7 +9005,11 @@ function csrfCookieHeader(token, secure) {
   ].filter(Boolean).join("; ");
 }
 function buildDynamicRouteRegexes(fileRouteBase) {
-  const toPattern = (p) => p.replace(/\[\.\.\.([^\]]+)\]/g, "(.+)").replace(/\[([^\]]+)\]/g, (param, _name, offset, whole) => offset + param.length === whole.length ? `${FILE_SEGMENT_GUARD}([^/]+)` : "([^/]+)").replace(/\//g, "\\/");
+  const paramGroup = (param, _name, offset, whole) => {
+    const last = offset + param.length === whole.length;
+    return last ? `${FILE_SEGMENT_GUARD}([^/]+)` : "([^/]+)";
+  };
+  const toPattern = (p) => p.replace(/\[\.\.\.([^\]]+)\]/g, "(.+)").replace(/\[([^\]]+)\]/g, paramGroup).replace(/\//g, "\\/");
   const patterns = [new RegExp(`^${toPattern(fileRouteBase)}$`)];
   const noIndex = fileRouteBase.replace(/\/index$/, "");
   if (noIndex !== fileRouteBase)
@@ -10102,7 +10106,7 @@ function __stxOverlay(errs){
           shortcutCSS += `@media (prefers-color-scheme: dark) { .dark .${name} { ${darkDecls.join(" ")} } }
 `;
       }
-      return cssCssCache.remember(cacheKey, tokenCSS + baseCss + shortcutCSS);
+      return cssCssCache.remember(cacheKey, renderFontCSS(cw.CSSGenerator, merged) + tokenCSS + baseCss + shortcutCSS);
     } catch (error) {
       console.warn("Failed to generate Css CSS:", error);
       return "";
@@ -10601,7 +10605,10 @@ ${block}`;
                 headers.set("x-stx-domain-route", requestHost(req));
                 req = new Request(original, { headers, method: req.method, body: req.body, redirect: req.redirect, duplex: "half" });
               } else if (req.method === "GET" || req.method === "HEAD") {
-                const location = resolveDomainElsewhere(requestHost(req), original.pathname, original.search, domainRoutes, (pathname) => pathname.startsWith("/api/") || pathname.startsWith("/_stx/") || pathname.startsWith("/.well-known/") || isStaticAssetPath(pathname) || publicFileExists(pathname, publicDir));
+                const staysHere = (pathname) => {
+                  return pathname.startsWith("/api/") || pathname.startsWith("/_stx/") || pathname.startsWith("/.well-known/") || isStaticAssetPath(pathname) || publicFileExists(pathname, publicDir);
+                };
+                const location = resolveDomainElsewhere(requestHost(req), original.pathname, original.search, domainRoutes, staysHere);
                 if (location) {
                   if (req.headers.get(SPA_NAV_HEADER) === "true")
                     return new Response(null, { status: 200, headers: { "X-STX-Location": location, "Cache-Control": "no-store", Vary: SPA_NAV_HEADER } });

package/package.json

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