zudoku 0.0.0-e2c0b54 → 0.0.0-e2ed43a

package/dist/vite/plugin-docs.js

@@ -1,11 +1,16 @@
 import { glob } from "glob";
+import { minimatch } from "minimatch";
 import path from "node:path";
+import { getCurrentConfig } from "../config/loader.js";
 import { DocResolver } from "../lib/plugins/markdown/resolver.js";
+import { joinUrl } from "../lib/util/joinUrl.js";
 import { writePluginDebugCode } from "./debug.js";
-const ensureLeadingSlash = (str) => str.startsWith("/") ? str : `/${str}`;
-const viteDocsPlugin = (getConfig) => {
+import { reload } from "./plugin-config-reload.js";
+const ensureLeadingSlash = joinUrl;
+const viteDocsPlugin = () => {
     const virtualModuleId = "virtual:zudoku-docs-plugins";
     const resolvedVirtualModuleId = "\0" + virtualModuleId;
+    let server;
     return {
         name: "zudoku-docs-plugin",
         resolveId(id) {
@@ -13,17 +18,30 @@ const viteDocsPlugin = (getConfig) => {
                 return resolvedVirtualModuleId;
             }
         },
+        configureServer(srv) {
+            server = srv;
+        },
+        watchChange(id, change) {
+            if (change.event !== "delete" && change.event !== "create")
+                return;
+            const config = getCurrentConfig();
+            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.mode === "standalone") {
+                const config = getCurrentConfig();
+                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.mode === "internal"
-                        ? `import { markdownPlugin } from "${config.moduleDir}/src/lib/plugins/markdown/index.tsx";`
+                    config.__meta.mode === "internal"
+                        ? `import { markdownPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/markdown/index.tsx";`
                         : `import { markdownPlugin } from "zudoku/plugins/markdown";`,
                     `const docsPluginOptions = [];`,
                 ];
@@ -44,7 +62,7 @@ const viteDocsPlugin = (getConfig) => {
                     //
                     // This does only happen in dev SSR environments, so for prod the `basePath` is not added
                     const globbedFiles = await glob(docsConfig.files, {
-                        root: config.rootDir,
+                        root: config.__meta.rootDir,
                         ignore: ["**/node_modules/**", "**/dist/**", "**/.git/**"],
                         absolute: false,
                         posix: true,
@@ -55,7 +73,7 @@ const viteDocsPlugin = (getConfig) => {
                 // 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.rootDir, "docs-plugin", code);
+                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":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAC;AAEnD,MAAM,kBAAkB,GAAG,OAAO,CAAC;AAEnC,MAAM,cAAc,GAAG,GAAW,EAAE;IAClC,MAAM,eAAe,GAAG,6BAA6B,CAAC;IACtD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,IAAI,MAAqB,CAAC;IAE1B,OAAO;QACL,IAAI,EAAE,oBAAoB;QAC1B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,eAAe,CAAC,GAAG;YACjB,MAAM,GAAG,GAAG,CAAC;QACf,CAAC;QACD,WAAW,CAAC,EAAE,EAAE,MAAM;YACpB,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,KAAK,QAAQ;gBAAE,OAAO;YAEnE,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;YACzC,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;YAE9C,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAC7C,SAAS,CACP,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAC5D,SAAS,CAAC,KAAK,CAChB,CACF,CAAC;YAEF,IAAI,OAAO;gBAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9B,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,EAAE,CAAC;oBACxC,OAAO,0CAA0C,CAAC;gBACpD,CAAC;gBAED,MAAM,IAAI,GAAa;oBACrB,0DAA0D;oBAC1D,2CAA2C;oBAC3C,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,mCAAmC,MAAM,CAAC,MAAM,CAAC,SAAS,uCAAuC;wBACnG,CAAC,CAAC,2DAA2D;oBAC/D,+BAA+B;iBAChC,CAAC;gBAEF,MAAM,QAAQ,GAAG,IAAI,WAAW,CAAC,MAAM,CAAC,CAAC;gBACzC,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,CAAC;gBAE9C,MAAM,kBAAkB,GACtB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAExE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC5C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;oBAElC,IAAI,CAAC,UAAU;wBAAE,SAAS;oBAE1B,gFAAgF;oBAChF,gCAAgC;oBAChC,gDAAgD;oBAChD,0CAA0C;oBAC1C,mBAAmB;oBACnB,0HAA0H;oBAC1H,qEAAqE;oBACrE,EAAE;oBACF,yFAAyF;oBAEzF,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;wBAChD,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO;wBAC3B,MAAM,EAAE,CAAC,oBAAoB,EAAE,YAAY,EAAE,YAAY,CAAC;wBAC1D,QAAQ,EAAE,KAAK;wBACf,KAAK,EAAE,IAAI;qBACZ,CAAC,CAAC;oBAEH,IAAI,CAAC,IAAI,CACP,oBAAoB,CAAC,oBAAoB,EACzC,GAAG,YAAY,CAAC,GAAG,CACjB,CAAC,IAAI,EAAE,EAAE,CACP,MAAM,kBAAkB,CAAC,IAAI,CAAC,oBAAoB,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,KAAK,CACvH,EACD,KAAK,EACL,0BAA0B,EAC1B,6BAA6B,CAAC,GAAG,EACjC,qBAAqB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,EACjE,YAAY,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,EAC9C,KAAK,CACN,CAAC;gBACJ,CAAC;gBAED,mEAAmE;gBACnE,qEAAqE;gBACrE,mDAAmD;gBACnD,IAAI,CAAC,IAAI,CACP,mEAAmE,EACnE,mCAAmC,CACpC,CAAC;gBAEF,MAAM,oBAAoB,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;gBAEvE,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}

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

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

package/dist/vite/plugin-frontmatter.js

@@ -1,15 +1,17 @@
 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";
 // 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 ({ watcher, restart }) => {
-        const config = getConfig();
+    configureServer: async (server) => {
+        const config = getCurrentConfig();
         const files = await glob("**/*.{md,mdx}", {
-            cwd: config.rootDir,
+            cwd: config.__meta.rootDir,
             ignore: ["node_modules", "dist"],
             absolute: true,
         });
@@ -18,13 +20,13 @@ export const viteFrontmatterPlugin = (getConfig) => ({
             const fm = matter(content);
             return [file, fm.data];
         })));
-        watcher.on("change", async (filePath) => {
+        server.watcher.on("change", async (filePath) => {
             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)) {
                     frontmatterMap.set(filePath, fm.data);
-                    await restart();
+                    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;AAI5C,4GAA4G;AAC5G,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,SAAoC,EAC5B,EAAE,CAAC,CAAC;IACZ,uDAAuD;IACvD,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,2BAA2B;IACjC,eAAe,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;QAC9C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,EAAE;YACxC,GAAG,EAAE,MAAM,CAAC,OAAO;YACnB,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,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE;YACtC,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,OAAO,EAAE,CAAC;gBAClB,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;AAEnD,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,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"}

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

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

package/dist/vite/plugin-mdx.js

@@ -4,6 +4,7 @@ import withToc from "@stefanprobst/rehype-extract-toc";
 import withTocExport from "@stefanprobst/rehype-extract-toc/mdx";
 import { toString as hastToString } from "hast-util-to-string";
 import path from "node:path";
+import rehypeMdxImportMedia from "rehype-mdx-import-media";
 import rehypeSlug from "rehype-slug";
 import remarkComment from "remark-comment";
 import remarkDirective from "remark-directive";
@@ -12,13 +13,36 @@ 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 { 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")
+            return;
+        const hasStringSrc = node.attributes.some(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        (attr) => attr.type === "mdxJsxAttribute" &&
+            attr.name === "src" &&
+            typeof attr.value === "string");
+        if (!hasStringSrc)
+            return;
+        node.type = "element";
+        node.tagName = "img";
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        node.properties = {};
+        for (const attr of node.attributes) {
+            if (attr.type === "mdxJsxAttribute" && typeof attr.value === "string") {
+                node.properties[attr.name] = attr.value;
+            }
         }
+        delete node.name;
+        delete node.attributes;
+        delete node.children;
+        delete node.data;
+        delete node.position;
     });
 };
 const remarkLinkRewritePlugin = (basePath = "") => (tree) => {
@@ -38,21 +62,8 @@ const remarkLinkRewritePlugin = (basePath = "") => (tree) => {
         node.url = node.url.replace(/\.mdx?(#.*?)?/, "$1");
     });
 };
-const rehypeMediaBasePath = (basePath = "") => 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-(tree) => {
-    if (!basePath)
-        return;
-    visit(tree, "element", (node) => {
-        if (node.tagName !== "img" && node.tagName !== "video")
-            return;
-        if (node.properties.src && !node.properties.src.startsWith("http")) {
-            node.properties.src = path.join(basePath, node.properties.src);
-        }
-    });
-};
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const rehypeExcerptWithMdxExport = () => (tree, _vfile) => {
+const rehypeExcerptWithMdxExport = () => (tree) => {
     let excerpt;
     visit(tree, "element", (node) => {
         if (node.tagName !== "p")
@@ -96,12 +107,12 @@ const rehypeExcerptWithMdxExport = () => (tree, _vfile) => {
         },
     });
 };
-const viteMdxPlugin = (getConfig) => {
-    const config = getConfig();
+const viteMdxPlugin = () => {
+    const config = getCurrentConfig();
     return {
         enforce: "pre",
         ...mdx({
-            providerImportSource: config.mode === "internal" || config.mode === "standalone"
+            providerImportSource: config.__meta.mode === "internal" || config.__meta.mode === "standalone"
                 ? "@mdx-js/react"
                 : "zudoku/components",
             // Treat .md files as MDX
@@ -120,12 +131,13 @@ const viteMdxPlugin = (getConfig) => {
             ],
             rehypePlugins: [
                 rehypeSlug,
-                rehypeCodeBlockPlugin,
-                rehypeMetaAsAttributes,
-                [rehypeMediaBasePath, config.basePath],
                 withToc,
                 withTocExport,
                 rehypeExcerptWithMdxExport,
+                rehypeNormalizeMdxImages,
+                rehypeMdxImportMedia,
+                rehypeMetaAsAttributes,
+                ...createConfiguredShikiRehypePlugins(config.syntaxHighlighting?.themes),
                 ...(config.build?.rehypePlugins ?? []),
             ],
         }),

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-redirect.d.ts

@@ -1,4 +1,3 @@
 import { type Plugin } from "vite";
-import { type ZudokuPluginOptions } from "../config/config.js";
-declare const viteRedirectPlugin: (getConfig: () => ZudokuPluginOptions) => 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,14 +11,14 @@ const viteRedirectPlugin = (getConfig) => {
         },
         async load(id) {
             if (id === resolvedVirtualModuleId) {
-                const config = getConfig();
-                if (!config.redirects || config.mode === "standalone") {
+                const config = getCurrentConfig();
+                if (!config.redirects || config.__meta.mode === "standalone") {
                     return `export const configuredRedirectPlugin = undefined;`;
                 }
                 const code = [
                     `const redirects = ${JSON.stringify(config.redirects ?? [], null, 2)};`,
-                    config.mode === "internal"
-                        ? `import { redirectPlugin } from "${config.moduleDir}/src/lib/plugins/redirect/index.tsx";`
+                    config.__meta.mode === "internal"
+                        ? `import { redirectPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/redirect/index.tsx";`
                         : `import { redirectPlugin } from "zudoku/plugins/redirect";`,
                 ];
                 code.push(`export const configuredRedirectPlugin = redirectPlugin({ redirects });`);

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,SAAoC,EAAU,EAAE;IAC1E,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,IAAI,KAAK,YAAY,EAAE,CAAC;oBACtD,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,IAAI,KAAK,UAAU;wBACxB,CAAC,CAAC,mCAAmC,MAAM,CAAC,SAAS,uCAAuC;wBAC5F,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 ZudokuPluginOptions } from "../config/config.js";
-export declare const viteSearchPlugin: (getConfig: () => ZudokuPluginOptions) => 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,8 +12,8 @@ export const viteSearchPlugin = (getConfig) => {
         async load(id) {
             if (id !== resolvedVirtualModuleId)
                 return;
-            const config = getConfig();
-            if (!config.search || config.mode === "standalone") {
+            const config = getCurrentConfig();
+            if (!config.search || config.__meta.mode === "standalone") {
                 return `export const configuredSearchPlugin = undefined;`;
             }
             const code = [];
@@ -20,6 +21,10 @@ export const viteSearchPlugin = (getConfig) => {
                 code.push(`import config from 'virtual:zudoku-config';`, `import { inkeepSearchPlugin } from "zudoku/plugins/search-inkeep";`, `export const configuredSearchPlugin = inkeepSearchPlugin(config.search);`);
                 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);`);
+                return code.join("\n");
+            }
         },
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"plugin-search.js","sourceRoot":"","sources":["../../src/vite/plugin-search.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAoC,EAC5B,EAAE;IACV,MAAM,eAAe,GAAG,8BAA8B,CAAC;IACvD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,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;gBAAE,OAAO;YAE3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBACnD,OAAO,kDAAkD,CAAC;YAC5D,CAAC;YAED,MAAM,IAAI,GAAG,EAAE,CAAC;YAEhB,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CACP,6CAA6C,EAC7C,oEAAoE,EACpE,0EAA0E,CAC3E,CAAC;gBAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"plugin-search.js","sourceRoot":"","sources":["../../src/vite/plugin-search.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAW,EAAE;IAC3C,MAAM,eAAe,GAAG,8BAA8B,CAAC;IACvD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,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;gBAAE,OAAO;YAE3C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAElC,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gBAC1D,OAAO,kDAAkD,CAAC;YAC5D,CAAC;YAED,MAAM,IAAI,GAAG,EAAE,CAAC;YAEhB,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpC,IAAI,CAAC,IAAI,CACP,6CAA6C,EAC7C,oEAAoE,EACpE,0EAA0E,CAC3E,CAAC;gBAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;YAED,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACtC,IAAI,CAAC,IAAI,CACP,6CAA6C,EAC7C,wEAAwE,EACxE,4EAA4E,CAC7E,CAAC;gBAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzB,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

package/dist/vite/plugin-shiki-register.d.ts

@@ -0,0 +1,2 @@
+import type { Plugin } from "vite";
+export declare const viteShikiRegisterPlugin: () => Plugin;

package/dist/vite/plugin-shiki-register.js

@@ -0,0 +1,39 @@
+import { getCurrentConfig } from "../config/loader.js";
+import { defaultHighlightOptions, defaultLanguages, highlighter, } from "../lib/shiki.js";
+export const viteShikiRegisterPlugin = () => {
+    const virtualModuleId = "virtual:zudoku-shiki-register";
+    const resolvedVirtualModuleId = "\0" + virtualModuleId;
+    return {
+        name: "vite-plugin-shiki-register",
+        resolveId(id) {
+            if (id === virtualModuleId) {
+                return resolvedVirtualModuleId;
+            }
+        },
+        async load(id) {
+            if (id !== resolvedVirtualModuleId)
+                return;
+            const config = getCurrentConfig();
+            const languages = config.syntaxHighlighting?.languages ?? defaultLanguages;
+            const themes = Object.values(config.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes);
+            await Promise.all([
+                highlighter.loadTheme(...themes.map((theme) => import(`@shikijs/themes/${theme}`))),
+                highlighter.loadLanguage(...languages.map((lang) => import(`@shikijs/langs/${lang}`))),
+            ]);
+            const code = [
+                "export const registerShiki = async (highlighter) => {",
+                "  await Promise.all([",
+                "    highlighter.loadTheme(",
+                themes.map((t) => `import('zudoku/shiki/themes/${t}')`).join(","),
+                "    ),",
+                "    highlighter.loadLanguage(",
+                languages.map((l) => `import('zudoku/shiki/langs/${l}')`).join(","),
+                "    ),",
+                "  ]);",
+                "};",
+            ];
+            return code.join("\n");
+        },
+    };
+};
+//# sourceMappingURL=plugin-shiki-register.js.map

package/dist/vite/plugin-shiki-register.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-shiki-register.js","sourceRoot":"","sources":["../../src/vite/plugin-shiki-register.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,uBAAuB,EACvB,gBAAgB,EAChB,WAAW,GACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAW,EAAE;IAClD,MAAM,eAAe,GAAG,+BAA+B,CAAC;IACxD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,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;gBAAE,OAAO;YAC3C,MAAM,MAAM,GAAG,gBAAgB,EAAE,CAAC;YAElC,MAAM,SAAS,GACb,MAAM,CAAC,kBAAkB,EAAE,SAAS,IAAI,gBAAgB,CAAC;YAE3D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,MAAM,CAAC,kBAAkB,EAAE,MAAM,IAAI,uBAAuB,CAAC,MAAM,CACpE,CAAC;YAEF,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChB,WAAW,CAAC,SAAS,CACnB,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,mBAAmB,KAAK,EAAE,CAAC,CAAC,CAC7D;gBACD,WAAW,CAAC,YAAY,CACtB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,IAAI,EAAE,CAAC,CAAC,CAC7D;aACF,CAAC,CAAC;YAEH,MAAM,IAAI,GAAG;gBACX,uDAAuD;gBACvD,uBAAuB;gBACvB,4BAA4B;gBAC5B,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACjE,QAAQ;gBACR,+BAA+B;gBAC/B,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACnE,QAAQ;gBACR,OAAO;gBACP,IAAI;aACL,CAAC;YAEF,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}

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

@@ -1,3 +1,4 @@
-import { type Plugin } from "vite";
-import { type ZudokuPluginOptions } from "../config/config.js";
-export declare const viteSidebarPlugin: (getConfig: () => ZudokuPluginOptions) => Plugin;
+import { type Plugin, type ViteDevServer } from "vite";
+export declare const resolvedVirtualModuleId: string;
+export declare const invalidate: (server: ViteDevServer) => void;
+export declare const viteSidebarPlugin: () => Plugin;

package/dist/vite/plugin-sidebar.js

@@ -1,22 +1,38 @@
+import icons from "lucide-react/dist/esm/dynamicIconImports.js";
+import { getCurrentConfig } from "../config/loader.js";
 import { SidebarManager } from "../config/validators/SidebarSchema.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 collectedIcons = new Set();
     let match;
     while ((match = matchIconAnnotation.exec(code)) !== null) {
-        collectedIcons.add(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]));
+        }
+        else {
+            collectedIcons.add(toPascalCase(match[1]));
+        }
     }
-    const importStatement = `import { ${[...collectedIcons].map(toPascalCase).join(", ")} } from "zudoku/icons";`;
+    const importStatement = `import { ${[...collectedIcons].join(", ")} } from "zudoku/icons";`;
     const replacedString = code.replaceAll(matchIconAnnotation, 
     // The element will be created by the implementers side
     (_, iconName) => `"icon": ${toPascalCase(iconName)}`);
     return `${importStatement}export const configuredSidebar = ${replacedString};`;
 };
-export const viteSidebarPlugin = (getConfig) => {
-    const virtualModuleId = "virtual:zudoku-sidebar";
-    const resolvedVirtualModuleId = "\0" + virtualModuleId;
+const virtualModuleId = "virtual:zudoku-sidebar";
+export const resolvedVirtualModuleId = "\0" + virtualModuleId;
+export const invalidate = (server) => {
+    const sidebarModule = server.environments.ssr.moduleGraph.getModuleById(virtualModuleId);
+    if (!sidebarModule)
+        return;
+    server.environments.ssr.moduleGraph.invalidateModule(sidebarModule);
+};
+export const viteSidebarPlugin = () => {
     return {
         name: "zudoku-sidebar-plugin",
         resolveId(id) {
@@ -27,11 +43,11 @@ export const viteSidebarPlugin = (getConfig) => {
         async load(id) {
             if (id !== resolvedVirtualModuleId)
                 return;
-            const config = getConfig();
-            const manager = new SidebarManager(config.rootDir, config.sidebar);
+            const config = getCurrentConfig();
+            const manager = new SidebarManager(config.__meta.rootDir, config.sidebar);
             const resolvedSidebars = await manager.resolveSidebars();
             const code = JSON.stringify(resolvedSidebars);
-            await writePluginDebugCode(config.rootDir, "sidebar-plugin", code, "json");
+            await writePluginDebugCode(config.__meta.rootDir, "sidebar-plugin", code, "json");
             return code;
         },
         async transform(code, id) {

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

@@ -1 +1 @@
-{"version":3,"file":"plugin-sidebar.js","sourceRoot":"","sources":["../../src/vite/plugin-sidebar.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,mBAAmB,GAAG,oBAAoB,CAAC;AAEjD,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,EAAE,CACnC,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;AAE7E,MAAM,mBAAmB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC3C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IAEzC,IAAI,KAAK,CAAC;IACV,OAAO,CAAC,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QACzD,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,eAAe,GAAG,YAAY,CAAC,GAAG,cAAc,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC;IAC9G,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CACpC,mBAAmB;IACnB,uDAAuD;IACvD,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,WAAW,YAAY,CAAC,QAAQ,CAAC,EAAE,CACrD,CAAC;IAEF,OAAO,GAAG,eAAe,oCAAoC,cAAc,GAAG,CAAC;AACjF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,SAAoC,EAC5B,EAAE;IACV,MAAM,eAAe,GAAG,wBAAwB,CAAC;IACjD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,uBAAuB;QAC7B,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;gBAAE,OAAO;YAC3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,MAAM,OAAO,GAAG,IAAI,cAAc,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;YACnE,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,eAAe,EAAE,CAAC;YAEzD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YAC9C,MAAM,oBAAoB,CACxB,MAAM,CAAC,OAAO,EACd,gBAAgB,EAChB,IAAI,EACJ,MAAM,CACP,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,EAAE,KAAK,uBAAuB;gBAAE,OAAO;YAE3C,uFAAuF;YACvF,0CAA0C;YAC1C,iEAAiE;YACjE,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACnC,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"plugin-sidebar.js","sourceRoot":"","sources":["../../src/vite/plugin-sidebar.ts"],"names":[],"mappings":"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"}

package/dist/vite/plugin-theme-css.d.ts

@@ -1,6 +1,5 @@
 import { type Plugin } from "vite";
-import { type ZudokuPluginOptions } from "../config/config.js";
 declare const THEME_VARIABLES: readonly ["background", "foreground", "card", "cardForeground", "popover", "popoverForeground", "primary", "primaryForeground", "secondary", "secondaryForeground", "muted", "mutedForeground", "accent", "accentForeground", "destructive", "destructiveForeground", "border", "input", "ring", "radius"];
 export type Theme = Partial<Record<(typeof THEME_VARIABLES)[number], string>>;
-export declare const viteThemeCss: (getConfig: () => ZudokuPluginOptions) => Plugin;
+export declare const viteThemeCss: () => Plugin;
 export {};

package/dist/vite/plugin-theme-css.js

@@ -1,3 +1,5 @@
+import Color from "colorjs.io";
+import { getCurrentConfig } from "../config/loader.js";
 import { objectEntries } from "../lib/util/objectEntries.js";
 const THEME_VARIABLES = [
     "background",
@@ -22,11 +24,32 @@ const THEME_VARIABLES = [
     "radius",
 ];
 const uncamelize = (str) => str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
+const processColorValue = (value) => {
+    if (!value)
+        return "";
+    const c = !value.startsWith("#") &&
+        !value.includes("(") &&
+        value.split(" ").length >= 3
+        ? // Assume legacy tailwind hsl format
+            `hsl(${value})`
+        : value;
+    try {
+        return new Color(c).to("oklch").toString();
+    }
+    catch (e) {
+        // eslint-disable-next-line no-console
+        console.error("Invalid color value:", value, e);
+        return value;
+    }
+};
 const generateCss = (theme) => objectEntries(theme)
     .filter(([key]) => THEME_VARIABLES.includes(key))
-    .map(([key, value]) => `--${uncamelize(key)}:${value};`)
+    .map(([key, value]) => {
+    const processedValue = processColorValue(value);
+    return `--${uncamelize(key)}: ${processedValue};`;
+})
     .join("\n");
-export const viteThemeCss = (getConfig) => {
+export const viteThemeCss = () => {
     const virtualModuleId = "virtual:zudoku-theme.css";
     const resolvedVirtualModuleId = "\0" + virtualModuleId;
     return {
@@ -39,21 +62,13 @@ export const viteThemeCss = (getConfig) => {
         load(id) {
             if (id !== resolvedVirtualModuleId)
                 return;
-            const config = getConfig();
+            const config = getCurrentConfig();
             const cssParts = [];
-            // It's important that @import statements come first:
-            // > "@import must precede all other statements (besides @charset or empty @layer)"
-            if (config.theme?.fonts?.sans) {
-                cssParts.push(`@import url('${config.theme.fonts.sans.url}');`);
-            }
-            if (config.theme?.fonts?.mono) {
-                cssParts.push(`@import url('${config.theme.fonts.mono.url}');`);
-            }
             if (config.theme?.light) {
-                cssParts.push(`:root:root { ${generateCss(config.theme.light)} }`);
+                cssParts.push(`:root {\n${generateCss(config.theme.light)}\n}`);
             }
             if (config.theme?.dark) {
-                cssParts.push(`.dark.dark { ${generateCss(config.theme.dark)} }`);
+                cssParts.push(`.dark {\n${generateCss(config.theme.dark)}\n}`);
             }
             return cssParts.join("\n");
         },

package/dist/vite/plugin-theme-css.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-theme-css.js","sourceRoot":"","sources":["../../src/vite/plugin-theme-css.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,MAAM,eAAe,GAAG;IACtB,YAAY;IACZ,YAAY;IACZ,MAAM;IACN,gBAAgB;IAChB,SAAS;IACT,mBAAmB;IACnB,SAAS;IACT,mBAAmB;IACnB,WAAW;IACX,qBAAqB;IACrB,OAAO;IACP,iBAAiB;IACjB,QAAQ;IACR,kBAAkB;IAClB,aAAa;IACb,uBAAuB;IACvB,QAAQ;IACR,OAAO;IACP,MAAM;IACN,QAAQ;CACA,CAAC;AAEX,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AAIhE,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,EAAE,CACnC,aAAa,CAAC,KAAK,CAAC;KACjB,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;KAChD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,UAAU,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC;KACvD,IAAI,CAAC,IAAI,CAAC,CAAC;AAEhB,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,SAAoC,EAAU,EAAE;IAC3E,MAAM,eAAe,GAAG,0BAA0B,CAAC;IACnD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IAEvD,OAAO;QACL,IAAI,EAAE,cAAc;QACpB,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,IAAI,CAAC,EAAE;YACL,IAAI,EAAE,KAAK,uBAAuB;gBAAE,OAAO;YAE3C,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,MAAM,QAAQ,GAAG,EAAE,CAAC;YAEpB,qDAAqD;YACrD,mFAAmF;YACnF,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC9B,QAAQ,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;YAClE,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC9B,QAAQ,CAAC,IAAI,CAAC,gBAAgB,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;YAClE,CAAC;YAED,IAAI,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC;gBACxB,QAAQ,CAAC,IAAI,CAAC,gBAAgB,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrE,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;gBACvB,QAAQ,CAAC,IAAI,CAAC,gBAAgB,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpE,CAAC;YAED,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"plugin-theme-css.js","sourceRoot":"","sources":["../../src/vite/plugin-theme-css.ts"],"names":[],"mappings":"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"}

package/dist/vite/plugin.d.ts

@@ -1,3 +1,2 @@
 import { type PluginOption } from "vite";
-import { LoadedConfig, type ZudokuPluginOptions } from "../config/config.js";
-export default function vitePlugin(initialConfig: ZudokuPluginOptions, onConfigChange?: () => Promise<LoadedConfig>): PluginOption;
+export default function vitePlugin(): PluginOption;