zudoku 0.0.0-f417aae → 0.0.0-f471fb8

package/dist/vite/dev-server.js

@@ -1,37 +1,76 @@
 import express from "express";
 import { createHttpTerminator } from "http-terminator";
+import fs from "node:fs/promises";
+import http from "node:http";
+import https from "node:https";
 import path from "node:path";
-import { createServer as createViteServer } from "vite";
+import { createServer as createViteServer, isRunnableDevEnvironment, } from "vite";
 import { logger } from "../cli/common/logger.js";
 import { printDiagnosticsToConsole } from "../cli/common/output.js";
+import { findAvailablePort } from "../cli/common/utils/ports.js";
 import { createGraphQLServer } from "../lib/oas/graphql/index.js";
 import { getAppClientEntryPath, getAppServerEntryPath, getViteConfig, loadZudokuConfig, } from "./config.js";
 import { errorMiddleware } from "./error-handler.js";
 import { getDevHtml } from "./html.js";
+const DEFAULT_DEV_PORT = 3000;
 export class DevServer {
     options;
-    server;
     currentConfig;
     terminator;
+    resolvedPort = 0;
+    protocol = "http";
     constructor(options) {
         this.options = options;
     }
+    async createNodeServer(app, config) {
+        if (!config.https)
+            return http.createServer(app);
+        this.protocol = "https";
+        const { dir } = this.options;
+        const [key, cert, ca] = await Promise.all([
+            fs.readFile(path.resolve(dir, config.https.key)),
+            fs.readFile(path.resolve(dir, config.https.cert)),
+            config.https.ca
+                ? fs.readFile(path.resolve(dir, config.https.ca))
+                : undefined,
+        ]);
+        return https.createServer({ key, cert, ca }, app);
+    }
     async start() {
         const app = express();
-        const viteConfig = await getViteConfig(this.options.dir, {
+        const configEnv = {
             mode: "development",
             command: "serve",
             isSsrBuild: this.options.ssr,
-        }, (zudokuConfig) => (this.currentConfig = zudokuConfig));
+        };
+        const viteConfig = await getViteConfig(this.options.dir, configEnv, (zudokuConfig) => (this.currentConfig = zudokuConfig));
+        const { config } = await loadZudokuConfig(configEnv, this.options.dir);
+        this.currentConfig = config;
+        this.resolvedPort = await findAvailablePort(this.options.argPort ?? config.port ?? DEFAULT_DEV_PORT);
+        const server = await this.createNodeServer(app, config);
+        viteConfig.server = {
+            ...viteConfig.server,
+            open: this.options.open,
+            hmr: { server },
+        };
         const vite = await createViteServer(viteConfig);
-        this.currentConfig = await loadZudokuConfig(this.options.dir);
         const graphql = createGraphQLServer({
             graphqlEndpoint: "/__z/graphql",
         });
         const proxiedEntryClientPath = path.posix.join(vite.config.base, "/__z/entry.client.tsx");
+        app.use((req, res, next) => {
+            const base = this.currentConfig?.basePath;
+            if (req.method.toLowerCase() === "get" &&
+                req.url === "/" &&
+                base &&
+                base !== "/") {
+                return res.redirect(307, base);
+            }
+            next();
+        });
         app.use(graphql.graphqlEndpoint, graphql);
         app.use(proxiedEntryClientPath, async (_req, res) => {
-            const transformed = await vite.transformRequest(getAppClientEntryPath());
+            const transformed = await vite.environments.client.transformRequest(getAppClientEntryPath());
             if (!transformed)
                 throw new Error("Error transforming client entry");
             res
@@ -41,8 +80,20 @@ export class DevServer {
         });
         app.use(vite.middlewares);
         printDiagnosticsToConsole(`Server-side rendering ${this.options.ssr ? "enabled" : "disabled"}`);
+        if (config.search?.type === "pagefind") {
+            const pagefindPath = path.join(vite.config.publicDir, "pagefind/pagefind.js");
+            const exists = await fs.stat(pagefindPath).catch(() => false);
+            if (!exists) {
+                await fs.mkdir(path.dirname(pagefindPath), { recursive: true });
+                await fs.writeFile(pagefindPath, 'throw new Error("NOT_BUILT_YET");');
+            }
+        }
         app.use("*", async (request, response, next) => {
             const url = request.originalUrl;
+            const ssrEnvironment = vite.environments.ssr;
+            if (!isRunnableDevEnvironment(ssrEnvironment)) {
+                throw new Error("Server-side rendering is not enabled");
+            }
             try {
                 const rawHtml = getDevHtml("/__z/entry.client.tsx");
                 const template = await vite.transformIndexHtml(url, rawHtml);
@@ -50,13 +101,13 @@ export class DevServer {
                     if (!this.currentConfig) {
                         throw new Error("Error loading configuration.");
                     }
-                    const module = await vite.ssrLoadModule(getAppServerEntryPath());
-                    const render = module.render;
-                    void render({
+                    const server = await ssrEnvironment.runner.import(getAppServerEntryPath());
+                    void server.render({
                         template,
                         request,
                         response,
-                        config: this.currentConfig,
+                        routes: server.getRoutesByConfig(this.currentConfig),
+                        basePath: this.currentConfig.basePath,
                     });
                 }
                 else {
@@ -72,12 +123,11 @@ export class DevServer {
             }
         });
         app.use(errorMiddleware(vite));
-        return new Promise((resolve) => {
-            this.server = app.listen(this.options.port, () => resolve({ vite, express: app }));
-            this.terminator = createHttpTerminator({
-                server: this.server,
-            });
+        await new Promise((resolve) => {
+            server.listen(this.resolvedPort, () => resolve());
         });
+        this.terminator = createHttpTerminator({ server });
+        return { vite, express: app };
     }
     async stop() {
         await this.terminator?.terminate();

package/dist/vite/dev-server.js.map

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

package/dist/vite/error-handler.d.ts

@@ -1,3 +1,3 @@
 import { NextFunction, Request, Response } from "express";
 import { ViteDevServer } from "vite";
-export declare const errorMiddleware: (server: ViteDevServer) => (err: Error, req: Request, res: Response, next: NextFunction) => void;
+export declare const errorMiddleware: (server: ViteDevServer) => (err: Error, _req: Request, res: Response, _next: NextFunction) => Promise<void>;

package/dist/vite/error-handler.js

@@ -1,5 +1,5 @@
 import path from "node:path";
-export const errorMiddleware = (server) => (err, req, res, next) => {
+export const errorMiddleware = (server) => async (err, _req, res, _next) => {
     server.ssrFixStacktrace(err);
     const error = {
         message: err.message,

package/dist/vite/error-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/vite/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAqB,EAAE,EAAE,CAC1B,CAAC,GAAU,EAAE,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;IAC9D,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG;QACZ,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;IAEF,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;IACrB,GAAG,CAAC,GAAG,CAAC;;;;;;;8BAOkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;;wDAEpB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;;;;OAmBrH,CAAC,CAAC;AACP,CAAC,CAAC"}
+{"version":3,"file":"error-handler.js","sourceRoot":"","sources":["../../src/vite/error-handler.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,MAAM,CAAC,MAAM,eAAe,GAC1B,CAAC,MAAqB,EAAE,EAAE,CAC1B,KAAK,EAAE,GAAU,EAAE,IAAa,EAAE,GAAa,EAAE,KAAmB,EAAE,EAAE;IACtE,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC7B,MAAM,KAAK,GAAG;QACZ,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACjB,CAAC;IAEF,GAAG,CAAC,UAAU,GAAG,GAAG,CAAC;IACrB,GAAG,CAAC,GAAG,CAAC;;;;;;;8BAOkB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC;;wDAEpB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;;;;OAmBrH,CAAC,CAAC;AACP,CAAC,CAAC"}

package/dist/vite/html.js

@@ -1,4 +1,3 @@
-import { themeToggle } from "../lib/themeToggle.js";
 export function getDevHtml(jsEntry) {
     return `<!doctype html>
 <html lang="en">
@@ -23,7 +22,6 @@ export function getBuildHtml({ jsEntry, cssEntry, }) {
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
     <script type="module" crossorigin src="${jsEntry}"></script>
     <link rel="stylesheet" crossorigin href="${cssEntry}">
-    <script type="module">(${themeToggle.toString()})();</script>
     <!--app-helmet-->
     <link rel="preconnect" href="https://cdn.zudoku.dev/">
   </head>

package/dist/vite/html.js.map

@@ -1 +1 @@
-{"version":3,"file":"html.js","sourceRoot":"","sources":["../../src/vite/html.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,OAAO;;;;;;;;;;iCAUwB,OAAO;;;CAGvC,CAAC;AACF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAC3B,OAAO,EACP,QAAQ,GAIT;IACC,OAAO;;;;;6CAKoC,OAAO;+CACL,QAAQ;6BAC1B,WAAW,CAAC,QAAQ,EAAE;;;;;;;QAO3C,CAAC;AACT,CAAC"}
+{"version":3,"file":"html.js","sourceRoot":"","sources":["../../src/vite/html.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAC,OAAe;IACxC,OAAO;;;;;;;;;;iCAUwB,OAAO;;;CAGvC,CAAC;AACF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,EAC3B,OAAO,EACP,QAAQ,GAIT;IACC,OAAO;;;;;6CAKoC,OAAO;+CACL,QAAQ;;;;;;;QAO/C,CAAC;AACT,CAAC"}

package/dist/vite/output.d.ts

@@ -0,0 +1,113 @@
+import { LoadedConfig } from "../config/config.js";
+type Config = {
+    version: 3;
+    routes?: Route[];
+    images?: ImagesConfig;
+    wildcard?: WildcardConfig;
+    overrides?: OverrideConfig;
+    cache?: string[];
+    crons?: CronsConfig;
+    framework?: Framework;
+};
+type Route = Source | Handler;
+type Source = {
+    src: string;
+    dest?: string;
+    headers?: Record<string, string>;
+    methods?: string[];
+    continue?: boolean;
+    caseSensitive?: boolean;
+    check?: boolean;
+    status?: number;
+    has?: Array<HostHasField | HeaderHasField | CookieHasField | QueryHasField>;
+    missing?: Array<HostHasField | HeaderHasField | CookieHasField | QueryHasField>;
+    locale?: Locale;
+    middlewareRawSrc?: string[];
+    middlewarePath?: string;
+};
+type Locale = {
+    redirect?: Record<string, string>;
+    cookie?: string;
+};
+type HostHasField = {
+    type: "host";
+    value: string;
+};
+type HeaderHasField = {
+    type: "header";
+    key: string;
+    value?: string;
+};
+type CookieHasField = {
+    type: "cookie";
+    key: string;
+    value?: string;
+};
+type QueryHasField = {
+    type: "query";
+    key: string;
+    value?: string;
+};
+type HandleValue = "rewrite" | "filesystem" | "resource" | "miss" | "hit" | "error";
+type Handler = {
+    handle: HandleValue;
+    src?: string;
+    dest?: string;
+    status?: number;
+};
+type ImageFormat = "image/avif" | "image/webp";
+type RemotePattern = {
+    protocol?: "http" | "https";
+    hostname: string;
+    port?: string;
+    pathname?: string;
+    search?: string;
+};
+type LocalPattern = {
+    pathname?: string;
+    search?: string;
+};
+type ImagesConfig = {
+    sizes: number[];
+    domains: string[];
+    remotePatterns?: RemotePattern[];
+    localPatterns?: LocalPattern[];
+    minimumCacheTTL?: number;
+    formats?: ImageFormat[];
+    dangerouslyAllowSVG?: boolean;
+    contentSecurityPolicy?: string;
+    contentDispositionType?: string;
+};
+type WildCard = {
+    domain: string;
+    value: string;
+};
+type WildcardConfig = Array<WildCard>;
+type Override = {
+    path?: string;
+    contentType?: string;
+};
+type OverrideConfig = Record<string, Override>;
+type Framework = {
+    version: string;
+};
+type Cron = {
+    path: string;
+    schedule: string;
+};
+type CronsConfig = Cron[];
+export declare function generateOutput({ config, redirects, }: {
+    config: LoadedConfig;
+    redirects: Array<{
+        from: string;
+        to: string;
+    }>;
+}): Config;
+export declare function writeOutput(dir: string, { config, redirects, }: {
+    config: LoadedConfig;
+    redirects: Array<{
+        from: string;
+        to: string;
+    }>;
+}): Promise<void>;
+export {};

package/dist/vite/output.js

@@ -0,0 +1,60 @@
+import assert from "node:assert";
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import { joinUrl } from "../lib/util/joinUrl.js";
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkgJsonPath = path.join(__dirname, "../../package.json");
+const pkgJson = JSON.parse(await readFile(pkgJsonPath, "utf-8"));
+export function generateOutput({ config, redirects, }) {
+    const routes = [];
+    for (const redirect of redirects) {
+        routes.push({
+            src: redirect.from,
+            dest: redirect.to,
+            status: 301,
+            headers: { Location: redirect.to },
+        });
+    }
+    if (process.env.VERCEL_SKEW_PROTECTION_ENABLED) {
+        assert(process.env.VERCEL_DEPLOYMENT_ID);
+        routes.push({
+            src: "/.*",
+            has: [
+                {
+                    type: "header",
+                    key: "Sec-Fetch-Dest",
+                    value: "document",
+                },
+            ],
+            headers: {
+                "Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${joinUrl(config.basePath)}; SameSite=Strict; Secure; HttpOnly`,
+            },
+            continue: true,
+        });
+    }
+    const output = {
+        version: 3,
+        framework: {
+            version: pkgJson.version,
+        },
+        routes,
+    };
+    return output;
+}
+export async function writeOutput(dir, { config, redirects, }) {
+    const output = generateOutput({ config, redirects });
+    // For now we are putting this in the dist folder, eventually we can
+    // expand this to support the full vercel build output API
+    const outputDir = process.env.VERCEL
+        ? path.join(dir, ".vercel/output")
+        : path.join(dir, "dist/.output");
+    await mkdir(outputDir, { recursive: true });
+    const outputFile = path.join(outputDir, "config.json");
+    await writeFile(outputFile, JSON.stringify(output, null, 2), "utf-8");
+    if (process.env.VERCEL) {
+        // eslint-disable-next-line no-console
+        console.log("Wrote Vercel output to", outputDir);
+    }
+}
+//# sourceMappingURL=output.js.map

package/dist/vite/output.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/vite/output.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAE/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAkIjE,MAAM,UAAU,cAAc,CAAC,EAC7B,MAAM,EACN,SAAS,GAIV;IACC,MAAM,MAAM,GAAY,EAAE,CAAC;IAE3B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC;YACV,GAAG,EAAE,QAAQ,CAAC,IAAI;YAClB,IAAI,EAAE,QAAQ,CAAC,EAAE;YACjB,MAAM,EAAE,GAAG;YACX,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;SACnC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC;YACV,GAAG,EAAE,KAAK;YACV,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,gBAAgB;oBACrB,KAAK,EAAE,UAAU;iBAClB;aACF;YACD,OAAO,EAAE;gBACP,YAAY,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,oBAAoB,UAAU,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC;aAChI;YACD,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAW;QACrB,OAAO,EAAE,CAAC;QACV,SAAS,EAAE;YACT,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB;QACD,MAAM;KACP,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAW,EACX,EACE,MAAM,EACN,SAAS,GAIV;IAED,MAAM,MAAM,GAAG,cAAc,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;IACrD,oEAAoE;IACpE,0DAA0D;IAE1D,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM;QAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAEnC,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACvD,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvB,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}

package/dist/vite/plugin-api-keys.d.ts

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

package/dist/vite/plugin-api-keys.js

@@ -11,15 +11,15 @@ const viteApiKeysPlugin = (getConfig) => {
         async load(id) {
             if (id === resolvedVirtualModuleId) {
                 const config = getConfig();
-                if (!config.apiKeys || config.mode === "standalone") {
+                if (!config.apiKeys || config.__meta.mode === "standalone") {
                     return `export const configuredApiKeysPlugin = undefined;`;
                 }
                 const code = [
-                    `const config = ${JSON.stringify(config.apiKeys, null, 2)};`,
-                    config.mode === "internal"
-                        ? `import { apiKeyPlugin } from "${config.moduleDir}/src/lib/plugins/api-keys/index.tsx";`
+                    `import config from "virtual:zudoku-config";`,
+                    config.__meta.mode === "internal"
+                        ? `import { apiKeyPlugin } from "${config.__meta.moduleDir}/src/lib/plugins/api-keys/index.tsx";`
                         : `import { apiKeyPlugin } from "zudoku/plugins/api-keys";`,
-                    `export const configuredApiKeysPlugin = apiKeyPlugin(config);`,
+                    `export const configuredApiKeysPlugin = apiKeyPlugin(config.apiKeys);`,
                 ];
                 return {
                     code: code.join("\n"),

package/dist/vite/plugin-api-keys.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin-api-keys.js","sourceRoot":"","sources":["../../src/vite/plugin-api-keys.ts"],"names":[],"mappings":"AAGA,MAAM,iBAAiB,GAAG,CAAC,SAAoC,EAAU,EAAE;IACzE,MAAM,eAAe,GAAG,gCAAgC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBACpD,OAAO,mDAAmD,CAAC;gBAC7D,CAAC;gBAED,MAAM,IAAI,GAAG;oBACX,kBAAkB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG;oBAC5D,MAAM,CAAC,IAAI,KAAK,UAAU;wBACxB,CAAC,CAAC,iCAAiC,MAAM,CAAC,SAAS,uCAAuC;wBAC1F,CAAC,CAAC,yDAAyD;oBAC7D,8DAA8D;iBAC/D,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"plugin-api-keys.js","sourceRoot":"","sources":["../../src/vite/plugin-api-keys.ts"],"names":[],"mappings":"AAGA,MAAM,iBAAiB,GAAG,CAAC,SAA6B,EAAU,EAAE;IAClE,MAAM,eAAe,GAAG,gCAAgC,CAAC;IACzD,MAAM,uBAAuB,GAAG,IAAI,GAAG,eAAe,CAAC;IACvD,OAAO;QACL,IAAI,EAAE,wBAAwB;QAC9B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,uBAAuB,CAAC;YACjC,CAAC;QACH,CAAC;QACD,KAAK,CAAC,IAAI,CAAC,EAAE;YACX,IAAI,EAAE,KAAK,uBAAuB,EAAE,CAAC;gBACnC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;gBAE3B,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC3D,OAAO,mDAAmD,CAAC;gBAC7D,CAAC;gBAED,MAAM,IAAI,GAAG;oBACX,6CAA6C;oBAC7C,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;wBAC/B,CAAC,CAAC,iCAAiC,MAAM,CAAC,MAAM,CAAC,SAAS,uCAAuC;wBACjG,CAAC,CAAC,yDAAyD;oBAC7D,sEAAsE;iBACvE,CAAC;gBAEF,OAAO;oBACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;oBACrB,GAAG,EAAE,IAAI;iBACV,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}

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

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