@docubook/flame 1.7.1 → 2.0.0-alpha.0

package/.docu/lib/chunk-UISOJ4RW.js

@@ -0,0 +1,114 @@
+// .docu/node/runtime/deno.ts
+var denoAdapter = {
+  name: "deno",
+  serve(fetch, options) {
+    const server = Deno.serve(
+      {
+        port: options.port,
+        hostname: options.hostname,
+        onListen: () => {
+        }
+      },
+      fetch
+    );
+    return {
+      port: server.addr.port,
+      hostname: server.addr.hostname,
+      stop: () => server.shutdown()
+    };
+  }
+};
+
+// .docu/node/runtime/node.ts
+import { createServer } from "node:http";
+function toWebRequest(req, port, hostname) {
+  const host = req.headers.host ?? `${hostname}:${port}`;
+  const url = `http://${host}${req.url ?? "/"}`;
+  const headers = new Headers();
+  for (const [key, value] of Object.entries(req.headers)) {
+    if (value === void 0) continue;
+    if (Array.isArray(value)) {
+      for (const v of value) headers.append(key, v);
+    } else {
+      headers.set(key, value);
+    }
+  }
+  const method = req.method ?? "GET";
+  const hasBody = method !== "GET" && method !== "HEAD";
+  return new Request(url, {
+    method,
+    headers,
+    // IncomingMessage is an async iterable of Buffer chunks; Request accepts
+    // an async iterable body when half-duplex is declared.
+    body: hasBody ? req : void 0,
+    // @ts-expect-error -- required by undici for streaming request bodies
+    duplex: hasBody ? "half" : void 0
+  });
+}
+async function writeResponse(response, res) {
+  const headers = {};
+  const setCookie = response.headers.getSetCookie?.() ?? [];
+  response.headers.forEach((value, key) => {
+    if (key === "set-cookie") return;
+    headers[key] = value;
+  });
+  if (setCookie.length > 0) headers["set-cookie"] = setCookie;
+  res.writeHead(response.status, headers);
+  if (!response.body) {
+    res.end();
+    return;
+  }
+  const reader = response.body.getReader();
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      const ok = res.write(value);
+      if (!ok) await new Promise((resolve) => res.once("drain", resolve));
+    }
+    res.end();
+  } catch {
+    await reader.cancel().catch(() => {
+    });
+    res.destroy();
+  }
+}
+var nodeAdapter = {
+  name: "node",
+  serve(fetch, options) {
+    const hostname = options.hostname ?? "localhost";
+    const server = createServer((req, res) => {
+      Promise.resolve().then(() => fetch(toWebRequest(req, options.port, hostname))).then((response) => writeResponse(response, res)).catch((err) => {
+        console.error(err);
+        if (!res.headersSent) {
+          res.writeHead(500, { "Content-Type": "text/plain" });
+        }
+        res.end("Internal Server Error");
+      });
+    });
+    if (options.idleTimeout !== void 0) {
+      server.timeout = options.idleTimeout * 1e3;
+      server.keepAliveTimeout = options.idleTimeout * 1e3;
+    }
+    return new Promise((resolve, reject) => {
+      server.once("error", reject);
+      server.listen(options.port, () => {
+        const address = server.address();
+        const port = typeof address === "object" && address ? address.port : options.port;
+        resolve({
+          port,
+          hostname,
+          stop: () => new Promise((res2, rej2) => {
+            server.closeAllConnections?.();
+            server.close((err) => err ? rej2(err) : res2());
+          })
+        });
+      });
+    });
+  }
+};
+
+export {
+  denoAdapter,
+  nodeAdapter
+};

package/.docu/lib/{chunk-QPO4DS5F.js → chunk-VPV7KP7K.js}

