zudoku 0.0.0-f06d326 → 0.0.0-f0b4321

package/dist/vite/plugin-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../src/vite/plugin-config.ts"],"names":[],"mappings":"AAGA,MAAM,gBAAgB,GAAG,CAAC,SAA6B,EAAU,EAAE;IACjE,MAAM,eAAe,GAAG,uBAAuB,CAAC;IAEhD,IAAI,UAA0B,CAAC;IAE/B,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,SAAS,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YACvC,CAAC;QACH,CAAC;QACD,cAAc,CAAC,cAAc;YAC3B,UAAU,GAAG,cAAc,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC,MAAM,CAAC,UAAU;gBAAE,OAAO;YAEjD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAClC,oCAAoC,EACpC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACZ,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;oBACzD,CAAC,CAAC,UAAU,CAAC,SAAS;oBACtB,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAE3B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;oBACjE,UAAU,CAAC,MAAM,CAAC,IAAI,CACpB,wBAAwB,MAAM,yBAAyB,eAAe,CAAC,IAAI,CACzE,MAAM,CACP,GAAG,CACL,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,UAAU,CAAC,MAAM,CAAC,IAAI,CACpB,wBAAwB,MAAM,kBAAkB,CACjD,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CACF,CAAC;YAEF,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;QAC3C,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../src/vite/plugin-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,gBAAgB,GAAG,GAAW,EAAE;IACpC,MAAM,eAAe,GAAG,uBAAuB,CAAC;IAEhD,IAAI,UAA0B,CAAC;IAE/B,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,gBAAgB,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;YAC9C,CAAC;QACH,CAAC;QACD,cAAc,CAAC,cAAc;YAC3B,UAAU,GAAG,cAAc,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,EAAE,KAAK,gBAAgB,EAAE,CAAC,MAAM,CAAC,UAAU;gBAAE,OAAO;YAExD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAClC,oCAAoC,EACpC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACZ,MAAM,eAAe,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC;oBACzD,CAAC,CAAC,UAAU,CAAC,SAAS;oBACtB,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAE3B,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;oBACjE,UAAU,CAAC,MAAM,CAAC,IAAI,CACpB,wBAAwB,MAAM,yBAAyB,eAAe,CAAC,IAAI,CACzE,MAAM,CACP,GAAG,CACL,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,UAAU,CAAC,MAAM,CAAC,IAAI,CACpB,wBAAwB,MAAM,kBAAkB,CACjD,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CACF,CAAC;YAEF,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;QAC3C,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/vite/plugin-custom-pages.d.ts

@@ -1,4 +1,3 @@
 import { type Plugin } from "vite";
-import { type LoadedConfig } from "../config/config.js";
-declare const viteCustomPagesPlugin: (getConfig: () => LoadedConfig) => Plugin;
+declare const viteCustomPagesPlugin: () => Plugin;
 export default viteCustomPagesPlugin;

package/dist/vite/plugin-custom-pages.js

