bun-plugin-stx 0.2.219 → 0.2.221

package/dist/serve.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 import {
-  deriveLayoutGroup
+  extractLayoutMetadata
 } from "./chunk-93ete56h.js";
 import {
   __require
@@ -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, getBuildId, mergeCrosswindConfig, readResponseHeaders, readResponseStatus, stateDir, stateDirName } from "@stacksjs/stx";
+import { BUILD_ID_HEADER, extractPageResponseStatus, findContainerRegion, FRAGMENT_CACHE_CONTROL, getBuildId, mergeCrosswindConfig, 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";
@@ -10508,12 +10508,11 @@ ${html}`;
                 }
                 if (content) {
                   const responseStatus = reqCtx.responseStatus ?? 200;
-                  const isSpaNav = req.headers.get("X-STX-Router") === "true";
+                  const isSpaNav = req.headers.get(SPA_NAV_HEADER) === "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);
+                    const layoutMetadata = extractLayoutMetadata(content);
+                    const pageLayout = layoutMetadata.layout;
+                    const pageLayoutGroup = i18nConfig && i18nLocale ? `i18n:${i18nLocale}` : layoutMetadata.group;
                     let fragment = content;
                     let containerAttrs = "";
                     let mainContentStart = -1;
@@ -10624,7 +10623,8 @@ ${trailingPageScripts.join(`
                         ...pageTitle && { "X-STX-Title": encodeURIComponent(pageTitle) },
                         [BUILD_ID_HEADER]: getBuildId(),
                         ...containerAttrs && { "X-STX-Container-Attrs": encodeURIComponent(containerAttrs) },
-                        "Cache-Control": "no-store",
+                        ...spaNavVaryHeaders(),
+                        "Cache-Control": FRAGMENT_CACHE_CONTROL,
                         ...corsHeaders
                       }
                     });
@@ -10657,6 +10657,7 @@ ${trailingPageScripts.join(`
                   }
                   const pageHeaders = new Headers({
                     "Content-Type": "text/html; charset=utf-8",
+                    ...spaNavVaryHeaders(),
                     "Cache-Control": "no-store",
                     ...corsHeaders
                   });

package/package.json

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