meno-core 1.0.52 → 1.0.54

package/build-astro.ts

@@ -4,45 +4,54 @@
  * with a shared layout, global CSS, and optional CMS content collections.
  */
 
-import { existsSync, readdirSync, mkdirSync, rmSync, statSync, copyFileSync, writeFileSync } from "fs";
-import { writeFile, readFile } from "fs/promises";
-import { join } from "path";
-import { createHash } from "crypto";
+import { existsSync, readdirSync, mkdirSync, rmSync, statSync, copyFileSync, writeFileSync } from 'fs';
+import { writeFile, readFile } from 'fs/promises';
+import { join } from 'path';
+import { createHash } from 'crypto';
 import { inspect, minifyJS as runtimeMinifyJS } from './lib/server/runtime';
 import {
   loadJSONFile,
   loadComponentDirectory,
   mapPageNameToPath,
   parseJSON,
-  loadI18nConfig
-} from "./lib/server/jsonLoader";
-import { generateSSRHTML } from "./lib/server/ssrRenderer";
-import type { SSRHTMLResult } from "./lib/server/ssr/htmlGenerator";
-import { projectPaths } from "./lib/server/projectContext";
-import { loadProjectConfig, generateFontCSS, generateFontPreloadTags } from "./lib/shared/fontLoader";
-import { FileSystemCMSProvider } from "./lib/server/providers/fileSystemCMSProvider";
-import { CMSService } from "./lib/server/services/cmsService";
-import { isI18nValue, resolveI18nValue } from "./lib/shared/i18n";
-import type { ComponentDefinition, JSONPage, CMSSchema, CMSItem, I18nConfig } from "./lib/shared/types";
-import type { CMSFieldDefinition } from "./lib/shared/types/cms";
-import { isItemDraftForLocale } from "./lib/shared/types";
-import type { SlugMap } from "./lib/shared/slugTranslator";
-import { renderPageSSR } from "./lib/server/ssr/ssrRenderer";
-import { generateThemeColorVariablesCSS, generateVariablesCSS } from "./lib/server/cssGenerator";
-import { colorService } from "./lib/server/services/ColorService";
-import { variableService } from "./lib/server/services/VariableService";
-import { configService } from "./lib/server/services/configService";
-import { loadBreakpointConfig, loadIconsConfig } from "./lib/server/jsonLoader";
-import type { InteractiveStyles } from "./lib/shared/types/styles";
-import { collectComponentLibraries, filterLibrariesByContext, mergeLibraries, generateLibraryTags } from "./lib/shared/libraryLoader";
-import { migrateTemplatesDirectory } from "./lib/server/migrateTemplates";
-import { emitAstroComponent } from "./lib/server/astro/componentEmitter";
-import { emitAstroPage } from "./lib/server/astro/pageEmitter";
-import { emitCMSPage } from './lib/server/astro/cmsPageEmitter';
-import { collectAllMappingClasses } from "./lib/server/astro/cssCollector";
-import { buildImageMetadataMap, RESPONSIVE_WIDTHS } from "./lib/server/ssr/imageMetadata";
-import { needsFormHandler, formHandlerScript } from "./lib/client/scripts/formHandler";
-
+  loadI18nConfig,
+} from './lib/server/jsonLoader';
+import { generateSSRHTML } from './lib/server/ssrRenderer';
+import type { SSRHTMLResult } from './lib/server/ssr/htmlGenerator';
+import { projectPaths } from './lib/server/projectContext';
+import { loadProjectConfig, generateFontCSS, generateFontPreloadTags } from './lib/shared/fontLoader';
+import { FileSystemCMSProvider } from './lib/server/providers/fileSystemCMSProvider';
+import { CMSService } from './lib/server/services/cmsService';
+import { isI18nValue, resolveI18nValue } from './lib/shared/i18n';
+import { syncNetlifyLocale404Block } from './lib/shared/netlifyLocale404';
+import { tiptapToHtml } from './lib/shared/richtext/tiptapToHtml';
+import { isTiptapDocument } from './lib/shared/richtext/types';
+import type { ComponentDefinition, JSONPage, CMSSchema, CMSItem, I18nConfig } from './lib/shared/types';
+import type { CMSFieldDefinition } from './lib/shared/types/cms';
+import { isItemDraftForLocale } from './lib/shared/types';
+import { CMS_DRAFT_SUFFIX } from './lib/shared/pathSecurity';
+import type { SlugMap } from './lib/shared/slugTranslator';
+import { renderPageSSR } from './lib/server/ssr/ssrRenderer';
+import { generateThemeColorVariablesCSS, generateVariablesCSS } from './lib/server/cssGenerator';
+import { colorService } from './lib/server/services/ColorService';
+import { variableService } from './lib/server/services/VariableService';
+import { configService } from './lib/server/services/configService';
+import { loadBreakpointConfig, loadIconsConfig } from './lib/server/jsonLoader';
+import type { InteractiveStyles } from './lib/shared/types/styles';
+import {
+  collectComponentLibraries,
+  filterLibrariesByContext,
+  mergeLibraries,
+  generateLibraryTags,
+} from './lib/shared/libraryLoader';
+import { migrateTemplatesDirectory } from './lib/server/migrateTemplates';
+import { emitAstroComponent } from './lib/server/astro/componentEmitter';
+import { emitAstroPage } from './lib/server/astro/pageEmitter';
+import { normalizeOrphanTemplateProps } from './lib/server/astro/normalizeOrphanTemplateProps';
+import { emitCMSPage, CMS_SLUG_PLACEHOLDER } from './lib/server/astro/cmsPageEmitter';
+import { collectAllMappingClasses } from './lib/server/astro/cssCollector';
+import { buildImageMetadataMap, RESPONSIVE_WIDTHS } from './lib/server/ssr/imageMetadata';
+import { needsFormHandler, formHandlerScript } from './lib/client/scripts/formHandler';
 
 // ---------------------------------------------------------------------------
 // Helpers
