zudoku 0.79.1 → 0.80.1

package/dist/cli/cli.js

@@ -85,9 +85,9 @@ var init_transform_config = __esm({
       }
       return result;
     };
-    runPluginTransformConfig = async (config2) => {
-      const plugins = config2.plugins ?? [];
-      let result = config2;
+    runPluginTransformConfig = async (config) => {
+      const plugins = config.plugins ?? [];
+      let result = config;
       for (const plugin of plugins.filter(isTransformConfigPlugin)) {
         const merge = (partial) => mergeConfig(result, partial);
         const transformed = await plugin.transformConfig?.({
@@ -506,8 +506,8 @@ var init_plugin_theme = __esm({
         // Handle the virtual module for dynamic theme content
         async load(id) {
           if (id !== resolvedVirtualModuleId) return;
-          const config2 = getCurrentConfig();
-          const themeConfig = config2.theme ?? {};
+          const config = getCurrentConfig();
+          const themeConfig = config.theme ?? {};
           const themeCss = [];
           const fonts = await processFonts(themeConfig);
           if (fonts.imports.length > 0) {
@@ -583,10 +583,18 @@ ${generateCss(themeConfig.dark)}
           if (fonts.families.serif) {
             rootVars.push(`  --font-serif: ${fonts.families.serif};`);
           }
-          const shikiThemes = config2.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes;
+          const shikiThemes = config.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes;
           const [lightTheme, darkTheme] = (await Promise.all([
-            import(`@shikijs/themes/${shikiThemes.light}`).then((m) => m.default),
-            import(`@shikijs/themes/${shikiThemes.dark}`).then((m) => m.default)
+            import(
+              /* @vite-ignore */
+              `@shikijs/themes/${shikiThemes.light}`
+            ).then((m) => m.default),
+            import(
+              /* @vite-ignore */
+              `@shikijs/themes/${shikiThemes.dark}`
+            ).then(
+              (m) => m.default
+            )
           ])).map(normalizeTheme);
           rootVars.push(
             `  --shiki-light: ${lightTheme?.fg ?? "#000"};`,
@@ -603,12 +611,12 @@ ${rootVars.join("\n")}
         // This goes through the normal CSS pipeline so Tailwind can process it
         async transform(src, id) {
           if (!id.endsWith("/src/app/main.css")) return;
-          const config2 = getCurrentConfig();
+          const config = getCurrentConfig();
           const files = new Set(
             [
-              config2.__meta.rootDir,
-              ...config2.__meta.dependencies,
-              ...config2.__pluginDirs ?? []
+              config.__meta.rootDir,
+              ...config.__meta.dependencies,
+              ...config.__pluginDirs ?? []
             ].map((file) => path2.relative(path2.dirname(id), file))
           );
           const code = [...files].map((file) => `@source "${file}";`);
@@ -660,11 +668,11 @@ ${rootVars.join("\n")}
             `  --font-serif: var(--font-serif);`
           );
           code.push("}");
-          const customCss = config2.theme?.customCss;
+          const customCss = config.theme?.customCss;
           if (customCss) {
             code.push(processCustomCss(customCss));
           }
-          const defaultThemeImport = config2.theme?.noDefaultTheme ? "" : '@import "./defaultTheme.css" layer(theme);';
+          const defaultThemeImport = config.theme?.noDefaultTheme ? "" : '@import "./defaultTheme.css" layer(theme);';
           return src.replace(DEFAULT_THEME_REPLACE, defaultThemeImport).replace(MAIN_REPLACE, code.join("\n"));
         }
       };
@@ -2695,6 +2703,11 @@ var init_InputNavigationSchema = __esm({
         file: z5.string(),
         label: z5.string().optional(),
         path: z5.string().optional()
+      }),
+      z5.object({
+        type: z5.literal("link"),
+        to: z5.string(),
+        label: z5.string().optional()
       })
     ]);
     DisplaySchema = z5.union([
@@ -2710,7 +2723,10 @@ var init_InputNavigationSchema = __esm({
         badge: BadgeSchema.optional(),
         collapsed: z5.boolean().optional(),
         collapsible: z5.boolean().optional(),
-        display: DisplaySchema
+        display: DisplaySchema,
+        // Turn a (plugin-generated) category into a stacked sub-nav
+        // E.g. make each OpenAPI tag drill into its own panel. See `stack` above.
+        stack: z5.boolean().optional()
       })
     });
     NavigationInsertRuleSchema = z5.object({
@@ -2762,7 +2778,8 @@ var init_InputNavigationSchema = __esm({
       target: z5.enum(["_self", "_blank"]).optional(),
       icon: IconSchema2.optional(),
       badge: BadgeSchema.optional(),
-      display: DisplaySchema
+      display: DisplaySchema,
+      stack: z5.boolean().optional()
     });
     InputNavigationCustomPageSchema = z5.object({
       type: z5.literal("custom-page"),
@@ -2795,7 +2812,8 @@ var init_InputNavigationSchema = __esm({
       collapsible: z5.boolean().optional(),
       collapsed: z5.boolean().optional(),
       link: InputNavigationCategoryLinkDocSchema.optional(),
-      display: DisplaySchema
+      display: DisplaySchema,
+      stack: z5.boolean().optional()
     });
     InputNavigationCategorySchema = BaseInputNavigationCategorySchema.extend({
       items: z5.lazy(() => InputNavigationItemSchema.array())
@@ -2919,20 +2937,35 @@ __export(ZudokuConfig_exports, {
 import colors from "picocolors";
 import { isValidElement as isValidElement2 } from "react";
 import { z as z7 } from "zod";
-function validateConfig(config2, configPath) {
-  const validationResult = ZudokuConfig.safeParse(config2);
+function validateConfig(config, configPath) {
+  warnUnsafeConfigKeys(config);
+  const validationResult = ZudokuConfig.safeParse(config);
   if (!validationResult.success) {
+    const prettyErrors = z7.prettifyError(validationResult.error);
+    const location = configPath ? ` at ${configPath}` : "";
     if (process.env.NODE_ENV === "production") {
       throw new Error(
-        `Whoops, looks like there's an issue with your ${configPath ?? "config"}:
-${z7.prettifyError(validationResult.error)}`
+        `Invalid Zudoku configuration${location}:
+${prettyErrors}`
       );
     }
-    console.log(colors.yellow("Validation errors:"));
-    console.log(colors.yellow(z7.prettifyError(validationResult.error)));
+    console.log(colors.yellow(`Invalid Zudoku configuration${location}:`));
+    console.log(colors.yellow(prettyErrors));
   }
 }
-var ThemeSchema, ApiCatalogCategorySchema, LanguageOption, AiAssistantCustomSchema, AiAssistantPresets, AiAssistantsSchema, ApiOptionsSchema, ApiConfigSchema, VersionConfigSchema, ApiSchema, ApiKeysSchema, LogoSchema, FooterSocialIcons, FooterSocialSchema, FooterSchema, SiteMapSchema, DEFAULT_DOCS_FILES, LlmsConfigSchema, DocsConfigSchema, Redirect, SearchSchema, SignUpUrlValueSchema, SignUpUrlSchema, SignUpOpenIdSchema, AuthenticationSchema, MetadataSchema, FontConfigSchema, FontsConfigSchema, CssObject, ThemeConfigSchema, SiteSchema, PlacementPosition, HeaderConfigSchema, ApiCatalogSchema, CdnUrlSchema, BaseConfigSchema, ZudokuConfig;
+function warnUnsafeConfigKeys(config) {
+  if (typeof config !== "object" || config === null) return;
+  const usedKeys = DEPRECATED_UNSAFE_KEYS.filter(
+    (key) => Object.hasOwn(config, key)
+  );
+  if (usedKeys.length === 0) return;
+  console.log(
+    colors.yellow(
+      `Warning: The following config ${usedKeys.length === 1 ? "option is" : "options are"} deprecated and will be removed soon: ${usedKeys.join(", ")}`
+    )
+  );
+}
+var ThemeSchema, ApiCatalogCategorySchema, LanguageOption, AiAssistantCustomSchema, AiAssistantPresets, AiAssistantsSchema, ApiOptionsSchema, ApiConfigSchema, VersionConfigSchema, ApiSchema, ApiKeysSchema, LogoSchema, FooterSocialIcons, FooterSocialSchema, FooterSchema, SiteMapSchema, DEFAULT_DOCS_FILES, LlmsConfigSchema, DocsConfigSchema, Redirect, SearchSchema, SignUpUrlValueSchema, SignUpUrlSchema, SignUpOpenIdSchema, AuthenticationSchema, MetadataSchema, FontConfigSchema, FontsConfigSchema, CssObject, ThemeConfigSchema, SiteSchema, PlacementPosition, HeaderConfigSchema, ApiCatalogSchema, CdnUrlSchema, BaseConfigSchema, ZudokuConfig, DEPRECATED_UNSAFE_KEYS;
 var init_ZudokuConfig = __esm({
   "src/config/validators/ZudokuConfig.ts"() {
     init_plugin_theme();
@@ -3471,6 +3504,7 @@ var init_ZudokuConfig = __esm({
       __pluginDirs: z7.array(z7.string())
     });
     ZudokuConfig = BaseConfigSchema.partial();
+    DEPRECATED_UNSAFE_KEYS = ["UNSAFE_slotlets"];
   }
 });
 
@@ -3493,29 +3527,48 @@ async function getConfigFilePath(rootDir) {
 }
 async function loadZudokuConfigWithMeta(rootDir) {
   const configPath = await getConfigFilePath(rootDir);
-  const { module, dependencies } = await runnerImport(configPath, {
-    plugins: [virtualModuleStubPlugin],
-    environments: {
-      inline: {
-        resolve: {
-          // Prevent Node.js from trying to load zudoku's raw .ts source
-          // directly, which fails with ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING
-          // when --experimental-strip-types is enabled. Uses regex to also
-          // catch plugins that re-export from zudoku (e.g. @zuplo/zudoku-plugin-*).
-          noExternal: [/zudoku/]
+  let module;
+  let dependencies;
+  try {
+    ({ module, dependencies } = await runnerImport(configPath, {
+      plugins: [virtualModuleStubPlugin],
+      environments: {
+        inline: {
+          resolve: {
+            // Prevent Node.js from trying to load zudoku's raw .ts source
+            // directly, which fails with ERR_UNSUPPORTED_NODE_MODULES_TYPE_STRIPPING
+            // when --experimental-strip-types is enabled. Uses regex to also
+            // catch plugins that re-export from zudoku (e.g. @zuplo/zudoku-plugin-*).
+            noExternal: [/zudoku/]
+          }
         }
+      },
+      server: {
+        // this allows us to 'load' CSS files in the config
+        // see https://github.com/vitejs/vite/pull/19577
+        perEnvironmentStartEndDuringDev: true
       }
-    },
-    server: {
-      // this allows us to 'load' CSS files in the config
-      // see https://github.com/vitejs/vite/pull/19577
-      perEnvironmentStartEndDuringDev: true
-    }
-  });
-  const config2 = module.default;
-  validateConfig(config2, configPath);
+    }));
+  } catch (error) {
+    const detail = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Invalid Zudoku configuration at ${colors2.dim(configPath)}:
+
+${detail}`,
+      { cause: error }
+    );
+  }
+  if (module.default === void 0) {
+    throw new Error(
+      `Invalid Zudoku configuration at ${colors2.dim(configPath)}:
+
+Config file must have a default export.`
+    );
+  }
+  const config = module.default;
+  validateConfig(config, configPath);
   const configWithMetadata = {
-    ...config2,
+    ...config,
     __meta: {
       rootDir,
       moduleDir: getZudokuRootDir(),
@@ -3536,8 +3589,12 @@ function loadEnv(configEnv, rootDir) {
   return { publicEnv: publicEnv2, envPrefix: envPrefix2 };
 }
 async function hasConfigChanged() {
+  const config = getConfig();
   if (!config || !modifiedTimes) return true;
-  const files = [config.__meta.configPath, ...config.__meta.dependencies];
+  const files = [
+    config.__meta.configPath,
+    ...config.__meta.dependencies.filter(isFileSystemPath)
+  ];
   try {
     const hasChanged = await Promise.all(
       files.map(async (depPath) => {
@@ -3552,8 +3609,12 @@ async function hasConfigChanged() {
   }
 }
 async function updateModifiedTimes() {
+  const config = getConfig();
   if (!config) return;
-  const files = [config.__meta.configPath, ...config.__meta.dependencies];
+  const files = [
+    config.__meta.configPath,
+    ...config.__meta.dependencies.filter(isFileSystemPath)
+  ];
   modifiedTimes = /* @__PURE__ */ new Map();
   await Promise.all(
     files.map(async (depPath) => {
@@ -3564,29 +3625,38 @@ async function updateModifiedTimes() {
 }
 async function loadZudokuConfig(configEnv, rootDir) {
   const shouldReload = await hasConfigChanged();
-  if (!shouldReload && config && envPrefix && publicEnv) {
-    return { config, envPrefix, publicEnv };
+  const existing = getConfig();
+  if (!shouldReload && existing && envPrefix && publicEnv) {
+    return { config: existing, envPrefix, publicEnv };
   }
   ({ publicEnv, envPrefix } = loadEnv(configEnv, rootDir));
   try {
     const loadedConfig = await loadZudokuConfigWithMeta(rootDir);
-    config = await runPluginTransformConfig(loadedConfig);
+    const config = await runPluginTransformConfig(loadedConfig);
+    setConfig(config);
     logger.info(
       colors2.cyan(`loaded config file `) + colors2.dim(config.__meta.configPath),
       { timestamp: true }
     );
     return { config, envPrefix, publicEnv };
   } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    if (config) {
-      return { config, envPrefix, publicEnv };
+    const lastValid = getConfig();
+    if (lastValid) {
+      logger.error(
+        colors2.red("Failed to reload config, using last valid config."),
+        {
+          timestamp: true,
+          error: error instanceof Error ? error : new Error(String(error))
+        }
+      );
+      return { config: lastValid, envPrefix, publicEnv };
     }
-    throw new Error(errorMessage, { cause: error });
+    throw error;
   } finally {
     await updateModifiedTimes();
   }
 }
-var config, envPrefix, publicEnv, modifiedTimes, zudokuConfigFiles, virtualModuleStubPlugin, getCurrentConfig;
+var configStore, getConfig, setConfig, envPrefix, publicEnv, modifiedTimes, zudokuConfigFiles, virtualModuleStubPlugin, isFileSystemPath, getCurrentConfig;
 var init_loader = __esm({
   "src/config/loader.ts"() {
     init_logger();
@@ -3595,6 +3665,11 @@ var init_loader = __esm({
     init_invariant();
     init_file_exists();
     init_ZudokuConfig();
+    configStore = globalThis;
+    getConfig = () => configStore.__zudokuConfig;
+    setConfig = (next) => {
+      configStore.__zudokuConfig = next;
+    };
     zudokuConfigFiles = [
       "zudoku.config.js",
       "zudoku.config.jsx",
@@ -3611,7 +3686,9 @@ var init_loader = __esm({
         if (id.startsWith("\0virtual:")) return "export default {}";
       }
     };
+    isFileSystemPath = (p) => !p.startsWith("\0") && !p.includes("virtual:");
     getCurrentConfig = () => {
+      const config = getConfig();
       invariant(config, "Config not loaded");
       return config;
     };
@@ -3808,25 +3885,25 @@ var getClerkFrontendApi = (publishableKey) => {
 };
 
 // src/lib/auth/issuer.ts
-var getIssuer = async (config2) => {
-  switch (config2.authentication?.type) {
+var getIssuer = async (config) => {
+  switch (config.authentication?.type) {
     case "clerk": {
-      return `https://${getClerkFrontendApi(config2.authentication.clerkPubKey)}`;
+      return `https://${getClerkFrontendApi(config.authentication.clerkPubKey)}`;
     }
     case "auth0": {
-      return `https://${config2.authentication.domain}/`;
+      return `https://${config.authentication.domain}/`;
     }
     case "openid": {
-      return config2.authentication.issuer;
+      return config.authentication.issuer;
     }
     case "supabase": {
-      return config2.authentication.supabaseUrl;
+      return config.authentication.supabaseUrl;
     }
     case "azureb2c": {
-      return config2.authentication.issuer;
+      return config.authentication.issuer;
     }
     case "firebase": {
-      return `https://securetoken.google.com/${config2.authentication.projectId}`;
+      return `https://securetoken.google.com/${config.authentication.projectId}`;
     }
     case void 0: {
       return void 0;
@@ -3867,22 +3944,22 @@ init_joinUrl();
 var PROTECTED_CHUNK_DIR = "_protected";
 var MANIFEST_VERSION = 1;
 var MANIFEST_FILENAME = "zudoku-manifest.json";
-var buildManifest = (config2) => {
-  const protectedRoutes = ProtectedRoutesSchema.parse(config2.protectedRoutes);
+var buildManifest = (config) => {
+  const protectedRoutes = ProtectedRoutesSchema.parse(config.protectedRoutes);
   const routePatterns = protectedRoutes ? Object.keys(protectedRoutes) : [];
   return {
     version: MANIFEST_VERSION,
-    basePath: config2.basePath ?? "/",
+    basePath: config.basePath ?? "/",
     ssrEntry: "server/entry.js",
     static: {
-      prefixes: [joinUrl(config2.basePath, "assets")]
+      prefixes: [joinUrl(config.basePath, "assets")]
     },
     protected: {
-      chunkPrefix: joinUrl(config2.basePath, PROTECTED_CHUNK_DIR),
+      chunkPrefix: joinUrl(config.basePath, PROTECTED_CHUNK_DIR),
       routePatterns
     },
     auth: {
-      sessionEndpoint: joinUrl(config2.basePath, "/__z/auth/session"),
+      sessionEndpoint: joinUrl(config.basePath, "/__z/auth/session"),
       cookies: {
         access: ACCESS_TOKEN_COOKIE,
         refresh: REFRESH_TOKEN_COOKIE,
@@ -3947,9 +4024,9 @@ async function collectStyleUrls(server, entries) {
 var VIRTUAL_ENTRY = "virtual:ssr-css.css";
 function vitePluginSsrCss(pluginOpts) {
   let server;
-  const config2 = getCurrentConfig();
+  const config = getCurrentConfig();
   const virtualHref = path5.join(
-    config2.basePath ?? "",
+    config.basePath ?? "",
     `/@id/__x00__${VIRTUAL_ENTRY}?direct`
   );
   const cssModuleMap = /* @__PURE__ */ new Map();
@@ -4057,8 +4134,8 @@ var viteApiKeysPlugin = () => {
     },
     async load(id) {
       if (id === resolvedVirtualModuleId4) {
-        const config2 = getCurrentConfig();
-        if (!config2.apiKeys?.enabled || config2.__meta.mode === "standalone") {
+        const config = getCurrentConfig();
+        if (!config.apiKeys?.enabled || config.__meta.mode === "standalone") {
           return `export const configuredApiKeysPlugin = undefined;`;
         }
         const deploymentName = ZuploEnv.buildConfig?.deploymentName || getZuploSystemConfigurations(process.env.ZUPLO_SYSTEM_CONFIGURATIONS)?.__ZUPLO_DEPLOYMENT_NAME;
@@ -4134,8 +4211,8 @@ var getBuildConfig = async () => {
   ).then((m) => m.module.default);
   return validateBuildConfig(buildModule);
 };
-function validateBuildConfig(config2) {
-  const validationResult = BuildConfigSchema2.safeParse(config2);
+function validateBuildConfig(config) {
+  const validationResult = BuildConfigSchema2.safeParse(config);
   if (!validationResult.success) {
     if (process.env.NODE_ENV === "production") {
       throw new Error(z8.prettifyError(validationResult.error));
@@ -5455,11 +5532,11 @@ var SchemaManager = class {
   config;
   constructor({
     storeDir,
-    config: config2,
+    config,
     processors
   }) {
     this.storeDir = storeDir;
-    this.config = config2;
+    this.config = config;
     this.processors = [
       ({ schema: schema2 }) => upgrade(schema2).specification,
       flattenAllOfProcessor,
@@ -5537,7 +5614,7 @@ var SchemaManager = class {
     const existingSchema = schemas[index];
     const schemaVersion = processedSchema.info.version ?? FALLBACK_VERSION;
     const versionPath = existingSchema?.path && existingSchema.path.length > 0 ? existingSchema.path : paramsPath(params) || schemaVersion;
-    const config2 = ensureArray(this.config.apis ?? []).find(
+    const config = ensureArray(this.config.apis ?? []).find(
       (c) => c.path === configuredPath
     );
     const processed = {
@@ -5553,7 +5630,7 @@ var SchemaManager = class {
         versionPath,
         configuredPath,
         params,
-        config2?.options
+        config?.options
       ),
       processedJsonPath,
       processedTime
@@ -5639,10 +5716,10 @@ var SchemaManager = class {
     }
     return map;
   };
-  createSchemaPath = (inputPath, versionPath, apiPath, params, config2) => {
+  createSchemaPath = (inputPath, versionPath, apiPath, params, config) => {
     const suffix = paramsSuffix(params);
     const extension = suffix ? ".json" : path7.extname(inputPath);
-    const fileName = config2?.schemaDownload?.fileName ?? this.config.defaults?.apis?.schemaDownload?.fileName ?? "schema";
+    const fileName = config?.schemaDownload?.fileName ?? this.config.defaults?.apis?.schemaDownload?.fileName ?? "schema";
     return joinUrl(
       this.config.basePath,
       apiPath,
@@ -5733,10 +5810,10 @@ var NavigationResolver = class {
   globFiles = [];
   items = [];
   itemIndex = 0;
-  constructor(config2) {
-    this.rootDir = config2.__meta.rootDir;
-    this.globPatterns = DocsConfigSchema.parse(config2.docs ?? {}).files;
-    this.items = config2.navigation ?? [];
+  constructor(config) {
+    this.rootDir = config.__meta.rootDir;
+    this.globPatterns = DocsConfigSchema.parse(config.docs ?? {}).files;
+    this.items = config.navigation ?? [];
   }
   async initialize() {
     if (this.globFiles.length > 0) return;
@@ -5803,6 +5880,9 @@ var NavigationResolver = class {
     if (typeof item === "string") {
       return this.resolveLink(item);
     }
+    if (item.type === "link") {
+      return { type: "link", to: item.to, label: item.label };
+    }
     const doc = await this.resolveDoc(item.file);
     return doc ? {
       ...item,
@@ -5890,11 +5970,11 @@ var viteNavigationPlugin = () => {
     },
     async load(id) {
       if (id !== resolvedVirtualModuleId2) return;
-      const config2 = getCurrentConfig();
-      const resolver = new NavigationResolver(config2);
+      const config = getCurrentConfig();
+      const resolver = new NavigationResolver(config);
       const resolvedNavigation = await resolver.resolve();
       const resolvedRules = await resolver.resolveRules(
-        config2.navigationRules ?? []
+        config.navigationRules ?? []
       );
       const collectedIcons = /* @__PURE__ */ new Set();
       let hasMissingIcon = false;
@@ -5920,7 +6000,7 @@ var viteNavigationPlugin = () => {
         2
       );
       const headerNavigationCode = stringifyWithIcons(
-        config2.header?.navigation ?? []
+        config.header?.navigation ?? []
       );
       const navigationCode = stringifyWithIcons(resolvedNavigation);
       const rulesCode = stringifyWithIcons(resolvedRules);
@@ -5928,7 +6008,7 @@ var viteNavigationPlugin = () => {
       invariant(navigationCode, "Failed to stringify navigation");
       invariant(rulesCode, "Failed to stringify navigation rules");
       await writePluginDebugCode(
-        config2.__meta.rootDir,
+        config.__meta.rootDir,
         "navigation-plugin",
         `export const headerNavigation = ${headerNavigationCode};
 export const navigation = ${navigationCode};
@@ -6031,8 +6111,24 @@ var viteApiPlugin = async () => {
         const mainFiles = schemaManager.getFilesToReprocess(id);
         if (mainFiles.length === 0) return;
         console.log(`Re-processing schema ${id}`);
-        for (const inputConfig of mainFiles) {
-          await schemaManager.processSchema(inputConfig);
+        try {
+          for (const inputConfig of mainFiles) {
+            await schemaManager.processSchema(inputConfig);
+          }
+        } catch (error) {
+          const err = error instanceof Error ? error : new Error(String(error));
+          server.config.logger.error(
+            `Failed to re-process schema ${id}. Fix the error and save again.`,
+            { error: err }
+          );
+          server.ws.send({
+            type: "error",
+            err: {
+              message: `Failed to re-process schema ${id}: ${err.message}`,
+              stack: err.stack ?? ""
+            }
+          });
+          return;
         }
         schemaManager.getAllTrackedFiles().forEach((file) => server.watcher.add(file));
         invalidate(server);
@@ -6046,13 +6142,13 @@ var viteApiPlugin = async () => {
     },
     async load(id) {
       if (id !== resolvedVirtualModuleId4) return;
-      const config2 = getCurrentConfig();
-      if (!deepEqual2(schemaManager.config.apis, config2.apis)) {
-        schemaManager.config = config2;
+      const config = getCurrentConfig();
+      if (!deepEqual2(schemaManager.config.apis, config.apis)) {
+        schemaManager.config = config;
         await schemaManager.processAllSchemas();
         schemaManager.getAllTrackedFiles().forEach((file) => this.addWatchFile(file));
       }
-      if (config2.__meta.mode === "standalone") {
+      if (config.__meta.mode === "standalone") {
         return [
           "export const configuredApiPlugins = [];",
           "export const configuredApiCatalogPlugins = [];"
@@ -6063,12 +6159,12 @@ var viteApiPlugin = async () => {
         `const configuredApiPlugins = [];`,
         `const configuredApiCatalogPlugins = [];`
       ];
-      if (config2.apis) {
+      if (config.apis) {
         code.push('import { openApiPlugin } from "zudoku/plugins/openapi";');
         code.push(
           `const apis = Array.isArray(config.apis) ? config.apis : [config.apis]`
         );
-        const apis = ensureArray(config2.apis);
+        const apis = ensureArray(config.apis);
         const apiMetadata = [];
         const httpMethods = /* @__PURE__ */ new Set([
           "get",
@@ -6145,7 +6241,7 @@ var viteApiPlugin = async () => {
               `    disableSecurity: config.defaults?.apis?.disableSecurity ?? true,`,
               `    showVersionSelect: config.defaults?.apis?.showVersionSelect ?? "if-available",`,
               `    expandAllTags: config.defaults?.apis?.expandAllTags ?? true,`,
-              `    showInfoPage: config.defaults?.apis?.showInfoPage ?? true,`,
+              `    showInfoPage: config.defaults?.apis?.showInfoPage,`,
               `    schemaDownload: config.defaults?.apis?.schemaDownload,`,
               `    transformExamples: config.defaults?.apis?.transformExamples,`,
               `    generateCodeSnippet: config.defaults?.apis?.generateCodeSnippet,`,
@@ -6170,7 +6266,7 @@ var viteApiPlugin = async () => {
               `    disableSecurity: config.defaults?.apis?.disableSecurity ?? true,`,
               `    showVersionSelect: config.defaults?.apis?.showVersionSelect ?? "if-available",`,
               `    expandAllTags: config.defaults?.apis?.expandAllTags ?? false,`,
-              `    showInfoPage: config.defaults?.apis?.showInfoPage ?? true,`,
+              `    showInfoPage: config.defaults?.apis?.showInfoPage,`,
               `    schemaDownload: config.defaults?.apis?.schemaDownload,`,
               `    ...${JSON.stringify(apiConfig.options ?? {})},`,
               "  },",
@@ -6178,11 +6274,11 @@ var viteApiPlugin = async () => {
             );
           }
         }
-        if (config2.catalogs) {
+        if (config.catalogs) {
           code.push(
             'import { apiCatalogPlugin } from "zudoku/plugins/api-catalog";'
           );
-          const catalogs = ensureArray(config2.catalogs);
+          const catalogs = ensureArray(config.catalogs);
           const categories = apis.flatMap((api) => api.categories ?? []).reduce((acc, catalog) => {
             if (!acc.has(catalog.label)) {
               acc.set(catalog.label ?? "", new Set(catalog.tags));
@@ -6228,12 +6324,12 @@ var viteApiPlugin = async () => {
     },
     async closeBundle() {
       if (this.environment.name === "ssr") return;
-      const config2 = getCurrentConfig();
+      const config = getCurrentConfig();
       const pathMap = schemaManager.getUrlToFilePathMap();
       if (process.env.NODE_ENV !== "production") return;
       for (const [urlPath, inputPath] of pathMap) {
         const content = await fs2.readFile(inputPath, "utf-8");
-        const outputPath = path11.join(config2.__meta.rootDir, "dist", urlPath);
+        const outputPath = path11.join(config.__meta.rootDir, "dist", urlPath);
         await fs2.mkdir(path11.dirname(outputPath), { recursive: true });
         await fs2.writeFile(outputPath, content, "utf-8");
       }
@@ -6257,16 +6353,16 @@ var viteAuthPlugin = () => {
     },
     async load(id) {
       if (id === resolvedVirtualModuleId4) {
-        const config2 = getCurrentConfig();
-        if (!config2.authentication || config2.__meta.mode === "standalone") {
+        const config = getCurrentConfig();
+        if (!config.authentication || config.__meta.mode === "standalone") {
           return `export const configuredAuthProvider = undefined;`;
         }
         return [
           `const config = {
-            ...${JSON.stringify(config2.authentication, null, 2)},
-            basePath: ${config2.basePath ? JSON.stringify(config2.basePath) : "undefined"},
+            ...${JSON.stringify(config.authentication, null, 2)},
+            basePath: ${config.basePath ? JSON.stringify(config.basePath) : "undefined"},
           };`,
-          `import authProvider from "zudoku/auth/${config2.authentication.type}";`,
+          `import authProvider from "zudoku/auth/${config.authentication.type}";`,
           `export const configuredAuthProvider = authProvider(config);`
         ].join("\n");
       }
@@ -6349,8 +6445,8 @@ var viteCustomPagesPlugin = () => {
     },
     async load(id) {
       if (id === resolvedVirtualModuleId4) {
-        const config2 = getCurrentConfig();
-        if (config2.__meta.mode === "standalone" || !config2.navigation) {
+        const config = getCurrentConfig();
+        if (config.__meta.mode === "standalone" || !config.navigation) {
           return `export const configuredCustomPagesPlugin = undefined;`;
         }
         const code = [
@@ -6377,9 +6473,9 @@ var viteDocMetadataPlugin = () => ({
   enforce: "pre",
   name: "zudoku-doc-metadata-plugin",
   configureServer: async (server) => {
-    const config2 = getCurrentConfig();
+    const config = getCurrentConfig();
     const files = await glob2("**/*.{md,mdx}", {
-      cwd: config2.__meta.rootDir,
+      cwd: config.__meta.rootDir,
       ignore: ["node_modules", "dist"],
       absolute: true
     });
@@ -6457,12 +6553,12 @@ var navigationListItem = cva(
 // src/vite/plugin-docs.ts
 init_joinUrl();
 var ensureLeadingSlash = joinUrl;
-var globMarkdownFiles = async (config2, options = { absolute: false }) => {
-  const docsConfig = DocsConfigSchema.parse(config2.docs ?? {});
+var globMarkdownFiles = async (config, options = { absolute: false }) => {
+  const docsConfig = DocsConfigSchema.parse(config.docs ?? {});
   const fileMapping = {};
   for (const globPattern of docsConfig.files) {
     const globbedFiles = await glob3(globPattern, {
-      root: config2.__meta.rootDir,
+      root: config.__meta.rootDir,
       ignore: ["**/node_modules/**", "**/dist/**", "**/.git/**"],
       // Always glob with relative paths to avoid issues on different OS
       absolute: false,
@@ -6473,7 +6569,7 @@ var globMarkdownFiles = async (config2, options = { absolute: false }) => {
     if (process.env.NODE_ENV !== "development") {
       const draftStatuses = await Promise.all(
         globbedFiles.map(async (file) => {
-          const absolutePath = path12.resolve(config2.__meta.rootDir, file);
+          const absolutePath = path12.resolve(config.__meta.rootDir, file);
           const { data } = await readFrontmatter(absolutePath);
           return { file, isDraft: data.draft === true };
         })
@@ -6488,32 +6584,32 @@ var globMarkdownFiles = async (config2, options = { absolute: false }) => {
       }
       const relativePath = path12.posix.relative(parent, file);
       const routePath = ensureLeadingSlash(relativePath.replace(/\.mdx?$/, ""));
-      const filePath = options.absolute ? path12.resolve(config2.__meta.rootDir, file) : file;
+      const filePath = options.absolute ? path12.resolve(config.__meta.rootDir, file) : file;
       fileMapping[routePath] = filePath;
     }
   }
   return fileMapping;
 };
-var resolveCustomNavigationPaths = async (config2, fileMapping) => {
-  if (!config2.navigation && !config2.navigationRules) return fileMapping;
-  const resolver = new NavigationResolver(config2);
+var resolveCustomNavigationPaths = async (config, fileMapping) => {
+  if (!config.navigation && !config.navigationRules) return fileMapping;
+  const resolver = new NavigationResolver(config);
   const mapping = { ...fileMapping };
   const processItem = (item) => {
-    const doc = item.type === "doc" ? { file: item.file, path: item.path } : item.type === "category" && item.link ? { file: item.link.file, path: item.link.path } : void 0;
+    const doc = item.type === "doc" ? { file: item.file, path: item.path } : item.type === "category" && item.link?.type === "doc" ? { file: item.link.file, path: item.link.path } : void 0;
     if (!doc || doc.path === doc.file) return;
     const fileRoutePath = ensureLeadingSlash(doc.file.replace(/\.mdx?$/, ""));
     const filePath = mapping[fileRoutePath];
     if (!filePath) return;
     const customPath = ensureLeadingSlash(doc.path);
     mapping[customPath] = filePath;
-    delete mapping[fileRoutePath];
+    if (customPath !== fileRoutePath) delete mapping[fileRoutePath];
   };
-  if (config2.navigation) {
+  if (config.navigation) {
     const resolvedNavigation = await resolver.resolve();
     traverseNavigation(resolvedNavigation, processItem);
   }
-  if (config2.navigationRules) {
-    const resolvedRules = await resolver.resolveRules(config2.navigationRules);
+  if (config.navigationRules) {
+    const resolvedRules = await resolver.resolveRules(config.navigationRules);
     for (const rule of resolvedRules) {
       if (rule.type === "insert") {
         traverseNavigation(rule.items, processItem);
@@ -6534,17 +6630,17 @@ var viteDocsPlugin = () => {
     },
     async load(id) {
       if (id !== resolvedVirtualModuleId4) return;
-      const config2 = getCurrentConfig();
-      if (config2.__meta.mode === "standalone") {
+      const config = getCurrentConfig();
+      if (config.__meta.mode === "standalone") {
         return `export const configuredDocsPlugin = undefined;`;
       }
       const code = [
         'import { markdownPlugin } from "zudoku/plugins/markdown";'
       ];
-      const docsConfig = DocsConfigSchema.parse(config2.docs ?? {});
+      const docsConfig = DocsConfigSchema.parse(config.docs ?? {});
       const fileMapping = await resolveCustomNavigationPaths(
-        config2,
-        await globMarkdownFiles(config2, { absolute: false })
+        config,
+        await globMarkdownFiles(config, { absolute: false })
       );
       const globbedDocuments = {};
       for (const [routePath, file] of Object.entries(fileMapping)) {
@@ -6558,13 +6654,13 @@ var viteDocsPlugin = () => {
         ),
         `};`,
         `export const configuredDocsPlugin = markdownPlugin({`,
-        `  basePath: "${config2.basePath ?? ""}",`,
+        `  basePath: "${config.basePath ?? ""}",`,
         `  fileImports,`,
         `  defaultOptions: ${JSON.stringify(docsConfig.defaultOptions)},`,
         `  publishMarkdown: ${JSON.stringify(docsConfig.publishMarkdown)},`,
         `});`
       );
-      await writePluginDebugCode(config2.__meta.rootDir, "docs-plugin", code);
+      await writePluginDebugCode(config.__meta.rootDir, "docs-plugin", code);
       return code.join("\n");
     }
   };
@@ -6614,19 +6710,19 @@ var viteMarkdownExportPlugin = () => {
       return env.name === "ssr";
     },
     async buildStart() {
-      const config2 = getCurrentConfig();
-      const llmsConfig = config2.docs?.llms;
-      const needsMdFiles = config2.docs?.publishMarkdown || llmsConfig?.llmsTxt || llmsConfig?.llmsTxtFull;
-      if (config2.__meta.mode === "standalone" || !needsMdFiles) {
+      const config = getCurrentConfig();
+      const llmsConfig = config.docs?.llms;
+      const needsMdFiles = config.docs?.publishMarkdown || llmsConfig?.llmsTxt || llmsConfig?.llmsTxtFull;
+      if (config.__meta.mode === "standalone" || !needsMdFiles) {
         return;
       }
       markdownFiles = await resolveCustomNavigationPaths(
-        config2,
-        await globMarkdownFiles(config2, { absolute: true })
+        config,
+        await globMarkdownFiles(config, { absolute: true })
       );
       if (!llmsConfig?.includeProtected) {
         const protectedRoutes = ProtectedRoutesSchema.parse(
-          config2.protectedRoutes
+          config.protectedRoutes
         );
         if (protectedRoutes) {
           const patterns = Object.keys(protectedRoutes);
@@ -6639,19 +6735,19 @@ var viteMarkdownExportPlugin = () => {
       }
     },
     async configureServer(server) {
-      const config2 = getCurrentConfig();
-      const llmsConfig = config2.docs?.llms;
-      const needsMdFiles = config2.docs?.publishMarkdown || llmsConfig?.llmsTxt || llmsConfig?.llmsTxtFull;
+      const config = getCurrentConfig();
+      const llmsConfig = config.docs?.llms;
+      const needsMdFiles = config.docs?.publishMarkdown || llmsConfig?.llmsTxt || llmsConfig?.llmsTxtFull;
       if (!needsMdFiles) return;
       markdownFiles = await resolveCustomNavigationPaths(
-        config2,
-        await globMarkdownFiles(config2, { absolute: true })
+        config,
+        await globMarkdownFiles(config, { absolute: true })
       );
       server.middlewares.use(async (req, res, next) => {
         if (req.method !== "GET" || !req.url?.endsWith(".md")) {
           return next();
         }
-        const basePath = joinUrl(config2.basePath);
+        const basePath = joinUrl(config.basePath);
         const routePath = resolveMarkdownRoutePath(req.url, basePath);
         const filePath = markdownFiles[routePath];
         if (!filePath) return next();
@@ -6666,16 +6762,16 @@ var viteMarkdownExportPlugin = () => {
       });
     },
     async closeBundle() {
-      const config2 = getCurrentConfig();
-      const llmsConfig = config2.docs?.llms;
-      const needsMdFiles = config2.docs?.publishMarkdown || llmsConfig?.llmsTxt || llmsConfig?.llmsTxtFull;
+      const config = getCurrentConfig();
+      const llmsConfig = config.docs?.llms;
+      const needsMdFiles = config.docs?.publishMarkdown || llmsConfig?.llmsTxt || llmsConfig?.llmsTxtFull;
       if (process.env.NODE_ENV !== "production" || Object.keys(markdownFiles).length === 0 || !needsMdFiles) {
         return;
       }
       const distDir = path13.join(
-        config2.__meta.rootDir,
+        config.__meta.rootDir,
         "dist",
-        config2.basePath ?? ""
+        config.basePath ?? ""
       );
       markdownFileInfos = [];
       for (const [routePath, filePath] of Object.entries(markdownFiles)) {
@@ -6699,9 +6795,9 @@ var viteMarkdownExportPlugin = () => {
           console.warn(`Failed to export markdown for ${routePath}:`, error);
         }
       }
-      if (config2.docs?.llms?.llmsTxt || config2.docs?.llms?.llmsTxtFull) {
+      if (config.docs?.llms?.llmsTxt || config.docs?.llms?.llmsTxtFull) {
         const markdownInfoPath = path13.join(
-          config2.__meta.rootDir,
+          config.__meta.rootDir,
           "node_modules/.zudoku/markdown-info.json"
         );
         await writeFile2(
@@ -7119,12 +7215,12 @@ var rehypeExcerptWithMdxExport = () => (tree) => {
   tree.children.unshift(exportMdxjsConst("excerpt", excerpt));
 };
 var viteMdxPlugin = async () => {
-  const config2 = getCurrentConfig();
+  const config = getCurrentConfig();
   const buildConfig = await getBuildConfig();
   const highlighter = await highlighterPromise;
   const defaultRemarkPlugins = [
     remarkStaticGeneration,
-    [remarkInjectFilepath, config2.__meta.rootDir],
+    [remarkInjectFilepath, config.__meta.rootDir],
     remarkComment,
     remarkGfm,
     remarkFrontmatter,
@@ -7136,9 +7232,9 @@ var viteMdxPlugin = async () => {
     remarkDirective,
     remarkDirectiveRehype,
     remarkCodeTabs,
-    [remarkLinkRewrite, config2.basePath],
-    [remarkNormalizeImageUrl, config2.basePath],
-    ...config2.build?.remarkPlugins ?? []
+    [remarkLinkRewrite, config.basePath],
+    [remarkNormalizeImageUrl, config.basePath],
+    ...config.build?.remarkPlugins ?? []
   ];
   const remarkPlugins = typeof buildConfig?.remarkPlugins === "function" ? buildConfig.remarkPlugins(defaultRemarkPlugins) : [...defaultRemarkPlugins, ...buildConfig?.remarkPlugins ?? []];
   const defaultRehypePlugins = [
@@ -7151,9 +7247,9 @@ var viteMdxPlugin = async () => {
     rehypeMetaAsAttributes,
     ...createConfiguredShikiRehypePlugins(
       highlighter,
-      config2.syntaxHighlighting?.themes
+      config.syntaxHighlighting?.themes
     ),
-    ...config2.build?.rehypePlugins ?? []
+    ...config.build?.rehypePlugins ?? []
   ];
   const rehypePlugins = typeof buildConfig?.rehypePlugins === "function" ? buildConfig.rehypePlugins(defaultRehypePlugins) : [...defaultRehypePlugins, ...buildConfig?.rehypePlugins ?? []];
   return {
@@ -7184,12 +7280,12 @@ var viteSearchPlugin = () => {
     },
     async load(id) {
       if (id !== resolvedVirtualModuleId4) return;
-      const config2 = getCurrentConfig();
-      if (!config2.search || config2.__meta.mode === "standalone") {
+      const config = getCurrentConfig();
+      if (!config.search || config.__meta.mode === "standalone") {
         return `export const configuredSearchPlugin = undefined;`;
       }
       const code = [];
-      if (config2.search.type === "inkeep") {
+      if (config.search.type === "inkeep") {
         code.push(
           `import config from 'virtual:zudoku-config';`,
           `import { inkeepSearchPlugin } from "zudoku/plugins/search-inkeep";`,
@@ -7197,7 +7293,7 @@ var viteSearchPlugin = () => {
         );
         return code.join("\n");
       }
-      if (config2.search.type === "pagefind") {
+      if (config.search.type === "pagefind") {
         code.push(
           `import config from 'virtual:zudoku-config';`,
           `import { pagefindSearchPlugin } from "zudoku/plugins/search-pagefind";`,
@@ -7227,10 +7323,10 @@ var viteShikiPlugin = () => {
   return {
     name: "vite-plugin-shiki-register",
     config() {
-      const config2 = getCurrentConfig();
-      const languages = config2.syntaxHighlighting?.languages ?? defaultLanguages;
+      const config = getCurrentConfig();
+      const languages = config.syntaxHighlighting?.languages ?? defaultLanguages;
       const themes = Object.values(
-        config2.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes
+        config.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes
       );
       const shikiIds = [
         ...languages.map((lang) => `@shikijs/langs/${resolveLang(lang)}`),
@@ -7253,10 +7349,10 @@ var viteShikiPlugin = () => {
     },
     async load(id) {
       if (id !== resolvedVirtualModuleId4) return;
-      const config2 = getCurrentConfig();
-      const languages = config2.syntaxHighlighting?.languages ?? defaultLanguages;
+      const config = getCurrentConfig();
+      const languages = config.syntaxHighlighting?.languages ?? defaultLanguages;
       const themes = Object.values(
-        config2.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes
+        config.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes
       );
       const highlighter = await highlighterPromise;
       await Promise.all([
@@ -7332,8 +7428,8 @@ var scopeMatchesPattern = (scope, pattern) => {
   }
   return matchPath2({ path: pattern, end: false }, root) != null;
 };
-var getProtectedSourceMatcher = (config2) => {
-  const protectedRoutes = ProtectedRoutesSchema.parse(config2.protectedRoutes);
+var getProtectedSourceMatcher = (config) => {
+  const protectedRoutes = ProtectedRoutesSchema.parse(config.protectedRoutes);
   const patterns = protectedRoutes ? Object.keys(protectedRoutes) : [];
   if (patterns.length === 0) {
     return { match: () => false, enabled: false, patterns };
@@ -7471,16 +7567,16 @@ var defineEnvVars = (vars) => Object.fromEntries(
   ])
 );
 async function getViteConfig(dir, configEnv, options = {}) {
-  const { config: config2, publicEnv: publicEnv2, envPrefix: envPrefix2 } = await loadZudokuConfig(
+  const { config, publicEnv: publicEnv2, envPrefix: envPrefix2 } = await loadZudokuConfig(
     configEnv,
     dir
   );
-  const { match: isProtectedSource, enabled: hasProtectedSources } = getProtectedSourceMatcher(config2);
+  const { match: isProtectedSource, enabled: hasProtectedSources } = getProtectedSourceMatcher(config);
   const shouldProtectChunks = hasProtectedSources && options.ssr === true;
   const isProtectedChunk = (chunk) => chunk.facadeModuleId && isProtectedSource(chunk.facadeModuleId) || chunk.moduleIds.some(isProtectedSource);
   const isWorker = options.adapter === "cloudflare";
-  const cdnUrl = CdnUrlSchema.parse(config2.cdnUrl);
-  const base = cdnUrl?.base ? joinUrl(cdnUrl.base, config2.basePath) : config2.basePath;
+  const cdnUrl = CdnUrlSchema.parse(config.cdnUrl);
+  const base = cdnUrl?.base ? joinUrl(cdnUrl.base, config.basePath) : config.basePath;
   if (cdnUrl && !hasLoggedCdnInfo) {
     logger.info(colors4.blue(`Using CDN URL:`));
     logger.info(colors4.blue(`  base:  `) + colors4.dim(cdnUrl.base));
@@ -7495,7 +7591,7 @@ async function getViteConfig(dir, configEnv, options = {}) {
   );
   if (ZuploEnv.isZuplo) {
     dotenv.config({
-      path: path16.resolve(config2.__meta.rootDir, "../.env.zuplo"),
+      path: path16.resolve(config.__meta.rootDir, "../.env.zuplo"),
       quiet: true
     });
   }
@@ -7546,8 +7642,8 @@ async function getViteConfig(dir, configEnv, options = {}) {
           `${dir}/dist`,
           `${dir}/lib`,
           `${dir}/.git`,
-          `${config2.__meta.moduleDir}/src/vite`,
-          `${config2.__meta.moduleDir}/src/cli`
+          `${config.__meta.moduleDir}/src/vite`,
+          `${config.__meta.moduleDir}/src/cli`
         ]
       }
     },
@@ -7555,10 +7651,10 @@ async function getViteConfig(dir, configEnv, options = {}) {
       sourcemap: true,
       target: "es2022",
       chunkSizeWarningLimit: 1500,
-      outDir: path16.resolve(path16.join(dir, "dist", config2.basePath ?? "")),
+      outDir: path16.resolve(path16.join(dir, "dist", config.basePath ?? "")),
       emptyOutDir: false,
       rolldownOptions: {
-        external: [joinUrl(config2.basePath, "/pagefind/pagefind.js")],
+        external: [joinUrl(config.basePath, "/pagefind/pagefind.js")],
         logLevel: process.env.ZUDOKU_ENV === "internal" ? "info" : "warn",
         checks: {
           pluginTimings: process.env.ZUDOKU_ENV === "internal"
@@ -7586,12 +7682,12 @@ async function getViteConfig(dir, configEnv, options = {}) {
         },
         build: {
           outDir: path16.resolve(
-            path16.join(dir, "dist", config2.basePath ?? "", "server")
+            path16.join(dir, "dist", config.basePath ?? "", "server")
           ),
           copyPublicDir: false,
           rolldownOptions: {
             logLevel: "warn",
-            input: ["zudoku/app/entry.server.tsx", config2.__meta.configPath]
+            input: ["zudoku/app/entry.server.tsx", config.__meta.configPath]
           }
         }
       }
@@ -7599,7 +7695,7 @@ async function getViteConfig(dir, configEnv, options = {}) {
     experimental: {
       renderBuiltUrl(filename) {
         if (filename.startsWith(`${PROTECTED_CHUNK_DIR}/`)) {
-          return joinUrl(config2.basePath, `/${filename}`);
+          return joinUrl(config.basePath, `/${filename}`);
         }
         if (cdnUrl?.base && [".js", ".css"].includes(path16.extname(filename))) {
           return joinUrl(cdnUrl.base, filename);
@@ -7638,7 +7734,7 @@ async function getViteConfig(dir, configEnv, options = {}) {
     }
   };
   const configRoots = await Promise.all(
-    (config2.__pluginDirs ?? []).map(findPackageRoot)
+    (config.__pluginDirs ?? []).map(findPackageRoot)
   );
   configRoots.push(dir);
   let mergedViteConfig = viteConfig;
@@ -7709,10 +7805,10 @@ ${cssLinks}
 // src/vite/manifest.ts
 import { writeFile as writeFile3 } from "node:fs/promises";
 import path17 from "node:path";
-var writeManifest = async (distDir, config2) => {
+var writeManifest = async (distDir, config) => {
   await writeFile3(
     path17.join(distDir, MANIFEST_FILENAME),
-    `${JSON.stringify(buildManifest(config2), null, 2)}
+    `${JSON.stringify(buildManifest(config), null, 2)}
 `,
     "utf-8"
   );
@@ -7726,7 +7822,7 @@ import { cp, mkdir as mkdir3, writeFile as writeFile4 } from "node:fs/promises";
 import path18 from "node:path";
 var pkgJson = getZudokuPackageJson();
 function generateOutput({
-  config: config2,
+  config,
   redirects,
   rewrites = []
 }) {
@@ -7751,7 +7847,7 @@ function generateOutput({
         }
       ],
       headers: {
-        "Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${joinUrl(config2.basePath)}; SameSite=Strict; Secure; HttpOnly`
+        "Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${joinUrl(config.basePath)}; SameSite=Strict; Secure; HttpOnly`
       },
       continue: true
     });
@@ -7760,8 +7856,8 @@ function generateOutput({
     routes.push({ handle: "filesystem" });
     for (const rewrite of rewrites) {
       routes.push({
-        src: joinUrl(config2.basePath, rewrite.source),
-        dest: joinUrl(config2.basePath, rewrite.destination)
+        src: joinUrl(config.basePath, rewrite.source),
+        dest: joinUrl(config.basePath, rewrite.destination)
       });
     }
   }
@@ -7775,11 +7871,11 @@ function generateOutput({
   return output;
 }
 async function writeOutput(dir, {
-  config: config2,
+  config,
   redirects,
   rewrites
 }) {
-  const output = generateOutput({ config: config2, redirects, rewrites });
+  const output = generateOutput({ config, redirects, rewrites });
   const outputDir = process.env.VERCEL ? path18.join(dir, ".vercel/output") : path18.join(dir, "dist/.output");
   await mkdir3(outputDir, { recursive: true });
   const outputFile = path18.join(outputDir, "config.json");
@@ -7844,14 +7940,14 @@ async function generateSitemap({
   outputUrls,
   basePath,
   baseOutputDir,
-  config: config2,
+  config,
   redirectUrls
 }) {
-  if (!config2) {
+  if (!config) {
     return;
   }
-  const sitemap = new SitemapStream({ hostname: config2.siteUrl });
-  const outputDir = path19.resolve(baseOutputDir, config2.outDir ?? "");
+  const sitemap = new SitemapStream({ hostname: config.siteUrl });
+  const outputDir = path19.resolve(baseOutputDir, config.outDir ?? "");
   if (!existsSync(outputDir)) {
     await mkdir4(outputDir, { recursive: true });
   }
@@ -7859,18 +7955,18 @@ async function generateSitemap({
   const writeStream = createWriteStream(sitemapOutputPath);
   sitemap.pipe(writeStream);
   let lastmod;
-  if (config2.autoLastmod !== false) {
+  if (config.autoLastmod !== false) {
     lastmod = (/* @__PURE__ */ new Date()).toISOString();
   }
-  const exclude = (typeof config2.exclude === "function" ? await config2.exclude() : config2.exclude) ?? [];
+  const exclude = (typeof config.exclude === "function" ? await config.exclude() : config.exclude) ?? [];
   for (const url of outputUrls) {
     const shouldExclude = exclude.includes(url) || url.includes("*") || /(400|404|500)$/.test(url) || redirectUrls.has(url);
     if (shouldExclude) continue;
     sitemap.write({
-      url: new URL(joinUrl(basePath, url), config2.siteUrl).toString(),
+      url: new URL(joinUrl(basePath, url), config.siteUrl).toString(),
       lastmod,
-      changefreq: config2.changefreq ?? "daily",
-      priority: config2.priority ?? 0.7
+      changefreq: config.changefreq ?? "daily",
+      priority: config.priority ?? 0.7
     });
   }
   sitemap.end();
@@ -7951,15 +8047,15 @@ var prerender = async ({
   const rawConfig = await import(serverConfigPath).then(
     (m) => m.default
   );
-  const config2 = await runPluginTransformConfig(rawConfig);
+  const config = await runPluginTransformConfig(rawConfig);
   const buildConfig = await getBuildConfig();
   const module = await import(entryServerPath);
   const getRoutes = module.getRoutesByConfig;
-  const routes = getRoutes(config2);
+  const routes = getRoutes(config);
   const paths = routesToPaths(routes);
   const rewrites = routesToRewrites(routes);
-  if (config2.redirects) {
-    for (const r of config2.redirects) {
+  if (config.redirects) {
+    for (const r of config.redirects) {
       paths.push(joinUrl(r.from));
     }
   }
@@ -7983,7 +8079,7 @@ var prerender = async ({
   }
   let completedCount = 0;
   let pagefindIndex;
-  if (config2.search?.type === "pagefind") {
+  if (config.search?.type === "pagefind") {
     const { index, errors } = await createIndex();
     invariant(
       index,
@@ -8069,18 +8165,18 @@ var prerender = async ({
       );
     }
   }
-  const redirectUrls = getRedirectUrls(workerResults, config2.basePath);
+  const redirectUrls = getRedirectUrls(workerResults, config.basePath);
   await generateSitemap({
-    basePath: config2.basePath,
+    basePath: config.basePath,
     outputUrls: paths,
-    config: config2.sitemap,
+    config: config.sitemap,
     baseOutputDir: distDir,
     redirectUrls
   });
-  if (config2.docs) {
+  if (config.docs) {
     const { DocsConfigSchema: DocsConfigSchema2 } = await Promise.resolve().then(() => (init_ZudokuConfig(), ZudokuConfig_exports));
     const { generateLlmsTxtFiles: generateLlmsTxtFiles2 } = await Promise.resolve().then(() => (init_llms(), llms_exports));
-    const docsConfig = DocsConfigSchema2.parse(config2.docs);
+    const docsConfig = DocsConfigSchema2.parse(config.docs);
     const llmsConfig = docsConfig.llms ?? {};
     const markdownInfoPath = path21.join(
       dir,
@@ -8094,10 +8190,10 @@ var prerender = async ({
     if (llmsConfig.llmsTxt || llmsConfig.llmsTxtFull) {
       await generateLlmsTxtFiles2({
         markdownFileInfos,
-        basePath: config2.basePath,
+        basePath: config.basePath,
         outputUrls: paths,
         baseOutputDir: distDir,
-        siteName: config2.site?.title,
+        siteName: config.site?.title,
         llmsTxt: llmsConfig.llmsTxt,
         llmsTxtFull: llmsConfig.llmsTxtFull,
         redirectUrls
@@ -8169,8 +8265,8 @@ var getContainerMemoryLimitMb = () => {
 import { mkdir as mkdir5, readdir, readFile as readFile3, rename, rm as rm2 } from "node:fs/promises";
 import path22 from "node:path";
 init_joinUrl();
-var assertProtectedPatternsCovered = (config2) => {
-  const { patterns } = getProtectedSourceMatcher(config2);
+var assertProtectedPatternsCovered = (config) => {
+  const { patterns } = getProtectedSourceMatcher(config);
   const unmatched = findUnmatchedProtectedPatterns(patterns);
   if (unmatched.length === 0) return;
   throw new Error(
@@ -8246,10 +8342,10 @@ These would be served publicly. Aborting build.`
   }
   await rm2(srcDir, { recursive: true, force: true });
 };
-var assertCloudflareWranglerGatesProtected = async (dir, config2) => {
-  const { enabled } = getProtectedSourceMatcher(config2);
+var assertCloudflareWranglerGatesProtected = async (dir, config) => {
+  const { enabled } = getProtectedSourceMatcher(config);
   if (!enabled) return;
-  const protectedPrefix = `${joinUrl(config2.basePath, PROTECTED_CHUNK_DIR)}/`;
+  const protectedPrefix = `${joinUrl(config.basePath, PROTECTED_CHUNK_DIR)}/`;
   const candidates = ["wrangler.toml", "wrangler.jsonc", "wrangler.json"];
   for (const name of candidates) {
     const file = await readFile3(path22.join(dir, name), "utf-8").catch(
@@ -8294,7 +8390,7 @@ async function runBuild(options) {
     serverResult && !Array.isArray(serverResult) && "output" in serverResult,
     "SSR build failed to produce valid output"
   );
-  const { config: config2 } = await loadZudokuConfig(
+  const { config } = await loadZudokuConfig(
     { mode: "production", command: "build" },
     dir
   );
@@ -8313,7 +8409,7 @@ async function runBuild(options) {
   const html = getBuildHtml({
     jsEntry: joinUrl(base, jsEntry),
     cssEntries: cssEntries.map((css) => joinUrl(base, css)),
-    dir: config2.site?.dir
+    dir: config.site?.dir
   });
   if (ssr) {
     await bundleSSREntry({
@@ -8322,12 +8418,12 @@ async function runBuild(options) {
       serverOutDir,
       html
     });
-    assertProtectedPatternsCovered(config2);
+    assertProtectedPatternsCovered(config);
     assertNoProtectedLeaks(clientResult.output);
     if (adapter !== "cloudflare") {
       await moveProtectedChunks(clientOutDir, serverOutDir);
     } else {
-      await assertCloudflareWranglerGatesProtected(dir, config2);
+      await assertCloudflareWranglerGatesProtected(dir, config);
     }
     await writeFile6(
       path23.join(distDir, "package.json"),
@@ -8335,12 +8431,12 @@ async function runBuild(options) {
 `,
       "utf-8"
     );
-    await writeManifest(distDir, config2);
+    await writeManifest(distDir, config);
     await rm3(path23.join(clientOutDir, "index.html"), { force: true });
   } else {
     await runPrerender({
       dir,
-      config: config2,
+      config,
       html,
       clientOutDir,
       serverOutDir,
@@ -8356,14 +8452,14 @@ var findServerConfigFilename = (result) => {
   return entry.fileName;
 };
 var runPrerender = async (options) => {
-  const { dir, config: config2, html, clientOutDir, serverOutDir, serverResult } = options;
-  const issuer = await getIssuer(config2);
+  const { dir, config, html, clientOutDir, serverOutDir, serverResult } = options;
+  const issuer = await getIssuer(config);
   const serverConfigFilename = findServerConfigFilename(serverResult);
   try {
     const { workerResults, rewrites } = await prerender({
       html,
       dir,
-      basePath: config2.basePath,
+      basePath: config.basePath,
       serverConfigFilename,
       writeRedirects: process.env.VERCEL === void 0
     });
@@ -8389,12 +8485,12 @@ var runPrerender = async (options) => {
       );
     }
     await writeOutput(dir, {
-      config: config2,
+      config,
       redirects: workerResults.flatMap((r) => r.redirect ?? []),
       rewrites
     });
     if (ZuploEnv.isZuplo && issuer) {
-      const provider = config2.authentication?.type;
+      const provider = config.authentication?.type;
       await writeFile6(
         path23.join(dir, DIST_DIR, ".output/zuplo.json"),
         JSON.stringify({ issuer, provider }, null, 2),
@@ -8696,6 +8792,7 @@ import fs3 from "node:fs/promises";
 import http from "node:http";
 import https from "node:https";
 import path27 from "node:path";
+import { stripVTControlCharacters } from "node:util";
 import { createHttpTerminator } from "http-terminator";
 import {
   createServer as createViteServer,
@@ -8732,7 +8829,7 @@ init_joinUrl();
 import path26 from "node:path";
 import { createIndex as createIndex2 } from "pagefind";
 import { isRunnableDevEnvironment } from "vite";
-async function* buildPagefindDevIndex(vite, config2) {
+async function* buildPagefindDevIndex(vite, config) {
   const { index, errors } = await createIndex2();
   invariant(index, `Failed to create pagefind index: ${errors.join(", ")}`);
   const pagefindIndex = index;
@@ -8743,12 +8840,12 @@ async function* buildPagefindDevIndex(vite, config2) {
   const serverModule = await ssrEnvironment.runner.import(
     getAppServerEntryPath()
   );
-  const routes = serverModule.getRoutesByConfig(config2);
+  const routes = serverModule.getRoutesByConfig(config);
   const paths = routesToPaths(routes);
-  const { basePath } = config2;
+  const { basePath } = config;
   const template = getDevHtml({
     jsEntry: "/__z/entry.client.tsx",
-    dir: config2.site?.dir
+    dir: config.site?.dir
   });
   const transformedTemplate = await vite.transformIndexHtml("/", template);
   let indexed = 0;
@@ -8797,14 +8894,14 @@ var DevServer = class {
   constructor(options) {
     this.#options = options;
   }
-  async createNodeServer(config2) {
-    if (!config2.https) return http.createServer();
+  async createNodeServer(config) {
+    if (!config.https) return http.createServer();
     this.protocol = "https";
     const { dir } = this.#options;
     const [key, cert, ca] = await Promise.all([
-      fs3.readFile(path27.resolve(dir, config2.https.key)),
-      fs3.readFile(path27.resolve(dir, config2.https.cert)),
-      config2.https.ca ? fs3.readFile(path27.resolve(dir, config2.https.ca)) : void 0
+      fs3.readFile(path27.resolve(dir, config.https.key)),
+      fs3.readFile(path27.resolve(dir, config.https.cert)),
+      config.https.ca ? fs3.readFile(path27.resolve(dir, config.https.ca)) : void 0
     ]);
     return https.createServer({ key, cert, ca });
   }
@@ -8813,12 +8910,14 @@ var DevServer = class {
       mode: "development",
       command: "serve"
     };
-    const viteConfig = await getViteConfig(this.#options.dir, configEnv);
-    const { config: config2 } = await loadZudokuConfig(configEnv, this.#options.dir);
+    const viteConfig = await getViteConfig(this.#options.dir, configEnv, {
+      ssr: this.#options.ssr
+    });
+    const { config } = await loadZudokuConfig(configEnv, this.#options.dir);
     this.resolvedPort = await findAvailablePort(
-      this.#options.argPort ?? config2.port ?? DEFAULT_DEV_PORT
+      this.#options.argPort ?? config.port ?? DEFAULT_DEV_PORT
     );
-    const server = await this.createNodeServer(config2);
+    const server = await this.createNodeServer(config);
     const mergedViteConfig = mergeConfig3(viteConfig, {
       server: {
         hmr: { server }
@@ -8853,15 +8952,15 @@ var DevServer = class {
     const vite = await createViteServer(mergedViteConfig);
     const graphql = createGraphQLServer({ graphqlEndpoint: "/__z/graphql" });
     vite.middlewares.use((req, res, next) => {
-      if (req.method === "GET" && req.originalUrl === "/" && config2.basePath && config2.basePath !== "/") {
-        res.writeHead(307, { Location: config2.basePath });
+      if (req.method === "GET" && req.originalUrl === "/" && config.basePath && config.basePath !== "/") {
+        res.writeHead(307, { Location: config.basePath });
         res.end();
         return;
       }
       next();
     });
     vite.middlewares.use(graphql.graphqlEndpoint, graphql);
-    const sessionEndpoint = joinUrl(config2.basePath, "/__z/auth/session");
+    const sessionEndpoint = joinUrl(config.basePath, "/__z/auth/session");
     vite.middlewares.use(sessionEndpoint, async (req, res) => {
       if (req.method !== "POST" && req.method !== "DELETE") {
         res.writeHead(405, { Allow: "POST, DELETE" });
@@ -8942,7 +9041,7 @@ var DevServer = class {
     printDiagnosticsToConsole(
       `Server-side rendering ${this.#options.ssr ? "enabled" : "disabled"}`
     );
-    if (config2.search?.type === "pagefind") {
+    if (config.search?.type === "pagefind") {
       const pagefindPath = path27.join(
         vite.config.publicDir,
         "pagefind/pagefind.js"
@@ -9015,11 +9114,15 @@ var DevServer = class {
         const html = `<!DOCTYPE html><html><body><script type="module">
           import { ErrorOverlay } from '/@vite/client';
           document.body.appendChild(new ErrorOverlay(${JSON.stringify({
-          message: e instanceof Error ? e.message : String(e),
-          stack: e instanceof Error ? e.stack : ""
+          message: stripVTControlCharacters(
+            e instanceof Error ? e.message : String(e)
+          ),
+          stack: stripVTControlCharacters(
+            e instanceof Error ? e.stack ?? "" : ""
+          )
         })}));
         </script></body></html>`;
-        res.writeHead(500, { "Content-Type": "text/html" });
+        res.writeHead(500, { "Content-Type": "text/html; charset=utf-8" });
         res.end(html);
       }
     });