fumadocs-core 15.5.3 → 15.5.4

package/dist/{chunk-KNWSJ4IF.js → chunk-3NX26V7I.js}

@@ -8,18 +8,49 @@ var defaultThemes = {
 };
 var highlighters = /* @__PURE__ */ new Map();
 async function _highlight(code, options) {
-  const { lang, components: _, engine, ...rest } = options;
-  let themes = { themes: defaultThemes };
+  const {
+    lang: initialLang,
+    fallbackLanguage,
+    components: _,
+    engine = "oniguruma",
+    ...rest
+  } = options;
+  let lang = initialLang;
+  let themes;
+  let themesToLoad;
   if ("theme" in options && options.theme) {
     themes = { theme: options.theme };
-  } else if ("themes" in options && options.themes) {
-    themes = { themes: options.themes };
+    themesToLoad = [themes.theme];
+  } else {
+    themes = {
+      themes: "themes" in options && options.themes ? options.themes : defaultThemes
+    };
+    themesToLoad = Object.values(themes.themes).filter((v) => v !== void 0);
+  }
+  let highlighter;
+  if (typeof engine === "string") {
+    highlighter = await getHighlighter(engine, {
+      langs: [],
+      themes: themesToLoad
+    });
+  } else {
+    highlighter = await getHighlighter("custom", {
+      engine,
+      langs: [],
+      themes: themesToLoad
+    });
+    if (process.env.NODE_ENV === "development") {
+      console.warn(
+        "[Fumadocs `highlight()`] Avoid passing `engine` directly. For custom engines, use `shiki` directly instead."
+      );
+    }
+  }
+  try {
+    await highlighter.loadLanguage(lang);
+  } catch {
+    lang = fallbackLanguage ?? "text";
+    await highlighter.loadLanguage(lang);
   }
-  const highlighter = await getHighlighter("custom", {
-    engine,
-    langs: [lang],
-    themes: "theme" in themes ? [themes.theme] : Object.values(themes.themes).filter((v) => v !== void 0)
-  });
   return highlighter.codeToHast(code, {
     lang,
     ...rest,

package/dist/highlight/client.js

@@ -3,29 +3,18 @@ import {
   _highlight,
   _renderHighlight,
   highlight
-} from "../chunk-KNWSJ4IF.js";
+} from "../chunk-3NX26V7I.js";
 
 // src/highlight/client.tsx
 import {
   use,
+  useEffect,
   useId,
-  useLayoutEffect,
   useMemo,
   useRef,
   useState
 } from "react";
 import { jsx } from "react/jsx-runtime";
-var jsEngine;
-function getHighlightOptions(from) {
-  if (from.engine) return from;
-  jsEngine ??= import("shiki/engine/javascript").then(
-    (res) => res.createJavaScriptRegexEngine()
-  );
-  return {
-    ...from,
-    engine: jsEngine
-  };
-}
 function useShiki(code, {
   withPrerenderScript = false,
   loading,
@@ -36,7 +25,10 @@ function useShiki(code, {
     () => deps ? JSON.stringify(deps) : `${options.lang}:${code}`,
     [code, deps, options.lang]
   );
-  const shikiOptions = getHighlightOptions(options);
+  const shikiOptions = {
+    ...options,
+    engine: options.engine ?? "js"
+  };
   const currentTask = useRef({
     key,
     aborted: false
@@ -51,7 +43,7 @@ function useShiki(code, {
     currentTask.current = void 0;
     return loading;
   });
-  useLayoutEffect(() => {
+  useEffect(() => {
     if (currentTask.current?.key === key) return;
     if (currentTask.current) {
       currentTask.current.aborted = true;

package/dist/highlight/index.d.ts

@@ -4,8 +4,9 @@ import { Components } from 'hast-util-to-jsx-runtime';
 import { ReactNode } from 'react';
 
 type HighlightOptionsCommon = CodeToHastOptionsCommon<BundledLanguage> & CodeOptionsMeta & {
-    engine?: Awaitable<RegexEngine>;
+    engine?: 'js' | 'oniguruma' | Awaitable<RegexEngine>;
     components?: Partial<Components>;
+    fallbackLanguage?: BundledLanguage;
 };
 type HighlightOptionsThemes = CodeOptionsThemes<BundledTheme>;
 type HighlightOptions = HighlightOptionsCommon & (HighlightOptionsThemes | Record<never, never>);

package/dist/highlight/index.js

@@ -1,7 +1,7 @@
 import {
   getHighlighter,
   highlight
-} from "../chunk-KNWSJ4IF.js";
+} from "../chunk-3NX26V7I.js";
 export {
   getHighlighter,
   highlight

package/dist/mdx-plugins/index.js

@@ -9,7 +9,7 @@ import {
 import {
   defaultThemes,
   getHighlighter
-} from "../chunk-KNWSJ4IF.js";
+} from "../chunk-3NX26V7I.js";
 
 // src/mdx-plugins/index.ts
 import {

package/dist/source/index.d.ts

@@ -22,6 +22,7 @@ declare class FileSystem<File> {
 
 interface LoadOptions {
     transformers?: Transformer[];
+    buildFiles: (files: VirtualFile[]) => (MetaFile | PageFile)[];
 }
 type ContentStorage = FileSystem<MetaFile | PageFile>;
 interface MetaFile<Data extends MetaData = MetaData> {
@@ -41,7 +42,7 @@ type Transformer = (context: {
     storage: ContentStorage;
     options: LoadOptions;
 }) => void;
-declare function loadFiles(files: VirtualFile[], buildFile: (file: VirtualFile) => MetaFile | PageFile, options: LoadOptions): ContentStorage;
+declare function loadFiles(files: VirtualFile[], options: LoadOptions): ContentStorage;
 
 interface FileInfo {
     /**
@@ -201,14 +202,14 @@ interface LoaderOutput<Config extends LoaderConfig> {
     generateParams: <TSlug extends string = 'slug', TLang extends string = 'lang'>(slug?: TSlug, lang?: TLang) => (Record<TSlug, string[]> & Record<TLang, string>)[];
 }
 declare function createGetUrl(baseUrl: string, i18n?: I18nConfig): UrlFn;
-/**
- * Convert file path into slugs, also encode non-ASCII characters, so they can work in pathname
- */
-declare function getSlugs(info: FileInfo): string[];
 declare function loader<Config extends SourceConfig, I18n extends I18nConfig | undefined = undefined>(options: LoaderOptions<Config, I18n>): LoaderOutput<{
     source: Config;
     i18n: I18n extends I18nConfig ? true : false;
 }>;
+/**
+ * Convert file path into slugs, also encode non-ASCII characters, so they can work in pathname
+ */
+declare function getSlugs(file: string | FileInfo): string[];
 
 interface MetaData {
     icon?: string | undefined;

package/dist/source/index.js

@@ -265,18 +265,15 @@ var FileSystem = class {
 };
 
 // src/source/load-files.ts
-function loadFiles(files, buildFile, options) {
+function loadFiles(files, options) {
   const { transformers = [] } = options;
   const storage = new FileSystem();
-  for (const file of files) {
-    const parsedPath = normalizePath(file.path);
-    storage.write(
-      parsedPath,
-      buildFile({
-        ...file,
-        path: parsedPath
-      })
-    );
+  const normalized = files.map((file) => ({
+    ...file,
+    path: normalizePath(file.path)
+  }));
+  for (const item of options.buildFiles(normalized)) {
+    storage.write(item.path, item);
   }
   for (const transformer of transformers) {
     transformer({
@@ -286,14 +283,14 @@ function loadFiles(files, buildFile, options) {
   }
   return storage;
 }
-function loadFilesI18n(files, buildFile, options) {
-  const parser = options.i18n.parser === "dir" ? dirParser : dotParser;
+function loadFilesI18n(files, options, i18n) {
+  const parser = i18n.parser === "dir" ? dirParser : dotParser;
   const storages = {};
-  for (const lang of options.i18n.languages) {
+  for (const lang of i18n.languages) {
     storages[lang] = loadFiles(
       files.flatMap((file) => {
         const [path, locale] = parser(normalizePath(file.path));
-        if ((locale ?? options.i18n.defaultLanguage) === lang) {
+        if ((locale ?? i18n.defaultLanguage) === lang) {
           return {
             ...file,
             path
@@ -301,7 +298,6 @@ function loadFilesI18n(files, buildFile, options) {
         }
         return [];
       }),
-      buildFile,
       options
     );
   }
@@ -391,16 +387,6 @@ function createGetUrl(baseUrl, i18n) {
     return `/${paths.filter((v) => v.length > 0).join("/")}`;
   };
 }
-function getSlugs(info) {
-  const slugs = [];
-  for (const seg of info.dirname.split("/")) {
-    if (seg.length > 0 && !/^\(.+\)$/.test(seg)) slugs.push(encodeURI(seg));
-  }
-  if (info.name !== "index") {
-    slugs.push(encodeURI(info.name));
-  }
-  return slugs;
-}
 function loader(options) {
   return createOutput(options);
 }
@@ -408,35 +394,67 @@ function createOutput(options) {
   if (!options.url && !options.baseUrl) {
     console.warn("`loader()` now requires a `baseUrl` option to be defined.");
   }
-  const { source, slugs: slugsFn = getSlugs, i18n } = options;
+  const {
+    source,
+    baseUrl = "/",
+    i18n,
+    slugs: slugsFn,
+    url: getUrl = createGetUrl(baseUrl ?? "/", i18n),
+    transformers
+  } = options;
   const defaultLanguage = i18n?.defaultLanguage ?? "";
-  const getUrl = options.url ?? createGetUrl(options.baseUrl ?? "/", options.i18n);
   const files = typeof source.files === "function" ? source.files() : source.files;
-  function buildFile(file) {
-    if (file.type === "page") {
+  function buildFiles(files2) {
+    const indexFiles = [];
+    const taken = /* @__PURE__ */ new Set();
+    for (const file of files2) {
+      if (file.type !== "page" || file.slugs) continue;
+      if (isIndex(file.path) && !slugsFn) {
+        indexFiles.push(file);
+        continue;
+      }
+      file.slugs = slugsFn ? slugsFn(parseFilePath(file.path)) : getSlugs(file.path);
+      const key = file.slugs.join("/");
+      if (taken.has(key)) throw new Error("Duplicated slugs");
+      taken.add(key);
+    }
+    for (const file of indexFiles) {
+      file.slugs = getSlugs(file.path);
+      if (taken.has(file.slugs.join("/"))) file.slugs.push("index");
+    }
+    return files2.map((file) => {
+      if (file.type === "page") {
+        return {
+          format: "page",
+          path: file.path,
+          slugs: file.slugs,
+          data: file.data,
+          absolutePath: file.absolutePath ?? ""
+        };
+      }
       return {
-        format: "page",
+        format: "meta",
         path: file.path,
-        slugs: file.slugs ?? slugsFn(parseFilePath(file.path)),
-        data: file.data,
-        absolutePath: file.absolutePath ?? ""
+        absolutePath: file.absolutePath ?? "",
+        data: file.data
       };
-    }
-    return {
-      format: "meta",
-      path: file.path,
-      absolutePath: file.absolutePath ?? "",
-      data: file.data
-    };
+    });
   }
-  const storages = i18n ? loadFilesI18n(files, buildFile, {
-    ...options,
-    i18n: {
+  const storages = i18n ? loadFilesI18n(
+    files,
+    {
+      buildFiles,
+      transformers
+    },
+    {
       ...i18n,
       parser: i18n.parser ?? "dot"
     }
-  }) : {
-    "": loadFiles(files, buildFile, options)
+  ) : {
+    "": loadFiles(files, {
+      transformers,
+      buildFiles
+    })
   };
   const walker = indexPages(storages, getUrl, i18n);
   const builder = createPageTreeBuilder(getUrl);
@@ -464,20 +482,19 @@ function createOutput(options) {
       pageTree = v;
     },
     getPageByHref(href, { dir = "", language } = {}) {
-      const pages = this.getPages(language);
       const [value, hash] = href.split("#", 2);
       let target;
       if (value.startsWith(".") && (value.endsWith(".md") || value.endsWith(".mdx"))) {
-        const hrefPath = joinPath(dir, value);
-        target = pages.find((item) => item.file.path === hrefPath);
+        const path = joinPath(dir, value);
+        target = walker.pathToPage.get(`${language}.${path}`);
       } else {
-        target = pages.find((item) => item.url === value);
+        target = this.getPages(language).find((item) => item.url === value);
       }
-      if (!target) return;
-      return {
-        page: target,
-        hash
-      };
+      if (target)
+        return {
+          page: target,
+          hash
+        };
     },
     getPages(language = defaultLanguage) {
       const pages = [];
@@ -555,6 +572,25 @@ function fileToPage(file, getUrl, locale) {
     locale
   };
 }
+var GroupRegex = /^\(.+\)$/;
+function isIndex(file) {
+  return basename(file, extname(file)) === "index";
+}
+function getSlugs(file) {
+  if (typeof file !== "string") return getSlugs(file.path);
+  const dir = dirname(file);
+  const name = basename(file, extname(file));
+  const slugs = [];
+  for (const seg of dir.split("/")) {
+    if (seg.length > 0 && !GroupRegex.test(seg)) slugs.push(encodeURI(seg));
+  }
+  if (GroupRegex.test(name))
+    throw new Error(`Cannot use folder group in file names: ${file}`);
+  if (name !== "index") {
+    slugs.push(encodeURI(name));
+  }
+  return slugs;
+}
 export {
   FileSystem,
   createGetUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fumadocs-core",
-  "version": "15.5.3",
+  "version": "15.5.4",
   "description": "The library for building a documentation website in Next.js",
   "keywords": [
     "NextJs",
@@ -87,8 +87,8 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.6.1",
     "@orama/orama": "^3.1.6",
-    "@shikijs/rehype": "^3.6.0",
-    "@shikijs/transformers": "^3.6.0",
+    "@shikijs/rehype": "^3.7.0",
+    "@shikijs/transformers": "^3.7.0",
     "github-slugger": "^2.0.0",
     "hast-util-to-estree": "^3.1.3",
     "hast-util-to-jsx-runtime": "^2.3.6",
@@ -99,24 +99,24 @@
     "remark-gfm": "^4.0.1",
     "remark-rehype": "^11.1.2",
     "scroll-into-view-if-needed": "^3.1.0",
-    "shiki": "^3.6.0",
+    "shiki": "^3.7.0",
     "unist-util-visit": "^5.0.0"
   },
   "devDependencies": {
     "@mdx-js/mdx": "^3.1.0",
     "@oramacloud/client": "^2.1.4",
-    "@tanstack/react-router": "^1.121.2",
+    "@tanstack/react-router": "^1.121.27",
     "@types/estree-jsx": "^1.0.5",
     "@types/hast": "^3.0.4",
     "@types/mdast": "^4.0.3",
     "@types/negotiator": "^0.6.4",
-    "@types/node": "24.0.1",
+    "@types/node": "24.0.3",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",
-    "algoliasearch": "5.27.0",
+    "algoliasearch": "5.29.0",
     "mdast-util-mdx-jsx": "^3.2.0",
     "mdast-util-mdxjs-esm": "^2.0.1",
-    "next": "^15.3.3",
+    "next": "^15.3.4",
     "react-router": "^7.6.2",
     "remark-mdx": "^3.1.0",
     "typescript": "^5.8.3",
@@ -127,11 +127,11 @@
   },
   "peerDependencies": {
     "@oramacloud/client": "1.x.x || 2.x.x",
+    "@types/react": "*",
     "algoliasearch": "5.x.x",
     "next": "14.x.x || 15.x.x",
     "react": "18.x.x || 19.x.x",
-    "react-dom": "18.x.x || 19.x.x",
-    "@types/react": "*"
+    "react-dom": "18.x.x || 19.x.x"
   },
   "peerDependenciesMeta": {
     "@types/react": {