zudoku 0.45.1 → 0.46.1

package/dist/app/main.js

@@ -15,13 +15,6 @@ import { highlighter } from "../lib/shiki.js";
 import { ZuploEnv } from "./env.js";
 await registerShiki(highlighter);
 export const convertZudokuConfigToOptions = (config) => {
-    const fallbackLogoLight = config.page?.logoUrl ??
-        "https://cdn.zudoku.dev/logos/zudoku-logo-full-light.svg";
-    const fallbackLogoDark = config.page?.logoUrl ??
-        "https://cdn.zudoku.dev/logos/zudoku-logo-full-dark.svg";
-    const isUsingFallback = !config.page?.logoUrl &&
-        !config.page?.logo?.src?.light &&
-        !config.page?.logo?.src?.dark;
     return {
         basePath: config.basePath,
         canonicalUrlOrigin: config.canonicalUrlOrigin,
@@ -30,16 +23,9 @@ export const convertZudokuConfigToOptions = (config) => {
             ...config.page,
             showPoweredBy: ZuploEnv.buildConfig?.entitlements.devPortalZuploBranding ??
                 config.page?.showPoweredBy,
-            logo: {
-                ...(isUsingFallback ? { width: "130px" } : {}),
-                ...config.page?.logo,
-                src: {
-                    light: config.page?.logo?.src?.light ?? fallbackLogoLight,
-                    dark: config.page?.logo?.src?.dark ?? fallbackLogoDark,
-                },
-            },
+            logo: config.page?.logo,
         },
-        slotlets: config.UNSAFE_slotlets,
+        slots: config.slots,
         metadata: {
             favicon: "https://cdn.zudoku.dev/logos/favicon.svg",
             title: "%s - Zudoku",
@@ -48,8 +34,8 @@ export const convertZudokuConfigToOptions = (config) => {
         sidebars: configuredSidebar,
         topNavigation: config.topNavigation,
         mdx: config.mdx,
-        authentication: configuredAuthProvider,
         plugins: [
+            ...(configuredAuthProvider ? [configuredAuthProvider] : []),
             ...configuredDocsPlugins,
             ...configuredApiPlugins,
             ...(configuredSearchPlugin ? [configuredSearchPlugin] : []),
@@ -57,9 +43,6 @@ export const convertZudokuConfigToOptions = (config) => {
             ...(configuredApiKeysPlugin ? [configuredApiKeysPlugin] : []),
             ...(configuredCustomPagesPlugin ? [configuredCustomPagesPlugin] : []),
             ...configuredApiCatalogPlugins,
-            ...(configuredAuthProvider?.getAuthenticationPlugin
-                ? [configuredAuthProvider.getAuthenticationPlugin()]
-                : []),
             ...(config.plugins ?? []),
         ],
         syntaxHighlighting: {
@@ -71,9 +54,7 @@ export const convertZudokuConfigToOptions = (config) => {
 export const getRoutesByOptions = (options, enableStatusPages = false) => {
     const allPlugins = [
         ...(options.plugins ?? []),
-        ...(options.authentication?.getAuthenticationPlugin
-            ? [options.authentication.getAuthenticationPlugin()]
-            : []),
+        ...(options.authentication ? [options.authentication] : []),
     ];
     const routes = allPlugins
         .flatMap((plugin) => (isNavigationPlugin(plugin) ? plugin.getRoutes() : []))

package/dist/app/main.js.map

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

package/dist/config/config.d.ts

@@ -1,10 +1,10 @@
 import type { Provider } from "@supabase/supabase-js";
-import type { ConfigWithMeta } from "./common.js";
+import type { ConfigWithMeta } from "./loader.js";
 import type { BuildConfig } from "./validators/BuildSchema.js";
 import type { ZudokuConfig } from "./validators/validate.js";
 export type { ZudokuConfig };
 export type ZudokuBuildConfig = BuildConfig;
-export type LoadedConfig = ConfigWithMeta<ZudokuConfig>;
+export type LoadedConfig = ConfigWithMeta;
 type RedirectOptions = {
     redirectToAfterSignUp?: string;
     redirectToAfterSignIn?: string;

package/dist/config/file-exists.d.ts

@@ -0,0 +1 @@
+export declare const fileExists: (path: string) => Promise<boolean>;

package/dist/config/file-exists.js

@@ -0,0 +1,5 @@
+import { stat } from "node:fs/promises";
+export const fileExists = (path) => stat(path)
+    .then(() => true)
+    .catch(() => false);
+//# sourceMappingURL=file-exists.js.map

package/dist/config/file-exists.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-exists.js","sourceRoot":"","sources":["../../src/config/file-exists.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CACzC,IAAI,CAAC,IAAI,CAAC;KACP,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;KAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC"}

package/dist/config/loader.d.ts

@@ -1,6 +1,21 @@
 import type { RollupOutput, RollupWatcher } from "rollup";
-import { type ConfigWithMeta } from "./common.js";
-import { type CommonConfig } from "./validators/common.js";
-export declare const fileExists: (path: string) => Promise<boolean>;
-export declare function tryLoadZudokuConfig<TConfig extends CommonConfig>(rootDir: string, moduleDir: string): Promise<ConfigWithMeta<TConfig>>;
+import { type ConfigEnv } from "vite";
+import type { ZudokuConfig } from "./validators/validate.js";
+export type ConfigWithMeta = ZudokuConfig & {
+    __meta: {
+        rootDir: string;
+        moduleDir: string;
+        configPath: string;
+        mode: typeof process.env.ZUDOKU_ENV;
+        dependencies: string[];
+    };
+};
 export declare function findOutputPathOfServerConfig(output: RollupOutput | RollupOutput[] | RollupWatcher): string;
+export declare const getCurrentConfig: () => ConfigWithMeta;
+export declare const setCurrentConfig: (newConfig: ConfigWithMeta) => void;
+export declare function loadZudokuConfig(configEnv: ConfigEnv, rootDir: string): Promise<{
+    config: ConfigWithMeta;
+    envPrefix: string[];
+    publicEnv: Record<string, string>;
+}>;
+export declare const setStandaloneConfig: (rootDir: string) => void;

package/dist/config/loader.js

@@ -1,7 +1,16 @@
 import { stat } from "node:fs/promises";
 import path from "node:path";
-import { runnerImport } from "vite";
+import colors from "picocolors";
+import { runnerImport, loadEnv as viteLoadEnv } from "vite";
+import { logger } from "../cli/common/logger.js";
+import invariant from "../lib/util/invariant.js";
+import { getModuleDir } from "../vite/config.js";
+import { fileExists } from "./file-exists.js";
 import { validateConfig } from "./validators/validate.js";
+let config;
+let envPrefix;
+let publicEnv;
+let modifiedTimes;
 const zudokuConfigFiles = [
     "zudoku.config.js",
     "zudoku.config.jsx",
@@ -9,9 +18,6 @@ const zudokuConfigFiles = [
     "zudoku.config.tsx",
     "zudoku.config.mjs",
 ];
-export const fileExists = (path) => stat(path)
-    .then(() => true)
-    .catch(() => false);
 async function getConfigFilePath(rootDir) {
     for (const fileName of zudokuConfigFiles) {
         const filepath = path.join(rootDir, fileName);
@@ -21,7 +27,8 @@ async function getConfigFilePath(rootDir) {
     }
     throw new Error(`No zudoku config file found in project root.`);
 }
-async function loadZudokuConfig(configPath) {
+async function loadZudokuConfigWithMeta(rootDir) {
+    const configPath = await getConfigFilePath(rootDir);
     const { module, dependencies } = await runnerImport(configPath, {
         server: {
             // this allows us to 'load' CSS files in the config
@@ -29,20 +36,13 @@ async function loadZudokuConfig(configPath) {
             perEnvironmentStartEndDuringDev: true,
         },
     });
-    return {
-        dependencies: [configPath, ...dependencies],
-        config: module.default,
-    };
-}
-export async function tryLoadZudokuConfig(rootDir, moduleDir) {
-    const configPath = await getConfigFilePath(rootDir);
-    const { config, dependencies } = await loadZudokuConfig(configPath);
+    const config = module.default;
     validateConfig(config);
     const configWithMetadata = {
         ...config,
         __meta: {
             rootDir,
-            moduleDir,
+            moduleDir: getModuleDir(),
             mode: process.env.ZUDOKU_ENV,
             dependencies,
             configPath,
@@ -62,4 +62,84 @@ export function findOutputPathOfServerConfig(output) {
     }
     throw new Error("Could not find server config output file");
 }
+function loadEnv(configEnv, rootDir) {
+    const envPrefix = ["ZUPLO_", "ZUDOKU_PUBLIC_"];
+    const localEnv = viteLoadEnv(configEnv.mode, rootDir, envPrefix);
+    process.env = { ...localEnv, ...process.env };
+    const publicEnv = Object.fromEntries(Object.entries(process.env)
+        .filter(([key]) => envPrefix.some((prefix) => key.startsWith(prefix)))
+        .map(([key, value]) => [key, JSON.stringify(value)]));
+    return { publicEnv, envPrefix };
+}
+async function hasConfigChanged() {
+    if (!config || !modifiedTimes)
+        return true;
+    const files = [config.__meta.configPath, ...config.__meta.dependencies];
+    try {
+        const hasChanged = await Promise.all(files.map(async (depPath) => {
+            const depStat = await stat(depPath);
+            const cachedMtime = modifiedTimes?.get(depPath);
+            return !cachedMtime || depStat.mtimeMs !== cachedMtime;
+        })).then((results) => results.some(Boolean));
+        return hasChanged;
+    }
+    catch {
+        return true;
+    }
+}
+async function updateModifiedTimes() {
+    if (!config)
+        return;
+    const files = [config.__meta.configPath, ...config.__meta.dependencies];
+    modifiedTimes = new Map();
+    await Promise.all(files.map(async (depPath) => {
+        const depStat = await stat(depPath);
+        modifiedTimes?.set(depPath, depStat.mtimeMs);
+    }));
+}
+export const getCurrentConfig = () => {
+    invariant(config, "Config not loaded");
+    return config;
+};
+export const setCurrentConfig = (newConfig) => {
+    config = newConfig;
+};
+export async function loadZudokuConfig(configEnv, rootDir) {
+    const shouldReload = await hasConfigChanged();
+    if (!shouldReload && config && envPrefix && publicEnv) {
+        return { config, envPrefix, publicEnv };
+    }
+    ({ publicEnv, envPrefix } = loadEnv(configEnv, rootDir));
+    try {
+        config = await loadZudokuConfigWithMeta(rootDir);
+        logger.info(colors.yellow(`loaded config file `) +
+            colors.dim(config.__meta.configPath), { timestamp: true });
+        return { config, envPrefix, publicEnv };
+    }
+    catch (error) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        logger.error(colors.red(`Error loading Zudoku config:\n${errorMessage}`), {
+            timestamp: true,
+        });
+        if (config) {
+            // return the last valid config if it exists
+            return { config, envPrefix, publicEnv };
+        }
+        throw new Error("Failed to load Zudoku config");
+    }
+    finally {
+        await updateModifiedTimes();
+    }
+}
+export const setStandaloneConfig = (rootDir) => {
+    config = {
+        __meta: {
+            rootDir,
+            moduleDir: getModuleDir(),
+            mode: "standalone",
+            dependencies: [],
+            configPath: "",
+        },
+    };
+};
 //# sourceMappingURL=loader.js.map

package/dist/config/loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,YAAY,EAAE,MAAM,MAAM,CAAC;AAGpC,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,MAAM,iBAAiB,GAAG;IACxB,kBAAkB;IAClB,mBAAmB;IACnB,kBAAkB;IAClB,mBAAmB;IACnB,mBAAmB;CACpB,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,EAAE,CACzC,IAAI,CAAC,IAAI,CAAC;KACP,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC;KAChB,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAExB,KAAK,UAAU,iBAAiB,CAAC,OAAe;IAC9C,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,MAAM,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC/B,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;AAClE,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,UAAkB;IAElB,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,YAAY,CACjD,UAAU,EACV;QACE,MAAM,EAAE;YACN,mDAAmD;YACnD,gDAAgD;YAChD,+BAA+B,EAAE,IAAI;SACtC;KACF,CACF,CAAC;IAEF,OAAO;QACL,YAAY,EAAE,CAAC,UAAU,EAAE,GAAG,YAAY,CAAC;QAC3C,MAAM,EAAE,MAAM,CAAC,OAAO;KACvB,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAe,EACf,SAAiB;IAEjB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAEpD,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,gBAAgB,CAAU,UAAU,CAAC,CAAC;IAC7E,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvB,MAAM,kBAAkB,GAA4B;QAClD,GAAG,MAAM;QACT,MAAM,EAAE;YACN,OAAO;YACP,SAAS;YACT,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;YAC5B,YAAY;YACZ,UAAU;SACX;KACF,CAAC;IAEF,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,MAAqD;IAErD,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAC/B,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,KAAK,kBAAkB,CACxE,CAAC;QACF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,MAAM,CAAC,QAAQ,CAAC;QACzB,CAAC;IACH,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"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"}