@@ -9,12 +9,13 @@ import {
   compileMdx,
   computeInlineThemeCss,
   errorHtml,
+  frontmatterField,
   generateSearchIndex,
   hmrScript,
   htmlShell,
   initSentry,
   loadPlugins
-} from "./chunk-B6LGUADD.js";
+} from "./chunk-QPF4DPZQ.js";
 import {
   SECURITY_HEADERS,
   generateNonce,
@@ -27,7 +28,7 @@ import {
 } from "./chunk-EOK6KATZ.js";
 import {
   logger
-} from "./chunk-PFXUCD2U.js";
+} from "./chunk-AJV2GEDF.js";
 import {
   DIST_DIR,
   DOCS_DIR,
@@ -36,10 +37,12 @@ import {
 } from "./chunk-4IQXHHPF.js";
 
 // .docu/node/server.impl.ts
-import { watch } from "node:fs";
+import { watch, existsSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { createRequire } from "node:module";
 
 // .docu/node/server-routes.ts
-import { readFile } from "node:fs/promises";
+import { readFile, stat } from "node:fs/promises";
 import { resolve } from "node:path";
 import { readFileSync, statSync } from "node:fs";
 import React from "react";
@@ -61,6 +64,7 @@ function createHtmlResponse(title, description, body, status, state, depth = 0)
   });
   return htmlResponse(html, nonce, status, true);
 }
