bun-plugin-stx 0.2.134 → 0.2.135

package/dist/serve.js

@@ -10181,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) {
@@ -10224,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) {
@@ -10239,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.134",
+  "version": "0.2.135",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",