@@ -1,4 +1,5 @@
-const viteCustomPagesPlugin = (getConfig) => {
+import { getCurrentConfig } from "../config/loader.js";
+const viteCustomPagesPlugin = () => {
     const virtualModuleId = "virtual:zudoku-custom-pages-plugin";
     const resolvedVirtualModuleId = "\0" + virtualModuleId;
     return {
@@ -10,8 +11,8 @@ const viteCustomPagesPlugin = (getConfig) => {
         },
         async load(id) {
             if (id === resolvedVirtualModuleId) {
-                const config = getConfig();
-                if (!config.customPages || config.__meta.mode === "standalone") {
+                const config = getCurrentConfig();
+                if (config.__meta.mode === "standalone" || !config.navigation) {
                     return `export const configuredCustomPagesPlugin = undefined;`;
                 }
                 const code = [
@@ -19,7 +20,7 @@ const viteCustomPagesPlugin = (getConfig) => {
                     config.__meta.mode === "internal"
                         ? `import { customPagesPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/custom-pages/index.tsx";`
                         : `import { customPagesPlugin } from "zudoku/plugins/custom-pages";`,
-                    `export const configuredCustomPagesPlugin = customPagesPlugin(config.customPages);`,
+                    `export const configuredCustomPagesPlugin = customPagesPlugin(config.navigation);`,
                 ];
                 return code.join("\n");
             }

package/dist/vite/plugin-custom-pages.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-custom-pages.js","sourceRoot":"","sources":["../../src/vite/plugin-custom-pages.ts"],"names":[],"mappings":"AAGA,MAAM,qBAAqB,GAAG,CAAC,SAA6B,EAAU,EAAE;IACtE,MAAM,eAAe,GAAG,oCAAoC,CAAC;IAC7D,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,4BAA4B;QAClC,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC/D,OAAO,uDAAuD,CAAC;gBACjE,CAAC;gBAED,MAAM,IAAI,GAAG;oBACX,6CAA6C;oBAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,SAAS,2CAA2C;wBAC1G,CAAC,CAAC,kEAAkE;oBACtE,mFAAmF;iBACpF,CAAC;gBAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"plugin-custom-pages.js","sourceRoot":"","sources":["../../src/vite/plugin-custom-pages.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,qBAAqB,GAAG,GAAW,EAAE;IACzC,MAAM,eAAe,GAAG,oCAAoC,CAAC;IAC7D,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,4BAA4B;QAClC,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;gBAElC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;oBAC9D,OAAO,uDAAuD,CAAC;gBACjE,CAAC;gBAED,MAAM,IAAI,GAAG;oBACX,6CAA6C;oBAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,sCAAsC,MAAM,CAAC,MAAM,CAAC,SAAS,2CAA2C;wBAC1G,CAAC,CAAC,kEAAkE;oBACtE,kFAAkF;iBACnF,CAAC;gBAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,qBAAqB,CAAC"}

package/dist/vite/plugin-docs.d.ts

@@ -1,4 +1,3 @@
 import type { Plugin } from "vite";
-import type { LoadedConfig } from "../config/config.js";
-declare const viteDocsPlugin: (getConfig: () => LoadedConfig) => Plugin;
+declare const viteDocsPlugin: () => Plugin;
 export default viteDocsPlugin;

package/dist/vite/plugin-docs.js

@@ -1,15 +1,16 @@
 import { glob } from "glob";
-import { minimatch } from "minimatch";
+import globParent from "glob-parent";
 import path from "node:path";
-import { DocResolver } from "../lib/plugins/markdown/resolver.js";
+import { getCurrentConfig } from "../config/loader.js";
+import { NavigationResolver } from "../config/validators/NavigationSchema.js";
+import { DocsConfigSchema } from "../config/validators/validate.js";
+import { traverseNavigation } from "../lib/components/navigation/utils.js";
 import { joinUrl } from "../lib/util/joinUrl.js";
 import { writePluginDebugCode } from "./debug.js";
-import { reload } from "./plugin-config-reload.js";
 const ensureLeadingSlash = joinUrl;
-const viteDocsPlugin = (getConfig) => {
-    const virtualModuleId = "virtual:zudoku-docs-plugins";
+const viteDocsPlugin = () => {
+    const virtualModuleId = "virtual:zudoku-docs-plugin";
     const resolvedVirtualModuleId = "\0" + virtualModuleId;
-    let server;
     return {
         name: "zudoku-docs-plugin",
         resolveId(id) {
@@ -17,64 +18,66 @@ const viteDocsPlugin = (getConfig) => {
                 return resolvedVirtualModuleId;
             }
         },
-        configureServer(srv) {
-            server = srv;
-        },
-        watchChange(id, change) {
-            if (change.event !== "delete" && change.event !== "create")
-                return;
-            const config = getConfig();
-            const resolver = new DocResolver(config);
-            const docsConfigs = resolver.getDocsConfigs();
-            const matches = docsConfigs.some((docConfig) => minimatch(ensureLeadingSlash(path.relative(config.__meta.rootDir, id)), docConfig.files));
-            if (matches)
-                reload(server);
-        },
         async load(id) {
-            if (id === resolvedVirtualModuleId) {
-                const config = getConfig();
-                if (config.__meta.mode === "standalone") {
-                    return `export const configuredDocsPlugins = [];`;
-                }
-                const code = [
-                    // IMPORTANT! This path here is important, we MUST resolve
-                    // files here as Typescript from the appDir
-                    config.__meta.mode === "internal"
-                        ? `import { markdownPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/markdown/index.tsx";`
-                        : `import { markdownPlugin } from "zudoku/plugins/markdown";`,
-                    `const docsPluginOptions = [];`,
-                ];
-                const resolver = new DocResolver(config);
-                const docsConfigs = resolver.getDocsConfigs();
-                const globImportBasePath = process.env.NODE_ENV === "development" ? (config.basePath ?? "") : "";
-                for (let i = 0; i < docsConfigs.length; i++) {
-                    const docsConfig = docsConfigs[i];
-                    if (!docsConfig)
-                        continue;
-                    // This is a workaround for a bug(?) in Vite where `import.meta.glob` failed us:
-                    // - Root dir is `/path/to/docs`
-                    // - The Markdown docs config is `/docs/**/*.md`
-                    // - The basePath config is set to `/docs`
-                    // This results in:
-                    // > `Internal server error: Failed to resolve import "/some.md" from "virtual:zudoku-docs-plugins". Does the file exist?`
-                    // Mind that the `docs` part that should be prepended is not in there
-                    //
-                    // This does only happen in dev SSR environments, so for prod the `basePath` is not added
-                    const globbedFiles = await glob(docsConfig.files, {
-                        root: config.__meta.rootDir,
-                        ignore: ["**/node_modules/**", "**/dist/**", "**/.git/**"],
-                        absolute: false,
-                        posix: true,
-                    });
-                    code.push(`const fileImports${i} = Object.assign({`, ...globbedFiles.map((file) => `  "${ensureLeadingSlash(file)}": () => import("${ensureLeadingSlash(path.posix.join(globImportBasePath, file))}"),`), `});`, `docsPluginOptions.push({`, `  fileImports: fileImports${i},`, `  defaultOptions: ${JSON.stringify(docsConfig.defaultOptions)},`, `  files: ${JSON.stringify(docsConfig.files)}`, `});`);
+            if (id !== resolvedVirtualModuleId)
+                return;
+            const config = getCurrentConfig();
+            if (config.__meta.mode === "standalone") {
+                return `export const configuredDocsPlugin = undefined;`;
+            }
+            const code = [
+                // IMPORTANT! This path here is important, we MUST resolve
+                // files here as Typescript from the appDir
+                config.__meta.mode === "internal"
+                    ? `import { markdownPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/markdown/index.tsx";`
+                    : `import { markdownPlugin } from "zudoku/plugins/markdown";`,
+            ];
+            const docsConfig = DocsConfigSchema.parse(config.docs ?? {});
+            const globImportBasePath = process.env.NODE_ENV === "development" ? (config.basePath ?? "") : "";
+            const allFileImports = {};
+            for (const globPattern of docsConfig.files) {
+                // This is a workaround for a bug(?) in Vite where `import.meta.glob` failed us:
+                // - Root dir is `/path/to/docs`
+                // - The Markdown docs config is `/docs/**/*.md`
+                // - The basePath config is set to `/docs`
+                // This results in:
+                // > `Internal server error: Failed to resolve import "/some.md" from "virtual:zudoku-docs-plugins". Does the file exist?`
+                // Mind that the `docs` part that should be prepended is not in there
+                //
+                // This does only happen in dev SSR environments, so for prod the `basePath` is not added
+                const globbedFiles = await glob(globPattern, {
+                    root: config.__meta.rootDir,
+                    ignore: ["**/node_modules/**", "**/dist/**", "**/.git/**"],
+                    absolute: false,
+                    posix: true,
+                });
+                const parent = globParent(globPattern);
+                const toRoutePath = (file) => ensureLeadingSlash(file.slice(parent.length).replace(/\.mdx?$/, ""));
+                for (const file of globbedFiles) {
+                    const routePath = toRoutePath(file);
+                    const importPath = ensureLeadingSlash(path.posix.join(globImportBasePath, file));
+                    allFileImports[routePath] = importPath;
                 }
-                // Even though this returns an array, the plugin should be a single
-                // instance because we need to make sure that there are not duplicate
-                // routes even if different folders have been used.
-                code.push(`const configuredDocsPlugins = [markdownPlugin(docsPluginOptions)]`, `export { configuredDocsPlugins };`);
-                await writePluginDebugCode(config.__meta.rootDir, "docs-plugin", code);
-                return code.join("\n");
             }
+            // Resolve navigation to get custom paths as in `plugin-navigation.ts`
+            if (config.navigation) {
+                const resolvedNavigation = await new NavigationResolver(config).resolve();
+                // Collect custom paths from navigation
+                traverseNavigation(resolvedNavigation, (item) => {
+                    if (item.type === "doc" && item.path !== item.file) {
+                        // Find the import path for this file
+                        const fileRoutePath = ensureLeadingSlash(item.file.replace(/\.mdx?$/, ""));
+                        const importPath = allFileImports[fileRoutePath];
+                        if (importPath) {
+                            // Create route for custom path pointing to the same file
+                            allFileImports[ensureLeadingSlash(item.path)] = importPath;
+                        }
+                    }
+                });
+            }
+            code.push(`const fileImports = {`, ...Object.entries(allFileImports).map(([routePath, importPath]) => `  "${routePath}": () => import("${importPath}"),`), `};`, `export const configuredDocsPlugin = markdownPlugin({`, `  fileImports,`, `  defaultOptions: ${JSON.stringify(docsConfig.defaultOptions)},`, `});`);
+            await writePluginDebugCode(config.__meta.rootDir, "docs-plugin", code);
+            return code.join("\n");
         },
     };
 };

package/dist/vite/plugin-docs.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-docs.js","sourceRoot":"","sources":["../../src/vite/plugin-docs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-docs.js","sourceRoot":"","sources":["../../src/vite/plugin-docs.ts"],"names":[],"mappings":"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"}

package/dist/vite/plugin-frontmatter.d.ts

@@ -1,3 +1,2 @@
 import type { Plugin } from "vite";
-import type { LoadedConfig } from "../config/config.js";
-export declare const viteFrontmatterPlugin: (getConfig: () => LoadedConfig) => Plugin;
+export declare const viteFrontmatterPlugin: () => Plugin;

package/dist/vite/plugin-frontmatter.js

@@ -1,14 +1,16 @@
 import { glob } from "glob";
 import matter from "gray-matter";
 import { readFile } from "node:fs/promises";
+import { getCurrentConfig } from "../config/loader.js";
 import { reload } from "./plugin-config-reload.js";
+import { invalidate as invalidateNavigation } from "./plugin-navigation.js";
 // This plugin is responsible to restart the dev server when the frontmatter changed inside a markdown file.
-export const viteFrontmatterPlugin = (getConfig) => ({
+export const viteFrontmatterPlugin = () => ({
     // set enforce: "pre" so it's run before the MDX plugin
     enforce: "pre",
     name: "zudoku-frontmatter-plugin",
     configureServer: async (server) => {
-        const config = getConfig();
+        const config = getCurrentConfig();
         const files = await glob("**/*.{md,mdx}", {
             cwd: config.__meta.rootDir,
             ignore: ["node_modules", "dist"],
@@ -19,12 +21,15 @@ export const viteFrontmatterPlugin = (getConfig) => ({
             const fm = matter(content);
             return [file, fm.data];
         })));
-        server.watcher.on("change", async (filePath) => {
+        server.watcher.on("all", async (event, filePath) => {
+            if (event !== "change" && event !== "add")
+                return;
             if (/\.mdx?$/.test(filePath)) {
                 const fm = matter(await readFile(filePath, "utf-8"));
                 const prevFm = frontmatterMap.get(filePath);
-                if (prevFm && JSON.stringify(prevFm) !== JSON.stringify(fm.data)) {
+                if (!prevFm || JSON.stringify(prevFm) !== JSON.stringify(fm.data)) {
                     frontmatterMap.set(filePath, fm.data);
+                    invalidateNavigation(server);
                     reload(server);
                 }
             }

package/dist/vite/plugin-frontmatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-frontmatter.js","sourceRoot":"","sources":["../../src/vite/plugin-frontmatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,4GAA4G;AAC5G,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,SAA6B,EACrB,EAAE,CAAC,CAAC;IACZ,uDAAuD;IACvD,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,2BAA2B;IACjC,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE;YACxC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;YAC1B,MAAM,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC;YAChC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAU,CAAC;QAClC,CAAC,CAAC,CACH,CACF,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YAC7C,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;gBACrD,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAE5C,IAAI,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjE,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;oBACtC,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"plugin-frontmatter.js","sourceRoot":"","sources":["../../src/vite/plugin-frontmatter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AACnD,OAAO,EAAE,UAAU,IAAI,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE5E,4GAA4G;AAC5G,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAW,EAAE,CAAC,CAAC;IAClD,uDAAuD;IACvD,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,2BAA2B;IACjC,eAAe,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE;YACxC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;YAC1B,MAAM,EAAE,CAAC,cAAc,EAAE,MAAM,CAAC;YAChC,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,IAAI,GAAG,CAC5B,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvB,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAC9C,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YAC3B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAU,CAAC;QAClC,CAAC,CAAC,CACH,CACF,CAAC;QAEF,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACjD,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,KAAK;gBAAE,OAAO;YAElD,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAC7B,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;gBACrD,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAE5C,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAClE,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;oBACtC,oBAAoB,CAAC,MAAM,CAAC,CAAC;oBAC7B,MAAM,CAAC,MAAM,CAAC,CAAC;gBACjB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC"}

package/dist/vite/plugin-mdx.d.ts

@@ -1,4 +1,3 @@
 import { type Plugin } from "vite";
-import { type LoadedConfig } from "../config/config.js";
-declare const viteMdxPlugin: (getConfig: () => LoadedConfig) => Plugin;
+declare const viteMdxPlugin: () => Plugin;
 export default viteMdxPlugin;

package/dist/vite/plugin-mdx.js

@@ -13,20 +13,18 @@ import remarkFrontmatter from "remark-frontmatter";
 import remarkGfm from "remark-gfm";
 import remarkMdxFrontmatter from "remark-mdx-frontmatter";
 import { EXIT, visit } from "unist-util-visit";
+import { getCurrentConfig } from "../config/loader.js";
+import { createConfiguredShikiRehypePlugins } from "../lib/shiki.js";
+import { remarkLastModified } from "./mdx/remark-last-modified.js";
+import { exportMdxjsConst } from "./mdx/utils.js";
 import { remarkStaticGeneration } from "./remarkStaticGeneration.js";
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const rehypeCodeBlockPlugin = () => (tree) => {
-    visit(tree, "element", (node, index, parent) => {
-        if (node.type === "element" && node.tagName === "code") {
-            node.properties.inline = parent?.tagName !== "pre";
-        }
-    });
-};
 // Convert mdxJsxFlowElement img elements to regular element nodes
 // so rehype-mdx-import-media can pick them up
 const rehypeNormalizeMdxImages = () => (tree) => {
     visit(tree, ["mdxJsxFlowElement", "mdxJsxElement"], (node) => {
-        if (node.type !== "mdxJsxFlowElement" || node.name !== "img")
+        if (node.type !== "mdxJsxFlowElement")
+            return;
+        if (!["img", "video"].includes(node.name))
             return;
         const hasStringSrc = node.attributes.some(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -36,7 +34,7 @@ const rehypeNormalizeMdxImages = () => (tree) => {
         if (!hasStringSrc)
             return;
         node.type = "element";
-        node.tagName = "img";
+        node.tagName = node.name;
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         node.properties = {};
         for (const attr of node.attributes) {
@@ -68,53 +66,23 @@ const remarkLinkRewritePlugin = (basePath = "") => (tree) => {
         node.url = node.url.replace(/\.mdx?(#.*?)?/, "$1");
     });
 };
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const remarkInjectFilepath = (rootDir) => (tree, vfile) => {
+    tree.children.unshift(exportMdxjsConst("__filepath", path.relative(rootDir, vfile.path)));
+};
 const rehypeExcerptWithMdxExport = () => (tree) => {
     let excerpt;
-    visit(tree, "element", (node) => {
-        if (node.tagName !== "p")
+    visit(tree, "element", (node, _index, parent) => {
+        if (node.tagName !== "p" || parent?.type !== "root")
             return;
         excerpt = hastToString(node);
         return EXIT;
     });
     if (!excerpt)
         return;
-    // Inject the excerpt as a named export into the MDX AST
-    // Injection code taken from @stefanprobst/rehype-extract-toc/mdx
-    tree.children.unshift({
-        type: "mdxjsEsm",
-        data: {
-            estree: {
-                type: "Program",
-                sourceType: "module",
-                body: [
-                    {
-                        type: "ExportNamedDeclaration",
-                        source: null,
-                        specifiers: [],
-                        declaration: {
-                            type: "VariableDeclaration",
-                            kind: "const",
-                            declarations: [
-                                {
-                                    type: "VariableDeclarator",
-                                    id: { name: "excerpt", type: "Identifier" },
-                                    init: {
-                                        type: "Literal",
-                                        value: excerpt,
-                                        raw: JSON.stringify(excerpt),
-                                    },
-                                },
-                            ],
-                        },
-                    },
-                ],
-            },
-        },
-    });
+    tree.children.unshift(exportMdxjsConst("excerpt", excerpt));
 };
-const viteMdxPlugin = (getConfig) => {
-    const config = getConfig();
+const viteMdxPlugin = () => {
+    const config = getCurrentConfig();
     return {
         enforce: "pre",
         ...mdx({
@@ -126,9 +94,14 @@ const viteMdxPlugin = (getConfig) => {
             format: "mdx",
             remarkPlugins: [
                 remarkStaticGeneration,
+                [remarkInjectFilepath, config.__meta.rootDir],
                 remarkComment,
                 remarkGfm,
                 remarkFrontmatter,
+                // ---  important:
+                // this must be sandwiched between remarkFrontmatter and remarkMdxFrontmatter
+                remarkLastModified,
+                // ---
                 remarkMdxFrontmatter,
                 remarkDirective,
                 remarkDirectiveRehype,
@@ -137,14 +110,14 @@ const viteMdxPlugin = (getConfig) => {
             ],
             rehypePlugins: [
                 rehypeSlug,
-                rehypeCodeBlockPlugin,
-                rehypeMetaAsAttributes,
                 withToc,
                 withTocExport,
                 rehypeExcerptWithMdxExport,
-                ...(config.build?.rehypePlugins ?? []),
                 rehypeNormalizeMdxImages,
                 rehypeMdxImportMedia,
+                rehypeMetaAsAttributes,
+                ...createConfiguredShikiRehypePlugins(config.syntaxHighlighting?.themes),
+                ...(config.build?.rehypePlugins ?? []),
             ],
         }),
         name: "zudoku-mdx-plugin",

package/dist/vite/plugin-mdx.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-mdx.js","sourceRoot":"","sources":["../../src/vite/plugin-mdx.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plugin-mdx.js","sourceRoot":"","sources":["../../src/vite/plugin-mdx.ts"],"names":[],"mappings":"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"}

package/dist/vite/plugin-navigation.d.ts

@@ -0,0 +1,4 @@
+import { type Plugin, type ViteDevServer } from "vite";
+export declare const resolvedVirtualModuleId: string;
+export declare const invalidate: (server: ViteDevServer) => void;
+export declare const viteNavigationPlugin: () => Plugin;

package/dist/vite/{plugin-sidebar.js → plugin-navigation.js}

@@ -1,14 +1,14 @@
-import icons from "lucide-react/dynamicIconImports";
-import { SidebarManager } from "../config/validators/SidebarSchema.js";
+import { getCurrentConfig } from "../config/loader.js";
+import { IconNames } from "../config/validators/icon-types.js";
+import { NavigationResolver } from "../config/validators/NavigationSchema.js";
 import { writePluginDebugCode } from "./debug.js";
 const matchIconAnnotation = /"icon":\s*"(.*?)"/g;
-const iconNames = Object.keys(icons);
 const toPascalCase = (str) => str.replace(/(^\w|-\w)/g, (match) => match.replace("-", "").toUpperCase());
-const replaceSidebarIcons = (code) => {
+const replaceNavigationIcons = (code) => {
     const collectedIcons = new Set();
     let match;
     while ((match = matchIconAnnotation.exec(code)) !== null) {
-        if (!iconNames.includes(match[1])) {
+        if (!IconNames.includes(match[1])) {
             // eslint-disable-next-line no-console
             console.warn(`Icon ${match[1]} not found, see: https://lucide.dev/icons/`);
             collectedIcons.add("MissingIcon as " + toPascalCase(match[1]));
@@ -21,13 +21,22 @@ const replaceSidebarIcons = (code) => {
     const replacedString = code.replaceAll(matchIconAnnotation, 
     // The element will be created by the implementers side
     (_, iconName) => `"icon": ${toPascalCase(iconName)}`);
-    return `${importStatement}export const configuredSidebar = ${replacedString};`;
+    return [
+        importStatement,
+        `export const configuredNavigation = ${replacedString};`,
+    ].join("\n");
 };
-export const viteSidebarPlugin = (getConfig) => {
-    const virtualModuleId = "virtual:zudoku-sidebar";
-    const resolvedVirtualModuleId = "\0" + virtualModuleId;
+const virtualModuleId = "virtual:zudoku-navigation";
+export const resolvedVirtualModuleId = "\0" + virtualModuleId;
+export const invalidate = (server) => {
+    const navigationModule = server.environments.ssr.moduleGraph.getModuleById(virtualModuleId);
+    if (!navigationModule)
+        return;
+    server.environments.ssr.moduleGraph.invalidateModule(navigationModule);
+};
+export const viteNavigationPlugin = () => {
     return {
-        name: "zudoku-sidebar-plugin",
+        name: "zudoku-navigation-plugin",
         resolveId(id) {
             if (id === virtualModuleId) {
                 return resolvedVirtualModuleId;
@@ -36,11 +45,10 @@ export const viteSidebarPlugin = (getConfig) => {
         async load(id) {
             if (id !== resolvedVirtualModuleId)
                 return;
-            const config = getConfig();
-            const manager = new SidebarManager(config.__meta.rootDir, config.sidebar);
-            const resolvedSidebars = await manager.resolveSidebars();
-            const code = JSON.stringify(resolvedSidebars);
-            await writePluginDebugCode(config.__meta.rootDir, "sidebar-plugin", code, "json");
+            const config = getCurrentConfig();
+            const resolvedNavigation = await new NavigationResolver(config).resolve();
+            const code = JSON.stringify(resolvedNavigation);
+            await writePluginDebugCode(config.__meta.rootDir, "navigation-plugin", code, "json");
             return code;
         },
         async transform(code, id) {
@@ -48,9 +56,9 @@ export const viteSidebarPlugin = (getConfig) => {
                 return;
             // In the stringified config all occurrences of icons are replaced with icon components
             // and their imports are added to the top.
-            // They will be created as elements when the sidebar is rendered.
-            return replaceSidebarIcons(code);
+            // They will be created as elements when the navigation is rendered.
+            return replaceNavigationIcons(code);
         },
     };
 };
-//# sourceMappingURL=plugin-sidebar.js.map
+//# sourceMappingURL=plugin-navigation.js.map

package/dist/vite/plugin-navigation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-navigation.js","sourceRoot":"","sources":["../../src/vite/plugin-navigation.ts"],"names":[],"mappings":"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"}

package/dist/vite/plugin-redirect.d.ts

@@ -1,4 +1,3 @@
 import { type Plugin } from "vite";
-import { type LoadedConfig } from "../config/config.js";
-declare const viteRedirectPlugin: (getConfig: () => LoadedConfig) => Plugin;
+declare const viteRedirectPlugin: () => Plugin;
 export default viteRedirectPlugin;

package/dist/vite/plugin-redirect.js

@@ -1,4 +1,5 @@
-const viteRedirectPlugin = (getConfig) => {
+import { getCurrentConfig } from "../config/loader.js";
+const viteRedirectPlugin = () => {
     const virtualModuleId = "virtual:zudoku-redirect-plugin";
     const resolvedVirtualModuleId = "\0" + virtualModuleId;
     return {
@@ -10,7 +11,7 @@ const viteRedirectPlugin = (getConfig) => {
         },
         async load(id) {
             if (id === resolvedVirtualModuleId) {
-                const config = getConfig();
+                const config = getCurrentConfig();
                 if (!config.redirects || config.__meta.mode === "standalone") {
                     return `export const configuredRedirectPlugin = undefined;`;
                 }

package/dist/vite/plugin-redirect.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-redirect.js","sourceRoot":"","sources":["../../src/vite/plugin-redirect.ts"],"names":[],"mappings":"AAGA,MAAM,kBAAkB,GAAG,CAAC,SAA6B,EAAU,EAAE;IACnE,MAAM,eAAe,GAAG,gCAAgC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAC3B,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC7D,OAAO,oDAAoD,CAAC;gBAC9D,CAAC;gBAED,MAAM,IAAI,GAAa;oBACrB,qBAAqB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG;oBACvE,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,mCAAmC,MAAM,CAAC,MAAM,CAAC,SAAS,uCAAuC;wBACnG,CAAC,CAAC,2DAA2D;iBAChE,CAAC;gBAEF,IAAI,CAAC,IAAI,CACP,wEAAwE,CACzE,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"plugin-redirect.js","sourceRoot":"","sources":["../../src/vite/plugin-redirect.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,kBAAkB,GAAG,GAAW,EAAE;IACtC,MAAM,eAAe,GAAG,gCAAgC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;gBAClC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC7D,OAAO,oDAAoD,CAAC;gBAC9D,CAAC;gBAED,MAAM,IAAI,GAAa;oBACrB,qBAAqB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,IAAI,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG;oBACvE,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,mCAAmC,MAAM,CAAC,MAAM,CAAC,SAAS,uCAAuC;wBACnG,CAAC,CAAC,2DAA2D;iBAChE,CAAC;gBAEF,IAAI,CAAC,IAAI,CACP,wEAAwE,CACzE,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/dist/vite/plugin-search.d.ts

@@ -1,3 +1,2 @@
 import { type Plugin } from "vite";
-import { type LoadedConfig } from "../config/config.js";
-export declare const viteSearchPlugin: (getConfig: () => LoadedConfig) => Plugin;
+export declare const viteSearchPlugin: () => Plugin;

package/dist/vite/plugin-search.js

@@ -1,4 +1,5 @@
-export const viteSearchPlugin = (getConfig) => {
+import { getCurrentConfig } from "../config/loader.js";
+export const viteSearchPlugin = () => {
     const virtualModuleId = "virtual:zudoku-search-plugin";
     const resolvedVirtualModuleId = "\0" + virtualModuleId;
     return {
@@ -11,7 +12,7 @@ export const viteSearchPlugin = (getConfig) => {
         async load(id) {
             if (id !== resolvedVirtualModuleId)
                 return;
-            const config = getConfig();
+            const config = getCurrentConfig();
             if (!config.search || config.__meta.mode === "standalone") {
                 return `export const configuredSearchPlugin = undefined;`;
             }
@@ -21,7 +22,7 @@ export const viteSearchPlugin = (getConfig) => {
                 return code.join("\n");
             }
             if (config.search.type === "pagefind") {
-                code.push(`import config from 'virtual:zudoku-config';`, `import { pagefindSearchPlugin } from "zudoku/plugins/search-pagefind";`, `export const configuredSearchPlugin = pagefindSearchPlugin({ ...config.search, basePath: config.basePath });`);
+                code.push(`import config from 'virtual:zudoku-config';`, `import { pagefindSearchPlugin } from "zudoku/plugins/search-pagefind";`, `export const configuredSearchPlugin = pagefindSearchPlugin(config.search);`);
                 return code.join("\n");
             }
         },