meno-core 1.0.45 → 1.0.47

package/dist/lib/server/index.js

@@ -3,7 +3,7 @@ import {
 } from "../../chunks/chunk-4OFZP5NQ.js";
 import {
   buildStaticPages
-} from "../../chunks/chunk-OUNJ76QM.js";
+} from "../../chunks/chunk-LJFB5EBT.js";
 import {
   ComponentService,
   EnumService,
@@ -32,7 +32,7 @@ import {
   logResponseTime,
   withErrorHandling,
   withLogging
-} from "../../chunks/chunk-TVH3TC2T.js";
+} from "../../chunks/chunk-47UNLQUU.js";
 import {
   CMSService,
   ColorService,
@@ -65,6 +65,7 @@ import {
   loadBreakpointConfig,
   loadComponentDirectory,
   loadI18nConfig,
+  loadIconsConfig,
   loadJSONFile,
   loadProjectConfig,
   loadResponsiveScalesConfig,
@@ -82,11 +83,11 @@ import {
   styleToString,
   translatePath,
   variableService
-} from "../../chunks/chunk-BZQKEJQY.js";
+} from "../../chunks/chunk-FGUZOYJX.js";
 import {
   ConfigService,
   configService
-} from "../../chunks/chunk-WQSG5WHC.js";
+} from "../../chunks/chunk-ZTKHJQ2Z.js";
 import {
   bundleFile,
   createRuntimeServer,
@@ -100,7 +101,7 @@ import {
   resolveProjectPath,
   setProjectRoot,
   validateJS
-} from "../../chunks/chunk-5Z5VQRTJ.js";
+} from "../../chunks/chunk-I7YIGZXT.js";
 import {
   ensureDir,
   fileExists,
@@ -117,7 +118,7 @@ import {
 } from "../../chunks/chunk-WQFG7PAH.js";
 import "../../chunks/chunk-IF3RATBY.js";
 import "../../chunks/chunk-KITQJYZV.js";
-import "../../chunks/chunk-F7MA62WG.js";
+import "../../chunks/chunk-BCLGRZ3U.js";
 import {
   extractInteractiveStyleMappings,
   generateAllInteractiveCSS,
@@ -127,13 +128,15 @@ import {
   isItemDraftForLocale,
   isVoidElement,
   singularize
-} from "../../chunks/chunk-5ZASE4IG.js";
+} from "../../chunks/chunk-FED5MME6.js";
 import {
   DEFAULT_BREAKPOINTS,
   DEFAULT_I18N_CONFIG,
   buildLocalizedPath,
+  getScaleMultiplier,
   isI18nValue,
-  resolveI18nValue
+  resolveI18nValue,
+  scalePropertyValue
 } from "../../chunks/chunk-XSWR3QLI.js";
 import "../../chunks/chunk-UB44F4Z2.js";
 import {
@@ -144,11 +147,11 @@ import {
   SERVER_PORT,
   SERVE_PORT,
   init_constants
-} from "../../chunks/chunk-NZTSJS5C.js";
+} from "../../chunks/chunk-2QK6U5UK.js";
 import "../../chunks/chunk-KSBZ2L7C.js";
 
 // build-astro.ts
-import { existsSync, readdirSync, mkdirSync, rmSync, statSync, copyFileSync } from "fs";
+import { existsSync, readdirSync, mkdirSync, rmSync, statSync, copyFileSync, writeFileSync } from "fs";
 import { writeFile as writeFile2, readFile } from "fs/promises";
 import { join } from "path";
 import { createHash } from "crypto";
@@ -582,7 +585,7 @@ function stylesToTailwind(style) {
   }
   return { classes, dynamicStyles };
 }
