meno-core 1.0.42 → 1.0.44

package/build-astro.ts

@@ -661,7 +661,8 @@ export async function buildAstroProject(
   const fontCSS = generateFontCSS();
   const themeColorCSS = generateThemeColorVariablesCSS(themeConfig);
   const variablesCSS = generateVariablesCSS(variablesConfig, breakpoints, responsiveScales);
-  const interactiveCSS = generateAllInteractiveCSS(allInteractiveStyles, breakpoints);
+  const remConversionConfig = configService.getRemConversion();
+  const interactiveCSS = generateAllInteractiveCSS(allInteractiveStyles, breakpoints, remConversionConfig);
   const componentCSSCombined = Array.from(allComponentCSS).join('\n');
 
   const baseCSS = `@layer base {

package/build-static.ts

@@ -454,6 +454,7 @@ async function buildCMSTemplates(
             cmsService,
             returnSeparateJS: true,
             pageLibraries: pageData.meta?.libraries,
+            pageCustomCode: pageData.meta?.customCode,
             clientDataCollections,
             isProductionBuild: true,
           }) as SSRHTMLResult;
@@ -876,6 +877,7 @@ export async function buildStaticPages(): Promise<void> {
           cmsService,
           returnSeparateJS: true,
           pageLibraries: pageData.meta?.libraries,
+          pageCustomCode: pageData.meta?.customCode,
           isProductionBuild: true,
         }) as SSRHTMLResult;
 

package/dist/bin/cli.js

@@ -82,7 +82,7 @@ function getMatchingHeaders(pathname, headersMap) {
   return result;
 }
 async function startStaticServer(distPath) {
-  const { SERVE_PORT } = await import("../chunks/constants-JOIPAAAA.js");
+  const { SERVE_PORT } = await import("../chunks/constants-34NUGHQR.js");
   const headersMap = parseHeadersFile(distPath);
   const server = await createRuntimeServer({
     port: SERVE_PORT,

package/dist/build-static.js

@@ -9,17 +9,17 @@ import {
   hashContent,
   injectTrackingScript,
   isCMSPage
-} from "./chunks/chunk-ACK7AURE.js";
-import "./chunks/chunk-UGHOL7IP.js";
-import "./chunks/chunk-24KKYW25.js";
+} from "./chunks/chunk-G3WIPJN3.js";
+import "./chunks/chunk-3XXLBUYA.js";
+import "./chunks/chunk-YEJVSNVF.js";
 import "./chunks/chunk-5Z5VQRTJ.js";
 import "./chunks/chunk-WQFG7PAH.js";
 import "./chunks/chunk-S2HXJTAF.js";
-import "./chunks/chunk-6AYGKR6Y.js";
-import "./chunks/chunk-ITVPRBD6.js";
-import "./chunks/chunk-PGH3ATYI.js";
+import "./chunks/chunk-OLNQMCSR.js";
+import "./chunks/chunk-KPNSCQNA.js";
+import "./chunks/chunk-X5SH4HXS.js";
 import "./chunks/chunk-UB44F4Z2.js";
-import "./chunks/chunk-DIYO4RBJ.js";
+import "./chunks/chunk-BXB6AX76.js";
 import "./chunks/chunk-KSBZ2L7C.js";
 export {
   buildCMSItemPath,

package/dist/chunks/{chunk-UGHOL7IP.js → chunk-3XXLBUYA.js}

@@ -1,6 +1,6 @@
 import {
   configService
-} from "./chunk-24KKYW25.js";
+} from "./chunk-YEJVSNVF.js";
 import {
   projectPaths,
   resolveProjectPath,
@@ -23,7 +23,7 @@ import {
   processStructure,
   resolveHtmlMapping,
   skipEmptyTemplateAttributes
-} from "./chunk-6AYGKR6Y.js";
+} from "./chunk-OLNQMCSR.js";
 import {
   DEFAULT_PREFETCH_CONFIG,
   SSRRegistry,
@@ -62,7 +62,7 @@ import {
   singularize,
   validateCMSItem,
   validateComponentDefinition
-} from "./chunk-ITVPRBD6.js";
+} from "./chunk-KPNSCQNA.js";
 import {
   DEFAULT_BREAKPOINTS,
   DEFAULT_I18N_CONFIG,
@@ -74,7 +74,7 @@ import {
   normalizeBreakpointConfig,
   resolveI18nValue,
   scalePropertyValue
-} from "./chunk-PGH3ATYI.js";
+} from "./chunk-X5SH4HXS.js";
 import {
   isTiptapDocument,
   tiptapToHtml
@@ -83,7 +83,7 @@ import {
   NODE_TYPE,
   RAW_HTML_PREFIX,
   init_constants
-} from "./chunk-DIYO4RBJ.js";
+} from "./chunk-BXB6AX76.js";
 import {
   __require
 } from "./chunk-KSBZ2L7C.js";
@@ -2756,12 +2756,7 @@ function renderImageElement(propsWithStyleAndAttrs, classAttr, attrs, ctx) {
   const fetchpriority = imgProps.fetchpriority;
   let width = imgProps.width;
   let height = imgProps.height;
-  const originalHeight = height;
   const metadata = src ? ctx.imageMetadataMap?.get(src) : void 0;
-  if (metadata) {
-    if (width === void 0 && metadata.width) width = metadata.width;
-    if (height === void 0 && metadata.height) height = metadata.height;
-  }
   const sizesAttr = sizes || DEFAULT_SIZES;
   if (fetchpriority === "high" && metadata && ctx.preloadImages) {
     if (metadata.avifSrcset && ctx.imageFormat !== "webp") {
@@ -2785,14 +2780,6 @@ function renderImageElement(propsWithStyleAndAttrs, classAttr, attrs, ctx) {
   if (loading) imgAttrs += ` loading="${escapeHtml(String(loading))}"`;
   if (width !== void 0) imgAttrs += ` width="${escapeHtml(String(width))}"`;
   if (height !== void 0) imgAttrs += ` height="${escapeHtml(String(height))}"`;
-  const needsHeightAuto = originalHeight === void 0 && height !== void 0;
-  let blurStyle = "";
-  if (metadata?.blurHash) {
-    const heightAuto = needsHeightAuto ? "height: auto; " : "";
-    blurStyle = ` style="${heightAuto}background-image: url(${escapeHtml(metadata.blurHash)}); background-size: cover;" onload="this.style.backgroundImage=''"`;
-  } else if (needsHeightAuto) {
-    blurStyle = ` style="height: auto;"`;
-  }
   if (metadata?.avifSrcset && ctx.imageFormat !== "webp") {
     const imgClassPrefixes = [
       "objf-",
@@ -2822,13 +2809,13 @@ function renderImageElement(propsWithStyleAndAttrs, classAttr, attrs, ctx) {
     }
     const pictureClassAttr = pictureClasses.length > 0 ? ` class="${escapeHtml(pictureClasses.join(" "))}"` : "";
     const imgClassAttr = imgClasses.length > 0 ? ` class="${escapeHtml(imgClasses.join(" "))}"` : "";
-    return `<picture${pictureClassAttr}><source type="image/avif" srcset="${escapeHtml(metadata.avifSrcset)}" sizes="${escapeHtml(sizesAttr)}" /><source type="image/webp" srcset="${escapeHtml(metadata.srcset)}" sizes="${escapeHtml(sizesAttr)}" /><img${imgClassAttr}${imgAttrs}${blurStyle}${attrs} /></picture>`;
+    return `<picture${pictureClassAttr}><source type="image/avif" srcset="${escapeHtml(metadata.avifSrcset)}" sizes="${escapeHtml(sizesAttr)}" /><source type="image/webp" srcset="${escapeHtml(metadata.srcset)}" sizes="${escapeHtml(sizesAttr)}" /><img${imgClassAttr}${imgAttrs}${attrs} /></picture>`;
   }
   if (metadata?.srcset) {
     imgAttrs += ` srcset="${escapeHtml(metadata.srcset)}"`;
     imgAttrs += ` sizes="${escapeHtml(sizesAttr)}"`;
   }
-  return `<img${classAttr}${imgAttrs}${blurStyle}${attrs} />`;
+  return `<img${classAttr}${imgAttrs}${attrs} />`;
 }
 function renderLocaleList(node, ctx) {
   const { slugMappings, pagePath, i18nConfig, locale } = ctx;
@@ -3303,6 +3290,7 @@ async function generateSSRHTML(pageDataOrOptions, globalComponents = {}, pagePat
     cmsTemplatePath,
     returnSeparateJS = false,
     pageLibraries,
+    pageCustomCode,
     clientDataCollections,
     injectLiveReload = false,
     isEditor = false,
@@ -3338,6 +3326,12 @@ async function generateSSRHTML(pageDataOrOptions, globalComponents = {}, pagePat
   }
   await configService.load();
   const globalLibraries = configService.getLibraries() || { js: [], css: [] };
+  const globalCustomCode = configService.getCustomCode();
+  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].filter(Boolean).join("\n")
+  };
   const componentLibraries = collectComponentLibraries(components, pageData.components || {});
   const globalPlusComponent = mergeLibraries(globalLibraries, componentLibraries) || { js: [], css: [] };
   const mergedRaw = mergeLibraries(globalPlusComponent, pageLibraries) || { js: [], css: [] };
@@ -3418,8 +3412,9 @@ ${escapedJavaScript}
   const responsiveScalesConfig = await loadResponsiveScalesConfig();
   const variablesConfig = await variableService.loadConfig();
   const variablesCSS = generateVariablesCSS(variablesConfig, breakpointConfig, responsiveScalesConfig);
-  const utilityCSS = generateUtilityCSS(usedUtilityClasses, breakpointConfig, responsiveScalesConfig);
-  const interactiveCSS = rendered.interactiveStylesMap.size > 0 ? generateAllInteractiveCSS(rendered.interactiveStylesMap, breakpointConfig) : "";
+  const remConversionConfig = configService.getRemConversion();
+  const utilityCSS = generateUtilityCSS(usedUtilityClasses, breakpointConfig, responsiveScalesConfig, remConversionConfig);
+  const interactiveCSS = rendered.interactiveStylesMap.size > 0 ? generateAllInteractiveCSS(rendered.interactiveStylesMap, breakpointConfig, remConversionConfig) : "";
   printMissingStyleWarnings(false);
   const baseCSS = `* {
   margin: 0;
@@ -3446,6 +3441,8 @@ picture {
 }
 .oem {
   display: inline-block;
+  vertical-align: top;
+  line-height: 0;
 }`;
   const combinedCSS = [
     fontCSS,
@@ -3487,13 +3484,13 @@ picture {
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   ${iconTags ? iconTags + "\n  " : ""}${scriptPreloadTag ? scriptPreloadTag + "\n  " : ""}${imagePreloadTags ? imagePreloadTags + "\n  " : ""}${fontPreloadTags ? fontPreloadTags + "\n  " : ""}${libraryTags.headCSS ? libraryTags.headCSS + "\n  " : ""}${libraryTags.headJS ? libraryTags.headJS + "\n  " : ""}${rendered.meta}
-  ${configInlineScript}${cmsInlineScript}${clientDataScripts}<style id="meno-styles">${styleContent}</style>
+  ${configInlineScript}${cmsInlineScript}${clientDataScripts}<style id="meno-styles">${styleContent}</style>${mergedCustomCode.head ? "\n  " + mergedCustomCode.head : ""}
 </head>
-<body>
+<body>${mergedCustomCode.bodyStart ? "\n  " + mergedCustomCode.bodyStart : ""}
   <div id="root">
     ${rendered.html}
   </div>
-  ${clientScript}${componentScript}${libraryTags.bodyEndJS ? "\n  " + libraryTags.bodyEndJS : ""}${liveReloadScript ? "\n  " + liveReloadScript : ""}${scrollHandlerScript ? "\n  " + scrollHandlerScript : ""}
+  ${clientScript}${componentScript}${libraryTags.bodyEndJS ? "\n  " + libraryTags.bodyEndJS : ""}${liveReloadScript ? "\n  " + liveReloadScript : ""}${scrollHandlerScript ? "\n  " + scrollHandlerScript : ""}${mergedCustomCode.bodyEnd ? "\n  " + mergedCustomCode.bodyEnd : ""}
 </body>
 </html>`;
   if (returnSeparateJS) {
@@ -5967,4 +5964,4 @@ export {
   FileSystemCMSProvider,
   migrateTemplatesDirectory
 };
-//# sourceMappingURL=chunk-UGHOL7IP.js.map
+//# sourceMappingURL=chunk-3XXLBUYA.js.map