+var docsCache = /* @__PURE__ */ new Map();
 async function getDocsForSlug(slug, state) {
   if (!isSlugSafe(slug, DOCS_DIR)) return null;
   const paths = [
@@ -87,6 +91,11 @@ async function getDocsForSlug(slug, state) {
   }
   if (!filePath || !raw) return null;
   const relPath = filePath.replace(PROJECT_ROOT + "/", "");
+  const mtimeMs = (await stat(filePath)).mtimeMs;
+  const cached = docsCache.get(relPath);
+  if (cached && cached.mtimeMs === mtimeMs) {
+    return cached.doc;
+  }
   let content = raw;
   if (state.builder) {
     const transformed = await state.builder.runOnLoad(relPath, content);
@@ -105,7 +114,7 @@ async function getDocsForSlug(slug, state) {
       content
     });
   }
-  return {
+  const doc = {
     content: result.content,
     compiledSource: result.compiledSource,
     frontmatter,
@@ -113,10 +122,12 @@ async function getDocsForSlug(slug, state) {
     filePath: relPath,
     resolvedContent: content
   };
+  docsCache.set(relPath, { mtimeMs, doc });
+  return doc;
 }
 async function renderDocsServerPage(doc, slug, pathname, state) {
-  const title = (typeof doc.frontmatter.title === "string" ? doc.frontmatter.title : "") || slug.join("/") || "Docs";
-  const description = typeof doc.frontmatter.description === "string" ? doc.frontmatter.description : "";
+  const title = frontmatterField(doc.frontmatter, "title") || slug.join("/") || "Docs";
+  const description = frontmatterField(doc.frontmatter, "description");
   const page = React.createElement(
     DocsLayout,
     { repoUrl: state.docuConfig.repo?.url, pathname },
@@ -124,8 +135,9 @@ async function renderDocsServerPage(doc, slug, pathname, state) {
       slug,
       title,
       description,
-      date: doc.frontmatter.date,
-      content: doc.content,
+      date: frontmatterField(doc.frontmatter, "date") || void 0,
+      // Same root-relative SSR as build — see build.ts.
+      content: renderToString(doc.content),
       tocs: doc.tocs,
       filePath: doc.filePath,
       repoUrl: state.docuConfig.repo?.url,
@@ -283,6 +295,16 @@ async function runServer(adapter) {
     builder
   };
   const hmrClients = /* @__PURE__ */ new Set();
+  const require2 = createRequire(import.meta.url);
+  function resolveMdxContentSrc() {
+    try {
+      const pkgDir = dirname(require2.resolve("@docubook/markdown/package.json"));
+      const src = join(pkgDir, "src");
+      return existsSync(src) ? src : null;
+    } catch {
+      return null;
+    }
+  }
   let hmrTimeout = null;
   const watcher = watch(DOCS_DIR, { recursive: true }, (_event, filename) => {
     if (!filename || !filename.endsWith(".mdx") && !filename.endsWith(".md")) return;
@@ -297,12 +319,37 @@ async function runServer(adapter) {
       }
     }, 300);
   });
+  let srcHmrTimeout = null;
+  const mdxContentSrc = resolveMdxContentSrc();
+  const srcWatcher = mdxContentSrc ? watch(mdxContentSrc, { recursive: true }, (_event, filename) => {
+    if (!filename || !/\.(ts|tsx|js|jsx|css)$/.test(filename)) return;
+    if (srcHmrTimeout) clearTimeout(srcHmrTimeout);
+    srcHmrTimeout = setTimeout(async () => {
+      try {
+        state.assetManifest = await buildClientBundle();
+        logger.warn("[hmr] client bundle rebuilt (component change)");
+      } catch (e) {
+        logger.warn(
+          `[hmr] bundle rebuild failed: ${e instanceof Error ? e.message : String(e)}`
+        );
+      }
+      for (const client of [...hmrClients]) {
+        try {
+          client.enqueue(new TextEncoder().encode("data: reload\n\n"));
+        } catch {
+          hmrClients.delete(client);
+        }
+      }
+    }, 300);
+  }) : null;
   process.on("SIGINT", () => {
     watcher.close();
+    srcWatcher?.close();
     process.exit(0);
   });
   process.on("SIGTERM", () => {
     watcher.close();
+    srcWatcher?.close();
     process.exit(0);
   });
   let handle = null;

package/.docu/lib/{chunk-QL6TQV3S.js → chunk-X7KPVCDN.js}

@@ -28,7 +28,7 @@ var NGINX_CONF = `server {
   add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
   add_header Referrer-Policy "strict-origin-when-cross-origin" always;
   add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
-  add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'" always;
+  add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'" always;
 
   location /assets/ {
     expires 1y;
@@ -38,7 +38,7 @@ var NGINX_CONF = `server {
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
     add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
-    add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'" always;
+    add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'" always;
   }
 
   location /docs/assets/ {
@@ -49,7 +49,7 @@ var NGINX_CONF = `server {
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
     add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
-    add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'" always;
+    add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'" always;
   }
 
   location / {
@@ -113,7 +113,7 @@ var HEADERS_FILE = `/*
   Strict-Transport-Security: max-age=63072000; includeSubDomains; preload
   Referrer-Policy: strict-origin-when-cross-origin
   Permissions-Policy: camera=(), microphone=(), geolocation=()
-  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'
+  Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; img-src 'self' https: data:; font-src 'self' data:; connect-src 'self' https:; frame-src https://www.youtube-nocookie.com; frame-ancestors 'none'
 
 /assets/*
   Cache-Control: public, max-age=31536000, immutable
@@ -137,7 +137,7 @@ async function runBuild() {
     process.env.FLAME_BUILD_SILENT = "1";
     process.env.LOG_LEVEL = "error";
   }
-  const { runBuildCli } = await import("./build.impl-TUVHCOIP.js");
+  const { runBuildCli } = await import("./build.impl-WR24HDUT.js");
   await runBuildCli();
 }
 async function writeDockerFiles() {
@@ -145,7 +145,7 @@ async function writeDockerFiles() {
   if (!existsSync(join(dockerDir, "Dockerfile"))) {
     await writeFile(
       join(dockerDir, "Dockerfile"),
-      `FROM ghcr.io/docubook/flame-builder:${FLAME_MAJOR} AS builder
+      `FROM ghcr.io/docubook/flame:${FLAME_MAJOR} AS builder
 ENV NODE_ENV=production
 WORKDIR /app
 COPY . .

package/.docu/lib/clean.js

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-PFXUCD2U.js";
+} from "./chunk-AJV2GEDF.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/clean.ts

package/.docu/lib/deploy.deno.js

@@ -1,6 +1,6 @@
 import {
   runDeploy
-} from "./chunk-QL6TQV3S.js";
+} from "./chunk-X7KPVCDN.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/deploy.deno.ts

package/.docu/lib/deploy.node.js

@@ -1,6 +1,6 @@
 import {
   runDeploy
-} from "./chunk-QL6TQV3S.js";
+} from "./chunk-X7KPVCDN.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/deploy.node.ts

package/.docu/lib/preview.deno.js

@@ -1,10 +1,12 @@
 import {
   runPreview
-} from "./chunk-XMIEMHTQ.js";
+} from "./chunk-KEWRVASF.js";
+import {
+  denoAdapter
+} from "./chunk-UISOJ4RW.js";
 import "./chunk-EOK6KATZ.js";
-import "./chunk-PFXUCD2U.js";
+import "./chunk-AJV2GEDF.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/preview.deno.ts
-import { denoAdapter } from "@docubook/runt";
 await runPreview(denoAdapter);

package/.docu/lib/preview.node.js

@@ -1,10 +1,12 @@
 import {
   runPreview
-} from "./chunk-XMIEMHTQ.js";
+} from "./chunk-KEWRVASF.js";
+import {
+  nodeAdapter
+} from "./chunk-UISOJ4RW.js";
 import "./chunk-EOK6KATZ.js";
-import "./chunk-PFXUCD2U.js";
+import "./chunk-AJV2GEDF.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/preview.node.ts
-import { nodeAdapter } from "@docubook/runt";
 await runPreview(nodeAdapter);

package/.docu/lib/server.deno.js

@@ -1,11 +1,13 @@
 import {
   runServer
-} from "./chunk-QPO4DS5F.js";
-import "./chunk-B6LGUADD.js";
+} from "./chunk-VPV7KP7K.js";
+import "./chunk-QPF4DPZQ.js";
+import {
+  denoAdapter
+} from "./chunk-UISOJ4RW.js";
 import "./chunk-EOK6KATZ.js";
-import "./chunk-PFXUCD2U.js";
+import "./chunk-AJV2GEDF.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/server.deno.ts
-import { denoAdapter } from "@docubook/runt";
 await runServer(denoAdapter);

package/.docu/lib/server.node.js

@@ -1,11 +1,13 @@
 import {
   runServer
-} from "./chunk-QPO4DS5F.js";
-import "./chunk-B6LGUADD.js";
+} from "./chunk-VPV7KP7K.js";
+import "./chunk-QPF4DPZQ.js";
+import {
+  nodeAdapter
+} from "./chunk-UISOJ4RW.js";
 import "./chunk-EOK6KATZ.js";
-import "./chunk-PFXUCD2U.js";
+import "./chunk-AJV2GEDF.js";
 import "./chunk-4IQXHHPF.js";
 
 // .docu/node/server.node.ts
-import { nodeAdapter } from "@docubook/runt";
 await runServer(nodeAdapter);

package/.docu/node/build.impl.ts

@@ -12,7 +12,7 @@ import { createHash } from "node:crypto";
 import { join, dirname } from "node:path";
 import React from "react";
 import { renderToString } from "react-dom/server";
-import { compileMdx, getGitLastModifiedBatch } from "./mdx";
+import { compileMdx, compileMdxModule, frontmatterField, getGitLastModifiedBatch } from "./mdx";
 import {
   DOCS_DIR,
   DIST_DIR,
@@ -120,8 +120,8 @@ async function renderDocsPage(
     });
   }
 
-  const title = (typeof frontmatter.title === "string" ? frontmatter.title : "") || slug || "Docs";
-  const description = typeof frontmatter.description === "string" ? frontmatter.description : "";
+  const title = frontmatterField(frontmatter, "title") || slug || "Docs";
+  const description = frontmatterField(frontmatter, "description");
   const slugParts = slug ? slug.split("/") : [];
 
   const page = React.createElement(
@@ -131,12 +131,15 @@ async function renderDocsPage(
       slug: slugParts,
       title,
       description,
-      date: (frontmatter.date as string) || undefined,
-      content: result.content,
+      date: frontmatterField(frontmatter, "date") || undefined,
+      // Render MDX content as its own root: client hydrates the island as a
+      // separate root, so SSR must be root-relative too or useId-based ids
+      // (mdx-compiler components) mismatch during hydration.
+      content: renderToString(result.content),
       tocs: result.tocs,
       filePath,
       repoUrl: docuConfig.repo?.url,
-      compiledSource: result.compiledSource,
+      mdxSlug: slug,
     })
   );
 
@@ -149,11 +152,9 @@ async function renderDocsPage(
   const depth = slug ? slug.split("/").length : 1;
   const favicon = docuConfig.meta?.favicon || "/docs/assets/images/favicon.ico";
   const seo = buildSeoMeta(docuConfig, frontmatter, slug || "");
-  /**
-   * @docubook/mdx-remote uses new Function(compiledSource) for
-   * client-side MDX hydration. Keep allowEval=true until mdx-remote drops new Function.
-   */
-  const csp = cspHeader(nonce, true);
+  // MDX content hydrates from the bundled ESM module (mdx-hydrate), not
+  // new Function — no 'unsafe-eval' needed in the CSP.
+  const csp = cspHeader(nonce);
   let html = htmlShell({
     title,
     description,
@@ -217,9 +218,66 @@ export async function runBuild(): Promise<void> {
   let built = 0;
   let skipped = 0;
 
+  const pluginsConfig = docuConfig.plugins ?? [];
+  const builder = pluginsConfig.length > 0 ? new BuildPluginBuilder(docuConfig) : null;
+  if (builder) {
+    const plugins = await loadPlugins(pluginsConfig);
+    for (const plugin of plugins) {
+      await plugin.setup(builder);
+    }
+    await builder.runOnStart();
+  }
+
+  // Pre-compile every page's MDX to an ESM module (program format) so the
+  // client bundle can hydrate the content island statically — no new Function.
+  // Mirrors the page loop's transform + plugin chain so SSR and client trees
+  // match. Runs for all files regardless of cache; the bundle is shared by
+  // every page, so a content change invalidates the page cache anyway.
+  const mdxSources: Record<string, string> = {};
+  const prePassTasks = mdxFiles.map(async (file) => {
+    let raw: string;
+    try {
+      raw = await readFile(file.absPath, "utf-8");
+    } catch {
+      return;
+    }
+    let content = raw;
+    if (builder) {
+      const relPath = file.absPath.replace(PROJECT_ROOT + "/", "");
+      const transformed = await builder.runOnLoad(relPath, content);
+      if (transformed?.contents) content = transformed.contents;
+    }
+    const remarkPlugins = builder?.collectRemarkPlugins();
+    const rehypePlugins = builder?.collectRehypePlugins();
+    mdxSources[file.path] = await compileMdxModule(content, remarkPlugins, rehypePlugins);
+  });
+  await Promise.all(prePassTasks);
+
+  // The docs root (index.mdx) renders with slug "" — mirror that key so the
+  // index page hydrates too. Its render has its own try/catch; skip on error.
+  const indexMdxPath = join(DOCS_DIR, "index.mdx");
+  if (existsSync(indexMdxPath)) {
+    try {
+      const indexRaw = await readFile(indexMdxPath, "utf-8");
+      let indexContent = indexRaw;
+      if (builder) {
+        const relPath = indexMdxPath.replace(PROJECT_ROOT + "/", "");
+        const transformed = await builder.runOnLoad(relPath, indexContent);
+        if (transformed?.contents) indexContent = transformed.contents;
+      }
+      mdxSources[""] = await compileMdxModule(
+        indexContent,
+        builder?.collectRemarkPlugins(),
+        builder?.collectRehypePlugins()
+      );
+    } catch {
+      // ignore — the index render reports its own error
+    }
+  }
+
   logger.bundleStart();
   let t = performance.now();
-  assetManifest = await buildClientBundle();
+  assetManifest = await buildClientBundle(mdxSources);
   logger.bundleDone(Math.round(performance.now() - t));
 
   inlineThemeCss = computeInlineThemeCss();
@@ -235,16 +293,6 @@ export async function runBuild(): Promise<void> {
     };
   }
 
-  const pluginsConfig = docuConfig.plugins ?? [];
-  const builder = pluginsConfig.length > 0 ? new BuildPluginBuilder(docuConfig) : null;
-  if (builder) {
-    const plugins = await loadPlugins(pluginsConfig);
-    for (const plugin of plugins) {
-      await plugin.setup(builder);
-    }
-    await builder.runOnStart();
-  }
-
   logger.spinner.start("Building pages...");
   t = performance.now();
 
@@ -362,8 +410,7 @@ export async function runBuild(): Promise<void> {
     body: renderToString(landingPage),
     favicon: landingFavicon,
     seo: landingSeo,
-    /** unsafe-eval required by mdx-remote hydration — see above. */
-    csp: cspHeader(landingNonce, true),
+    csp: cspHeader(landingNonce),
     css: assetManifest.css,
     js: assetManifest.js,
     nonce: landingNonce,
@@ -384,8 +431,7 @@ export async function runBuild(): Promise<void> {
     body: renderToString(notFoundPage),
     favicon: notFoundFavicon,
     headExtra: ['<meta name="robots" content="noindex,follow">'],
-    /** unsafe-eval required by mdx-remote hydration — see above. */
-    csp: cspHeader(notFoundNonce, true),
+    csp: cspHeader(notFoundNonce),
     css: assetManifest.css,
     js: assetManifest.js,
     nonce: notFoundNonce,