fix: make static site generation work

Author: Priestch

packages/markopress/src/build/index.ts

@@ -14,7 +14,8 @@ import type { ResolvedConfig } from '../config/types.js';
 import { getDesignSystem, getDarkModeOverride, type DesignSystem } from '../theme/default/design-systems/index.js';
 import { globalTagValidator, formatValidationError } from '../markdown/tag-validator.js';
 import { PluginManager } from '../plugin/manager.js';
-import { loadMarkdownModule, registerMarkdownContent } from './vite-markdown-plugin.js';
+import { loadMarkdownModule, registerMarkdownContent, escapeMarkoText } from './vite-markdown-plugin.js';
+import { renderMarkdown } from '../markdown/renderer.js';
 
 const BUILD_MODULE_DIR = path.dirname(fileURLToPath(import.meta.url));
 const MARKOPRESS_PACKAGE_ROOT = path.resolve(BUILD_MODULE_DIR, '..', '..');
@@ -202,9 +203,10 @@ export async function build(options: BuildOptions = {}): Promise<BuildResult> {
         }
       }
 
-      const enhancementsPath = path.join(generatedDir, 'module-enhancements.json');
-      await fs.writeFile(enhancementsPath, JSON.stringify(moduleEnhancements, null, 2), 'utf-8');
-      console.log(`   Wrote module enhancements to src/.generated/module-enhancements.json\n`);
+      const enhancementsPath = path.join(generatedDir, 'module-enhancements.js');
+      const enhancementsJs = `// Auto-generated by MarkoPress - Do not edit\nexport default ${JSON.stringify(moduleEnhancements, null, 2)};\n`;
+      await fs.writeFile(enhancementsPath, enhancementsJs, 'utf-8');
+      console.log(`   Wrote module enhancements to src/.generated/module-enhancements.js\n`);
     }
 
     // Step 5: Initialize tag validator if Marko tags enabled
