fumadocs-mdx 11.7.4 → 11.8.0

package/dist/loader-mdx.cjs

@@ -102,6 +102,7 @@ function getDefaultMDXOptions({
   remarkStructureOptions,
   remarkCodeTabOptions,
   remarkNpmOptions,
+  _withoutBundler = false,
   ...mdxOptions
 }) {
   const mdxExports = [
@@ -120,7 +121,13 @@ function getDefaultMDXOptions({
           ...remarkHeadingOptions
         }
       ],
-      remarkImageOptions !== false && [plugins.remarkImage, remarkImageOptions],
+      remarkImageOptions !== false && [
+        plugins.remarkImage,
+        {
+          ...remarkImageOptions,
+          useImport: _withoutBundler ? false : remarkImageOptions?.useImport
+        }
+      ],
       "remarkCodeTab" in plugins && remarkCodeTabOptions !== false && [
         plugins.remarkCodeTab,
         remarkCodeTabOptions
@@ -145,6 +152,7 @@ function getDefaultMDXOptions({
   );
   return {
     ...mdxOptions,
+    outputFormat: _withoutBundler ? "function-body" : mdxOptions.outputFormat,
     remarkPlugins,
     rehypePlugins
   };
@@ -198,37 +206,73 @@ function buildConfig(config) {
       `Unknown export "${k}", you can only export collections from source configuration file.`
     );
   }
-  let cachedMdxOptions;
+  const mdxOptionsCache = /* @__PURE__ */ new Map();
   return {
     global: globalConfig,
     collections,
-    async getDefaultMDXOptions() {
-      if (cachedMdxOptions) return cachedMdxOptions;
+    async getDefaultMDXOptions(mode = "default") {
+      const cached = mdxOptionsCache.get(mode);
+      if (cached) return cached;
       const input = this.global.mdxOptions;
       async function uncached() {
         const options = typeof input === "function" ? await input() : input;
         const { getDefaultMDXOptions: getDefaultMDXOptions2 } = await Promise.resolve().then(() => (init_mdx_options(), mdx_options_exports));
         if (options?.preset === "minimal") return options;
-        return getDefaultMDXOptions2(options ?? {});
+        return getDefaultMDXOptions2({
+          ...options,
+          _withoutBundler: mode === "remote"
+        });
       }
-      return cachedMdxOptions = uncached();
+      const result = uncached();
+      mdxOptionsCache.set(mode, result);
+      return result;
     }
   };
 }
 
 // src/utils/config.ts
 var cache = null;
+async function isZod3() {
+  try {
+    const content = JSON.parse(
+      (await fs.readFile("node_modules/zod/package.json")).toString()
+    );
+    const version = content.version;
+    return typeof version === "string" && version.startsWith("3.");
+  } catch {
+    return false;
+  }
+}
+function createCompatZodPlugin() {
+  return {
+    name: "replace-zod-import",
+    async setup(build) {
+      const usingZod3 = await isZod3();
+      if (!usingZod3) return;
+      console.warn(
+        "[Fumadocs MDX] Noticed Zod v3 in your node_modules, we recommend upgrading to Zod v4 for better compatibility."
+      );
+      build.onResolve({ filter: /^fumadocs-mdx\/config$/ }, () => {
+        return {
+          path: "fumadocs-mdx/config/zod-3",
+          external: true
+        };
+      });
+    }
+  };
+}
 async function compileConfig(configPath, outDir) {
   const { build } = await import("esbuild");
   const transformed = await build({
     entryPoints: [{ in: configPath, out: "source.config" }],
     bundle: true,
     outdir: outDir,
-    target: "node18",
+    target: "node20",
     write: true,
     platform: "node",
     format: "esm",
     packages: "external",
+    plugins: [createCompatZodPlugin()],
     outExtension: {
       ".js": ".mjs"
     },
@@ -278,9 +322,9 @@ function fumaMatter(input) {
   if (!match) {
     return output;
   }
-  output.matter = match[1];
+  output.matter = match[0];
   output.content = input.slice(match[0].length);
-  const loaded = (0, import_js_yaml.load)(output.matter);
+  const loaded = (0, import_js_yaml.load)(match[1]);
   output.data = loaded ?? {};
   return output;
 }
@@ -314,7 +358,7 @@ function extractSection(root, section) {
 }
 function remarkInclude() {
   const TagName = "include";
-  async function update(tree, directory, processor, compiler) {
+  async function update(tree, directory, data) {
     const queue = [];
     (0, import_unist_util_visit.visit)(
       tree,
@@ -342,7 +386,7 @@ function remarkInclude() {
         const asCode = params.lang || !file.endsWith(".md") && !file.endsWith(".mdx");
         queue.push(
           fs2.readFile(targetPath).then((buffer) => buffer.toString()).then(async (content) => {
-            compiler?.addDependency(targetPath);
+            data._compiler?.addDependency(targetPath);
             if (asCode) {
               const lang = params.lang ?? path2.extname(file).slice(1);
               Object.assign(node, {
@@ -354,6 +398,9 @@ function remarkInclude() {
               });
               return;
             }
+            const processor = data._processor ? data._processor.getProcessor(
+              targetPath.endsWith(".md") ? "md" : "mdx"
+            ) : this;
             let parsed = processor.parse(fumaMatter(content).content);
             if (section) {
               const extracted = extractSection(parsed, section);
@@ -363,11 +410,11 @@ function remarkInclude() {
                 );
               parsed = extracted;
             }
-            await update(
+            await update.call(
+              processor,
               parsed,
               path2.dirname(targetPath),
-              processor,
-              compiler
+              data
             );
             Object.assign(
               parent && parent.type === "paragraph" ? parent : node,
@@ -387,7 +434,7 @@ ${e instanceof Error ? e.message : String(e)}`,
     await Promise.all(queue);
   }
   return async (tree, file) => {
-    await update(tree, path2.dirname(file.path), this, file.data._compiler);
+    await update.call(this, tree, path2.dirname(file.path), file.data);
   };
 }
 
@@ -395,29 +442,32 @@ ${e instanceof Error ? e.message : String(e)}`,
 var cache2 = /* @__PURE__ */ new Map();
 async function buildMDX(cacheKey, source, options) {
   const { filePath, frontmatter, data, _compiler, ...rest } = options;
-  let format = options.format;
-  if (filePath) {
-    format ??= filePath.endsWith(".mdx") ? "mdx" : "md";
-  }
-  format ??= "mdx";
-  const key = `${cacheKey}:${format}`;
-  let cached = cache2.get(key);
-  if (!cached) {
-    cached = (0, import_mdx.createProcessor)({
-      outputFormat: "program",
-      ...rest,
-      remarkPlugins: [remarkInclude, ...rest.remarkPlugins ?? []],
-      format
-    });
-    cache2.set(key, cached);
+  function getProcessor(format) {
+    const key = `${cacheKey}:${format}`;
+    let processor = cache2.get(key);
+    if (!processor) {
+      processor = (0, import_mdx.createProcessor)({
+        outputFormat: "program",
+        ...rest,
+        remarkPlugins: [remarkInclude, ...rest.remarkPlugins ?? []],
+        format
+      });
+      cache2.set(key, processor);
+    }
+    return processor;
   }
-  return cached.process({
+  return getProcessor(
+    options.format ?? filePath.endsWith(".mdx") ? "mdx" : "md"
+  ).process({
     value: source,
     path: filePath,
     data: {
       ...data,
       frontmatter,
-      _compiler
+      _compiler,
+      _processor: {
+        getProcessor
+      }
     }
   });
 }
@@ -445,25 +495,8 @@ async function getGitTimestamp(file) {
   }
 }
 
-// src/utils/schema.ts
-var import_zod = require("zod");
+// src/utils/validation.ts
 var import_picocolors = __toESM(require("picocolors"), 1);
-var metaSchema = import_zod.z.object({
-  title: import_zod.z.string().optional(),
-  pages: import_zod.z.array(import_zod.z.string()).optional(),
-  description: import_zod.z.string().optional(),
-  root: import_zod.z.boolean().optional(),
-  defaultOpen: import_zod.z.boolean().optional(),
-  icon: import_zod.z.string().optional()
-});
-var frontmatterSchema = import_zod.z.object({
-  title: import_zod.z.string(),
-  description: import_zod.z.string().optional(),
-  icon: import_zod.z.string().optional(),
-  full: import_zod.z.boolean().optional(),
-  // Fumadocs OpenAPI generated
-  _openapi: import_zod.z.looseObject({}).optional()
-});
 var ValidationError = class extends Error {
   constructor(message, issues) {
     super(

package/dist/loader-mdx.js

@@ -1,23 +1,23 @@
 import {
   getConfigHash,
   loadConfig
-} from "./chunk-4CGSOZUZ.js";
+} from "./chunk-XZR5QXVY.js";
 import {
-  buildMDX,
   countLines
-} from "./chunk-2K55VKP6.js";
-import {
-  getGitTimestamp
-} from "./chunk-VUEZTR2H.js";
+} from "./chunk-UCY7OBZG.js";
 import {
   ValidationError,
+  getGitTimestamp,
   validate
-} from "./chunk-ZOWJF3OH.js";
-import "./chunk-PQCNPAD3.js";
-import "./chunk-JFNBRKRV.js";
+} from "./chunk-GX3THK2Q.js";
+import {
+  buildMDX
+} from "./chunk-7JFPDRW7.js";
+import "./chunk-IGXZS2W6.js";
+import "./chunk-XVL4ZQFK.js";
 import {
   fumaMatter
-} from "./chunk-KVWX6THC.js";
+} from "./chunk-VWJKRQZR.js";
 
 // src/loader-mdx.ts
 import * as path from "path";

package/dist/{mdx-options-UDV5WEFU.js → mdx-options-3NB74EMB.js}

@@ -1,6 +1,6 @@
 import {
   getDefaultMDXOptions
-} from "./chunk-2CSSQTP6.js";
+} from "./chunk-GYWPPGFD.js";
 export {
   getDefaultMDXOptions
 };

package/dist/next/index.cjs

@@ -102,6 +102,7 @@ function getDefaultMDXOptions({
   remarkStructureOptions,
   remarkCodeTabOptions,
   remarkNpmOptions,
+  _withoutBundler = false,
   ...mdxOptions
 }) {
   const mdxExports = [
@@ -120,7 +121,13 @@ function getDefaultMDXOptions({
           ...remarkHeadingOptions
         }
       ],
-      remarkImageOptions !== false && [plugins.remarkImage, remarkImageOptions],
+      remarkImageOptions !== false && [
+        plugins.remarkImage,
+        {
+          ...remarkImageOptions,
+          useImport: _withoutBundler ? false : remarkImageOptions?.useImport
+        }
+      ],
       "remarkCodeTab" in plugins && remarkCodeTabOptions !== false && [
         plugins.remarkCodeTab,
         remarkCodeTabOptions
@@ -145,6 +152,7 @@ function getDefaultMDXOptions({
   );
   return {
     ...mdxOptions,
+    outputFormat: _withoutBundler ? "function-body" : mdxOptions.outputFormat,
     remarkPlugins,
     rehypePlugins
   };
@@ -228,20 +236,26 @@ function buildConfig(config) {
       `Unknown export "${k}", you can only export collections from source configuration file.`
     );
   }
-  let cachedMdxOptions;
+  const mdxOptionsCache = /* @__PURE__ */ new Map();
   return {
     global: globalConfig,
     collections,
-    async getDefaultMDXOptions() {
-      if (cachedMdxOptions) return cachedMdxOptions;
+    async getDefaultMDXOptions(mode = "default") {
+      const cached = mdxOptionsCache.get(mode);
+      if (cached) return cached;
       const input = this.global.mdxOptions;
       async function uncached() {
         const options = typeof input === "function" ? await input() : input;
         const { getDefaultMDXOptions: getDefaultMDXOptions2 } = await Promise.resolve().then(() => (init_mdx_options(), mdx_options_exports));
         if (options?.preset === "minimal") return options;
-        return getDefaultMDXOptions2(options ?? {});
+        return getDefaultMDXOptions2({
+          ...options,
+          _withoutBundler: mode === "remote"
+        });
       }
-      return cachedMdxOptions = uncached();
+      const result = uncached();
+      mdxOptionsCache.set(mode, result);
+      return result;
     }
   };
 }
@@ -251,17 +265,47 @@ function findConfigFile() {
   return path.resolve("source.config.ts");
 }
 var cache = null;
+async function isZod3() {
+  try {
+    const content = JSON.parse(
+      (await fs.readFile("node_modules/zod/package.json")).toString()
+    );
+    const version = content.version;
+    return typeof version === "string" && version.startsWith("3.");
+  } catch {
+    return false;
+  }
+}
+function createCompatZodPlugin() {
+  return {
+    name: "replace-zod-import",
+    async setup(build) {
+      const usingZod3 = await isZod3();
+      if (!usingZod3) return;
+      console.warn(
+        "[Fumadocs MDX] Noticed Zod v3 in your node_modules, we recommend upgrading to Zod v4 for better compatibility."
+      );
+      build.onResolve({ filter: /^fumadocs-mdx\/config$/ }, () => {
+        return {
+          path: "fumadocs-mdx/config/zod-3",
+          external: true
+        };
+      });
+    }
+  };
+}
 async function compileConfig(configPath, outDir) {
   const { build } = await import("esbuild");
   const transformed = await build({
     entryPoints: [{ in: configPath, out: "source.config" }],
     bundle: true,
     outdir: outDir,
-    target: "node18",
+    target: "node20",
     write: true,
     platform: "node",
     format: "esm",
     packages: "external",
+    plugins: [createCompatZodPlugin()],
     outExtension: {
       ".js": ".mjs"
     },
@@ -303,25 +347,8 @@ var path4 = __toESM(require("path"), 1);
 var fs2 = __toESM(require("fs/promises"), 1);
 var import_tinyglobby = require("tinyglobby");
 
-// src/utils/schema.ts
-var import_zod = require("zod");
+// src/utils/validation.ts
 var import_picocolors = __toESM(require("picocolors"), 1);
-var metaSchema = import_zod.z.object({
-  title: import_zod.z.string().optional(),
-  pages: import_zod.z.array(import_zod.z.string()).optional(),
-  description: import_zod.z.string().optional(),
-  root: import_zod.z.boolean().optional(),
-  defaultOpen: import_zod.z.boolean().optional(),
-  icon: import_zod.z.string().optional()
-});
-var frontmatterSchema = import_zod.z.object({
-  title: import_zod.z.string(),
-  description: import_zod.z.string().optional(),
-  icon: import_zod.z.string().optional(),
-  full: import_zod.z.boolean().optional(),
-  // Fumadocs OpenAPI generated
-  _openapi: import_zod.z.looseObject({}).optional()
-});
 var ValidationError = class extends Error {
   constructor(message, issues) {
     super(
@@ -413,9 +440,9 @@ function fumaMatter(input) {
   if (!match) {
     return output;
   }
-  output.matter = match[1];
+  output.matter = match[0];
   output.content = input.slice(match[0].length);
-  const loaded = (0, import_js_yaml.load)(output.matter);
+  const loaded = (0, import_js_yaml.load)(match[1]);
   output.data = loaded ?? {};
   return output;
 }
@@ -437,7 +464,14 @@ function getImportCode(info) {
 }
 function toImportPath(file, config) {
   const ext = import_node_path2.default.extname(file);
-  const filename = ext === ".ts" ? file.substring(0, file.length - ext.length) : file;
+  let filename;
+  if (ext === ".ts" && config.jsExtension) {
+    filename = file.substring(0, file.length - ext.length) + ".js";
+  } else if (ext === ".ts") {
+    filename = file.substring(0, file.length - ext.length);
+  } else {
+    filename = file;
+  }
   let importPath;
   if ("relativeTo" in config) {
     importPath = import_node_path2.default.relative(config.relativeTo, filename);
@@ -562,7 +596,7 @@ async function generateJS(configPath, config, importPath, configHash = false) {
         info: file,
         lastModified,
         data,
-        content: parsed.content
+        content: { body: parsed.content, matter: parsed.matter }
       });
     });
     return Promise.all(entries2);

package/dist/next/index.js

@@ -2,24 +2,22 @@ import {
   findConfigFile,
   getConfigHash,
   loadConfig
-} from "../chunk-4CGSOZUZ.js";
+} from "../chunk-XZR5QXVY.js";
 import {
   getGlobPatterns,
   getImportCode,
   isFileSupported,
   toImportPath
-} from "../chunk-OWZSTKKX.js";
-import {
-  getGitTimestamp
-} from "../chunk-VUEZTR2H.js";
+} from "../chunk-6Y5JDZHD.js";
 import {
   ValidationError,
+  getGitTimestamp,
   validate
-} from "../chunk-ZOWJF3OH.js";
-import "../chunk-JFNBRKRV.js";
+} from "../chunk-GX3THK2Q.js";
+import "../chunk-XVL4ZQFK.js";
 import {
   fumaMatter
-} from "../chunk-KVWX6THC.js";
+} from "../chunk-VWJKRQZR.js";
 
 // src/map/index.ts
 import * as path2 from "path";
@@ -145,7 +143,7 @@ async function generateJS(configPath, config, importPath, configHash = false) {
         info: file,
         lastModified,
         data,
-        content: parsed.content
+        content: { body: parsed.content, matter: parsed.matter }
       });
     });
     return Promise.all(entries2);