meno-core 1.1.4 → 1.1.6

package/dist/lib/server/index.js

@@ -20,20 +20,21 @@ import {
   resolveSlugToPageId,
   rewriteComponentRefs,
   translatePath
-} from "../../chunks/chunk-FQBIC2OB.js";
+} from "../../chunks/chunk-YMBUSHII.js";
 import {
   syncNetlifyLocale404Block
 } from "../../chunks/chunk-2AR55GYH.js";
 import {
   deepMergeStyles,
   extractAttributesFromNode,
+  getTemplateVars,
   inlineSvgStyleRules,
   isHtmlMapping,
   mergeNodeStyles,
   processStructure,
   resolveHtmlMapping,
   skipEmptyTemplateAttributes
-} from "../../chunks/chunk-ZEDLSHYQ.js";
+} from "../../chunks/chunk-GHNLTFCN.js";
 import {
   DEFAULT_BREAKPOINTS,
   DEFAULT_FLUID_RANGE,
@@ -76,6 +77,7 @@ import {
   isVoidElement,
   logRuntimeError,
   markAsSlotContent,
+  mergeInstanceClasses,
   mergeResponsiveStyles,
   normalizeBreakpointConfig,
   processItemPropsTemplate,
@@ -89,11 +91,12 @@ import {
   rewriteViewportUnitsInStylesheet,
   scalePropertyValue,
   singularize,
+  stripClassOverriddenStyleProps,
   toFriendlyError,
   validateCMSDraftItem,
   validateCMSItem,
   validateComponentDefinition
-} from "../../chunks/chunk-UOF4MCAD.js";
+} from "../../chunks/chunk-KX2LPIZZ.js";
 import {
   DEFAULT_I18N_CONFIG,
   buildLocalizedPath,
@@ -1094,9 +1097,6 @@ var ConfigService = class {
     }
     return this.config.customCode;
   }
-  getShowMenoBadge() {
-    return this.config?.showMenoBadge === true;
-  }
   getImageFormat() {
     if (this.config?.imageFormat === "avif") return "avif";
     return "webp";
@@ -5549,7 +5549,11 @@ async function renderNode(node, ctx) {
       if (embedInteractiveStyles && embedInteractiveStyles.length > 0) {
         embedCssVariables = registerInteractiveStyles(ctx, elementClass2, embedInteractiveStyles);
       }
-      const embedStyleAttr = buildCssVariableStyleAttr(embedCssVariables);
+      const embedTemplateVars = getTemplateVars(node);
+      if (embedTemplateVars) {
+        embedCssVariables = { ...embedCssVariables, ...embedTemplateVars };
+      }
+      const embedStyleAttr2 = buildCssVariableStyleAttr(embedCssVariables);
       const attrClassName3 = nodeAttributes2.className || nodeAttributes2.class || "";
       if (attrClassName3) {
         classNames.push(attrClassName3);
@@ -5558,7 +5562,7 @@ async function renderNode(node, ctx) {
       delete nodeAttributes2.class;
       const attrs2 = buildAttributes(nodeAttributes2);
       const classAttr2 = classNames.length > 0 ? ` class="${escapeHtml(classNames.filter(Boolean).join(" "))}"` : "";
-      return `<span${classAttr2}${embedStyleAttr}${attrs2}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${optimizedHtml}</span>`;
+      return `<span${classAttr2}${embedStyleAttr2}${attrs2}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${optimizedHtml}</span>`;
     }
     const attrClassName2 = nodeAttributes2.className || nodeAttributes2.class || "";
     if (attrClassName2) {
@@ -5568,7 +5572,8 @@ async function renderNode(node, ctx) {
     delete nodeAttributes2.class;
     const attrs = buildAttributes(nodeAttributes2);
     const classAttr = classNames.length > 0 ? ` class="${escapeHtml(classNames.filter(Boolean).join(" "))}"` : "";
-    return `<span${classAttr}${attrs}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${optimizedHtml}</span>`;
+    const embedStyleAttr = buildCssVariableStyleAttr(getTemplateVars(node) ?? {});
+    return `<span${classAttr}${embedStyleAttr}${attrs}${editorAttrs(ctx, { isSlotContent: isSlotContent(node) })}>${optimizedHtml}</span>`;
   }
   if (isLinkNode(node)) {
     let href = typeof node.href === "string" ? node.href : "#";
@@ -5609,8 +5614,12 @@ async function renderNode(node, ctx) {
       if (olinkInteractiveStyles && olinkInteractiveStyles.length > 0) {
         olinkCssVariables = registerInteractiveStyles(ctx, elementClass2, olinkInteractiveStyles);
       }
-      olinkStyleAttr = buildCssVariableStyleAttr(olinkCssVariables);
     }
+    const olinkTemplateVars = getTemplateVars(node);
+    if (olinkTemplateVars) {
+      olinkCssVariables = { ...olinkCssVariables, ...olinkTemplateVars };
+    }
+    olinkStyleAttr = buildCssVariableStyleAttr(olinkCssVariables);
     const attrClassName2 = nodeAttributes2.className || nodeAttributes2.class || "";
     if (attrClassName2) {
       classNames.push(attrClassName2);
@@ -5706,6 +5715,12 @@ async function renderNode(node, ctx) {
       }
     }
   }
+  const nodeTemplateVars = getTemplateVars(node);
+  if (nodeTemplateVars) {
+    for (const [varName, value] of Object.entries(nodeTemplateVars)) {
+      resolvedStyle[varName] = value;
+    }
+  }
   const attrClassName = nodeAttributes.className || nodeAttributes.class || "";
   const nodeAttributesWithoutClass = { ...nodeAttributes };
   delete nodeAttributesWithoutClass.className;
@@ -5776,13 +5791,19 @@ async function renderComponent(componentName, propsWithStyleAndAttrs, children,
         mergeNodeStyles(rootNode, propsWithStyleAndAttrs.style);
       }
       if (propsWithStyleAndAttrs.className) {
+        const instanceClassName = propsWithStyleAndAttrs.className;
+        if (rootNode.style) {
+          const stripped = stripClassOverriddenStyleProps(rootNode.style, instanceClassName);
+          if (stripped) rootNode.style = stripped;
+          else delete rootNode.style;
+        }
         if (isHtmlNode(rootNode) || isLinkNode(rootNode)) {
           if (!rootNode.attributes) rootNode.attributes = {};
-          const existingClass = rootNode.attributes.class || "";
-          rootNode.attributes.class = existingClass ? `${existingClass} ${propsWithStyleAndAttrs.className}` : propsWithStyleAndAttrs.className;
+          const own = (rootNode.attributes.class || "").split(/\s+/).filter(Boolean);
+          rootNode.attributes.class = mergeInstanceClasses(own, instanceClassName).join(" ");
         } else {
-          const existingClassName = rootNode.props.className || "";
-          rootNode.props.className = existingClassName ? `${existingClassName} ${propsWithStyleAndAttrs.className}` : propsWithStyleAndAttrs.className;
+          const own = (rootNode.props.className || "").split(/\s+/).filter(Boolean);
+          rootNode.props.className = mergeInstanceClasses(own, instanceClassName).join(" ");
         }
       }
       Object.assign(rootNode.props, nodeAttributes);
@@ -6041,8 +6062,12 @@ function renderLocaleList(node, ctx) {
       if (localeListInteractiveStyles && localeListInteractiveStyles.length > 0) {
         localeListCssVariables = registerInteractiveStyles(ctx, elementClass, localeListInteractiveStyles);
       }
-      localeListStyleAttr = buildCssVariableStyleAttr(localeListCssVariables);
     }
+    const localeListTemplateVars = getTemplateVars(node);
+    if (localeListTemplateVars) {
+      localeListCssVariables = { ...localeListCssVariables, ...localeListTemplateVars };
+    }
+    localeListStyleAttr = buildCssVariableStyleAttr(localeListCssVariables);
     const containerClassAttr = containerClasses.length > 0 ? ` class="${escapeHtml(containerClasses.join(" "))}"` : "";
     let itemClasses = [];
     if (node.itemStyle) {
@@ -6372,8 +6397,8 @@ function minifyCSS(code) {
   if (!code.trim()) return code;
   return code.replace(/\/\*[\s\S]*?\*\//g, "").replace(/\s*([{};:,>~])\s*/g, "$1").replace(/\s+/g, " ").replace(/\{\s+/g, "{").replace(/\s+\}/g, "}").replace(/;}/g, "}").trim();
 }
-async function collectPageCssImports(frontmatter, pagePath, nonceAttr) {
-  if (!frontmatter?.includes(".css")) return "";
+function extractCssImportSpecs(frontmatter) {
+  if (!frontmatter?.includes(".css")) return [];
   const seen = /* @__PURE__ */ new Set();
   const specs = [];
   const re = /import\b[^'"]*['"]([^'"]+\.css)(?:\?[^'"]*)?['"]/g;
@@ -6385,25 +6410,63 @@ async function collectPageCssImports(frontmatter, pagePath, nonceAttr) {
     if (spec.endsWith("styles/theme.css")) continue;
     specs.push(spec);
   }
-  if (specs.length === 0) return "";
+  return specs;
+}
+function usedComponentDefs(pageData, components) {
+  const entries = Object.entries(components);
+  const used = /* @__PURE__ */ new Map();
+  let hay = JSON.stringify(pageData ?? "");
+  let grew = true;
+  while (grew) {
+    grew = false;
+    for (const [name, def] of entries) {
+      if (used.has(name) || !hay.includes(`"${name}"`)) continue;
+      used.set(name, def);
+      hay += JSON.stringify(def ?? "");
+      grew = true;
+    }
+  }
+  return [...used.values()];
+}
+async function collectPageCssImports(pageData, components, pagePath, nonceAttr) {
   const pageDir = posix.join("src/pages", posix.dirname(pagePath || "/"));
+  const sources = [];
+  if (Object.values(components).some((d) => d?.component?._frontmatter?.includes(".css"))) {
+    for (const def of usedComponentDefs(pageData, components)) {
+      for (const spec of extractCssImportSpecs(def.component?._frontmatter)) {
+        sources.push({ spec, baseDir: "src/components" });
+      }
+    }
+  }
+  for (const spec of extractCssImportSpecs(pageData._frontmatter)) {
+    sources.push({ spec, baseDir: pageDir });
+  }
+  if (sources.length === 0) return "";
   const tags = [];
-  for (const spec of specs) {
+  const linkedRemote = /* @__PURE__ */ new Set();
+  const inlinedFiles = /* @__PURE__ */ new Set();
+  for (const { spec, baseDir } of sources) {
     if (/^(?:https?:)?\/\//.test(spec)) {
+      if (linkedRemote.has(spec)) continue;
+      linkedRemote.add(spec);
       tags.push(`<link rel="stylesheet" href="${escapeHtml(spec)}">`);
       continue;
     }
-    const candidates = spec.startsWith("/") ? [spec.slice(1)] : [posix.normalize(posix.join(pageDir, spec)), `src/${spec.replace(/^(?:\.\.?\/)+/, "")}`];
+    const candidates = spec.startsWith("/") ? [spec.slice(1)] : [posix.normalize(posix.join(baseDir, spec)), `src/${spec.replace(/^(?:\.\.?\/)+/, "")}`];
     let css = null;
+    let resolved = null;
     for (const rel of candidates) {
       if (rel.startsWith("..")) continue;
       try {
         css = await readTextFile(resolveProjectPath(rel));
+        resolved = rel;
         break;
       } catch {
       }
     }
-    if (css == null) continue;
+    if (css == null || resolved == null) continue;
+    if (inlinedFiles.has(resolved)) continue;
+    inlinedFiles.add(resolved);
     const content = rewriteViewportUnitsInStylesheet(css).replace(/<\/style/gi, "<\\/style");
     tags.push(`<style${nonceAttr} data-meno-page-css="${escapeHtml(spec)}">${content}</style>`);
   }
@@ -6491,11 +6554,10 @@ async function generateSSRHTML(pageDataOrOptions, globalComponents = {}, pagePat
   await configService.load();
   const globalLibraries = configService.getLibraries() || { js: [], css: [] };
   const globalCustomCode = configService.getCustomCode();
-  const menoBadgeHtml = configService.getShowMenoBadge() ? `<style${nonceAttr}>.meno-badge{position:fixed;bottom:12px;left:12px;z-index:9999;background:#000;color:#fff;padding:4px 10px;border-radius:6px;font-size:12px;font-family:system-ui,sans-serif;text-decoration:none;opacity:0.8;transition:opacity 0.2s}.meno-badge:hover,.meno-badge:focus{opacity:1}</style><a class="meno-badge" href="https://meno.so" target="_blank" rel="noopener">Made in Meno</a>` : "";
   const mergedCustomCode = {
     head: [globalCustomCode.head, pageCustomCode?.head].filter(Boolean).join("\n"),
     bodyStart: [globalCustomCode.bodyStart, pageCustomCode?.bodyStart].filter(Boolean).join("\n"),
-    bodyEnd: [globalCustomCode.bodyEnd, pageCustomCode?.bodyEnd, menoBadgeHtml].filter(Boolean).join("\n")
+    bodyEnd: [globalCustomCode.bodyEnd, pageCustomCode?.bodyEnd].filter(Boolean).join("\n")
   };
   const componentLibraries = collectComponentLibraries(components, pageData.components || {});
   const globalPlusComponent = mergeLibraries(globalLibraries, componentLibraries) || { js: [], css: [] };
@@ -6665,12 +6727,12 @@ ${externalJavaScript}`;
   const scriptPreloadTag = extScriptPath ? `<link rel="preload" href="${extScriptPath}" as="script">` : "";
   const imagePreloadTags = generateImagePreloadTags(rendered.preloadImages);
   const wsUrl = serverPort ? `'ws://localhost:${serverPort}/hmr'` : `location.origin.replace('http','ws')+'/hmr'`;
-  const liveReloadScript = injectLiveReload ? `<script${nonceAttr}>(function(){var ws,timer,gen=0,lastSrvRoot=null,dn=document.querySelector('meta[name="csp-nonce"]'),docNonce=dn?dn.getAttribute('content'):'';function strip(s){return s?s.replace(/[?&]_r=\\d+/,''):''}function classList(el){return (el.getAttribute('class')||'').split(/\\s+/).filter(Boolean)}function syncEl(cur,srv,old){var cc=classList(cur),sc=classList(srv),oc=old?new Set(classList(old)):new Set();var rt=cc.filter(function(c){return !oc.has(c)});var seen=new Set(),fin=[];sc.concat(rt).forEach(function(c){if(!seen.has(c)){seen.add(c);fin.push(c)}});var fs=fin.join(' ');if((cur.getAttribute('class')||'')!==fs){if(fs)cur.setAttribute('class',fs);else cur.removeAttribute('class')}for(var i=0;i<srv.attributes.length;i++){var a=srv.attributes[i];if(a.name==='class')continue;var ov=old?old.getAttribute(a.name):null;if(a.value!==ov){if(cur.getAttribute(a.name)!==a.value)cur.setAttribute(a.name,a.value)}}if(old){for(var i=0;i<old.attributes.length;i++){var a=old.attributes[i];if(a.name==='class')continue;if(!srv.hasAttribute(a.name)&&cur.hasAttribute(a.name))cur.removeAttribute(a.name)}}}function syncText(cur,srv){var cc=cur.childNodes,sc=srv.childNodes;for(var i=0;i<sc.length;i++){var s=sc[i],c=cc[i];if(s.nodeType===3&&c&&c.nodeType===3){if(c.textContent!==s.textContent)c.textContent=s.textContent}}}function ek(el){var p=el.getAttribute('data-element-path'),ci=el.getAttribute('data-cms-item-index');return ci?p+'|'+ci:p}function structKey(root){var e=root.querySelectorAll('[data-element-path]'),k=[];for(var i=0;i<e.length;i++)k.push(ek(e[i]));return k.sort().join('~')}function softSync(curR,srvR,oldR){var ce=curR.querySelectorAll('[data-element-path]');var sbp={},se=srvR.querySelectorAll('[data-element-path]');for(var i=0;i<se.length;i++)sbp[ek(se[i])]=se[i];var obp={};if(oldR){var oe=oldR.querySelectorAll('[data-element-path]');for(var i=0;i<oe.length;i++)obp[ek(oe[i])]=oe[i]}for(var i=0;i<ce.length;i++){var c=ce[i],p=ek(c),s=sbp[p];if(!s)continue;syncEl(c,s,obp[p]);syncText(c,s)}syncText(curR,srvR)}function connect(){ws=new WebSocket(${wsUrl});ws.onmessage=function(e){var d=JSON.parse(e.data);if(d.type==='hmr:libraries-update'){location.reload()}else if(d.type==='hmr:update'||d.type==='hmr:cms-update'||d.type==='hmr:colors-update'||d.type==='hmr:variables-update')hotReload()};ws.onclose=function(){clearTimeout(timer);timer=setTimeout(connect,1000)}}function hotReload(){var g=++gen;var sx=window.scrollX,sy=window.scrollY;fetch(location.href,{cache:'no-store'}).then(function(r){return r.text()}).then(function(html){if(g!==gen)return;var p=new DOMParser();var d=p.parseFromString(html,'text/html');var or=document.getElementById('root'),nr=d.getElementById('root');var oscr=document.querySelector('script[src^="/_scripts/"]'),nscr=d.querySelector('script[src^="/_scripts/"]');var oss=oscr?strip(oscr.getAttribute('src')):'',nss=nscr?strip(nscr.getAttribute('src')):'';var hardReset=(oss!==nss)||!lastSrvRoot||!or||!nr||structKey(lastSrvRoot)!==structKey(nr);if(or&&nr){if(hardReset){if(or.innerHTML!==nr.innerHTML)or.innerHTML=nr.innerHTML}else{softSync(or,nr,lastSrvRoot)}}if(nr)lastSrvRoot=nr.cloneNode(true);var os=document.getElementById('meno-styles'),ns=d.getElementById('meno-styles');if(os&&ns&&os.textContent!==ns.textContent)os.textContent=ns.textContent;var nh=d.documentElement;if(nh){var nl=nh.getAttribute('lang')||'en',nt=nh.getAttribute('theme')||'light';if(document.documentElement.getAttribute('lang')!==nl)document.documentElement.setAttribute('lang',nl);if(document.documentElement.getAttribute('theme')!==nt)document.documentElement.setAttribute('theme',nt)}var ocms=document.querySelectorAll('script[id^="meno-cms-"]'),ncms=d.querySelectorAll('script[id^="meno-cms-"]');var ock=JSON.stringify(Array.prototype.map.call(ocms,function(s){return [s.id,s.textContent]}));var nck=JSON.stringify(Array.prototype.map.call(ncms,function(s){return [s.id,s.textContent]}));if(ock!==nck){ocms.forEach(function(s){s.remove()});ncms.forEach(function(s){var c=document.createElement('script');c.type=s.type;c.id=s.id;if(docNonce)c.nonce=docNonce;c.textContent=s.textContent;document.head.appendChild(c)})}window.__menoHotReload=true;var olib=document.querySelectorAll('body > script[src^="/libraries/"]'),nlib=d.querySelectorAll('body > script[src^="/libraries/"]');var olk=JSON.stringify(Array.prototype.map.call(olib,function(s){return strip(s.getAttribute('src'))}).sort());var nlk=JSON.stringify(Array.prototype.map.call(nlib,function(s){return strip(s.getAttribute('src'))}).sort());if(olk!==nlk){olib.forEach(function(o){o.remove()});nlib.forEach(function(n){var src=n.getAttribute('src');var ls=document.createElement('script');ls.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();document.body.appendChild(ls)})}if(!hardReset){window.scrollTo(sx,sy)}else{if(oscr)oscr.remove();if(nscr){var src=nscr.getAttribute('src');var s=document.createElement('script');s.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();s.onload=function(){document.dispatchEvent(new Event('DOMContentLoaded'));window.scrollTo(sx,sy)};s.onerror=function(){window.scrollTo(sx,sy)};document.body.appendChild(s)}else{document.dispatchEvent(new Event('DOMContentLoaded'));window.scrollTo(sx,sy)}}}).catch(function(){location.reload()})}var iR=document.getElementById('root');if(iR)lastSrvRoot=iR.cloneNode(true);connect()})()</script>` : "";
-  const scrollHandlerScript = injectLiveReload ? `<script${nonceAttr}>(function(){window.addEventListener('message',function(e){if(e.data.type==='GET_SCROLL_POSITION'){window.parent.postMessage({type:'SCROLL_POSITION_RESPONSE',scrollX:window.scrollX,scrollY:window.scrollY},'*')}else if(e.data.type==='SET_SCROLL_POSITION'){window.scrollTo(e.data.scrollX,e.data.scrollY)}})})()</script>` : "";
+  const liveReloadScript = injectLiveReload ? `<script${nonceAttr}>(function(){var ws,timer,gen=0,lastSrvRoot=null,dn=document.querySelector('meta[name="csp-nonce"]'),docNonce=dn?dn.getAttribute('content'):'';function strip(s){return s?s.replace(/[?&]_r=\\d+/,''):''}function iScroll(x,y){var de=document.documentElement,b=document.body,pd=de.style.scrollBehavior,pb=b?b.style.scrollBehavior:'';de.style.scrollBehavior='auto';if(b)b.style.scrollBehavior='auto';try{window.scrollTo(x,y)}catch(e){}de.style.scrollBehavior=pd;if(b)b.style.scrollBehavior=pb}function classList(el){return (el.getAttribute('class')||'').split(/\\s+/).filter(Boolean)}function syncEl(cur,srv,old){var cc=classList(cur),sc=classList(srv),oc=old?new Set(classList(old)):new Set();var rt=cc.filter(function(c){return !oc.has(c)});var seen=new Set(),fin=[];sc.concat(rt).forEach(function(c){if(!seen.has(c)){seen.add(c);fin.push(c)}});var fs=fin.join(' ');if((cur.getAttribute('class')||'')!==fs){if(fs)cur.setAttribute('class',fs);else cur.removeAttribute('class')}for(var i=0;i<srv.attributes.length;i++){var a=srv.attributes[i];if(a.name==='class')continue;var ov=old?old.getAttribute(a.name):null;if(a.value!==ov){if(cur.getAttribute(a.name)!==a.value)cur.setAttribute(a.name,a.value)}}if(old){for(var i=0;i<old.attributes.length;i++){var a=old.attributes[i];if(a.name==='class')continue;if(!srv.hasAttribute(a.name)&&cur.hasAttribute(a.name))cur.removeAttribute(a.name)}}}function syncText(cur,srv){var cc=cur.childNodes,sc=srv.childNodes;for(var i=0;i<sc.length;i++){var s=sc[i],c=cc[i];if(s.nodeType===3&&c&&c.nodeType===3){if(c.textContent!==s.textContent)c.textContent=s.textContent}}}function ek(el){var p=el.getAttribute('data-element-path'),ci=el.getAttribute('data-cms-item-index');return ci?p+'|'+ci:p}function structKey(root){var e=root.querySelectorAll('[data-element-path]'),k=[];for(var i=0;i<e.length;i++)k.push(ek(e[i]));return k.sort().join('~')}function softSync(curR,srvR,oldR){var ce=curR.querySelectorAll('[data-element-path]');var sbp={},se=srvR.querySelectorAll('[data-element-path]');for(var i=0;i<se.length;i++)sbp[ek(se[i])]=se[i];var obp={};if(oldR){var oe=oldR.querySelectorAll('[data-element-path]');for(var i=0;i<oe.length;i++)obp[ek(oe[i])]=oe[i]}for(var i=0;i<ce.length;i++){var c=ce[i],p=ek(c),s=sbp[p];if(!s)continue;syncEl(c,s,obp[p]);syncText(c,s)}syncText(curR,srvR)}function connect(){ws=new WebSocket(${wsUrl});ws.onmessage=function(e){var d=JSON.parse(e.data);if(d.type==='hmr:libraries-update'){location.reload()}else if(d.type==='hmr:update'||d.type==='hmr:cms-update'||d.type==='hmr:colors-update'||d.type==='hmr:variables-update')hotReload()};ws.onclose=function(){clearTimeout(timer);timer=setTimeout(connect,1000)}}function hotReload(){var g=++gen;var sx=window.scrollX,sy=window.scrollY;fetch(location.href,{cache:'no-store'}).then(function(r){return r.text()}).then(function(html){if(g!==gen)return;var p=new DOMParser();var d=p.parseFromString(html,'text/html');var or=document.getElementById('root'),nr=d.getElementById('root');var oscr=document.querySelector('script[src^="/_scripts/"]'),nscr=d.querySelector('script[src^="/_scripts/"]');var oss=oscr?strip(oscr.getAttribute('src')):'',nss=nscr?strip(nscr.getAttribute('src')):'';var hardReset=(oss!==nss)||!lastSrvRoot||!or||!nr||structKey(lastSrvRoot)!==structKey(nr);if(or&&nr){if(hardReset){if(or.innerHTML!==nr.innerHTML)or.innerHTML=nr.innerHTML}else{softSync(or,nr,lastSrvRoot)}}if(nr)lastSrvRoot=nr.cloneNode(true);var os=document.getElementById('meno-styles'),ns=d.getElementById('meno-styles');if(os&&ns&&os.textContent!==ns.textContent)os.textContent=ns.textContent;var ops=document.querySelectorAll('style[data-meno-page-css]'),nps=d.querySelectorAll('style[data-meno-page-css]');var pcMismatch=ops.length!==nps.length;if(!pcMismatch){for(var pi=0;pi<nps.length;pi++){if(ops[pi].getAttribute('data-meno-page-css')!==nps[pi].getAttribute('data-meno-page-css')){pcMismatch=true;break}if(ops[pi].textContent!==nps[pi].textContent)ops[pi].textContent=nps[pi].textContent}}if(pcMismatch){location.reload();return}var nh=d.documentElement;if(nh){var nl=nh.getAttribute('lang')||'en',nt=nh.getAttribute('theme')||'light';if(document.documentElement.getAttribute('lang')!==nl)document.documentElement.setAttribute('lang',nl);if(document.documentElement.getAttribute('theme')!==nt)document.documentElement.setAttribute('theme',nt)}var ocms=document.querySelectorAll('script[id^="meno-cms-"]'),ncms=d.querySelectorAll('script[id^="meno-cms-"]');var ock=JSON.stringify(Array.prototype.map.call(ocms,function(s){return [s.id,s.textContent]}));var nck=JSON.stringify(Array.prototype.map.call(ncms,function(s){return [s.id,s.textContent]}));if(ock!==nck){ocms.forEach(function(s){s.remove()});ncms.forEach(function(s){var c=document.createElement('script');c.type=s.type;c.id=s.id;if(docNonce)c.nonce=docNonce;c.textContent=s.textContent;document.head.appendChild(c)})}window.__menoHotReload=true;var olib=document.querySelectorAll('body > script[src^="/libraries/"]'),nlib=d.querySelectorAll('body > script[src^="/libraries/"]');var olk=JSON.stringify(Array.prototype.map.call(olib,function(s){return strip(s.getAttribute('src'))}).sort());var nlk=JSON.stringify(Array.prototype.map.call(nlib,function(s){return strip(s.getAttribute('src'))}).sort());if(olk!==nlk){olib.forEach(function(o){o.remove()});nlib.forEach(function(n){var src=n.getAttribute('src');var ls=document.createElement('script');ls.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();document.body.appendChild(ls)})}if(!hardReset){iScroll(sx,sy)}else{if(oscr)oscr.remove();if(nscr){var src=nscr.getAttribute('src');var s=document.createElement('script');s.src=src+(src.indexOf('?')>-1?'&':'?')+'_r='+Date.now();s.onload=function(){document.dispatchEvent(new Event('DOMContentLoaded'));iScroll(sx,sy)};s.onerror=function(){iScroll(sx,sy)};document.body.appendChild(s)}else{document.dispatchEvent(new Event('DOMContentLoaded'));iScroll(sx,sy)}}}).catch(function(){location.reload()})}var iR=document.getElementById('root');if(iR)lastSrvRoot=iR.cloneNode(true);connect()})()</script>` : "";
+  const scrollHandlerScript = injectLiveReload ? `<script${nonceAttr}>(function(){window.addEventListener('message',function(e){if(e.data.type==='GET_SCROLL_POSITION'){window.parent.postMessage({type:'SCROLL_POSITION_RESPONSE',scrollX:window.scrollX,scrollY:window.scrollY},'*')}else if(e.data.type==='SET_SCROLL_POSITION'){var de=document.documentElement,b=document.body,pd=de.style.scrollBehavior,pb=b?b.style.scrollBehavior:'';de.style.scrollBehavior='auto';if(b)b.style.scrollBehavior='auto';window.scrollTo(e.data.scrollX,e.data.scrollY);de.style.scrollBehavior=pd;if(b)b.style.scrollBehavior=pb}})})()</script>` : "";
   const styleContent = useBundled ? finalCSS : `
     ${combinedCSS.split("\n").join("\n    ")}
   `;
-  const pageCssTags = await collectPageCssImports(pageData._frontmatter, pagePath, nonceAttr);
+  const pageCssTags = await collectPageCssImports(pageData, components, path5, nonceAttr);
   const htmlDocument = `<!DOCTYPE html>
 <html lang="${rendered.locale}" theme="${themeConfig.default}">
 <head>
@@ -12452,6 +12514,7 @@ var FileWatcher = class {
   templatesWatcher = null;
   colorsWatcher = null;
   variablesWatcher = null;
+  themeCssWatcher = null;
   enumsWatcher = null;
   cmsWatcher = null;
   imagesWatcher = null;
@@ -12543,6 +12606,33 @@ var FileWatcher = class {
       }
     });
   }
+  /**
+   * Start watching `src/styles/theme.css` — the token source of truth for
+   * astro-format projects, where colors AND variables share the one file
+   * (colors.json / variables.json were migrated away, so the two watchers
+   * above never fire there). An external edit (e.g. an AI tool adding tokens)
+   * must invalidate both service caches and refresh connected clients, or the
+   * new tokens only appear after a dev-server restart. Deferred attach:
+   * `src/styles` may not exist yet (theme.css lands later via migration or an
+   * external tool). No-op in legacy JSON projects (no `src/`).
+   */
+  watchThemeCss(dirPath = join7(getProjectRoot(), "src", "styles")) {
+    attachWhenDirExists(
+      dirPath,
+      () => watch(dirPath, { recursive: false }, async (_event, filename) => {
+        if (filename !== "theme.css") return;
+        if (this.callbacks.onColorsChange) {
+          await this.callbacks.onColorsChange();
+        }
+        if (this.callbacks.onVariablesChange) {
+          await this.callbacks.onVariablesChange();
+        }
+      }),
+      (w) => {
+        this.themeCssWatcher = w;
+      }
+    );
+  }
   /**
    * Start watching enums.json file
    */
@@ -12684,6 +12774,7 @@ var FileWatcher = class {
     this.watchTemplates();
     this.watchColors();
     this.watchVariables();
+    this.watchThemeCss();
     this.watchEnums();
     this.watchCMS();
     this.watchImages();
@@ -12717,6 +12808,10 @@ var FileWatcher = class {
       this.variablesWatcher.close();
       this.variablesWatcher = null;
     }
+    if (this.themeCssWatcher) {
+      this.themeCssWatcher.close();
+      this.themeCssWatcher = null;
+    }
     if (this.enumsWatcher) {
       this.enumsWatcher.close();
       this.enumsWatcher = null;