zudoku 0.13.7 → 0.14.0

package/lib/zudoku.openapi-worker.js

@@ -15,7 +15,7 @@ var Sn = (t, e, n, i) => ({
 });
 import { a as $l } from "./index-LNp6rxyU.js";
 import { g as jl } from "./_commonjsHelpers-BkfeUUK-.js";
-import { C as Qa, b as Wa, m as Ha, f as Ya } from "./urql-core-KJnLL26g.js";
+import { C as Qa, b as Wa, m as Ha, f as Ya } from "./urql-core-CqTI9H6N.js";
 function Pl(t, e) {
   for (var n = 0; n < e.length; n++) {
     const i = e[n];

package/lib/zudoku.plugin-api-keys.js

@@ -1,13 +1,13 @@
 import { j as e } from "./jsx-runtime-B6kdoens.js";
-import { S as m, R as f } from "./SlotletProvider-CPfsBw39.js";
+import { S as m, R as g } from "./SlotletProvider-4Naek_5M.js";
 import { i as c } from "./invariant-Caa8-XvF.js";
-import { u as d, S as g, a as j, b as v, c as w, d as b, e as x } from "./Select-m1aXZGAP.js";
+import { u as d, S as f, a as j, b as v, c as w, d as b, e as x } from "./Select-Bagt3Bme.js";
 import { a as k } from "./index.esm-C5mr_sKO.js";
 import { a as K, L as u, O as N } from "./index-CRo94sKK.js";
-import { u as h, a as I, e as S } from "./ZudokuContext-D1D8Anlj.js";
+import { u as h, d as I, g as S } from "./ZudokuContext-BKXGJTmu.js";
 import { Button as l } from "./ui/Button.js";
 import { Input as A } from "./ui/Input.js";
-import { u as C } from "./hook-JSRuxV1P.js";
+import { u as C } from "./hook-sn0zMTkE.js";
 import { D as E } from "./DeveloperHint-DHdLXGHA.js";
 import { RotateCwIcon as P, TrashIcon as D, EyeOffIcon as R, EyeIcon as q, CheckIcon as O, CopyIcon as z } from "lucide-react";
 import { useState as p } from "react";
@@ -40,7 +40,7 @@ const F = ({ service: t }) => {
           /* @__PURE__ */ e.jsx(A, { ...n.register("description") }),
           "Expiration",
           /* @__PURE__ */ e.jsxs(
-            g,
+            f,
             {
               onValueChange: (a) => n.setValue("expiresOn", a),
               defaultValue: n.getValues("expiresOn"),
@@ -259,7 +259,7 @@ const F = ({ service: t }) => {
     getRoutes: () => [
       {
         element: /* @__PURE__ */ e.jsx(V, {}),
-        errorElement: /* @__PURE__ */ e.jsx(f, {}),
+        errorElement: /* @__PURE__ */ e.jsx(g, {}),
         children: [
           {
             path: "/settings/api-keys",

package/lib/zudoku.plugin-custom-pages.js

@@ -1,6 +1,6 @@
 import { j as e } from "./jsx-runtime-B6kdoens.js";
 import a from "react";
-import { P as n } from "./Markdown-1BO9EA_X.js";
+import { P as n } from "./Markdown-BDcCAWwm.js";
 import { c } from "./cn-BmFQLtkS.js";
 import { u } from "./useExposedProps-B9K-9GTc.js";
 const l = ({

package/lib/zudoku.plugin-markdown.js

@@ -1,32 +1,98 @@
-import { j as u } from "./jsx-runtime-B6kdoens.js";
-const x = (t, e, n) => Object.entries(t).flatMap(([a, p]) => {
-  let o = e.split("**")[0];
-  o = o.replace("/**", "/");
-  const c = new RegExp(`^${o}(.*).mdx?`), r = a.match(c), s = r == null ? void 0 : r.at(1);
-  return s ? {
-    path: s,
-    lazy: async () => {
-      const { MdxPage: i } = await import("./MdxPage-BEOcOICU.js"), { default: m, ...l } = await p();
-      return {
-        element: /* @__PURE__ */ u.jsx(
-          i,
-          {
-            mdxComponent: m,
-            ...l,
-            defaultOptions: n
+var d = Object.defineProperty;
+var m = (n, t, o) => t in n ? d(n, t, { enumerable: !0, configurable: !0, writable: !0, value: o }) : n[t] = o;
+var f = (n, t, o) => m(n, typeof t != "symbol" ? t + "" : t, o);
+import { j as P } from "./jsx-runtime-B6kdoens.js";
+import { f as u } from "./__vite-browser-external-BYRIRx8p.js";
+const x = "/pages/**/*.{md,mdx}", D = [".md", ".mdx"];
+class c {
+  constructor(t) {
+    f(this, "fileMap", /* @__PURE__ */ new Map());
+    this.config = t;
+  }
+  /**
+   * Gets the default docs config from the zudoku config
+   */
+  getDocsConfigs() {
+    return this.config.docs ? Array.isArray(this.config.docs) ? this.config.docs : [this.config.docs] : [{ files: x }];
+  }
+  /**
+   * Resolves the first matching file system path for a given docId
+   * @param docId - The docId to resolve
+   * @returns
+   */
+  resolveFilePath(t) {
+    const o = this.getDocsConfigs();
+    let s;
+    return o.forEach(({ files: i }) => {
+      if (s)
+        return;
+      const e = c.getRootDir(i);
+      for (const a of D) {
+        if (s)
+          return;
+        const r = u.join(e, `${t}${a}`);
+        u.existsSync(r) && (s = r);
+      }
+    }), s;
+  }
+  /**
+   * Gets the root directory from a files glob
+   */
+  static getRootDir(t) {
+    let o = t.split("**")[0];
+    if (!o)
+      throw new Error("Invalid files glob. Must have '**' in the path.");
+    return o = o.replace("/**", "/"), o;
+  }
+  /**
+   * Resolves the route path for a given file system path
+   * @param options - The options to resolve the route path
+   * @returns The string route path
+   */
+  static resolveRoutePath({
+    filesGlob: t,
+    fsPath: o
+  }) {
+    const s = this.getRootDir(t), i = new RegExp(`^${s}(.*).mdx?`), e = o.match(i);
+    return e == null ? void 0 : e.at(1);
+  }
+}
+const C = (n) => ({
+  getRoutes: () => {
+    const t = /* @__PURE__ */ new Map();
+    return n.forEach(
+      ({ fileImports: o, files: s, defaultOptions: i }) => Object.entries(o).flatMap(([e, a]) => {
+        const r = c.resolveRoutePath({
+          filesGlob: s,
+          fsPath: e
+        });
+        if (!r) return [];
+        if (t.has(r))
+          return console.warn(
+            `Duplicate route path found for ${r}. Skipping file at '${e}'.`
+          ), [];
+        const h = {
+          path: r,
+          lazy: async () => {
+            const { MdxPage: l } = await import("./MdxPage-DKMH_t0f.js"), { default: p, ...g } = await a();
+            return {
+              element: /* @__PURE__ */ P.jsx(
+                l,
+                {
+                  mdxComponent: p,
+                  ...g,
+                  defaultOptions: i
+                }
+              )
+            };
           }
-        )
-      };
-    }
-  } : [];
-}), f = ({
-  markdownFiles: t,
-  defaultOptions: e,
-  filesPath: n
-}) => ({
-  getRoutes: () => x(t, n, e)
+        };
+        t.set(r, h);
+      })
+    ), [...t.values()];
+  }
 });
 export {
-  f as markdownPlugin
+  C as markdownPlugin
 };
 //# sourceMappingURL=zudoku.plugin-markdown.js.map

package/lib/zudoku.plugin-markdown.js.map

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-markdown.js","sources":["../src/lib/plugins/markdown/generateRoutes.tsx","../src/lib/plugins/markdown/index.tsx"],"sourcesContent":["import { type RouteObject } from \"react-router-dom\";\n\nimport {\n  MarkdownPluginDefaultOptions,\n  MarkdownPluginOptions,\n} from \"./index.js\";\n\nexport const generateRoutes = (\n  markdownFiles: MarkdownPluginOptions[\"markdownFiles\"],\n  filesPath: string,\n  defaultOptions?: MarkdownPluginDefaultOptions,\n): RouteObject[] =>\n  Object.entries(markdownFiles).flatMap(([file, importPromise]) => {\n    let rootDir = filesPath.split(\"**\")[0];\n    rootDir = rootDir.replace(\"/**\", \"/\");\n    const re = new RegExp(`^${rootDir}(.*).mdx?`);\n    const match = file.match(re);\n    const fsPath = match?.at(1);\n\n    if (!fsPath) return [];\n\n    return {\n      path: fsPath,\n      lazy: async () => {\n        const { MdxPage } = await import(\"./MdxPage.js\");\n        const { default: Component, ...props } = await importPromise();\n        return {\n          element: (\n            <MdxPage\n              mdxComponent={Component}\n              {...props}\n              defaultOptions={defaultOptions}\n            />\n          ),\n        };\n      },\n    } satisfies RouteObject;\n  });\n","import type { Toc } from \"@stefanprobst/rehype-extract-toc\";\nimport type { MDXProps } from \"mdx/types.js\";\nimport type { DevPortalPlugin } from \"../../core/plugins.js\";\nimport { generateRoutes } from \"./generateRoutes.js\";\n\nexport type MarkdownPluginOptions = {\n  markdownFiles: Record<string, () => Promise<MDXImport>>;\n  defaultOptions?: MarkdownPluginDefaultOptions;\n  filesPath: string;\n};\nexport type MarkdownPluginDefaultOptions = Pick<\n  Frontmatter,\n  \"toc\" | \"disablePager\"\n>;\n\nexport type Frontmatter = {\n  title?: string;\n  description?: string;\n  category?: string;\n  toc?: boolean;\n  disablePager?: boolean;\n};\n\nexport type MDXImport = {\n  tableOfContents: Toc;\n  frontmatter: Frontmatter;\n  default: (props: MDXProps) => JSX.Element;\n};\n\nexport const markdownPlugin = ({\n  markdownFiles,\n  defaultOptions,\n  filesPath,\n}: MarkdownPluginOptions): DevPortalPlugin => ({\n  getRoutes: () => generateRoutes(markdownFiles, filesPath, defaultOptions),\n});\n"],"names":["generateRoutes","markdownFiles","filesPath","defaultOptions","file","importPromise","rootDir","re","match","fsPath","MdxPage","Component","props","jsx","markdownPlugin"],"mappings":";AAOO,MAAMA,IAAiB,CAC5BC,GACAC,GACAC,MAEA,OAAO,QAAQF,CAAa,EAAE,QAAQ,CAAC,CAACG,GAAMC,CAAa,MAAM;AAC/D,MAAIC,IAAUJ,EAAU,MAAM,IAAI,EAAE,CAAC;AAC3B,EAAAI,IAAAA,EAAQ,QAAQ,OAAO,GAAG;AACpC,QAAMC,IAAK,IAAI,OAAO,IAAID,CAAO,WAAW,GACtCE,IAAQJ,EAAK,MAAMG,CAAE,GACrBE,IAASD,KAAA,gBAAAA,EAAO,GAAG;AAErB,SAACC,IAEE;AAAA,IACL,MAAMA;AAAA,IACN,MAAM,YAAY;AAChB,YAAM,EAAE,SAAAC,EAAA,IAAY,MAAM,OAAO,uBAAc,GACzC,EAAE,SAASC,GAAW,GAAGC,EAAM,IAAI,MAAMP;AACxC,aAAA;AAAA,QACL,SACEQ,gBAAAA,EAAA;AAAA,UAACH;AAAA,UAAA;AAAA,YACC,cAAcC;AAAA,YACb,GAAGC;AAAA,YACJ,gBAAAT;AAAA,UAAA;AAAA,QACF;AAAA,MAAA;AAAA,IAGN;AAAA,EAAA,IAhBkB;AAkBtB,CAAC,GCRUW,IAAiB,CAAC;AAAA,EAC7B,eAAAb;AAAA,EACA,gBAAAE;AAAA,EACA,WAAAD;AACF,OAA+C;AAAA,EAC7C,WAAW,MAAMF,EAAeC,GAAeC,GAAWC,CAAc;AAC1E;"}
+{"version":3,"file":"zudoku.plugin-markdown.js","sources":["../src/lib/plugins/markdown/resolver.ts","../src/lib/plugins/markdown/index.tsx"],"sourcesContent":["import fs from \"fs\";\nimport path from \"path\";\nimport {\n  ZudokuConfig,\n  ZudokuDocsConfig,\n} from \"../../../config/validators/validate.js\";\n\nconst DEFAULT_DOCS_FILES = \"/pages/**/*.{md,mdx}\";\n\n// TODO: This should be dynamic based on the glob selector\nconst SUPPORTED_EXTENSIONS = [\".md\", \".mdx\"];\n\n/**\n * Utilities for resolving markdown file paths and routes\n */\nexport class DocResolver {\n  constructor(private config: ZudokuConfig) {}\n\n  fileMap = new Map<string, string>();\n\n  /**\n   * Gets the default docs config from the zudoku config\n   */\n  getDocsConfigs() {\n    const docsConfigs: ZudokuDocsConfig[] = this.config.docs\n      ? Array.isArray(this.config.docs)\n        ? this.config.docs\n        : [this.config.docs]\n      : [{ files: DEFAULT_DOCS_FILES }];\n\n    return docsConfigs;\n  }\n\n  /**\n   * Resolves the first matching file system path for a given docId\n   * @param docId - The docId to resolve\n   * @returns\n   */\n  resolveFilePath(docId: string) {\n    const docsConfigs = this.getDocsConfigs();\n    let fsPath: string | undefined;\n\n    docsConfigs.forEach(({ files: fileGlob }) => {\n      if (fsPath) {\n        return;\n      }\n      const rootDir = DocResolver.getRootDir(fileGlob);\n      for (const ext of SUPPORTED_EXTENSIONS) {\n        if (fsPath) {\n          return;\n        }\n        const checkPath = path.join(rootDir, `${docId}${ext}`);\n        if (fs.existsSync(checkPath)) {\n          fsPath = checkPath;\n        }\n      }\n    });\n\n    return fsPath;\n  }\n\n  /**\n   * Gets the root directory from a files glob\n   */\n  private static getRootDir(filesGlob: string) {\n    let rootDir = filesGlob.split(\"**\")[0];\n    if (!rootDir) {\n      throw new Error(\"Invalid files glob. Must have '**' in the path.\");\n    }\n    rootDir = rootDir.replace(\"/**\", \"/\");\n    return rootDir;\n  }\n\n  /**\n   * Resolves the route path for a given file system path\n   * @param options - The options to resolve the route path\n   * @returns The string route path\n   */\n  static resolveRoutePath({\n    filesGlob,\n    fsPath,\n  }: {\n    filesGlob: string;\n    fsPath: string;\n  }) {\n    const rootDir = this.getRootDir(filesGlob);\n    const re = new RegExp(`^${rootDir}(.*).mdx?`);\n    const match = fsPath.match(re);\n    const routePath = match?.at(1);\n    return routePath;\n  }\n}\n","import type { Toc } from \"@stefanprobst/rehype-extract-toc\";\nimport type { MDXProps } from \"mdx/types.js\";\nimport { RouteObject } from \"react-router-dom\";\nimport { ZudokuDocsConfig } from \"../../../config/validators/validate.js\";\nimport type { DevPortalPlugin } from \"../../core/plugins.js\";\nimport { DocResolver } from \"./resolver.js\";\n\nexport interface MarkdownPluginOptions extends ZudokuDocsConfig {\n  fileImports: Record<string, () => Promise<MDXImport>>;\n}\nexport type MarkdownPluginDefaultOptions = Pick<\n  Frontmatter,\n  \"toc\" | \"disablePager\"\n>;\n\nexport type Frontmatter = {\n  title?: string;\n  description?: string;\n  category?: string;\n  toc?: boolean;\n  disablePager?: boolean;\n};\n\nexport type MDXImport = {\n  tableOfContents: Toc;\n  frontmatter: Frontmatter;\n  default: (props: MDXProps) => JSX.Element;\n};\n\nexport const markdownPlugin = (\n  options: MarkdownPluginOptions[],\n): DevPortalPlugin => ({\n  getRoutes: () => {\n    const routeMap = new Map<string, RouteObject>();\n    options.forEach(({ fileImports, files, defaultOptions }) =>\n      Object.entries(fileImports).flatMap(([file, importPromise]) => {\n        const routePath = DocResolver.resolveRoutePath({\n          filesGlob: files,\n          fsPath: file,\n        });\n\n        if (!routePath) return [];\n\n        if (routeMap.has(routePath)) {\n          // eslint-disable-next-line no-console\n          console.warn(\n            `Duplicate route path found for ${routePath}. Skipping file at '${file}'.`,\n          );\n          return [];\n        }\n\n        const route: RouteObject = {\n          path: routePath,\n          lazy: async () => {\n            const { MdxPage } = await import(\"./MdxPage.js\");\n            const { default: Component, ...props } = await importPromise();\n            return {\n              element: (\n                <MdxPage\n                  mdxComponent={Component}\n                  {...props}\n                  defaultOptions={defaultOptions}\n                />\n              ),\n            };\n          },\n        };\n        routeMap.set(routePath, route);\n      }),\n    );\n    return [...routeMap.values()];\n  },\n});\n"],"names":["DEFAULT_DOCS_FILES","SUPPORTED_EXTENSIONS","DocResolver","config","__publicField","docId","docsConfigs","fsPath","fileGlob","rootDir","ext","checkPath","path","fs","filesGlob","re","match","markdownPlugin","options","routeMap","fileImports","files","defaultOptions","file","importPromise","routePath","route","MdxPage","Component","props","jsx"],"mappings":";;;;;AAOA,MAAMA,IAAqB,wBAGrBC,IAAuB,CAAC,OAAO,MAAM;AAKpC,MAAMC,EAAY;AAAA,EACvB,YAAoBC,GAAsB;AAE1C,IAAAC,EAAA,qCAAc;AAFM,SAAA,SAAAD;AAAA,EAAuB;AAAA;AAAA;AAAA;AAAA,EAO3C,iBAAiB;AAOR,WANiC,KAAK,OAAO,OAChD,MAAM,QAAQ,KAAK,OAAO,IAAI,IAC5B,KAAK,OAAO,OACZ,CAAC,KAAK,OAAO,IAAI,IACnB,CAAC,EAAE,OAAOH,EAAA,CAAoB;AAAA,EAGpC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,gBAAgBK,GAAe;AACvB,UAAAC,IAAc,KAAK;AACrB,QAAAC;AAEJ,WAAAD,EAAY,QAAQ,CAAC,EAAE,OAAOE,QAAe;AAC3C,UAAID;AACF;AAEI,YAAAE,IAAUP,EAAY,WAAWM,CAAQ;AAC/C,iBAAWE,KAAOT,GAAsB;AACtC,YAAIM;AACF;AAEI,cAAAI,IAAYC,EAAK,KAAKH,GAAS,GAAGJ,CAAK,GAAGK,CAAG,EAAE;AACjD,QAAAG,EAAG,WAAWF,CAAS,MAChBJ,IAAAI;AAAA,MAEb;AAAA,IAAA,CACD,GAEMJ;AAAA,EACT;AAAA;AAAA;AAAA;AAAA,EAKA,OAAe,WAAWO,GAAmB;AAC3C,QAAIL,IAAUK,EAAU,MAAM,IAAI,EAAE,CAAC;AACrC,QAAI,CAACL;AACG,YAAA,IAAI,MAAM,iDAAiD;AAEzD,WAAAA,IAAAA,EAAQ,QAAQ,OAAO,GAAG,GAC7BA;AAAA,EACT;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAOA,OAAO,iBAAiB;AAAA,IACtB,WAAAK;AAAA,IACA,QAAAP;AAAA,EAAA,GAIC;AACK,UAAAE,IAAU,KAAK,WAAWK,CAAS,GACnCC,IAAK,IAAI,OAAO,IAAIN,CAAO,WAAW,GACtCO,IAAQT,EAAO,MAAMQ,CAAE;AAEtB,WADWC,KAAA,gBAAAA,EAAO,GAAG;AAAA,EAE9B;AACF;AC9Da,MAAAC,IAAiB,CAC5BC,OACqB;AAAA,EACrB,WAAW,MAAM;AACT,UAAAC,wBAAe;AACb,WAAAD,EAAA;AAAA,MAAQ,CAAC,EAAE,aAAAE,GAAa,OAAAC,GAAO,gBAAAC,QACrC,OAAO,QAAQF,CAAW,EAAE,QAAQ,CAAC,CAACG,GAAMC,CAAa,MAAM;AACvD,cAAAC,IAAYvB,EAAY,iBAAiB;AAAA,UAC7C,WAAWmB;AAAA,UACX,QAAQE;AAAA,QAAA,CACT;AAEG,YAAA,CAACE,EAAW,QAAO;AAEnB,YAAAN,EAAS,IAAIM,CAAS;AAEhB,yBAAA;AAAA,YACN,kCAAkCA,CAAS,uBAAuBF,CAAI;AAAA,UAAA,GAEjE;AAGT,cAAMG,IAAqB;AAAA,UACzB,MAAMD;AAAA,UACN,MAAM,YAAY;AAChB,kBAAM,EAAE,SAAAE,EAAA,IAAY,MAAM,OAAO,uBAAc,GACzC,EAAE,SAASC,GAAW,GAAGC,EAAM,IAAI,MAAML;AACxC,mBAAA;AAAA,cACL,SACEM,gBAAAA,EAAA;AAAA,gBAACH;AAAA,gBAAA;AAAA,kBACC,cAAcC;AAAA,kBACb,GAAGC;AAAA,kBACJ,gBAAAP;AAAA,gBAAA;AAAA,cACF;AAAA,YAAA;AAAA,UAGN;AAAA,QAAA;AAEO,QAAAH,EAAA,IAAIM,GAAWC,CAAK;AAAA,MAAA,CAC9B;AAAA,IAAA,GAEI,CAAC,GAAGP,EAAS,OAAA,CAAQ;AAAA,EAC9B;AACF;"}

package/lib/zudoku.plugin-openapi.js

@@ -1,16 +1,15 @@
 import "./jsx-runtime-B6kdoens.js";
-import { o as u } from "./index-Cj-F-4ME.js";
-import "./ZudokuContext-D1D8Anlj.js";
+import { o as s } from "./index-B3F9d8oi.js";
+import "./ZudokuContext-BKXGJTmu.js";
 import "lucide-react";
 import "zudoku/openapi-worker";
-import "./hook-JSRuxV1P.js";
-import "./Markdown-1BO9EA_X.js";
+import "./hook-sn0zMTkE.js";
+import "./Markdown-BDcCAWwm.js";
 import "./ui/Button.js";
-import "./joinPath-B7kNnUX4.js";
-import "./urql-core-KJnLL26g.js";
+import "./urql-core-CqTI9H6N.js";
 import "./router-BsfSoK2j.js";
 import "./index-CRo94sKK.js";
 export {
-  u as openApiPlugin
+  s as openApiPlugin
 };
 //# sourceMappingURL=zudoku.plugin-openapi.js.map

package/lib/zudoku.plugin-openapi.js.map

@@ -1 +1 @@
-{"version":3,"file":"zudoku.plugin-openapi.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}
+{"version":3,"file":"zudoku.plugin-openapi.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zudoku",
-  "version": "0.13.7",
+  "version": "0.14.0",
   "type": "module",
   "homepage": "https://zudoku.dev",
   "repository": {
@@ -167,7 +167,7 @@
     "posthog-node": "4.2.1",
     "prism-react-renderer": "2.4.0",
     "prismjs": "1.29.0",
-    "react-error-boundary": "4.0.13",
+    "react-error-boundary": "4.1.2",
     "react-hook-form": "7.53.0",
     "react-is": "18.3.1",
     "react-markdown": "9.0.1",
@@ -199,7 +199,7 @@
     "zustand": "5.0.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.21",
+    "@types/express": "5.0.0",
     "@types/har-format": "1.2.15",
     "@types/json-schema": "7.0.15",
     "@types/mdx": "2.0.13",

package/src/app/entry.client.tsx

@@ -20,8 +20,10 @@ if (root.childElementCount > 0) {
 }
 
 async function hydrateLazyRoutes(routes: RouteObject[]) {
-  const path = window.location.pathname.slice(config.basePath?.length ?? 0);
-  const lazyMatches = matchRoutes(routes, path)?.filter((m) => m.route.lazy);
+  const path = window.location.pathname;
+  const lazyMatches = matchRoutes(routes, path, config.basePath)?.filter(
+    (m) => m.route.lazy,
+  );
 
   if (lazyMatches?.length) {
     await Promise.all(

package/src/app/entry.server.tsx

@@ -96,6 +96,10 @@ export const render = async ({
 
         const [htmlStart, htmlEnd] = template.split("<!--app-html-->");
 
+        if (!htmlStart) {
+          throw new Error("No <!--app-html--> found in template");
+        }
+
         response.write(
           htmlStart.replace(
             "<!--app-helmet-->",

package/src/app/main.css

@@ -103,6 +103,10 @@
     @apply h-full overscroll-none;
   }
 
+  details summary {
+    @apply cursor-pointer;
+  }
+
   #root {
     @apply min-h-screen w-full;
   }

package/src/app/main.tsx

@@ -1,4 +1,4 @@
-import { redirect, type RouteObject } from "react-router-dom";
+import { type RouteObject } from "react-router-dom";
 import { configuredApiKeysPlugin } from "virtual:zudoku-api-keys-plugin";
 import { configuredApiPlugins } from "virtual:zudoku-api-plugins";
 import { configuredAuthProvider } from "virtual:zudoku-auth";
@@ -10,10 +10,8 @@ import { configuredSidebar } from "virtual:zudoku-sidebar";
 import "virtual:zudoku-theme.css";
 import { DevPortal, Layout, RouterError } from "zudoku/components";
 import type { ZudokuConfig } from "../config/config.js";
-import { traverseSidebar } from "../lib/components/navigation/utils.js";
 import type { ZudokuContextOptions } from "../lib/core/DevPortalContext.js";
 import { isNavigationPlugin } from "../lib/core/plugins.js";
-import { joinPath } from "../lib/util/joinPath.js";
 
 export const convertZudokuConfigToOptions = (
   config: ZudokuConfig,
@@ -67,9 +65,7 @@ export const convertZudokuConfigToOptions = (
   };
 };
 
-export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
-  const options = convertZudokuConfigToOptions(config);
-
+export const getRoutesByOptions = (options: ZudokuContextOptions) => {
   const allPlugins = [
     ...(options.plugins ? options.plugins : []),
     ...(options.authentication?.getAuthenticationPlugin
@@ -77,27 +73,8 @@ export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
       : []),
   ];
 
-  const topNavRedirects =
-    options.topNavigation?.flatMap((topNavItem) => {
-      if (!options.sidebars?.[topNavItem.id]) return [];
-
-      const first =
-        topNavItem.default ??
-        traverseSidebar(options.sidebars[topNavItem.id], (item) => {
-          if (item.type === "doc") return joinPath(topNavItem.id, item.id);
-        });
-
-      if (!first) return [];
-
-      return {
-        path: topNavItem.id,
-        loader: () => redirect(joinPath(first)),
-      } satisfies RouteObject;
-    }) ?? [];
-
   const routes = allPlugins
     .flatMap((plugin) => (isNavigationPlugin(plugin) ? plugin.getRoutes() : []))
-    .concat(topNavRedirects)
     .concat({
       path: "*",
       loader: () => {
@@ -105,6 +82,13 @@ export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
       },
     });
 
+  return routes;
+};
+
+export const getRoutesByConfig = (config: ZudokuConfig): RouteObject[] => {
+  const options = convertZudokuConfigToOptions(config);
+  const routes = getRoutesByOptions(options);
+
   return [
     {
       element: (

package/src/app/standalone.tsx

@@ -16,7 +16,7 @@ if (!root) {
 themeToggle();
 
 const apiUrl = root.getAttribute("data-api-url");
-const pageTitle = document.getElementsByTagName("title")[0].innerText;
+const pageTitle = document.getElementsByTagName("title")[0]!.innerText;
 const logoUrl = root.getAttribute("data-logo-url");
 
 // IMPORTANT: This component must not contain tailwind classes

package/src/lib/components/Header.tsx

@@ -70,14 +70,22 @@ export const Header = memo(function HeaderInner() {
                 {page?.logo && (
                   <>
                     <img
-                      src={page.logo.src.light}
+                      src={
+                        /https?:\/\//.test(page.logo.src.light)
+                          ? page.logo.src.light
+                          : import.meta.env.BASE_URL + page.logo.src.light
+                      }
                       alt={page.logo.alt ?? page.pageTitle}
                       style={{ width: page.logo.width }}
                       className={cn("h-10", isDark && "hidden")}
                       loading="lazy"
                     />
                     <img
-                      src={page.logo.src.dark}
+                      src={
+                        /https?:\/\//.test(page.logo.src.dark)
+                          ? page.logo.src.dark
+                          : import.meta.env.BASE_URL + page.logo.src.dark
+                      }
                       alt={page.logo.alt ?? page.pageTitle}
                       style={{ width: page.logo.width }}
                       className={cn("h-10", !isDark && "hidden")}

package/src/lib/components/SyntaxHighlight.tsx

@@ -46,6 +46,10 @@ type SyntaxHighlightProps = {
   language?: string;
 } & Omit<HighlightProps, "children" | "language">;
 
+const remapLang = {
+  mdx: "md",
+} as Record<string, string>;
+
 export const SyntaxHighlight = ({
   copyable = true,
   language = "plain",
@@ -61,7 +65,7 @@ export const SyntaxHighlight = ({
   return (
     <Highlight
       theme={isDark ? themes.vsDark : themes.github}
-      language={language}
+      language={remapLang[language] ?? language}
       {...props}
     >
       {({ className, style, tokens, getLineProps, getTokenProps }) => (

package/src/lib/components/TopNavigation.tsx

@@ -1,8 +1,11 @@
 import { cx } from "class-variance-authority";
-import { NavLink } from "react-router-dom";
-
+import { Suspense } from "react";
+import { Link } from "react-router-dom";
 import { useAuth } from "../authentication/hook.js";
-import { useZudoku } from "./context/ZudokuContext.js";
+import { TopNavigationItem } from "../../config/validators/validate.js";
+import { joinPath } from "../util/joinPath.js";
+import { useCurrentNavigation, useZudoku } from "./context/ZudokuContext.js";
+import { traverseSidebar } from "./navigation/utils.js";
 
 export const isHiddenItem =
   (isAuthenticated?: boolean) =>
@@ -25,26 +28,57 @@ export const TopNavigation = () => {
   }
 
   return (
-    <nav className="hidden lg:block border-b text-sm px-12 h-[--top-nav-height]">
-      <ul className="flex flex-row items-center gap-8">
-        {topNavigation.filter(isHiddenItem(isAuthenticated)).map((item) => (
-          <li key={item.label}>
-            <NavLink
-              className={({ isActive }) =>
-                cx(
-                  "block py-3.5 font-medium -mb-px border-b-2",
-                  isActive
-                    ? "border-primary text-foreground"
-                    : "border-transparent text-foreground/75 hover:text-foreground hover:border-accent-foreground/25",
-                )
-              }
-              to={item.id}
-            >
-              {item.label}
-            </NavLink>
-          </li>
-        ))}
-      </ul>
-    </nav>
+    <Suspense>
+      <nav className="hidden lg:block border-b text-sm px-12 h-[--top-nav-height]">
+        <ul className="flex flex-row items-center gap-8">
+          {topNavigation.filter(isHiddenItem(isAuthenticated)).map((item) => (
+          <li key={item.id}>
+              <TopNavItem {...item} />
+            </li>
+          ))}
+        </ul>
+      </nav>
+    </Suspense>
+  );
+};
+
+const TopNavItem = ({ id, label, default: defaultLink }: TopNavigationItem) => {
+  const { sidebars } = useZudoku();
+  const nav = useCurrentNavigation();
+  const currentSidebar = sidebars[id];
+
+  // TODO: This is a bit of a hack to get the first link in the sidebar
+  // We should really process this when we load the config so we can validate
+  // that the sidebar is actually set. In this case we just fall back to linking
+  // to the id if we can't resolve a sidebar.
+  const first =
+    defaultLink ??
+    (currentSidebar
+      ? traverseSidebar(currentSidebar, (item) => {
+          if (item.type === "doc") return joinPath(item.id);
+        })
+      : joinPath(id));
+
+  if (!first) {
+    throw new Error(
+      `No links found in top navigation for top navigation '${id}'. Check that the sidebar isn't empty or that a default link set.`,
+    );
+  }
+
+  // Manually set the active sidebar based on our logic of what is active
+  const isActive = nav.data.topNavItem?.id === id;
+
+  return (
+    <Link
+      className={cx(
+        "block py-3.5 font-medium -mb-px border-b-2",
+        isActive
+          ? "border-primary text-foreground"
+          : "border-transparent text-foreground/75 hover:text-foreground hover:border-accent-foreground/25",
+      )}
+      to={first}
+    >
+      {label}
+    </Link>
   );
 };

package/src/lib/components/context/ZudokuContext.ts

@@ -1,7 +1,9 @@
 import { useQuery, useSuspenseQuery } from "@tanstack/react-query";
 import { createContext, useContext } from "react";
-import { useLocation } from "react-router-dom";
+import { matchPath, useLocation } from "react-router-dom";
 import { DevPortalContext } from "../../core/DevPortalContext.js";
+import { joinPath } from "../../util/joinPath.js";
+import { traverseSidebar } from "../navigation/utils.js";
 
 export const ZudokuReactContext = createContext<DevPortalContext | undefined>(
   undefined,
@@ -25,34 +27,40 @@ export const useApiIdentities = () => {
   });
 };
 
-export const useTopNavigationItem = () => {
-  const { topNavigation } = useZudoku();
+export const useCurrentNavigation = () => {
+  const { getPluginSidebar, sidebars, topNavigation } = useZudoku();
   const location = useLocation();
 
-  const firstPart = location.pathname.split("/").at(1);
-  if (!firstPart) return;
+  const currentSidebarItem = Object.entries(sidebars).find(([, sidebar]) => {
+    return traverseSidebar(sidebar, (item) => {
+      const itemId =
+        item.type === "doc"
+          ? joinPath(item.id)
+          : item.type === "category" && item.link
+            ? joinPath(item.link.id)
+            : undefined;
 
-  return topNavigation.find((item) => item.id === firstPart);
-};
-
-export const useNavigation = () => {
-  const { getPluginSidebar, sidebars } = useZudoku();
-  const navItem = useTopNavigationItem();
-  const path = navItem?.id;
-  const currentSidebar = path ? (sidebars[path] ?? []) : [];
-  const location = useLocation();
+      if (itemId === location.pathname) {
+        return item;
+      }
+    });
+  });
+  const currentTopNavItem =
+    topNavigation.find((t) => t.id === currentSidebarItem?.[0]) ??
+    topNavigation.find((item) => matchPath(item.id, location.pathname));
 
   return useSuspenseQuery({
     queryFn: async () => {
-      const pluginSidebar = path
-        ? await getPluginSidebar(path)
-        : await getPluginSidebar(location.pathname);
+      const pluginSidebar = await getPluginSidebar(location.pathname);
 
       return {
-        items: [...currentSidebar, ...pluginSidebar],
-        currentTopNavItem: navItem,
+        sidebar: [
+          ...(currentSidebarItem ? currentSidebarItem[1] : []),
+          ...pluginSidebar,
+        ],
+        topNavItem: currentTopNavItem,
       };
     },
-    queryKey: ["navigation", path],
+    queryKey: ["navigation", location.pathname],
   });
 };

package/src/lib/components/navigation/Sidebar.tsx

@@ -2,23 +2,23 @@ import { useRef } from "react";
 
 import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
 import { DrawerContent, DrawerTitle } from "../../ui/Drawer.js";
-import { useNavigation } from "../context/ZudokuContext.js";
+import { useCurrentNavigation } from "../context/ZudokuContext.js";
 import { Slotlet } from "../SlotletProvider.js";
 import { SidebarItem } from "./SidebarItem.js";
 import { SidebarWrapper } from "./SidebarWrapper.js";
 
 export const Sidebar = () => {
   const navRef = useRef<HTMLDivElement | null>(null);
-  const navigation = useNavigation();
+  const navigation = useCurrentNavigation();
 
   return (
     <>
       <SidebarWrapper
         ref={navRef}
-        pushMainContent={navigation.data.items.length > 0}
+        pushMainContent={navigation.data.sidebar.length > 0}
       >
         <Slotlet name="zudoku-before-navigation" />
-        {navigation.data.items.map((item) => (
+        {navigation.data.sidebar.map((item) => (
           <SidebarItem key={item.label} item={item} />
         ))}
         <Slotlet name="zudoku-after-navigation" />
@@ -30,7 +30,7 @@ export const Sidebar = () => {
         <VisuallyHidden>
           <DrawerTitle>Sidebar</DrawerTitle>
         </VisuallyHidden>
-        {navigation.data.items.map((item) => (
+        {navigation.data.sidebar.map((item) => (
           <SidebarItem key={item.label} item={item} />
         ))}
       </DrawerContent>