-function responsiveStylesToTailwind(style, breakpoints) {
+function responsiveStylesToTailwind(style, breakpoints, responsiveScales) {
   if (!style) return { classes: [], dynamicStyles: {} };
   const allClasses = [];
   const allDynamicStyles = {};
@@ -616,6 +619,9 @@ function responsiveStylesToTailwind(style, breakpoints) {
       allClasses.push(...classes.map((cls) => `${prefix}${cls}`));
       Object.assign(allDynamicStyles, dynamicStyles);
     }
+    if (responsiveScales?.enabled === true && responsive.base) {
+      appendAutoScaledClasses(responsive, breakpoints, responsiveScales, allClasses);
+    }
   } else {
     const { classes, dynamicStyles } = stylesToTailwind(style);
     allClasses.push(...classes);
@@ -623,6 +629,35 @@ function responsiveStylesToTailwind(style, breakpoints) {
   }
   return { classes: allClasses, dynamicStyles: allDynamicStyles };
 }
+function appendAutoScaledClasses(responsive, breakpoints, responsiveScales, out) {
+  const base = responsive.base;
+  if (!base) return;
+  const baseRef = responsiveScales.baseReference ?? 16;
+  const sortedBps = Object.entries(breakpoints).map(([name, cfg]) => ({ name, value: cfg?.breakpoint })).filter(
+    (bp) => typeof bp.value === "number" && bp.value > 0
+  ).sort((a, b) => b.value - a.value);
+  for (const [property, value] of Object.entries(base)) {
+    if (isStyleMapping(value)) continue;
+    if (value == null) continue;
+    const strValue = String(value);
+    if (strValue === "" || hasTemplateExpression(strValue)) continue;
+    for (const { name: bpName, value: bpPixels } of sortedBps) {
+      const bpBranch = responsive[bpName];
+      if (bpBranch && property in bpBranch) continue;
+      const scale = getScaleMultiplier(
+        responsiveScales,
+        property,
+        bpName
+      );
+      if (scale == null) continue;
+      const scaledValue = scalePropertyValue(strValue, baseRef, scale);
+      if (scaledValue == null || scaledValue === strValue) continue;
+      const scaledClass = propertyToTailwind(property, scaledValue);
+      if (!scaledClass) continue;
+      out.push(`max-[${bpPixels}px]:${scaledClass}`);
+    }
+  }
+}
 
 // lib/server/astro/nodeToAstro.ts
 init_constants();
@@ -687,6 +722,28 @@ function transformItemTemplate(text, itemVar = "item", indexVar, sourceVar) {
   return text;
 }
 
+// lib/server/astro/astroEmitHelpers.ts
+init_constants();
+function stripRawHtmlPrefixDeep(value) {
+  if (typeof value === "string") {
+    return value.startsWith(RAW_HTML_PREFIX) ? value.slice(RAW_HTML_PREFIX.length) : value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => stripRawHtmlPrefixDeep(item));
+  }
+  if (value !== null && typeof value === "object") {
+    const out = {};
+    for (const [k, v] of Object.entries(value)) {
+      out[k] = stripRawHtmlPrefixDeep(v);
+    }
+    return out;
+  }
+  return value;
+}
+function astroComponentName(name) {
+  return name.charAt(0).toUpperCase() + name.slice(1);
+}
+
 // lib/server/astro/nodeToAstro.ts
 function ind(ctx) {
   return "  ".repeat(ctx.indent);
@@ -751,7 +808,7 @@ function escapeJSX(s) {
   return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 function escapeTemplateLiteral(s) {
-  return s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+  return s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
 }
 function collectStyleMappings(style) {
   if (!style) return [];
@@ -808,7 +865,7 @@ function getClassForValue(property, value, breakpointPrefix) {
   return breakpointPrefix ? `${breakpointPrefix}${twClass}` : twClass;
 }
 function buildClassAndStyleExpression(style, interactiveStyles, elementClass, ctx) {
-  const result = style ? responsiveStylesToTailwind(style, ctx.breakpoints) : { classes: [], dynamicStyles: {} };
+  const result = style ? responsiveStylesToTailwind(style, ctx.breakpoints, ctx.responsiveScales) : { classes: [], dynamicStyles: {} };
   const staticClasses = result.classes;
   const dynamicStyles = result.dynamicStyles;
   if (elementClass) {
@@ -899,7 +956,7 @@ function resolveTemplate(text, ctx) {
     let propName = fullMatch[1].trim();
     if (ctx.listItemBinding) propName = rewriteItemVar(propName, ctx.listItemBinding);
     if (ctx.listIndexVar) propName = replaceItemMetaVars(propName, ctx.listIndexVar, ctx.listSourceVar);
-    if (ctx.componentProps[propName]?.type === "rich-text") {
+    if (ctx.componentProps[propName]?.type === "rich-text" || ctx.componentProps[propName]?.type === "embed") {
       return `<Fragment set:html={${propName}} />`;
     }
     return `{${propName}}`;
@@ -988,6 +1045,7 @@ function buildAttributesString(attributes, ctx) {
   return parts.length > 0 ? " " + parts.join(" ") : "";
 }
 function formatPropValue(value) {
+  value = stripRawHtmlPrefixDeep(value);
   if (typeof value === "string") return `"${escapeJSX(value)}"`;
   if (typeof value === "number") return `{${value}}`;
   if (typeof value === "boolean") return `{${value}}`;
@@ -1005,12 +1063,11 @@ function nodeToAstro(node, ctx) {
   if (typeof node === "object" && !Array.isArray(node) && isI18nValue(node)) {
     const resolved = resolveI18n(node, ctx);
     if (typeof resolved === "string") {
-      return `${ind(ctx)}${escapeJSX(resolved)}
-`;
+      return nodeToAstro(resolved, ctx);
     }
     if (ctx.isComponentDef && isI18nValue(resolved)) {
       ctx.needsI18nResolver = true;
-      return `${ind(ctx)}{r(${JSON.stringify(resolved)})}
+      return `${ind(ctx)}{r(${JSON.stringify(stripRawHtmlPrefixDeep(resolved))})}
 `;
     }
     return `${ind(ctx)}${String(resolved ?? "")}
@@ -1032,7 +1089,8 @@ function nodeToAstro(node, ctx) {
 `;
     }
     if (node.startsWith(RAW_HTML_PREFIX)) {
-      const rawHtml = node.slice(RAW_HTML_PREFIX.length);
+      const rawSlice = node.slice(RAW_HTML_PREFIX.length);
+      const rawHtml = ctx.processedRawHtml?.get(rawSlice) ?? rawSlice;
       return `${ind(ctx)}<Fragment set:html={\`${escapeTemplateLiteral(rawHtml)}\`} />
 `;
     }
@@ -1079,6 +1137,7 @@ function nodeToAstro(node, ctx) {
 var IMG_TAILWIND_PREFIXES = ["object-", "rounded", "border", "shadow", "[filter", "[transform", "mix-blend"];
 var IMG_OPACITY_PATTERN = /^opacity-/;
 var DEFAULT_SIZES2 = "100vw";
+var IMG_FILL_CLASSES = ["block", "w-full", "h-full"];
 function splitImageClasses(allClasses) {
   const imgClasses = [];
   const pictureClasses = [];
@@ -1092,11 +1151,164 @@ function splitImageClasses(allClasses) {
   }
   return { pictureClasses, imgClasses };
 }
+function extractPxWidth(val) {
+  if (typeof val === "number" && Number.isFinite(val) && val > 0) return val;
+  if (typeof val !== "string") return null;
+  const match = val.trim().match(/^(\d+(?:\.\d+)?)px$/);
+  if (!match) return null;
+  const n = parseFloat(match[1]);
+  return n > 0 ? n : null;
+}
+function computeSizesAttribute(style, breakpoints) {
+  if (!style) return DEFAULT_SIZES2;
+  const responsive = isResponsiveStyle2(style);
+  const baseStyle = responsive ? style.base : style;
+  const baseWidth = baseStyle ? extractPxWidth(baseStyle.width) : null;
+  if (baseWidth == null) return DEFAULT_SIZES2;
+  const bpEntries = Object.entries(breakpoints).sort(
+    (a, b) => a[1].breakpoint - b[1].breakpoint
+  );
+  const parts = [];
+  for (const [name, entry] of bpEntries) {
+    let effective = null;
+    if (responsive) {
+      const bpStyle = style[name];
+      effective = bpStyle ? extractPxWidth(bpStyle.width) : null;
+      if (effective == null) {
+        for (const [largerName, largerEntry] of bpEntries) {
+          if (largerEntry.breakpoint <= entry.breakpoint) continue;
+          const largerStyle = style[largerName];
+          const larger = largerStyle ? extractPxWidth(largerStyle.width) : null;
+          if (larger != null) {
+            effective = larger;
+            break;
+          }
+        }
+      }
+      if (effective == null) effective = baseWidth;
+    } else {
+      effective = baseWidth;
+    }
+    parts.push(`(max-width: ${entry.breakpoint}px) ${effective}px`);
+  }
+  parts.push(`${baseWidth}px`);
+  return parts.join(", ");
+}
+function injectInlineStyle(styleAttr, extraCss) {
+  if (!extraCss) return styleAttr;
+  if (!styleAttr) return ` style="${extraCss}"`;
+  return styleAttr.replace(/style="([^"]*)"/, (_, existing) => {
+    const trimmed = existing.trimEnd();
+    const sep = trimmed.length > 0 && !trimmed.endsWith(";") ? ";" : "";
+    return `style="${existing}${sep}${extraCss}"`;
+  });
+}
+var PICTURE_WIDTHS = [500, 800, 1080, 1600, 2400];
+function imagePathToVarName(srcPath) {
+  const stripped = srcPath.replace(/^\/+/, "").replace(/^images\//, "").replace(/\.[^.]+$/, "");
+  const parts = stripped.split(/[/_\-\s.]+/).filter(Boolean);
+  if (parts.length === 0) return "imgAsset";
+  const camel = parts.map((p, i) => {
+    const clean = p.replace(/[^a-zA-Z0-9]/g, "");
+    if (!clean) return "";
+    if (i === 0) return clean.toLowerCase();
+    return clean[0].toUpperCase() + clean.slice(1).toLowerCase();
+  }).join("");
+  if (!camel) return "imgAsset";
+  return "img" + camel[0].toUpperCase() + camel.slice(1);
+}
+function imageImportPath(srcPath, fileDepth) {
+  const rest = srcPath.replace(/^\/+/, "").replace(/^images\//, "");
+  const ups = "../".repeat(Math.max(0, fileDepth) + 1);
+  return `${ups}assets/images/${rest}`;
+}
+function isStaticImageSrc(src, ctx) {
+  if (!src) return false;
+  if (typeof src !== "string") return false;
+  if (hasTemplates(src)) return false;
+  if (!src.startsWith("/images/")) return false;
+  if (!ctx.imageMetadataMap?.has(src)) return false;
+  return true;
+}
+function registerStaticImageImport(src, ctx) {
+  if (!ctx.imageImports) ctx.imageImports = /* @__PURE__ */ new Map();
+  const depth = ctx.fileDepth ?? 0;
+  const importPath = imageImportPath(src, depth);
+  for (const [existingName, existingPath] of ctx.imageImports) {
+    if (existingPath === importPath) return existingName;
+  }
+  const base = imagePathToVarName(src);
+  let name = base;
+  let counter = 2;
+  while (ctx.imageImports.has(name)) {
+    name = `${base}${counter++}`;
+  }
+  ctx.imageImports.set(name, importPath);
+  return name;
+}
+function splitStaticClassExpr(classExpr) {
+  if (classExpr.includes("class:list=")) return null;
+  const classMatch = classExpr.match(/class="([^"]*)"/);
+  if (!classMatch) return { outerClasses: [], innerClasses: [] };
+  const all = classMatch[1].split(/\s+/).filter(Boolean);
+  const { pictureClasses, imgClasses } = splitImageClasses(all);
+  return { outerClasses: pictureClasses, innerClasses: imgClasses };
+}
+function formatPictureAttributesProp(classValue, styleAttr) {
+  const styleMatch = styleAttr.match(/style="([^"]*)"/);
+  const parts = [];
+  if (classValue) parts.push(`class: ${JSON.stringify(classValue)}`);
+  if (styleMatch) parts.push(`style: ${JSON.stringify(styleMatch[1])}`);
+  if (parts.length === 0) return "";
+  return ` pictureAttributes={{${parts.join(", ")}}}`;
+}
+function emitStaticPictureImage(src, alt, loading, fetchpriority, sizesValue, classExpr, styleAttr, ifExpr, ifClose, blurHash, ctx) {
+  const varName = registerStaticImageImport(src, ctx);
+  const widthsLiteral = `[${PICTURE_WIDTHS.join(", ")}]`;
+  const altAttr = alt !== void 0 ? ` alt="${escapeJSX(String(alt))}"` : ' alt=""';
+  const loadingAttr = loading ? ` loading="${escapeJSX(loading)}"` : "";
+  const fetchpriorityAttr = fetchpriority ? ` fetchpriority="${escapeJSX(fetchpriority)}"` : "";
+  const split = splitStaticClassExpr(classExpr);
+  if (blurHash) {
+    const blurCss = `background-image:url(${escapeJSX(blurHash)});background-size:cover`;
+    const blurStyleAttr = injectInlineStyle(styleAttr, blurCss);
+    const onloadAttr = ` onload="this.parentElement.style.backgroundImage=''"`;
+    if (split) {
+      const outerClassValue = split.outerClasses.join(" ");
+      const pictureAttrs = formatPictureAttributesProp(outerClassValue, blurStyleAttr);
+      const innerClasses = [...split.innerClasses, ...IMG_FILL_CLASSES];
+      const innerClassAttr = ` class="${innerClasses.join(" ")}"`;
+      return `${ifExpr}${ind(ctx)}<Picture${pictureAttrs} src={${varName}}${altAttr}${innerClassAttr} formats={['avif','webp']} widths={${widthsLiteral}} sizes="${escapeJSX(sizesValue)}"${loadingAttr}${fetchpriorityAttr}${onloadAttr} />
+${ifClose}`;
+    }
+    const wrapperClassExpr = classExpr;
+    const wrapperStyleAttr = injectInlineStyle(styleAttr, blurCss);
+    const fillClassAttr = ` class="${IMG_FILL_CLASSES.join(" ")}"`;
+    return `${ifExpr}${ind(ctx)}<div${wrapperClassExpr}${wrapperStyleAttr}>
+${ind(ctx)}  <Picture pictureAttributes={{class: "${IMG_FILL_CLASSES.join(" ")}"}} src={${varName}}${altAttr}${fillClassAttr} formats={['avif','webp']} widths={${widthsLiteral}} sizes="${escapeJSX(sizesValue)}"${loadingAttr}${fetchpriorityAttr} onload="this.parentElement.parentElement.style.backgroundImage=''" />
+${ind(ctx)}</div>
+${ifClose}`;
+  }
+  if (split) {
+    const outerClassValue = split.outerClasses.join(" ");
+    const innerClassAttr = split.innerClasses.length > 0 ? ` class="${split.innerClasses.join(" ")}"` : "";
+    const pictureAttrs = formatPictureAttributesProp(outerClassValue, styleAttr);
+    return `${ifExpr}${ind(ctx)}<Picture${pictureAttrs} src={${varName}}${altAttr}${innerClassAttr} formats={['avif','webp']} widths={${widthsLiteral}} sizes="${escapeJSX(sizesValue)}"${loadingAttr}${fetchpriorityAttr} />
+${ifClose}`;
+  }
+  return `${ifExpr}${ind(ctx)}<div${classExpr}${styleAttr}>
+${ind(ctx)}  <Picture src={${varName}}${altAttr} formats={['avif','webp']} widths={${widthsLiteral}} sizes="${escapeJSX(sizesValue)}"${loadingAttr}${fetchpriorityAttr} />
+${ind(ctx)}</div>
+${ifClose}`;
+}
 function emitImageNode(node, ctx) {
   const style = node.style;
   let elementClass = null;
   if (node.interactiveStyles && node.interactiveStyles.length > 0 || node.generateElementClass) {
     elementClass = buildElementClass(ctx, node.label);
+    if (elementClass && node.interactiveStyles?.length && ctx.collectedInteractiveStyles) {
+      ctx.collectedInteractiveStyles.set(elementClass, node.interactiveStyles);
+    }
   }
   const { classExpr, styleAttr } = buildClassAndStyleExpression(
     style,
@@ -1117,7 +1329,22 @@ function emitImageNode(node, ctx) {
     if (width === void 0 && metadata.width) width = metadata.width;
     if (height === void 0 && metadata.height) height = metadata.height;
   }
-  const sizesValue = sizes || DEFAULT_SIZES2;
+  const sizesValue = sizes || computeSizesAttribute(style, ctx.breakpoints);
+  if (isStaticImageSrc(src, ctx)) {
+    return emitStaticPictureImage(
+      src,
+      alt,
+      loading,
+      fetchpriority,
+      sizesValue,
+      classExpr,
+      styleAttr,
+      emitIfOpen(node, ctx),
+      emitIfClose(node, ctx),
+      metadata?.blurHash,
+      ctx
+    );
+  }
   const imageSpecificKeys = /* @__PURE__ */ new Set(["src", "alt", "loading", "width", "height", "sizes", "srcset", "fetchpriority"]);
   const otherAttrs = {};
   if (node.attributes) {
@@ -1133,31 +1360,44 @@ function emitImageNode(node, ctx) {
   if (loading) imgAttrs += ` loading="${escapeJSX(String(loading))}"`;
   if (width !== void 0) imgAttrs += ` width="${escapeJSX(String(width))}"`;
   if (height !== void 0) imgAttrs += ` height="${escapeJSX(String(height))}"`;
-  let blurStyle = "";
-  if (metadata?.blurHash) {
-    blurStyle = ` style="background-image: url(${escapeJSX(metadata.blurHash)}); background-size: cover;" onload="this.style.backgroundImage=''"`;
-  }
+  const hasAvif = !!(metadata?.avifSrcset && ctx.imageFormat !== "webp");
+  const hasBlur = !!metadata?.blurHash;
+  const useWrapper = hasAvif || hasBlur;
+  const blurWrapperCss = hasBlur ? `background-image:url(${escapeJSX(metadata.blurHash)});background-size:cover` : "";
+  const blurOnload = hasBlur ? ` onload="this.parentElement.style.backgroundImage=''"` : "";
   const ifExpr = emitIfOpen(node, ctx);
   const ifClose = emitIfClose(node, ctx);
-  if (metadata?.avifSrcset && ctx.imageFormat !== "webp") {
-    const classMatch = classExpr.match(/class="([^"]*)"/);
+  if (useWrapper) {
+    const imgFillClasses = IMG_FILL_CLASSES.slice();
     const classListMatch = classExpr.match(/class:list={\[(.+)\]}/);
+    const classMatch = classExpr.match(/class="([^"]*)"/);
+    let pictureClassExpr = "";
+    let imgClassAttr = "";
     if (classListMatch) {
-      return `${ifExpr}${ind(ctx)}<picture${classExpr}${styleAttr}>
+      pictureClassExpr = classExpr;
+      imgClassAttr = ` class="${imgFillClasses.join(" ")}"`;
+    } else {
+      const allClasses = classMatch ? classMatch[1].split(/\s+/).filter(Boolean) : [];
+      const { pictureClasses, imgClasses } = splitImageClasses(allClasses);
+      const fullImgClasses = [...imgClasses, ...imgFillClasses];
+      pictureClassExpr = pictureClasses.length > 0 ? ` class="${pictureClasses.join(" ")}"` : "";
+      imgClassAttr = fullImgClasses.length > 0 ? ` class="${fullImgClasses.join(" ")}"` : "";
+    }
+    const wrapperStyleAttr = injectInlineStyle(styleAttr, blurWrapperCss);
+    if (hasAvif) {
+      return `${ifExpr}${ind(ctx)}<picture${pictureClassExpr}${wrapperStyleAttr}>
 ${ind(ctx)}  <source type="image/avif" srcset="${escapeJSX(metadata.avifSrcset)}" sizes="${escapeJSX(sizesValue)}" />
 ${ind(ctx)}  <source type="image/webp" srcset="${escapeJSX(metadata.srcset)}" sizes="${escapeJSX(sizesValue)}" />
-${ind(ctx)}  <img${imgAttrs}${blurStyle}${otherAttrsStr} />
+${ind(ctx)}  <img${imgClassAttr}${imgAttrs}${blurOnload}${otherAttrsStr} />
 ${ind(ctx)}</picture>
 ${ifClose}`;
     }
-    const allClasses = classMatch ? classMatch[1].split(/\s+/).filter(Boolean) : [];
-    const { pictureClasses, imgClasses } = splitImageClasses(allClasses);
-    const pictureClassAttr = pictureClasses.length > 0 ? ` class="${pictureClasses.join(" ")}"` : "";
-    const imgClassAttr = imgClasses.length > 0 ? ` class="${imgClasses.join(" ")}"` : "";
-    return `${ifExpr}${ind(ctx)}<picture${pictureClassAttr}${styleAttr}>
-${ind(ctx)}  <source type="image/avif" srcset="${escapeJSX(metadata.avifSrcset)}" sizes="${escapeJSX(sizesValue)}" />
-${ind(ctx)}  <source type="image/webp" srcset="${escapeJSX(metadata.srcset)}" sizes="${escapeJSX(sizesValue)}" />
-${ind(ctx)}  <img${imgClassAttr}${imgAttrs}${blurStyle}${otherAttrsStr} />
+    if (metadata?.srcset) {
+      imgAttrs += ` srcset="${escapeJSX(metadata.srcset)}"`;
+      imgAttrs += ` sizes="${escapeJSX(sizesValue)}"`;
+    }
+    return `${ifExpr}${ind(ctx)}<picture${pictureClassExpr}${wrapperStyleAttr}>
+${ind(ctx)}  <img${imgClassAttr}${imgAttrs}${blurOnload}${otherAttrsStr} />
 ${ind(ctx)}</picture>
 ${ifClose}`;
   }
@@ -1165,7 +1405,7 @@ ${ifClose}`;
     imgAttrs += ` srcset="${escapeJSX(metadata.srcset)}"`;
     imgAttrs += ` sizes="${escapeJSX(sizesValue)}"`;
   }
-  return `${ifExpr}${ind(ctx)}<img${classExpr}${styleAttr}${imgAttrs}${blurStyle}${otherAttrsStr} />
+  return `${ifExpr}${ind(ctx)}<img${classExpr}${styleAttr}${imgAttrs}${otherAttrsStr} />
 ${ifClose}`;
 }
 function emitHtmlNode(node, ctx) {
@@ -1192,6 +1432,9 @@ function emitHtmlNode(node, ctx) {
   let elementClass = null;
   if (node.interactiveStyles && node.interactiveStyles.length > 0 || node.generateElementClass) {
     elementClass = buildElementClass(ctx, label);
+    if (elementClass && node.interactiveStyles?.length && ctx.collectedInteractiveStyles) {
+      ctx.collectedInteractiveStyles.set(elementClass, node.interactiveStyles);
+    }
   }
   const { classExpr, styleAttr } = buildClassAndStyleExpression(style, node.interactiveStyles, elementClass, ctx);
   const attrs = buildAttributesString(node.attributes, ctx);
@@ -1210,8 +1453,8 @@ ${emitIfClose(node, ctx)}`;
 ${emitIfClose(node, ctx)}`;
 }
 function emitComponentInstance(node, ctx) {
-  const name = node.component;
-  ctx.imports.add(name);
+  const name = astroComponentName(node.component);
+  ctx.imports.add(node.component);
   const ifExpr = emitIfOpen(node, ctx);
   const propParts = [];
   if (node.props) {
@@ -1248,20 +1491,27 @@ function emitComponentInstance(node, ctx) {
         }
       } else if (ctx.isComponentDef && isI18nValue(value)) {
         ctx.needsI18nResolver = true;
-        propParts.push(`${key}={r(${JSON.stringify(value)})}`);
+        propParts.push(`${key}={r(${JSON.stringify(stripRawHtmlPrefixDeep(value))})}`);
       } else {
-        propParts.push(`${key}=${formatPropValue(value)}`);
+        const targetInterface = ctx.globalComponents[name]?.component?.interface;
+        const propDef = targetInterface?.[key];
+        if (typeof value === "string" && (propDef?.type === "rich-text" || propDef?.type === "embed")) {
+          propParts.push(`${key}={\`${escapeTemplateLiteral(stripRawHtmlPrefixDeep(value))}\`}`);
+        } else {
+          propParts.push(`${key}=${formatPropValue(value)}`);
+        }
       }
     }
   }
   if (node.style) {
-    const { classes: instanceClasses } = responsiveStylesToTailwind(node.style, ctx.breakpoints);
+    const { classes: instanceClasses } = responsiveStylesToTailwind(node.style, ctx.breakpoints, ctx.responsiveScales);
     if (instanceClasses.length > 0) {
       propParts.push(`class="${instanceClasses.join(" ")}"`);
     }
   }
   const propsStr = propParts.length > 0 ? " " + propParts.join(" ") : "";
-  const children = emitChildren(node.children, ctx);
+  const childCtx = { ...ctx, elementPath: [0] };
+  const children = emitChildren(node.children, childCtx);
   if (!children.trim()) {
     return `${ifExpr}${ind(ctx)}<${name}${propsStr} />
 ${emitIfClose(node, ctx)}`;
@@ -1288,6 +1538,9 @@ function emitEmbedNode(node, ctx) {
   let elementClass = null;
   if (node.interactiveStyles && node.interactiveStyles.length > 0 || node.generateElementClass) {
     elementClass = buildElementClass(ctx, node.label);
+    if (elementClass && node.interactiveStyles?.length && ctx.collectedInteractiveStyles) {
+      ctx.collectedInteractiveStyles.set(elementClass, node.interactiveStyles);
+    }
   }
   const { classExpr, styleAttr } = buildClassAndStyleExpression(style, node.interactiveStyles, elementClass, ctx);
   const attrs = buildAttributesString(node.attributes, ctx);
@@ -1341,6 +1594,9 @@ function emitLinkNode(node, ctx) {
   let elementClass = null;
   if (node.interactiveStyles && node.interactiveStyles.length > 0 || node.generateElementClass) {
     elementClass = buildElementClass(ctx, node.label);
+    if (elementClass && node.interactiveStyles?.length && ctx.collectedInteractiveStyles) {
+      ctx.collectedInteractiveStyles.set(elementClass, node.interactiveStyles);
+    }
   }
   const { classExpr, styleAttr } = buildClassAndStyleExpression(style, node.interactiveStyles, elementClass, ctx);
   let finalClassExpr = classExpr;
@@ -1417,6 +1673,9 @@ function emitImageTypeNode(node, ctx) {
   let elementClass = null;
   if (node.interactiveStyles && node.interactiveStyles.length > 0 || node.generateElementClass) {
     elementClass = buildElementClass(ctx, node.label);
+    if (elementClass && node.interactiveStyles?.length && ctx.collectedInteractiveStyles) {
+      ctx.collectedInteractiveStyles.set(elementClass, node.interactiveStyles);
+    }
   }
   const { classExpr, styleAttr } = buildClassAndStyleExpression(
     style,
@@ -1426,30 +1685,52 @@ function emitImageTypeNode(node, ctx) {
   );
   const src = node.src;
   const alt = node.alt;
+  if (isStaticImageSrc(src, ctx)) {
+    const staticMeta = ctx.imageMetadataMap.get(src);
+    return emitStaticPictureImage(
+      src,
+      alt,
+      void 0,
+      void 0,
+      computeSizesAttribute(style, ctx.breakpoints),
+      classExpr,
+      styleAttr,
+      "",
+      "",
+      staticMeta.blurHash,
+      ctx
+    );
+  }
   let imgAttrs = "";
   if (src) imgAttrs += ` src="${escapeJSX(String(src))}"`;
   if (alt !== void 0) imgAttrs += ` alt="${escapeJSX(String(alt))}"`;
   const metadata = src ? ctx.imageMetadataMap?.get(String(src)) : void 0;
-  if (metadata) {
-    let width = metadata.width;
-    let height = metadata.height;
-    if (width !== void 0) imgAttrs += ` width="${width}"`;
-    if (height !== void 0) imgAttrs += ` height="${height}"`;
-    let blurStyle = "";
-    if (metadata.blurHash) {
-      blurStyle = ` style="background-image: url(${escapeJSX(metadata.blurHash)}); background-size: cover;" onload="this.style.backgroundImage=''"`;
-    }
-    const sizesValue = DEFAULT_SIZES2;
-    if (metadata.avifSrcset && ctx.imageFormat !== "webp") {
-      const classMatch = classExpr.match(/class="([^"]*)"/);
-      const allClasses = classMatch ? classMatch[1].split(/\s+/).filter(Boolean) : [];
-      const { pictureClasses, imgClasses } = splitImageClasses(allClasses);
-      const pictureClassAttr = pictureClasses.length > 0 ? ` class="${pictureClasses.join(" ")}"` : "";
-      const imgClassAttr = imgClasses.length > 0 ? ` class="${imgClasses.join(" ")}"` : "";
-      return `${ind(ctx)}<picture${pictureClassAttr}${styleAttr}>
+  if (!metadata) {
+    return `${ind(ctx)}<img${classExpr}${styleAttr}${imgAttrs} />
+`;
+  }
+  if (metadata.width !== void 0) imgAttrs += ` width="${metadata.width}"`;
+  if (metadata.height !== void 0) imgAttrs += ` height="${metadata.height}"`;
+  const sizesValue = computeSizesAttribute(style, ctx.breakpoints);
+  const hasAvif = !!(metadata.avifSrcset && ctx.imageFormat !== "webp");
+  const hasBlur = !!metadata.blurHash;
+  const useWrapper = hasAvif || hasBlur;
+  const blurWrapperCss = hasBlur ? `background-image:url(${escapeJSX(metadata.blurHash)});background-size:cover` : "";
+  const blurOnload = hasBlur ? ` onload="this.parentElement.style.backgroundImage=''"` : "";
+  if (useWrapper) {
+    const imgFillClasses = IMG_FILL_CLASSES.slice();
+    const classMatch = classExpr.match(/class="([^"]*)"/);
+    const allClasses = classMatch ? classMatch[1].split(/\s+/).filter(Boolean) : [];
+    const { pictureClasses, imgClasses } = splitImageClasses(allClasses);
+    const fullImgClasses = [...imgClasses, ...imgFillClasses];
+    const pictureClassAttr = pictureClasses.length > 0 ? ` class="${pictureClasses.join(" ")}"` : "";
+    const imgClassAttr = fullImgClasses.length > 0 ? ` class="${fullImgClasses.join(" ")}"` : "";
+    const wrapperStyleAttr = injectInlineStyle(styleAttr, blurWrapperCss);
+    if (hasAvif) {
+      return `${ind(ctx)}<picture${pictureClassAttr}${wrapperStyleAttr}>
 ${ind(ctx)}  <source type="image/avif" srcset="${escapeJSX(metadata.avifSrcset)}" sizes="${escapeJSX(sizesValue)}" />
 ${ind(ctx)}  <source type="image/webp" srcset="${escapeJSX(metadata.srcset)}" sizes="${escapeJSX(sizesValue)}" />
-${ind(ctx)}  <img${imgClassAttr}${imgAttrs}${blurStyle} />
+${ind(ctx)}  <img${imgClassAttr}${imgAttrs}${blurOnload} />
 ${ind(ctx)}</picture>
 `;
     }
@@ -1457,6 +1738,14 @@ ${ind(ctx)}</picture>
       imgAttrs += ` srcset="${escapeJSX(metadata.srcset)}"`;
       imgAttrs += ` sizes="${escapeJSX(sizesValue)}"`;
     }
+    return `${ind(ctx)}<picture${pictureClassAttr}${wrapperStyleAttr}>
+${ind(ctx)}  <img${imgClassAttr}${imgAttrs}${blurOnload} />
+${ind(ctx)}</picture>
+`;
+  }
+  if (metadata.srcset) {
+    imgAttrs += ` srcset="${escapeJSX(metadata.srcset)}"`;
+    imgAttrs += ` sizes="${escapeJSX(sizesValue)}"`;
   }
   return `${ind(ctx)}<img${classExpr}${styleAttr}${imgAttrs} />
 `;
@@ -1567,6 +1856,9 @@ function emitLocaleListNode(node, ctx) {
   let elementClass = null;
   if (node.interactiveStyles && node.interactiveStyles.length > 0 || node.generateElementClass) {
     elementClass = buildElementClass(ctx, node.label);
+    if (elementClass && node.interactiveStyles?.length && ctx.collectedInteractiveStyles) {
+      ctx.collectedInteractiveStyles.set(elementClass, node.interactiveStyles);
+    }
   }
   const { classExpr: containerClassExpr, styleAttr: containerStyleAttr } = buildClassAndStyleExpression(
     style,
@@ -1575,13 +1867,13 @@ function emitLocaleListNode(node, ctx) {
     ctx
   );
   const itemStyle = node.itemStyle;
-  const itemResult = itemStyle ? responsiveStylesToTailwind(itemStyle, ctx.breakpoints) : { classes: [], dynamicStyles: {} };
+  const itemResult = itemStyle ? responsiveStylesToTailwind(itemStyle, ctx.breakpoints, ctx.responsiveScales) : { classes: [], dynamicStyles: {} };
   const itemClasses = itemResult.classes;
   const activeItemStyle = node.activeItemStyle;
-  const activeResult = activeItemStyle ? responsiveStylesToTailwind(activeItemStyle, ctx.breakpoints) : { classes: [], dynamicStyles: {} };
+  const activeResult = activeItemStyle ? responsiveStylesToTailwind(activeItemStyle, ctx.breakpoints, ctx.responsiveScales) : { classes: [], dynamicStyles: {} };
   const activeItemClasses = [...itemClasses, ...activeResult.classes];
   const separatorStyle = node.separatorStyle;
-  const sepResult = separatorStyle ? responsiveStylesToTailwind(separatorStyle, ctx.breakpoints) : { classes: [], dynamicStyles: {} };
+  const sepResult = separatorStyle ? responsiveStylesToTailwind(separatorStyle, ctx.breakpoints, ctx.responsiveScales) : { classes: [], dynamicStyles: {} };
   const separatorClasses = sepResult.classes;
   const localeIconMap = /* @__PURE__ */ new Map();
   for (const localeConfig of i18nConfig.locales) {
@@ -1590,7 +1882,7 @@ function emitLocaleListNode(node, ctx) {
     }
   }
   const flagStyle = node.flagStyle;
-  const flagResult = flagStyle ? responsiveStylesToTailwind(flagStyle, ctx.breakpoints) : { classes: [], dynamicStyles: {} };
+  const flagResult = flagStyle ? responsiveStylesToTailwind(flagStyle, ctx.breakpoints, ctx.responsiveScales) : { classes: [], dynamicStyles: {} };
   const flagClasses = flagResult.classes;
   const links = [];
   const currentLocale = ctx.locale || i18nConfig.defaultLocale;
@@ -1776,7 +2068,7 @@ function propDefToTSType(def) {
 }
 function formatDefault(def) {
   if (!("default" in def) || def.default === void 0) return null;
-  const val = def.default;
+  const val = stripRawHtmlPrefixDeep(def.default);
   if (typeof val === "string") return JSON.stringify(val);
   if (typeof val === "number" || typeof val === "boolean") return String(val);
   if (typeof val === "object" && val !== null && "_i18n" in val) {
@@ -1818,7 +2110,7 @@ function mergeClassNameOntoRoot(template) {
   }
   return prefix + tagName + ` class={className}` + attrs + close + template.slice(fullMatch.length);
 }
-function emitAstroComponent(name, def, allComponents, breakpoints = DEFAULT_BREAKPOINTS, defaultLocale = "en") {
+function emitAstroComponent(name, def, allComponents, breakpoints = DEFAULT_BREAKPOINTS, defaultLocale = "en", responsiveScales, remConfig) {
   const comp = def.component;
   const propDefs = comp.interface || {};
   const structure = comp.structure;
@@ -1836,25 +2128,49 @@ function emitAstroComponent(name, def, allComponents, breakpoints = DEFAULT_BREA
     fileType: "component",
     fileName: name,
     breakpoints,
-    defaultLocale
+    responsiveScales,
+    defaultLocale,
+    imageImports: /* @__PURE__ */ new Map(),
+    fileDepth: 0,
+    // components live at src/components/
+    collectedInteractiveStyles: /* @__PURE__ */ new Map()
   };
   let templateBody = nodeToAstro(structure, ctx);
   templateBody = mergeClassNameOntoRoot(templateBody);
-  const frontmatter = buildFrontmatter(name, propDefs, ctx.imports, ctx.dynamicTags, ctx.needsI18nResolver ? defaultLocale : void 0);
+  const frontmatter = buildFrontmatter(
+    name,
+    propDefs,
+    ctx.imports,
+    ctx.dynamicTags,
+    ctx.needsI18nResolver ? defaultLocale : void 0,
+    ctx.imageImports
+  );
   const styleSection = comp.css ? `
 <style>
 ${comp.css}
 </style>
+` : "";
+  const interactiveStyleSection = ctx.collectedInteractiveStyles.size > 0 ? `
+<style is:global>
+${generateAllInteractiveCSS(ctx.collectedInteractiveStyles, breakpoints, remConfig, responsiveScales)}
+</style>
 ` : "";
   const scriptSection = comp.javascript ? buildScriptSection(comp.javascript, comp, propDefs) : "";
   return `---
 ${frontmatter}---
-${templateBody}${styleSection}${scriptSection}`;
+${templateBody}${styleSection}${interactiveStyleSection}${scriptSection}`;
 }
-function buildFrontmatter(componentName, propDefs, imports, dynamicTags, i18nDefaultLocale) {
+function buildFrontmatter(componentName, propDefs, imports, dynamicTags, i18nDefaultLocale, imageImports) {
   const lines = [];
   for (const imp of Array.from(imports).sort()) {
-    lines.push(`import ${imp} from './${imp}.astro';`);
+    lines.push(`import ${astroComponentName(imp)} from './${imp}.astro';`);
+  }
+  if (imageImports && imageImports.size > 0) {
+    lines.push(`import { Picture } from 'astro:assets';`);
+    const sortedImages = Array.from(imageImports.entries()).sort(([a], [b]) => a.localeCompare(b));
+    for (const [varName, importPath] of sortedImages) {
+      lines.push(`import ${varName} from '${importPath}';`);
+    }
   }
   if (lines.length > 0) lines.push("");
   const propEntries = Object.entries(propDefs);
@@ -1948,7 +2264,13 @@ function transformDefineVarsJS(js, varNames) {
   return result;
 }
 function buildScriptSection(js, comp, propDefs) {
-  const elInit = "const el = document.currentScript.previousElementSibling;";
+  const cleanTextNodes = `(function _w(n){var c=n.firstChild,x;while(c){x=c.nextSibling;if(c.nodeType===3){if(!c.textContent.trim())n.removeChild(c)}else if(c.nodeType===1){if(c.tagName==='SCRIPT')n.removeChild(c);else _w(c)}c=x}})(el);`;
+  const deferWrapper = (innerJS) => `var el = document.currentScript.previousElementSibling;
+function __init__() {
+${cleanTextNodes}
+${innerJS}
+}
+if (document.readyState === 'loading') { document.addEventListener('DOMContentLoaded', __init__); } else { __init__(); }`;
   if (comp.defineVars) {
     const vars = comp.defineVars === true ? Object.keys(propDefs).filter((k) => k !== "children") : comp.defineVars;
     if (vars.length > 0) {
@@ -1956,23 +2278,25 @@ function buildScriptSection(js, comp, propDefs) {
       const defineVarsObj = `{ ${vars.join(", ")} }`;
       return `
 <script define:vars={${defineVarsObj}}>
-${elInit}
-${transformedJS}
+(function(){
+${deferWrapper(transformedJS)}
+})();
 </script>
 `;
     }
   }
   return `
 <script is:inline>
-${elInit}
-${js}
+(function(){
+${deferWrapper(js)}
+})();
 </script>
 `;
 }
 
 // lib/server/astro/pageEmitter.ts
 function escapeTemplateLiteral2(s) {
-  return s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+  return s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
 }
 function escapeJSX2(s) {
   return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
@@ -1997,11 +2321,14 @@ function emitAstroPage(options) {
     ssrFallbacks,
     pageName,
     breakpoints: breakpointsOpt,
+    responsiveScales,
     imageMetadataMap,
     i18nConfig,
     currentPageSlugMap,
     slugMappings,
-    imageFormat
+    imageFormat,
+    processedRawHtml,
+    remConfig
   } = options;
   const breakpoints = breakpointsOpt ?? DEFAULT_BREAKPOINTS;
   const root = pageData.root;
@@ -2020,6 +2347,7 @@ function emitAstroPage(options) {
     fileType: "page",
     fileName: pageName,
     breakpoints,
+    responsiveScales,
     imageMetadataMap,
     locale,
     i18nConfig,
@@ -2028,7 +2356,11 @@ function emitAstroPage(options) {
     astroImports: /* @__PURE__ */ new Set(),
     slugMappings,
     i18nDefaultLocale: i18nConfig?.defaultLocale,
-    imageFormat
+    imageFormat,
+    processedRawHtml,
+    imageImports: /* @__PURE__ */ new Map(),
+    fileDepth,
+    collectedInteractiveStyles: /* @__PURE__ */ new Map()
   };
   const templateBody = nodeToAstro(root, ctx);
   const importLines = [];
@@ -2037,16 +2369,28 @@ function emitAstroPage(options) {
     importLines.push(`import { ${astroImports.join(", ")} } from 'astro:content';`);
   }
   importLines.push(`import BaseLayout from '${layoutImportPath2}';`);
+  if (ctx.imageImports && ctx.imageImports.size > 0) {
+    importLines.push(`import { Picture } from 'astro:assets';`);
+    const sortedImages = Array.from(ctx.imageImports.entries()).sort(([a], [b]) => a.localeCompare(b));
+    for (const [varName, importPath] of sortedImages) {
+      importLines.push(`import ${varName} from '${importPath}';`);
+    }
+  }
   const componentImports = Array.from(ctx.imports).sort();
   for (const comp of componentImports) {
     const path = componentImportPath(fileDepth, comp);
-    importLines.push(`import ${comp} from '${path}';`);
+    importLines.push(`import ${astroComponentName(comp)} from '${path}';`);
   }
   const scriptsArrayLiteral = scriptPaths.length > 0 ? `[${scriptPaths.map((s) => `"${s}"`).join(", ")}]` : "[]";
   const libraryTagsLiteral = `{ headCSS: \`${escapeTemplateLiteral2(libraryTags.headCSS || "")}\`, headJS: \`${escapeTemplateLiteral2(libraryTags.headJS || "")}\`, bodyEndJS: \`${escapeTemplateLiteral2(libraryTags.bodyEndJS || "")}\` }`;
   const escapedMeta = escapeTemplateLiteral2(meta);
   const escapedFontPreloads = escapeTemplateLiteral2(fontPreloads);
   const extraFrontmatter = ctx.frontmatterLines && ctx.frontmatterLines.length > 0 ? "\n" + ctx.frontmatterLines.join("\n") : "";
+  const interactiveStyleSection = ctx.collectedInteractiveStyles.size > 0 ? `
+<style is:global>
+${generateAllInteractiveCSS(ctx.collectedInteractiveStyles, breakpoints, remConfig, responsiveScales)}
+</style>
+` : "";
   return `---
 ${importLines.join("\n")}${extraFrontmatter}
 ---
@@ -2062,7 +2406,7 @@ ${importLines.join("\n")}${extraFrontmatter}
   <div id="root">
 ${templateBody}  </div>
 </BaseLayout>
-`;
+${interactiveStyleSection}`;
 }
 function buildEmptyPage(layoutImport, title, meta, locale, theme, fontPreloads, libraryTags, scriptPaths) {
   const escapedMeta = escapeTemplateLiteral2(meta);
@@ -2087,7 +2431,7 @@ import BaseLayout from '${layoutImport}';
 
 // lib/server/astro/cmsPageEmitter.ts
 function escapeTemplateLiteral3(s) {
-  return s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+  return s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
 }
 function escapeJSX3(s) {
   return s.replace(/&/g, "&amp;").replace(/"/g, "&quot;");
@@ -2206,10 +2550,13 @@ function emitCMSPage(options) {
     ssrFallbacks,
     pageName,
     breakpoints: breakpointsOpt,
+    responsiveScales,
     imageMetadataMap,
     i18nConfig,
     isMultiLocale,
-    slugMappings
+    slugMappings,
+    processedRawHtml,
+    remConfig
   } = options;
   const breakpoints = breakpointsOpt ?? DEFAULT_BREAKPOINTS;
   const binding = "entry";
@@ -2245,6 +2592,7 @@ function emitCMSPage(options) {
     fileType: "page",
     fileName: pageName,
     breakpoints,
+    responsiveScales,
     imageMetadataMap,
     locale,
     cmsMode: true,
@@ -2253,16 +2601,27 @@ function emitCMSPage(options) {
     cmsWrapFn: wrapFn,
     slugMappings,
     i18nDefaultLocale: i18nConfig.defaultLocale,
-    imageFormat: options.imageFormat
+    imageFormat: options.imageFormat,
+    processedRawHtml,
+    imageImports: /* @__PURE__ */ new Map(),
+    fileDepth,
+    collectedInteractiveStyles: /* @__PURE__ */ new Map()
   };
   const templateBody = nodeToAstro(root, ctx);
   const importLines = [];
   importLines.push(`import { getCollection } from 'astro:content';`);
   importLines.push(`import BaseLayout from '${layoutImportPath2}';`);
+  if (ctx.imageImports && ctx.imageImports.size > 0) {
+    importLines.push(`import { Picture } from 'astro:assets';`);
+    const sortedImages = Array.from(ctx.imageImports.entries()).sort(([a], [b]) => a.localeCompare(b));
+    for (const [varName, importPath] of sortedImages) {
+      importLines.push(`import ${varName} from '${importPath}';`);
+    }
+  }
   const componentImports = Array.from(ctx.imports).sort();
   for (const comp of componentImports) {
     const path = componentImportPath2(fileDepth, comp);
-    importLines.push(`import ${comp} from '${path}';`);
+    importLines.push(`import ${astroComponentName(comp)} from '${path}';`);
   }
   const staticPaths = buildGetStaticPaths(cmsSchema, isMultiLocale, i18nConfig, locale);
   const scriptsArrayLiteral = scriptPaths.length > 0 ? `[${scriptPaths.map((s) => `"${s}"`).join(", ")}]` : "[]";
@@ -2277,6 +2636,11 @@ function emitCMSPage(options) {
   if (v && typeof v === 'object' && v._i18n) return v['${locale}'] ?? v['${i18nConfig.defaultLocale}'] ?? Object.values(v).find(x => x !== true && x !== undefined) ?? '';
   return v ?? '';
 }`;
+  const interactiveStyleSection = ctx.collectedInteractiveStyles.size > 0 ? `
+<style is:global>
+${generateAllInteractiveCSS(ctx.collectedInteractiveStyles, breakpoints, remConfig, responsiveScales)}
+</style>
+` : "";
   return `---
 ${importLines.join("\n")}
 
@@ -2296,7 +2660,7 @@ ${resolverHelper}
   <div id="root">
 ${templateBody}  </div>
 </BaseLayout>
-`;
+${interactiveStyleSection}`;
 }
 function buildEmptyCMSPage(layoutImport, title, meta, locale, theme, fontPreloads, libraryTags, scriptPaths, cmsSchema, isMultiLocale, i18nConfig, binding, richTextFields) {
   const escapedMeta = escapeTemplateLiteral3(meta);
@@ -2338,25 +2702,32 @@ function isStyleMapping3(value) {
 function isResponsiveStyle3(style) {
   return "base" in style || "tablet" in style || "mobile" in style;
 }
-function collectFromStyle(style, classes, breakpoints) {
+function collectFromStyle(style, classes, breakpoints, responsiveScales) {
   if (!style) return;
   if (isResponsiveStyle3(style)) {
     for (const [bp, bpStyle] of Object.entries(style)) {
       if (!bpStyle) continue;
       let prefix = "";
+      let bpName;
       if (bp !== "base") {
         const bpValue = breakpoints[bp]?.breakpoint;
         if (bpValue) {
           prefix = `max-[${bpValue}px]:`;
+          bpName = bp;
         }
       }
-      collectFromFlatStyle(bpStyle, prefix, classes);
+      collectFromFlatStyle(bpStyle, prefix, classes, breakpoints, responsiveScales, bpName);
     }
   } else {
-    collectFromFlatStyle(style, "", classes);
+    collectFromFlatStyle(style, "", classes, breakpoints, responsiveScales);
   }
 }
-function collectFromFlatStyle(style, prefix, classes) {
+function collectFromFlatStyle(style, prefix, classes, breakpoints, responsiveScales, sourceBreakpoint) {
+  const shouldAutoScale = responsiveScales?.enabled === true && sourceBreakpoint === void 0;
+  const scaleBreakpoints = shouldAutoScale ? Object.entries(breakpoints).map(([name, cfg]) => ({ name, value: cfg?.breakpoint })).filter(
+    (bp) => typeof bp.value === "number" && bp.value > 0
+  ).sort((a, b) => b.value - a.value) : [];
+  const baseRef = responsiveScales?.baseReference ?? 16;
   for (const [property, value] of Object.entries(style)) {
     if (!isStyleMapping3(value)) continue;
     for (const [, cssValue] of Object.entries(value.values)) {
@@ -2364,41 +2735,58 @@ function collectFromFlatStyle(style, prefix, classes) {
       if (twClass) {
         classes.add(prefix ? `${prefix}${twClass}` : twClass);
       }
+      if (shouldAutoScale && responsiveScales) {
+        const strValue = String(cssValue);
+        if (strValue === "") continue;
+        for (const { name: bpName, value: bpPixels } of scaleBreakpoints) {
+          const scale = getScaleMultiplier(
+            responsiveScales,
+            property,
+            bpName
+          );
+          if (scale == null) continue;
+          const scaledValue = scalePropertyValue(strValue, baseRef, scale);
+          if (scaledValue == null || scaledValue === strValue) continue;
+          const scaledClass = propertyToTailwind(property, scaledValue);
+          if (!scaledClass) continue;
+          classes.add(`max-[${bpPixels}px]:${scaledClass}`);
+        }
+      }
     }
   }
 }
-function walkNode(node, classes, breakpoints) {
+function walkNode(node, classes, breakpoints, responsiveScales) {
   if (!node || typeof node === "string" || typeof node === "number") return;
   if (Array.isArray(node)) {
     for (const child of node) {
-      walkNode(child, classes, breakpoints);
+      walkNode(child, classes, breakpoints, responsiveScales);
     }
     return;
   }
   if ("style" in node && node.style) {
-    collectFromStyle(node.style, classes, breakpoints);
+    collectFromStyle(node.style, classes, breakpoints, responsiveScales);
   }
   if ("interactiveStyles" in node && Array.isArray(node.interactiveStyles)) {
     for (const rule of node.interactiveStyles) {
       if (rule.style) {
-        collectFromStyle(rule.style, classes, breakpoints);
+        collectFromStyle(rule.style, classes, breakpoints, responsiveScales);
       }
     }
   }
   if ("children" in node && node.children) {
     if (Array.isArray(node.children)) {
       for (const child of node.children) {
-        walkNode(child, classes, breakpoints);
+        walkNode(child, classes, breakpoints, responsiveScales);
       }
     }
   }
 }
-function collectAllMappingClasses(componentDefs, breakpoints = DEFAULT_BREAKPOINTS) {
+function collectAllMappingClasses(componentDefs, breakpoints = DEFAULT_BREAKPOINTS, responsiveScales) {
   const classes = /* @__PURE__ */ new Set();
   for (const def of Object.values(componentDefs)) {
     const structure = def.component?.structure;
     if (structure) {
-      walkNode(structure, classes, breakpoints);
+      walkNode(structure, classes, breakpoints, responsiveScales);
     }
   }
   return classes;
@@ -2408,18 +2796,40 @@ function collectAllMappingClasses(componentDefs, breakpoints = DEFAULT_BREAKPOIN
 function hashContent2(content) {
   return createHash("sha256").update(content).digest("hex").slice(0, 8);
 }
-function copyDirectory(src, dest) {
+function writePageScript(javascript, scriptsDir) {
+  if (!javascript) return [];
+  const hash = hashContent2(javascript);
+  const scriptFile = `${hash}.js`;
+  if (!existsSync(scriptsDir)) {
+    mkdirSync(scriptsDir, { recursive: true });
+  }
+  const fullScriptPath = join(scriptsDir, scriptFile);
+  if (!existsSync(fullScriptPath)) {
+    writeFileSync(fullScriptPath, javascript, "utf-8");
+  }
+  return [`/_scripts/${scriptFile}`];
+}
+function copyDirectory(src, dest, filter) {
   if (!existsSync(src)) return;
   if (!existsSync(dest)) mkdirSync(dest, { recursive: true });
   const files = readdirSync(src);
   for (const file of files) {
+    if (filter && !filter(file)) continue;
     const srcPath = join(src, file);
     const destPath = join(dest, file);
     const stat = statSync(srcPath);
-    if (stat.isDirectory()) copyDirectory(srcPath, destPath);
+    if (stat.isDirectory()) copyDirectory(srcPath, destPath, filter);
     else copyFileSync(srcPath, destPath);
   }
 }
+var imageVariantSuffixRe = new RegExp(
+  `-(${RESPONSIVE_WIDTHS.join("|")})\\.(webp|avif)$`
+);
+function shouldCopyImageForAstro(filename) {
+  if (filename === "manifest.json") return false;
+  if (imageVariantSuffixRe.test(filename)) return false;
+  return true;
+}
 function isCMSPage(pageData) {
   return pageData.meta?.source === "cms" && !!pageData.meta?.cms;
 }
@@ -2507,14 +2917,10 @@ import BaseLayout from '${importPath}';
 `;
 }
 async function buildAstroProject(projectRoot, outputDir) {
-  const startTime = Date.now();
-  console.log("\u{1F3D7}\uFE0F  Building Astro export...\n");
   configService.reset();
   const projectConfig = await loadProjectConfig();
   const siteUrl = projectConfig.siteUrl?.replace(/\/$/, "") || "";
   const i18nConfig = await loadI18nConfig();
-  console.log(`\u{1F310} Locales: ${i18nConfig.locales.map((l) => l.code).join(", ")} (default: ${i18nConfig.defaultLocale})
-`);
   await migrateTemplatesDirectory();
   const { components, warnings, errors: compErrors } = await loadComponentDirectory(projectPaths.components());
   const globalComponents = {};
@@ -2523,12 +2929,9 @@ async function buildAstroProject(projectRoot, outputDir) {
   });
   for (const w of warnings) console.warn(`  Warning: ${w}`);
   for (const e of compErrors) console.error(`  Error: ${e}`);
-  console.log(`Loaded ${components.size} global component(s)
-`);
   const cmsProvider = new FileSystemCMSProvider(projectPaths.templates(), projectPaths.cms());
   const cmsService = new CMSService(cmsProvider);
   await cmsService.initialize();
-  console.log("CMS service initialized\n");
   const themeConfig = await colorService.loadThemeConfig();
   const variablesConfig = await variableService.loadConfig();
   const breakpoints = await loadBreakpointConfig();
@@ -2537,10 +2940,6 @@ async function buildAstroProject(projectRoot, outputDir) {
   const globalLibraries = configService.getLibraries();
   const componentLibraries = collectComponentLibraries(globalComponents);
   const imageMetadataMap = await buildImageMetadataMap();
-  if (imageMetadataMap.size > 0) {
-    console.log(`Loaded image metadata for ${imageMetadataMap.size} image(s)
-`);
-  }
   const outDir = outputDir || join(projectPaths.project, "astro-export");
   if (existsSync(outDir)) {
     rmSync(outDir, { recursive: true, force: true });
@@ -2566,8 +2965,6 @@ async function buildAstroProject(projectRoot, outputDir) {
     console.warn("No pages found in ./pages directory");
     return { pages: 0, cmsPages: 0, collections: 0, errors: 0 };
   }
-  console.log(`Found ${pageFiles.length} page(s) to process
-`);
   const slugMappings = [];
   for (const file of pageFiles) {
     const pageName = file.replace(".json", "");
@@ -2588,6 +2985,7 @@ async function buildAstroProject(projectRoot, outputDir) {
   const allComponentCSS = /* @__PURE__ */ new Set();
   const jsContents = /* @__PURE__ */ new Map();
   let errorCount = 0;
+  let projectNeedsFormHandler = false;
   function mergeInteractiveStyles(source) {
     for (const [key, value] of source) {
       if (!allInteractiveStyles.has(key)) {
@@ -2606,6 +3004,9 @@ async function buildAstroProject(projectRoot, outputDir) {
         jsContents.set(hash, result.javascript);
       }
     }
+    if (!projectNeedsFormHandler && needsFormHandler(result.html)) {
+      projectNeedsFormHandler = true;
+    }
     allResults.push({
       html: result.html,
       meta: result.meta,
@@ -2620,7 +3021,8 @@ async function buildAstroProject(projectRoot, outputDir) {
       pageData,
       pageName,
       isCMSPage: isCMSPage3,
-      ssrFallbackCollector: result.ssrFallbackCollector
+      ssrFallbackCollector: result.ssrFallbackCollector,
+      processedRawHtmlCollector: result.processedRawHtmlCollector
     });
   }
   for (const file of pageFiles) {
@@ -2636,7 +3038,6 @@ async function buildAstroProject(projectRoot, outputDir) {
       const pageData = parseJSON(pageContent);
       const isDevBuild = process.env.MENO_DEV_BUILD === "true";
       if (pageData.meta?.draft === true && !isDevBuild) {
-        console.log(`  Skipping draft: ${basePath}`);
         continue;
       }
       const slugs = pageData.meta?.slugs;
@@ -2670,7 +3071,6 @@ async function buildAstroProject(projectRoot, outputDir) {
           // isProductionBuild
         );
         processRenderResult(result, urlPath, astroFilePath, fileDepth, pageData, pageName, false);
-        console.log(`  Rendered: ${urlPath}`);
       }
     } catch (error) {
       console.error(`  Error rendering ${basePath}:`, error?.message || error);
@@ -2680,18 +3080,45 @@ async function buildAstroProject(projectRoot, outputDir) {
   const fontPreloads = generateFontPreloadTags();
   const mergedLibraries = mergeLibraries(globalLibraries, componentLibraries);
   const buildLibraries = filterLibrariesByContext(mergedLibraries, "build");
-  const libraryTags = generateLibraryTags(buildLibraries);
+  const inlineContents = /* @__PURE__ */ new Map();
+  const localLibsToCopy = [];
+  for (const css of buildLibraries.css || []) {
+    if (!css.url.startsWith("/")) continue;
+    const shouldInline = css.inline !== false;
+    const relPath = css.url.slice(1);
+    const srcPath = join(projectPaths.project, relPath);
+    if (!existsSync(srcPath)) continue;
+    if (shouldInline) {
+      try {
+        inlineContents.set(css.url, await readFile(srcPath, "utf-8"));
+      } catch {
+        localLibsToCopy.push(relPath);
+      }
+    } else {
+      localLibsToCopy.push(relPath);
+    }
+  }
+  for (const js of buildLibraries.js || []) {
+    if (js.url.startsWith("/")) {
+      const relPath = js.url.slice(1);
+      if (existsSync(join(projectPaths.project, relPath))) {
+        localLibsToCopy.push(relPath);
+      }
+    }
+  }
+  const libraryTags = generateLibraryTags(buildLibraries, inlineContents);
   const defaultTheme = themeConfig.default || "light";
+  const customCode = configService.getCustomCode();
+  const iconsConfig = await loadIconsConfig();
+  const faviconTag = iconsConfig.favicon ? `<link rel="icon" href="${iconsConfig.favicon.replace(/"/g, "&quot;")}" />` : "";
+  const appleTouchIconTag = iconsConfig.appleTouchIcon ? `<link rel="apple-touch-icon" href="${iconsConfig.appleTouchIcon.replace(/"/g, "&quot;")}" />` : "";
+  const iconTagsHtml = [faviconTag, appleTouchIconTag].filter(Boolean).join("\n  ");
+  const remConversionConfig = configService.getRemConversion();
   const templatesDir = projectPaths.templates();
   const templateSchemas = [];
   let cmsPageCount = 0;
   if (existsSync(templatesDir)) {
     const templateFiles = readdirSync(templatesDir).filter((f) => f.endsWith(".json"));
-    if (templateFiles.length > 0) {
-      console.log(`
-Processing ${templateFiles.length} CMS template(s)...
-`);
-    }
     for (const file of templateFiles) {
       const templateContent = await loadJSONFile(join(templatesDir, file));
       if (!templateContent) continue;
@@ -2699,7 +3126,6 @@ Processing ${templateFiles.length} CMS template(s)...
         const pageData = parseJSON(templateContent);
         const isDevBuild = process.env.MENO_DEV_BUILD === "true";
         if (pageData.meta?.draft === true && !isDevBuild) {
-          console.log(`  Skipping draft template: ${file}`);
           continue;
         }
         if (!isCMSPage(pageData)) {
@@ -2708,14 +3134,8 @@ Processing ${templateFiles.length} CMS template(s)...
         }
         const cmsSchema = pageData.meta.cms;
         templateSchemas.push(cmsSchema);
-        console.log(`  CMS Collection: ${cmsSchema.id}`);
         const items = await cmsService.queryItems({ collection: cmsSchema.id });
         const itemCount = items.length;
-        if (itemCount === 0) {
-          console.log(`    No items found in cms/${cmsSchema.id}/`);
-        } else {
-          console.log(`    Found ${itemCount} item(s)`);
-        }
         const defaultLocale = i18nConfig.defaultLocale;
         const dummyPath = cmsSchema.urlPattern.replace("{{slug}}", "__placeholder__");
         const metaResult = await renderPageSSR(
@@ -2776,12 +3196,15 @@ Processing ${templateFiles.length} CMS template(s)...
             ssrFallbacks,
             pageName: file.replace(".json", ""),
             breakpoints,
+            responsiveScales,
             imageMetadataMap,
             i18nConfig,
             isMultiLocale: false,
             // Each file handles one locale
             slugMappings,
-            imageFormat: configService.getImageFormat()
+            imageFormat: configService.getImageFormat(),
+            processedRawHtml: metaResult.processedRawHtmlCollector,
+            remConfig: remConversionConfig
           });
           const astroFileFull = join(pagesOutDir, astroFilePath);
           const astroFileDir = astroFileFull.substring(0, astroFileFull.lastIndexOf("/"));
@@ -2790,7 +3213,6 @@ Processing ${templateFiles.length} CMS template(s)...
           }
           await writeFile2(astroFileFull, astroContent, "utf-8");
         }
-        console.log(`    Generated: ${pathPrefix}[slug].astro (${itemCount} items \xD7 ${localesToEmit.length} locale(s))`);
         cmsPageCount += itemCount * i18nConfig.locales.length;
       } catch (error) {
         console.error(`  Error processing template ${file}:`, error?.message || error);
@@ -2798,29 +3220,36 @@ Processing ${templateFiles.length} CMS template(s)...
       }
     }
   }
-  const mappingClasses = collectAllMappingClasses(globalComponents, breakpoints);
+  const mappingClasses = collectAllMappingClasses(globalComponents, breakpoints, responsiveScales);
   const fontCSS = generateFontCSS();
   const themeColorCSS = generateThemeColorVariablesCSS(themeConfig);
   const variablesCSS = generateVariablesCSS(variablesConfig, breakpoints, responsiveScales);
-  const remConversionConfig = configService.getRemConversion();
-  const interactiveCSS = generateAllInteractiveCSS(allInteractiveStyles, breakpoints, remConversionConfig);
   const componentCSSCombined = Array.from(allComponentCSS).join("\n");
   const baseCSS = `@layer base {
   * { margin: 0; padding: 0; box-sizing: border-box; }
   body { font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', sans-serif; }
   button { background: none; border: none; padding: 0; font: inherit; cursor: pointer; outline: inherit; }
-  img { display: block; width: 100%; height: 100%; }
+  img { max-width: 100%; height: auto; }
   picture { display: block; }
-  .olink { text-decoration: none; display: block; }
+  .olink { text-decoration: none; display: block; color: inherit; }
   .oem { display: inline-block; }
 }`;
-  const tailwindDirectives = `@tailwind base;
-@tailwind components;
-@tailwind utilities;`;
-  const globalCSS = [tailwindDirectives, fontCSS, themeColorCSS, variablesCSS, baseCSS, componentCSSCombined, interactiveCSS].filter(Boolean).join("\n\n");
+  const safelistClasses = Array.from(mappingClasses);
+  const safelistDirectives = safelistClasses.map((c) => `@source inline("${c}");`).join("\n");
+  const tailwindDirectives = safelistDirectives ? `@import "tailwindcss";
+
+${safelistDirectives}` : `@import "tailwindcss";`;
+  const globalCSS = [tailwindDirectives, fontCSS, themeColorCSS, variablesCSS, baseCSS, componentCSSCombined].filter(Boolean).join("\n\n");
   await writeFile2(join(stylesDir, "global.css"), globalCSS, "utf-8");
-  console.log(`
-Generated global.css (${(globalCSS.length / 1024).toFixed(1)} KB)`);
+  const escForTemplateLiteral = (s) => s.replace(/\\/g, "\\\\").replace(/`/g, "\\`").replace(/\$\{/g, "\\${");
+  const customHeadLiteral = escForTemplateLiteral(customCode.head || "");
+  const customBodyStartLiteral = escForTemplateLiteral(customCode.bodyStart || "");
+  const customBodyEndLiteral = escForTemplateLiteral(customCode.bodyEnd || "");
+  const iconTagsLiteral = escForTemplateLiteral(iconTagsHtml);
+  const formHandlerBlock = projectNeedsFormHandler ? `
+  <script is:inline>
+${formHandlerScript}
+  </script>` : "";
   const baseLayoutContent = `---
 import '../styles/global.css';
 
@@ -2841,48 +3270,37 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <Fragment set:html={\`${iconTagsLiteral}\`} />
   <Fragment set:html={fontPreloads} />
   <Fragment set:html={libraryTags.headCSS || ''} />
   <Fragment set:html={libraryTags.headJS || ''} />
   <Fragment set:html={meta} />
+  <Fragment set:html={\`${customHeadLiteral}\`} />
   <title>{title}</title>
 </head>
 <body>
+  <Fragment set:html={\`${customBodyStartLiteral}\`} />
   <slot />
   {scripts.map((s) => <script src={s} />)}
   <Fragment set:html={libraryTags.bodyEndJS || ''} />
+  <Fragment set:html={\`${customBodyEndLiteral}\`} />${formHandlerBlock}
 </body>
 </html>
 `;
   await writeFile2(join(layoutsDir, "BaseLayout.astro"), baseLayoutContent, "utf-8");
-  console.log("Generated BaseLayout.astro");
   let componentFileCount = 0;
   for (const [compName, compDef] of Object.entries(globalComponents)) {
     try {
-      const astroContent = emitAstroComponent(compName, compDef, globalComponents, breakpoints, i18nConfig.defaultLocale);
+      const astroContent = emitAstroComponent(compName, compDef, globalComponents, breakpoints, i18nConfig.defaultLocale, responsiveScales, remConversionConfig);
       await writeFile2(join(componentsOutDir, `${compName}.astro`), astroContent, "utf-8");
       componentFileCount++;
     } catch (error) {
       console.warn(`  Warning: could not generate component ${compName}: ${error?.message}`);
     }
   }
-  console.log(`Generated ${componentFileCount} component .astro file(s)`);
   for (const result of allResults) {
     const importPath = layoutImportPath(result.fileDepth);
-    const scriptPaths = [];
-    if (result.javascript) {
-      const hash = hashContent2(result.javascript);
-      const scriptFile = `${hash}.js`;
-      const scriptPublicPath = `/_scripts/${scriptFile}`;
-      if (!existsSync(scriptsDir)) {
-        mkdirSync(scriptsDir, { recursive: true });
-      }
-      const fullScriptPath = join(scriptsDir, scriptFile);
-      if (!existsSync(fullScriptPath)) {
-        await writeFile2(fullScriptPath, result.javascript, "utf-8");
-      }
-      scriptPaths.push(scriptPublicPath);
-    }
+    let scriptPaths = [];
     let astroContent;
     if (result.pageData) {
       try {
@@ -2897,23 +3315,28 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
           theme: defaultTheme,
           fontPreloads,
           libraryTags,
-          scriptPaths,
+          scriptPaths: [],
           layoutImportPath: importPath,
           fileDepth: result.fileDepth,
           ssrFallbacks,
           pageName: result.pageName || "index",
           breakpoints,
+          responsiveScales,
           imageMetadataMap,
           i18nConfig: i18nConfig.locales.length > 1 ? i18nConfig : void 0,
           currentPageSlugMap: pageSlugMap,
           slugMappings: i18nConfig.locales.length > 1 ? slugMappings : void 0,
-          imageFormat: configService.getImageFormat()
+          imageFormat: configService.getImageFormat(),
+          processedRawHtml: result.processedRawHtmlCollector,
+          remConfig: remConversionConfig
         });
       } catch (error) {
         console.warn(`  Warning: component emission failed for ${result.urlPath}, using SSR fallback: ${error?.message}`);
+        scriptPaths = writePageScript(result.javascript, scriptsDir);
         astroContent = buildSSRFallbackPage(result, importPath, fontPreloads, libraryTags, defaultTheme, scriptPaths);
       }
     } else {
+      scriptPaths = writePageScript(result.javascript, scriptsDir);
       astroContent = buildSSRFallbackPage(result, importPath, fontPreloads, libraryTags, defaultTheme, scriptPaths);
     }
     const astroFileFull = join(pagesOutDir, result.astroFilePath);
@@ -2923,7 +3346,23 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
     }
     await writeFile2(astroFileFull, astroContent, "utf-8");
   }
-  console.log(`Generated ${allResults.length} .astro page file(s)`);
+  const robotsTsContent = `import type { APIRoute } from 'astro';
+
+export const GET: APIRoute = () => {
+  const siteUrl = import.meta.env.SITE;
+  const robotsTxt = [
+    'User-agent: *',
+    'Allow: /',
+    '',
+    siteUrl ? \`Sitemap: \${siteUrl}/sitemap-index.xml\` : '',
+  ].filter(Boolean).join('\\n');
+
+  return new Response(robotsTxt, {
+    headers: { 'Content-Type': 'text/plain; charset=utf-8' },
+  });
+};
+`;
+  await writeFile2(join(pagesOutDir, "robots.txt.ts"), robotsTsContent, "utf-8");
   let collectionCount = 0;
   if (templateSchemas.length > 0) {
     const contentDir = join(srcDir, "content");
@@ -2959,7 +3398,7 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
         }
       }
       collectionDefs.push(`  '${schema.id}': defineCollection({
-    type: 'data',
+    loader: glob({ pattern: '**/*.json', base: './src/content/${schema.id}' }),
     schema: z.object({
 ${fieldDefs.join(",\n")}
     })
@@ -2967,6 +3406,7 @@ ${fieldDefs.join(",\n")}
       collectionCount++;
     }
     const configContent = `import { z, defineCollection } from 'astro:content';
+import { glob } from 'astro/loaders';
 
 const collections = {
 ${collectionDefs.join(",\n")}
@@ -2974,25 +3414,30 @@ ${collectionDefs.join(",\n")}
 
 export { collections };
 `;
-    await writeFile2(join(contentDir, "config.ts"), configContent, "utf-8");
-    console.log(`Generated ${collectionCount} content collection(s) with config.ts`);
+    await writeFile2(join(srcDir, "content.config.ts"), configContent, "utf-8");
   }
-  const assetDirs = ["fonts", "images", "icons", "videos", "assets"];
-  let copiedAssets = 0;
-  for (const dir of assetDirs) {
+  const imagesSrcDir = join(projectPaths.project, "images");
+  if (existsSync(imagesSrcDir)) {
+    copyDirectory(imagesSrcDir, join(srcDir, "assets", "images"), shouldCopyImageForAstro);
+    copyDirectory(imagesSrcDir, join(publicDir, "images"));
+  }
+  const publicAssetDirs = ["fonts", "icons", "videos", "assets"];
+  for (const dir of publicAssetDirs) {
     const srcAssetDir = join(projectPaths.project, dir);
     if (existsSync(srcAssetDir)) {
       copyDirectory(srcAssetDir, join(publicDir, dir));
-      copiedAssets++;
     }
   }
   const librariesDir = join(projectPaths.project, "libraries");
   if (existsSync(librariesDir)) {
     copyDirectory(librariesDir, join(publicDir, "libraries"));
-    copiedAssets++;
   }
-  if (copiedAssets > 0) {
-    console.log(`Copied ${copiedAssets} asset director${copiedAssets === 1 ? "y" : "ies"} to public/`);
+  for (const relPath of localLibsToCopy) {
+    const srcPath = join(projectPaths.project, relPath);
+    const destPath = join(publicDir, relPath);
+    const destDir = destPath.substring(0, destPath.lastIndexOf("/"));
+    if (destDir && !existsSync(destDir)) mkdirSync(destDir, { recursive: true });
+    copyFileSync(srcPath, destPath);
   }
   const packageJson = {
     name: "astro-export",
@@ -3006,9 +3451,14 @@ export { collections };
       preview: "astro preview"
     },
     dependencies: {
-      "astro": "^4.0.0",
-      "@astrojs/tailwind": "^5.0.0",
-      "tailwindcss": "^3.4.0"
+      "astro": "^6.0.0",
+      "@astrojs/sitemap": "^3.0.0",
+      "@tailwindcss/vite": "^4.0.0",
+      "tailwindcss": "^4.0.0"
+    },
+    // Astro 6 expects Vite 7; pin it so npm doesn't pull Vite 8+ and warn.
+    overrides: {
+      "vite": "^7.0.0"
     }
   };
   await writeFile2(join(outDir, "package.json"), JSON.stringify(packageJson, null, 2), "utf-8");
@@ -3020,51 +3470,24 @@ export { collections };
     routing: { prefixDefaultLocale: false },
   },` : "";
   const astroConfig = `import { defineConfig } from 'astro/config';
-import tailwind from '@astrojs/tailwind';
+import tailwindcss from '@tailwindcss/vite';
+import sitemap from '@astrojs/sitemap';
 
 export default defineConfig({${siteUrl ? `
   site: '${siteUrl}',` : ""}${i18nBlock}
-  integrations: [tailwind({ applyBaseStyles: false })],
-});
-`;
-  const safelistArray = Array.from(mappingClasses);
-  const safelistLiteral = safelistArray.length > 0 ? `
-  safelist: [
-${safelistArray.map((c) => `    '${c}'`).join(",\n")}
-  ],` : "";
-  const tailwindConfig = `/** @type {import('tailwindcss').Config} */
-export default {
-  content: ['./src/**/*.{astro,html,js,jsx,md,mdx,svelte,ts,tsx,vue}'],${safelistLiteral}
-  theme: {
-    extend: {},
+  integrations: [sitemap()],
+  vite: {
+    plugins: [tailwindcss()],
   },
-  plugins: [],
-};
+});
 `;
-  await writeFile2(join(outDir, "tailwind.config.mjs"), tailwindConfig, "utf-8");
   await writeFile2(join(outDir, "astro.config.mjs"), astroConfig, "utf-8");
   const tsConfig = {
     extends: "astro/tsconfigs/strict"
   };
   await writeFile2(join(outDir, "tsconfig.json"), JSON.stringify(tsConfig, null, 2), "utf-8");
-  console.log("Generated package.json, astro.config.mjs, tailwind.config.mjs, tsconfig.json");
-  const elapsed = ((Date.now() - startTime) / 1e3).toFixed(1);
+  await writeFile2(join(outDir, "src", "env.d.ts"), '/// <reference path="../.astro/types.d.ts" />\n', "utf-8");
   const totalPages = allResults.length;
-  console.log("\n" + "=".repeat(50));
-  console.log("Astro export complete!");
-  console.log(`  Pages: ${totalPages - cmsPageCount}`);
-  if (cmsPageCount > 0) {
-    console.log(`  CMS pages: ${cmsPageCount}`);
-  }
-  if (collectionCount > 0) {
-    console.log(`  Content collections: ${collectionCount}`);
-  }
-  if (errorCount > 0) {
-    console.log(`  Errors: ${errorCount}`);
-  }
-  console.log(`  Time: ${elapsed}s`);
-  console.log(`  Output: ${outDir}`);
-  console.log("");
   return {
     pages: totalPages - cmsPageCount,
     cmsPages: cmsPageCount,