@@ -244,8 +246,57 @@ export async function build(options: BuildOptions = {}): Promise<BuildResult> {
     const t6 = time('Route generation');
     t6.start();
     const routeMode = useCatchAllRoutes ?? config.build.useCatchAllRoutes;
+
+    // Step 7.5: Pre-render markdown to .marko files (build mode only)
+    // This runs before route generation so that import.meta.glob can discover the files
+    console.log('📄 Pre-rendering markdown to .marko files...');
+    const t7b = time('Pre-render markdown');
+    t7b.start();
+    const generatedMarkdownDir = path.join(root, 'src', '.generated', 'markdown');
+    await fs.mkdir(generatedMarkdownDir, { recursive: true });
+    const markdownMetadata: Record<string, { frontmatter: Record<string, unknown>; headers: unknown[] }> = {};
+    let preRenderedCount = 0;
+
+    for (const mod of modules) {
+      const moduleMarkdownDir = path.join(generatedMarkdownDir, mod.id);
+      await fs.mkdir(moduleMarkdownDir, { recursive: true });
+
+      for (const file of mod.files) {
+        try {
+          const source = await fs.readFile(file.filePath, 'utf-8');
+          const rendered = await renderMarkdown(source);
+
+          // Write .marko file with escaped HTML
+          // Clean up Shiki output: remove empty trailing <span class="line"></span>
+          // before </code> since Marko's parser is strict about tag nesting
+          let cleanHtml = rendered.html.replace(/<span class="line"><\/span>(\s*<\/code>)/g, '$1');
+          const markoContent = `<div class="markdown-content">\n${escapeMarkoText(cleanHtml)}\n</div>`;
+          const markoPath = path.join(moduleMarkdownDir, `${file.slug}.marko`);
+          await fs.writeFile(markoPath, markoContent);
+
+          // Store metadata
+          const metaKey = `${mod.id}/${file.slug}`;
+          markdownMetadata[metaKey] = {
+            frontmatter: rendered.frontmatter,
+            headers: rendered.headers || [],
+          };
+
+          preRenderedCount++;
+        } catch (err) {
+          console.warn(`   Warning: Failed to pre-render ${mod.id}/${file.slug}:`, err);
+        }
+      }
+    }
+
+    // Write metadata as JS module (placed outside markdown/ dir to avoid vite plugin collision)
+    const metadataPath = path.join(root, 'src', '.generated', 'content-metadata.js');
+    const metadataJs = `// Auto-generated by MarkoPress - Do not edit\nexport default ${JSON.stringify(markdownMetadata, null, 2)};\n`;
+    await fs.writeFile(metadataPath, metadataJs);
+    t7b.end();
+    console.log(`   Pre-rendered ${preRenderedCount} markdown files\n`);
+
     if (routeMode) {
-      await generateCatchAllRoutes(manifest, routesDir, config, modules, debug);
+      await generateCatchAllRoutes(manifest, routesDir, config, modules, debug, true);
       console.log('   Using catch-all dynamic routes');
     } else {
       await generateRoutes(manifest, routesDir, config, modules, debug);
@@ -347,6 +398,32 @@ export async function build(options: BuildOptions = {}): Promise<BuildResult> {
     // t13.end();
     // console.log('   Theme components copied\n');
 
+    // Step 15.5: Generate static URL manifest for the static adapter
+    // This allows @marko/run-adapter-static to crawl all dynamic routes
+    const staticUrls: string[] = [];
+    for (const mod of modules) {
+      for (const file of mod.files) {
+        if (mod.id === 'pages') {
+          // Pages are root-level: index → /, other → /slug
+          staticUrls.push(file.id === 'index' ? '/' : `/${file.id}`);
+        } else {
+          staticUrls.push(file.urlPath);
+        }
+      }
+    }
+    // Add plugin routes (e.g., /blog index page)
+    for (const routePath of Object.keys(routeManifest)) {
+      if (!staticUrls.includes(routePath)) {
+        staticUrls.push(routePath);
+      }
+    }
+    const staticUrlsPath = path.join(root, 'src', '.generated', 'static-urls.json');
+    await fs.mkdir(path.dirname(staticUrlsPath), { recursive: true });
+    await fs.writeFile(staticUrlsPath, JSON.stringify(staticUrls, null, 2));
+    if (debug) {
+      console.log(`   Generated static URL manifest: ${staticUrls.length} URLs`);
+    }
+
     // Step 16: Build with @marko/run
     console.log('🔨 Building with @marko/run...');
     const t14 = time('@marko/run build');
@@ -1724,10 +1801,11 @@ export async function generateCatchAllRoutes(
   routesDir: string,
   config: ResolvedConfig,
   modules: ContentModule[],
-  debug: boolean
+  debug: boolean,
+  isBuild: boolean = true
 ): Promise<void> {
   console.log('   Using catch-all dynamic routes...');
-  console.log('   Content will be rendered at request time');
+  console.log(`   Mode: ${isBuild ? 'build (pre-compiled)' : 'dev (request-time rendering)'}`);
 
   // Generate catch-all routes for each content directory from config
   const contentDirs = config.content || {};
@@ -1750,6 +1828,7 @@ export async function generateCatchAllRoutes(
         CONTENT_TYPE: 'pages',
         CONFIG_PATH: '../_config.js',
         VITE_PLUGIN_PATH: 'markopress/build',
+        IS_BUILD: isBuild ? 'true' : 'false',
       });
       await fs.writeFile(path.join(pagesDir, '+handler.js'), pagesHandler);
 
@@ -1770,6 +1849,7 @@ export async function generateCatchAllRoutes(
         CONTENT_TYPE: moduleId,
         CONFIG_PATH: '../../_config.js',
         VITE_PLUGIN_PATH: 'markopress/build',
+        IS_BUILD: isBuild ? 'true' : 'false',
       });
       await fs.writeFile(path.join(moduleDir, '+handler.js'), handlerTemplate);
 

packages/markopress/src/build/vite-markdown-plugin.ts

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { existsSync } from 'node:fs';
 
 const GLOBAL_COMPONENTS_KEY = '__MARKOPRESS_MARKDOWN_COMPONENTS__';
 const markdownComponents = ((globalThis as unknown) as Record<string, Map<string, string>>)[GLOBAL_COMPONENTS_KEY] ??= new Map();
@@ -65,6 +66,13 @@ export function markdownContentPlugin() {
         return undefined;
       }
 
+      // If the file exists on disk (pre-rendered during build), let Vite handle it normally
+      const cleanPath = id.split('?', 1)[0];
+      if (existsSync(cleanPath)) {
+        debug('load_FILE_EXISTS', { contentId, cleanPath });
+        return undefined;
+      }
+
       debug('load_MATCH', { contentId, storedKeys: Array.from(markdownComponents.keys()) });
 
       const html = markdownComponents.get(contentId);
@@ -104,7 +112,7 @@ function escapeHtml(value: string): string {
     .replace(/'/g, '&#39;');
 }
 
-function escapeMarkoText(value: string): string {
+export function escapeMarkoText(value: string): string {
   const input = String(value);
   let output = '';
   let inTag = false;
@@ -130,6 +138,13 @@ function escapeMarkoText(value: string): string {
       continue;
     }
 
+    // Escape // in text content - Marko treats it as a JS comment
+    if (!inTag && char === '/' && input[i + 1] === '/') {
+      output += '&#47;/';
+      i++;
+      continue;
+    }
+
     output += char;
   }
 

packages/markopress/src/dev/index.ts

@@ -62,7 +62,7 @@ export async function startDevServer(options: DevServerOptions = {}) {
   }
 
   if (routeMode) {
-    await generateCatchAllRoutes(manifest, routesDir, config, modules, false);
+    await generateCatchAllRoutes(manifest, routesDir, config, modules, false, false);
     console.log('   Using catch-all dynamic routes');
   } else {
     await generateRoutes(manifest, routesDir, config, modules, false);