@@ -66,11 +75,7 @@ function writePageScript(javascript: string | undefined, scriptsDir: string): st
   return [`/_scripts/${scriptFile}`];
 }
 
-function copyDirectory(
-  src: string,
-  dest: string,
-  filter?: (filename: string) => boolean,
-): void {
+function copyDirectory(src: string, dest: string, filter?: (filename: string) => boolean): void {
   if (!existsSync(src)) return;
   if (!existsSync(dest)) mkdirSync(dest, { recursive: true });
   const files = readdirSync(src);
@@ -87,9 +92,7 @@ function copyDirectory(
 // Astro's <Picture> re-derives responsive variants from originals at build
 // time, so the pre-baked -{width}.webp/.avif files and the SSR-only
 // manifest.json are dead weight in the exported project.
-const imageVariantSuffixRe = new RegExp(
-  `-(${RESPONSIVE_WIDTHS.join('|')})\\.(webp|avif)$`,
-);
+const imageVariantSuffixRe = new RegExp(`-(${RESPONSIVE_WIDTHS.join('|')})\\.(webp|avif)$`);
 function shouldCopyImageForAstro(filename: string): boolean {
   if (filename === 'manifest.json') return false;
   if (imageVariantSuffixRe.test(filename)) return false;
@@ -108,7 +111,7 @@ function buildCMSItemPath(
   item: CMSItem,
   slugField: string,
   locale: string,
-  i18nConfig: I18nConfig
+  i18nConfig: I18nConfig,
 ): string {
   let slug = item[slugField] ?? item._slug ?? item._id;
   if (isI18nValue(slug)) {
@@ -156,10 +159,7 @@ function escapeTemplateLiteral(s: string): string {
  * Compute locale → URL path map for a page's slug translations.
  * Used by locale list rendering to generate correct links.
  */
-function computePageSlugMap(
-  slugs: Record<string, string>,
-  i18nConfig: I18nConfig
-): Record<string, string> {
+function computePageSlugMap(slugs: Record<string, string>, i18nConfig: I18nConfig): Record<string, string> {
   const map: Record<string, string> = {};
   for (const localeConfig of i18nConfig.locales) {
     const code = localeConfig.code;
@@ -182,7 +182,9 @@ function cmsFieldToZod(field: CMSFieldDefinition): string {
     case 'string':
     case 'text':
     case 'rich-text':
-      // Support both plain strings and i18n objects { _i18n: true, en: "...", pl: "..." }
+      // Rich-text is serialized to an HTML string at item-copy time (see the
+      // CMS collection emission below), so by the time Astro validates it the
+      // value is a string (or an i18n object of strings). Support both.
       return 'z.union([z.string(), z.object({ _i18n: z.literal(true) }).passthrough()])';
     case 'number':
       return 'z.number()';
@@ -192,7 +194,7 @@ function cmsFieldToZod(field: CMSFieldDefinition): string {
       return 'z.coerce.date()';
     case 'select':
       if (field.options && field.options.length > 0) {
-        const opts = field.options.map(o => `'${o.replace(/'/g, "\\'")}'`).join(', ');
+        const opts = field.options.map((o) => `'${o.replace(/'/g, "\\'")}'`).join(', ');
         return `z.enum([${opts}])`;
       }
       return 'z.string()';
@@ -206,6 +208,101 @@ function cmsFieldToZod(field: CMSFieldDefinition): string {
   }
 }
 
+/**
+ * Serialize a single rich-text field value to an HTML string. Handles plain
+ * Tiptap doc objects, the `{ html: "..." }` marker shape, i18n-wrapped values
+ * ({ _i18n: true, en: <doc|string>, ... }), and already-serialized strings.
+ */
+function serializeRichTextValue(value: unknown): unknown {
+  const one = (v: unknown): unknown => {
+    if (v == null || typeof v === 'string') return v ?? '';
+    if (isTiptapDocument(v)) return tiptapToHtml(v);
+    if (typeof v === 'object' && v !== null && typeof (v as { html?: unknown }).html === 'string') {
+      return (v as { html: string }).html;
+    }
+    return v;
+  };
+
+  if (isI18nValue(value)) {
+    const out: Record<string, unknown> = { _i18n: true };
+    for (const [k, v] of Object.entries(value as Record<string, unknown>)) {
+      if (k === '_i18n') continue;
+      out[k] = one(v);
+    }
+    return out;
+  }
+  return one(value);
+}
+
+/**
+ * Walk a component structure and collect the names of every component instance
+ * it references (`{ type: 'component', component: 'X' }`).
+ */
+function collectComponentRefs(node: unknown, acc: Set<string>): void {
+  if (Array.isArray(node)) {
+    for (const child of node) collectComponentRefs(child, acc);
+    return;
+  }
+  if (!node || typeof node !== 'object') return;
+  const n = node as Record<string, unknown>;
+  if (n.type === 'component' && typeof n.component === 'string') {
+    acc.add(n.component);
+  }
+  for (const value of Object.values(n)) {
+    if (value && typeof value === 'object') collectComponentRefs(value, acc);
+  }
+}
+
+/**
+ * Compute the set of components that consume the CMS entry (`{{cms.*}}`),
+ * transitively including any component that renders a consumer in its own
+ * structure (it must forward the `cms` prop down). Astro components have
+ * isolated scopes, so each consumer needs the entry threaded in explicitly.
+ */
+function computeCmsConsumerComponents(components: Record<string, ComponentDefinition>): Set<string> {
+  const consumers = new Set<string>();
+  const refsByComponent = new Map<string, Set<string>>();
+
+  for (const [name, def] of Object.entries(components)) {
+    const structure = def.component?.structure;
+    if (structure && JSON.stringify(structure).includes('{{cms.')) {
+      consumers.add(name);
+    }
+    const refs = new Set<string>();
+    collectComponentRefs(structure, refs);
+    refsByComponent.set(name, refs);
+  }
+
+  // Fixpoint: a component that renders a consumer is itself a consumer/forwarder.
+  let changed = true;
+  while (changed) {
+    changed = false;
+    for (const [name, refs] of refsByComponent) {
+      if (consumers.has(name)) continue;
+      for (const ref of refs) {
+        if (consumers.has(ref)) {
+          consumers.add(name);
+          changed = true;
+          break;
+        }
+      }
+    }
+  }
+  return consumers;
+}
+
+/**
+ * Build the `_url` expression (a JS template literal over the `e` collection
+ * entry) for a CMS collection, so flattened list items expose a usable link.
+ * E.g. urlPattern "/blog/{{slug}}" + slugField "slug" → `/blog/${e.data.slug ?? e.id}`.
+ */
+function buildCollectionUrlExpr(schema: CMSSchema): string {
+  const slugField = schema.slugField || 'slug';
+  const pattern = schema.urlPattern || `/${schema.id}/{{slug}}`;
+  const body = pattern.replace(/\{\{[^}]+\}\}/, '${e.data.' + slugField + ' ?? e.id}');
+  return '`' + body + '`';
+}
+
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
@@ -260,15 +357,13 @@ function buildSSRFallbackPage(
   fontPreloads: string,
   libraryTags: { headCSS?: string; headJS?: string; bodyEndJS?: string },
   defaultTheme: string,
-  scriptPaths: string[]
+  scriptPaths: string[],
 ): string {
   const escapedMeta = escapeTemplateLiteral(result.meta);
   const escapedHTML = escapeTemplateLiteral(result.html);
   const escapedFontPreloads = escapeTemplateLiteral(fontPreloads);
 
-  const scriptsArrayLiteral = scriptPaths.length > 0
-    ? `[${scriptPaths.map(s => `"${s}"`).join(', ')}]`
-    : '[]';
+  const scriptsArrayLiteral = scriptPaths.length > 0 ? `[${scriptPaths.map((s) => `"${s}"`).join(', ')}]` : '[]';
 
   const libraryTagsLiteral = `{ headCSS: \`${escapeTemplateLiteral(libraryTags.headCSS || '')}\`, headJS: \`${escapeTemplateLiteral(libraryTags.headJS || '')}\`, bodyEndJS: \`${escapeTemplateLiteral(libraryTags.bodyEndJS || '')}\` }`;
 
@@ -293,10 +388,7 @@ import BaseLayout from '${importPath}';
 // Main export
 // ---------------------------------------------------------------------------
 
-export async function buildAstroProject(
-  projectRoot?: string,
-  outputDir?: string
-): Promise<AstroBuildStats> {
+export async function buildAstroProject(projectRoot?: string, outputDir?: string): Promise<AstroBuildStats> {
   // ----------------------------------------------------------
   // 1. Setup: load project configuration
   // ----------------------------------------------------------
@@ -311,7 +403,9 @@ export async function buildAstroProject(
 
   const { components, warnings, errors: compErrors } = await loadComponentDirectory(projectPaths.components());
   const globalComponents: Record<string, ComponentDefinition> = {};
-  components.forEach((value, key) => { globalComponents[key] = value; });
+  components.forEach((value, key) => {
+    globalComponents[key] = value;
+  });
   for (const w of warnings) console.warn(`  Warning: ${w}`);
   for (const e of compErrors) console.error(`  Error: ${e}`);
 
@@ -382,7 +476,9 @@ export async function buildAstroProject(
         const pageId = basePath === '/' ? 'index' : basePath.substring(1);
         slugMappings.push({ pageId, slugs: pageData.meta.slugs });
       }
-    } catch { /* ignore parse errors in first pass */ }
+    } catch {
+      /* ignore parse errors in first pass */
+    }
   }
 
   // ----------------------------------------------------------
@@ -406,13 +502,25 @@ export async function buildAstroProject(
 
   // Helper to process a render result
   function processRenderResult(
-    result: { html: string; meta: string; title: string; javascript: string; componentCSS?: string; locale: string; interactiveStylesMap: Map<string, InteractiveStyles>; preloadImages: any[]; neededCollections: Set<string>; ssrFallbackCollector?: Map<string, string>; processedRawHtmlCollector?: Map<string, string> },
+    result: {
+      html: string;
+      meta: string;
+      title: string;
+      javascript: string;
+      componentCSS?: string;
+      locale: string;
+      interactiveStylesMap: Map<string, InteractiveStyles>;
+      preloadImages: any[];
+      neededCollections: Set<string>;
+      ssrFallbackCollector?: Map<string, string>;
+      processedRawHtmlCollector?: Map<string, string>;
+    },
     urlPath: string,
     astroFilePath: string,
     fileDepth: number,
     pageData?: JSONPage,
     pageName?: string,
-    isCMSPage?: boolean
+    isCMSPage?: boolean,
   ): void {
     // Collect interactive styles
     mergeInteractiveStyles(result.interactiveStylesMap);
@@ -484,7 +592,12 @@ export async function buildAstroProject(
         // Compute URL path
         let slug: string;
         if (slugs && slugs[locale]) {
-          slug = slugs[locale];
+          // Slugs may be authored with a leading slash (e.g. "/blog" from the
+          // page-rename flow). Normalize to the bare form the rest of the
+          // pipeline expects — matches buildPageUrlForLocale(). A leading slash
+          // here would otherwise inflate fileDepth (".../blog.astro".split('/'))
+          // and produce a wrong "../../layouts" import.
+          slug = slugs[locale].replace(/^\/+/, '');
         } else if (basePath === '/') {
           slug = '';
         } else {
@@ -492,8 +605,12 @@ export async function buildAstroProject(
         }
 
         const urlPath = isDefault
-          ? (slug === '' ? '/' : `/${slug}`)
-          : (slug === '' ? `/${locale}` : `/${locale}/${slug}`);
+          ? slug === ''
+            ? '/'
+            : `/${slug}`
+          : slug === ''
+            ? `/${locale}`
+            : `/${locale}/${slug}`;
 
         // Determine .astro file path relative to src/pages/
         const astroFileName = slug === '' ? 'index.astro' : `${slug}.astro`;
@@ -510,7 +627,7 @@ export async function buildAstroProject(
           slugMappings,
           undefined, // cmsContext
           cmsService,
-          true // isProductionBuild
+          true, // isProductionBuild
         );
 
         processRenderResult(result, urlPath, astroFilePath, fileDepth, pageData, pageName, false);
@@ -584,8 +701,34 @@ export async function buildAstroProject(
   const templateSchemas: CMSSchema[] = [];
   let cmsPageCount = 0;
 
+  // Pre-pass: components that consume the CMS entry (so the page/component
+  // emitters know which instances to thread `cms={...}` into), plus per-
+  // collection `_url` expressions (for flattened collection lists). Built
+  // before the template loop so the very first emitted CMS page sees the
+  // full picture even when it lists items from another collection.
+  const cmsConsumerComponents = computeCmsConsumerComponents(globalComponents);
+  const collectionUrlExpr = new Map<string, string>();
+  const mergedRichTextFields = new Set<string>();
+  if (existsSync(templatesDir)) {
+    for (const file of readdirSync(templatesDir).filter((f) => f.endsWith('.json'))) {
+      const tc = await loadJSONFile(join(templatesDir, file));
+      if (!tc) continue;
+      try {
+        const pd = parseJSON<JSONPage>(tc);
+        const schema = pd.meta?.cms as CMSSchema | undefined;
+        if (!schema?.id) continue;
+        collectionUrlExpr.set(schema.id, buildCollectionUrlExpr(schema));
+        for (const [fn, fd] of Object.entries(schema.fields || {})) {
+          if (fd.type === 'rich-text') mergedRichTextFields.add(fn);
+        }
+      } catch {
+        /* ignore parse errors; handled in main loop */
+      }
+    }
+  }
+
   if (existsSync(templatesDir)) {
-    const templateFiles = readdirSync(templatesDir).filter(f => f.endsWith('.json'));
+    const templateFiles = readdirSync(templatesDir).filter((f) => f.endsWith('.json'));
 
     for (const file of templateFiles) {
       const templateContent = await loadJSONFile(join(templatesDir, file));
@@ -613,7 +756,7 @@ export async function buildAstroProject(
 
         // Render SSR once for metadata collection (interactive styles, component CSS, JS)
         const defaultLocale = i18nConfig.defaultLocale;
-        const dummyPath = cmsSchema.urlPattern.replace('{{slug}}', '__placeholder__');
+        const dummyPath = cmsSchema.urlPattern.replace('{{slug}}', CMS_SLUG_PLACEHOLDER);
 
         const metaResult = await renderPageSSR(
           pageData,
@@ -625,7 +768,7 @@ export async function buildAstroProject(
           slugMappings,
           undefined, // no CMS context - just collecting metadata
           cmsService,
-          true
+          true,
         );
 
         // Collect interactive styles and component CSS
@@ -663,13 +806,9 @@ export async function buildAstroProject(
           // Route file path: blog/[slug].astro for default, pl/blog/[slug].astro for non-default
           let astroFilePath: string;
           if (pathPrefix) {
-            astroFilePath = isDefault
-              ? `${pathPrefix}[slug].astro`
-              : `${localeCode}/${pathPrefix}[slug].astro`;
+            astroFilePath = isDefault ? `${pathPrefix}[slug].astro` : `${localeCode}/${pathPrefix}[slug].astro`;
           } else {
-            astroFilePath = isDefault
-              ? '[slug].astro'
-              : `${localeCode}/[slug].astro`;
+            astroFilePath = isDefault ? '[slug].astro' : `${localeCode}/[slug].astro`;
           }
 
           const fileDepth = astroFilePath.split('/').length - 1;
@@ -699,6 +838,8 @@ export async function buildAstroProject(
             imageFormat: configService.getImageFormat(),
             processedRawHtml: metaResult.processedRawHtmlCollector,
             remConfig: remConversionConfig,
+            cmsConsumers: cmsConsumerComponents,
+            collectionUrlExpr,
           });
 
           const astroFileFull = join(pagesOutDir, astroFilePath);
@@ -740,9 +881,7 @@ export async function buildAstroProject(
 }`;
 
   const safelistClasses = Array.from(mappingClasses);
-  const safelistDirectives = safelistClasses
-    .map(c => `@source inline("${c}");`)
-    .join('\n');
+  const safelistDirectives = safelistClasses.map((c) => `@source inline("${c}");`).join('\n');
   const tailwindDirectives = safelistDirectives
     ? `@import "tailwindcss";\n\n${safelistDirectives}`
     : `@import "tailwindcss";`;
@@ -758,19 +897,14 @@ export async function buildAstroProject(
   // ----------------------------------------------------------
   // Escape for embedding inside Astro <Fragment set:html={`...`}> template
   // literals in the generated BaseLayout file.
-  const escForTemplateLiteral = (s: string) => s
-    .replace(/\\/g, '\\\\')
-    .replace(/`/g, '\\`')
-    .replace(/\$\{/g, '\\${');
+  const escForTemplateLiteral = (s: string) => 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
-    ? `\n  <script is:inline>\n${formHandlerScript}\n  </script>`
-    : '';
+  const formHandlerBlock = projectNeedsFormHandler ? `\n  <script is:inline>\n${formHandlerScript}\n  </script>` : '';
 
   const baseLayoutContent = `---
 import '../styles/global.css';
@@ -815,10 +949,29 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
   // ----------------------------------------------------------
   // 7.5. Generate component .astro files
   // ----------------------------------------------------------
+  // SSR/Next.js resolve orphan `{{x}}` refs in a component's structure via
+  // the parentProps cascade in templateEngine. Astro can't fall back at
+  // runtime (each .astro file is its own scope), so we lift orphan refs
+  // onto each component's interface and forward them from hosts that
+  // declare the same prop. See `normalizeOrphanTemplateProps` for details.
+  const emittableComponents = normalizeOrphanTemplateProps(globalComponents);
   let componentFileCount = 0;
-  for (const [compName, compDef] of Object.entries(globalComponents)) {
+  for (const [compName, compDef] of Object.entries(emittableComponents)) {
     try {
-      const astroContent = emitAstroComponent(compName, compDef, globalComponents, breakpoints, i18nConfig.defaultLocale, responsiveScales, remConversionConfig);
+      const astroContent = emitAstroComponent(
+        compName,
+        compDef,
+        emittableComponents,
+        breakpoints,
+        i18nConfig.defaultLocale,
+        responsiveScales,
+        remConversionConfig,
+        {
+          cmsConsumers: cmsConsumerComponents,
+          cmsRichTextFields: mergedRichTextFields,
+          collectionUrlExpr,
+        },
+      );
       await writeFile(join(componentsOutDir, `${compName}.astro`), astroContent, 'utf-8');
       componentFileCount++;
     } catch (error: any) {
@@ -843,16 +996,15 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
         const ssrFallbacks = result.ssrFallbackCollector ?? new Map<string, string>();
 
         // Compute slug map for locale list rendering
-        const pageSlugMap: Record<string, string> | undefined =
-          result.pageData.meta?.slugs
-            ? computePageSlugMap(result.pageData.meta.slugs, i18nConfig)
-            : undefined;
+        const pageSlugMap: Record<string, string> | undefined = result.pageData.meta?.slugs
+          ? computePageSlugMap(result.pageData.meta.slugs, i18nConfig)
+          : undefined;
 
         // Component-structured pages don't need page-level _scripts/*.js
         // because each .astro component already has its own inline <script>
         astroContent = emitAstroPage({
           pageData: result.pageData,
-          globalComponents,
+          globalComponents: emittableComponents,
           title: result.title,
           meta: result.meta,
           locale: result.locale,
@@ -876,7 +1028,9 @@ const { title, meta = '', scripts = [], locale = 'en', theme = '${themeConfig.de
         });
       } catch (error: any) {
         // Fallback to SSR HTML if component emission fails — needs page-level script
-        console.warn(`  Warning: component emission failed for ${result.urlPath}, using SSR fallback: ${error?.message}`);
+        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);
       }
@@ -931,10 +1085,22 @@ export const GET: APIRoute = () => {
       const collectionDir = join(contentDir, schema.id);
       mkdirSync(collectionDir, { recursive: true });
 
+      // Rich-text fields are stored as Tiptap doc objects; Astro's content
+      // schema (and `<Fragment set:html>`) expects HTML strings. Mirror the
+      // live SSR (cmsSSRProcessor) by serializing them to HTML at copy time.
+      const richTextFieldNames = Object.entries(schema.fields || {})
+        .filter(([, fd]) => fd.type === 'rich-text')
+        .map(([fn]) => fn);
+
       // Copy CMS item JSON files, resolving i18n values to default locale
       const cmsItemsDir = join(projectPaths.cms(), schema.id);
       if (existsSync(cmsItemsDir)) {
-        const itemFiles = readdirSync(cmsItemsDir).filter(f => f.endsWith('.json'));
+        // Skip `*.draft.json` siblings in production builds — they mirror the
+        // published item-list filter and may hold partial/invalid WIP data.
+        const isDevBuild = process.env.MENO_DEV_BUILD === 'true';
+        const itemFiles = readdirSync(cmsItemsDir).filter(
+          (f) => f.endsWith('.json') && (isDevBuild || !f.endsWith(`${CMS_DRAFT_SUFFIX}.json`)),
+        );
 
         for (const itemFile of itemFiles) {
           try {
@@ -944,11 +1110,13 @@ export const GET: APIRoute = () => {
             // Keep i18n values as-is so getStaticPaths() can resolve per-locale
             const resolved: Record<string, unknown> = { ...item };
 
-            await writeFile(
-              join(collectionDir, itemFile),
-              JSON.stringify(resolved, null, 2),
-              'utf-8'
-            );
+            // Serialize rich-text fields (Tiptap doc → HTML string), handling
+            // i18n-wrapped values ({ _i18n: true, en: <doc>, ... }) per-locale.
+            for (const fieldName of richTextFieldNames) {
+              resolved[fieldName] = serializeRichTextValue(resolved[fieldName]);
+            }
+
+            await writeFile(join(collectionDir, itemFile), JSON.stringify(resolved, null, 2), 'utf-8');
           } catch (err: any) {
             console.warn(`    Warning: could not process CMS item ${itemFile}: ${err?.message}`);
           }
@@ -1015,7 +1183,7 @@ export { collections };
     const srcAssetDir = join(projectPaths.project, dir);
     if (existsSync(srcAssetDir)) {
       copyDirectory(srcAssetDir, join(publicDir, dir));
-      }
+    }
   }
 
   // Copy libraries folder if it exists
@@ -1052,24 +1220,23 @@ export { collections };
       preview: 'astro preview',
     },
     dependencies: {
-      'astro': '^6.0.0',
+      // Astro 5 (stable Vite), NOT 6 — Astro 6's rolldown-vite breaks
+      // @tailwindcss/vite at build time ("Missing field `tsconfigPaths`").
+      astro: '^5.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',
+      tailwindcss: '^4.0.0',
     },
   };
 
   await writeFile(join(outDir, 'package.json'), JSON.stringify(packageJson, null, 2), 'utf-8');
 
   // astro.config.mjs
-  const localeCodes = i18nConfig.locales.map(l => l.code);
-  const i18nBlock = i18nConfig.locales.length > 1
-    ? `\n  i18n: {\n    defaultLocale: '${i18nConfig.defaultLocale}',\n    locales: [${localeCodes.map(c => `'${c}'`).join(', ')}],\n    routing: { prefixDefaultLocale: false },\n  },`
-    : '';
+  const localeCodes = i18nConfig.locales.map((l) => l.code);
+  const i18nBlock =
+    i18nConfig.locales.length > 1
+      ? `\n  i18n: {\n    defaultLocale: '${i18nConfig.defaultLocale}',\n    locales: [${localeCodes.map((c) => `'${c}'`).join(', ')}],\n    routing: { prefixDefaultLocale: false },\n  },`
+      : '';
 
   const astroConfig = `import { defineConfig } from 'astro/config';
 import tailwindcss from '@tailwindcss/vite';
@@ -1092,6 +1259,27 @@ export default defineConfig({${siteUrl ? `\n  site: '${siteUrl}',` : ''}${i18nBl
 
   await writeFile(join(outDir, 'tsconfig.json'), JSON.stringify(tsConfig, null, 2), 'utf-8');
 
+  // netlify.toml — makes the exported project deployable on Netlify out of the
+  // box. `astro` is a real dependency here (see package.json above), so once
+  // Netlify runs `npm install`, `astro build` is on PATH and writes to dist/.
+  // Harmless on other hosts (Cloudflare Pages / Vercel ignore this file).
+  //
+  // Multi-locale projects WITH a 404 page (pages/404.json) also get the managed
+  // locale-404 redirects block (lib/shared/netlifyLocale404.ts): the regular-pages
+  // loop above emits src/pages/<locale>/404.astro per non-default locale, which
+  // Astro builds to dist/<locale>/404/index.html — exactly the rules' rewrite
+  // target — while the root 404.astro becomes Netlify's default catch-all 404.html.
+  const baseNetlifyToml = `# Generated by Meno's Astro build.
+[build]
+  command = "npm run build"
+  publish = "dist"
+
+[build.environment]
+  NODE_VERSION = "22"
+`;
+  const netlifyToml = syncNetlifyLocale404Block(baseNetlifyToml, i18nConfig, pageFiles.includes('404.json'));
+  await writeFile(join(outDir, 'netlify.toml'), netlifyToml, 'utf-8');
+
   // src/env.d.ts — resolves astro:assets and other virtual module types in IDE
   await writeFile(join(outDir, 'src', 'env.d.ts'), '/// <reference path="../.astro/types.d.ts" />\n', 'utf-8');