zudoku 0.0.0-ec30b50 → 0.0.0-edd80c1

package/dist/vite/api/schema-codegen.test.js

@@ -53,7 +53,9 @@ describe("Generate OpenAPI schema module", () => {
         const errorSchema = schema.paths["/pets"].get.responses["default"].content["application/json"]
             .schema;
         expect(successSchema).toStrictEqual(input.components.schemas.Pet);
+        expect(successSchema.__$ref).toStrictEqual("#/components/schemas/Pet");
         expect(errorSchema).toStrictEqual(input.components.schemas.Error);
+        expect(errorSchema.__$ref).toStrictEqual("#/components/schemas/Error");
     });
     it("should handle circular refs", async () => {
         const input = {
@@ -152,6 +154,63 @@ describe("Generate OpenAPI schema module", () => {
         expect(pet.oneOf[0]).toStrictEqual(input.components.schemas.Cat);
         expect(pet.oneOf[1]).toStrictEqual(input.components.schemas.Dog);
     });
+    it("should handle URL-encoded characters in references", async () => {
+        const input = {
+            components: { schemas: { "Type With Space": { type: "string" } } },
+            info: { schema: { $ref: "#/components/schemas/Type With Space" } },
+        };
+        const { schema } = await executeCode(await generateCode(input));
+        expect(schema.info.schema).toStrictEqual(input.components.schemas["Type With Space"]);
+    });
+    it("should generate proper slugs for tags and operations", async () => {
+        const input = {
+            openapi: "3.0.0",
+            info: {
+                title: "Test API",
+                version: "1.0.0",
+            },
+            tags: [{ name: "Pets & Animals" }, { name: "Admins & Users" }],
+            paths: {
+                "/pets": {
+                    tags: ["Pets & Animals"],
+                    get: {
+                        tags: ["Pets & Animals"],
+                        responses: { "200": { description: "OK" } },
+                    },
+                    post: {
+                        tags: ["Pets & Animals", "Some other tag"],
+                        responses: { "201": { description: "Created" } },
+                    },
+                    head: {
+                        tags: ["Pets & Animals"],
+                        responses: { "200": { description: "OK" } },
+                    },
+                },
+                "/users": {
+                    get: {
+                        tags: ["Admins & Users"],
+                        responses: { "200": { description: "OK" } },
+                    },
+                },
+            },
+        };
+        const { slugs } = await executeCode(await generateCode(input));
+        expect(slugs.operations).toMatchInlineSnapshot(`
+      {
+        "/pets-get": "get-pets",
+        "/pets-head": "head-pets",
+        "/pets-post": "post-pets",
+        "/users-get": "get-users",
+      }
+    `);
+        expect(slugs.tags).toMatchInlineSnapshot(`
+      {
+        "Admins & Users": "admins-and-users",
+        "Pets & Animals": "pets-and-animals",
+        "Some other tag": "some-other-tag",
+      }
+    `);
+    });
     it("should generate correct code for circular refs", async () => {
         const input = {
             definitions: {
@@ -183,6 +242,7 @@ describe("Generate OpenAPI schema module", () => {
         "#/definitions/pet": __refs[0],
         "#/definitions/thing": __refs[1]
       };
+      const __refMapPaths = Object.keys(__refMap);
       Object.assign(__refs[0], {
         "title": "pet",
         "type": "object",
@@ -204,7 +264,9 @@ describe("Generate OpenAPI schema module", () => {
           }
         }
       });
+      Object.defineProperty(__refs[0], "__$ref", { value: __refMapPaths[0], enumerable: false });
       Object.assign(__refs[1], __refMap["#/definitions/thing"]);
+      Object.defineProperty(__refs[1], "__$ref", { value: __refMapPaths[1], enumerable: false });
       export const schema = {
         "definitions": {
           "child": {
@@ -240,6 +302,10 @@ describe("Generate OpenAPI schema module", () => {
             }
           }
         }
+      };
+      export const slugs = {
+        operations: {},
+        tags: {},
       };"
     `);
     });

package/dist/vite/api/schema-codegen.test.js.map

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

package/dist/vite/build.js

@@ -1,13 +1,43 @@
 import { mkdir, rename, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { build as viteBuild } from "vite";
-import { findOutputPathOfServerConfig } from "../config/loader.js";
+import { ZuploEnv } from "../app/env.js";
+import { findOutputPathOfServerConfig, loadZudokuConfig, } from "../config/loader.js";
+import invariant from "../lib/util/invariant.js";
 import { joinUrl } from "../lib/util/joinUrl.js";
-import { getViteConfig, loadZudokuConfig } from "./config.js";
+import { getViteConfig } from "./config.js";
 import { getBuildHtml } from "./html.js";
 import { writeOutput } from "./output.js";
-import { prerender } from "./prerender.js";
+import { prerender } from "./prerender/prerender.js";
 const DIST_DIR = "dist";
+const getIssuer = async (config) => {
+    switch (config.authentication?.type) {
+        case "clerk": {
+            const frontendApiEncoded = config.authentication.clerkPubKey
+                .split("_")
+                .at(-1);
+            invariant(frontendApiEncoded, "Clerk public key is invalid");
+            const frontendApi = atob(frontendApiEncoded).split("$").at(0);
+            invariant(frontendApi, "Clerk frontend API is invalid");
+            return frontendApi;
+        }
+        case "auth0": {
+            return `https://${config.authentication.domain}/`;
+        }
+        case "openid": {
+            return config.authentication.issuer;
+        }
+        case "supabase": {
+            return config.authentication.supabaseUrl;
+        }
+        case undefined: {
+            return undefined;
+        }
+        default: {
+            throw new Error(`Unsupported authentication type`);
+        }
+    }
+};
 export async function runBuild(options) {
     // Shouldn't run in parallel because it's potentially racy
     const viteClientConfig = await getViteConfig(options.dir, {
@@ -21,51 +51,71 @@ export async function runBuild(options) {
     });
     // Don't run in parallel because it might overwrite itself
     const clientResult = await viteBuild(viteClientConfig);
-    const serverResult = await viteBuild(viteServerConfig);
+    const serverResult = await viteBuild({
+        ...viteServerConfig,
+        logLevel: "silent",
+    });
     if (Array.isArray(clientResult)) {
         throw new Error("Build failed");
     }
     const { config } = await loadZudokuConfig({ mode: "production", command: "build" }, options.dir);
+    const issuer = await getIssuer(config);
     if ("output" in clientResult) {
-        const [jsEntry, cssEntry] = [
+        const [jsEntry, cssEntries] = [
             clientResult.output.find((o) => "isEntry" in o && o.isEntry)?.fileName,
-            clientResult.output.find((o) => o.fileName.endsWith(".css"))?.fileName,
+            clientResult.output
+                .filter((o) => o.fileName.endsWith(".css"))
+                .map((o) => o.fileName),
         ];
-        if (!jsEntry || !cssEntry) {
+        if (!jsEntry || cssEntries.length === 0) {
             throw new Error("Build failed. No js or css assets found");
         }
         const html = getBuildHtml({
             jsEntry: joinUrl(viteClientConfig.base, jsEntry),
-            cssEntry: joinUrl(viteClientConfig.base, cssEntry),
+            cssEntries: cssEntries.map((css) => joinUrl(viteClientConfig.base, css)),
+            dir: config.page?.dir,
         });
         const serverConfigFilename = findOutputPathOfServerConfig(serverResult);
+        invariant(viteClientConfig.build?.outDir, "Client build outDir is missing");
+        invariant(viteServerConfig.build?.outDir, "Server build outDir is missing");
         try {
-            const writtenFiles = await prerender({
+            const results = await prerender({
                 html,
                 dir: options.dir,
                 basePath: config.basePath,
                 serverConfigFilename,
+                writeRedirects: process.env.VERCEL === undefined,
+            });
+            const indexHtml = path.join(viteClientConfig.build.outDir, "index.html");
+            if (!results.find((r) => r.outputPath === indexHtml)) {
+                await writeFile(indexHtml, html, "utf-8");
+            }
+            // Delete the server build output directory because we don't need it anymore
+            await rm(viteServerConfig.build.outDir, { recursive: true, force: true });
+            if (process.env.VERCEL) {
+                await mkdir(path.join(options.dir, ".vercel/output/static"), {
+                    recursive: true,
+                });
+                await rename(path.join(options.dir, DIST_DIR), path.join(options.dir, ".vercel/output/static"));
+            }
+            // Write the build output file
+            await writeOutput(options.dir, {
+                config,
+                redirects: results.flatMap((r) => r.redirect ?? []),
             });
-            if (writtenFiles.includes("index.html")) {
-                return;
+            if (ZuploEnv.isZuplo) {
+                if (!issuer) {
+                    throw new Error("Issuer is required for Zuplo");
+                }
+                await writeFile(path.join(options.dir, "dist/.output/zuplo.json"), JSON.stringify({ issuer }, null, 2), "utf-8");
             }
-            await writeFile(path.join(options.dir, DIST_DIR, config.basePath ?? "", "index.html"), html, "utf-8");
-            const serverDir = path.join(options.dir, DIST_DIR, "server");
-            await rm(serverDir, { recursive: true, force: true });
         }
         catch (e) {
             // dynamic imports in prerender swallow the stack trace, so we log it here
             // eslint-disable-next-line no-console
             console.error(e);
+            throw e;
         }
-        if (process.env.VERCEL) {
-            await mkdir(path.join(options.dir, ".vercel/output/static"), {
-                recursive: true,
-            });
-            await rename(path.join(options.dir, DIST_DIR), path.join(options.dir, ".vercel/output/static"));
-        }
-        // Write the build output file
-        await writeOutput(options.dir, config);
         return;
     }
     throw new Error("Build failed");

package/dist/vite/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,QAAQ,GAAG,MAAM,CAAC;AAExB,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAwB;IACrD,0DAA0D;IAC1D,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE;QACxD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IACH,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,GAAG,EAAE;QACxD,IAAI,EAAE,YAAY;QAClB,OAAO,EAAE,OAAO;QAChB,UAAU,EAAE,IAAI;KACjB,CAAC,CAAC;IAEH,0DAA0D;IAC1D,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC,CAAC;IACvD,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CACvC,EAAE,IAAI,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,EACxC,OAAO,CAAC,GAAG,CACZ,CAAC;IAEF,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QAC7B,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG;YAC1B,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,QAAQ;YACtE,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,QAAQ;SACvE,CAAC;QAEF,IAAI,CAAC,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,IAAI,GAAG,YAAY,CAAC;YACxB,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC;YAChD,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,CAAC;SACnD,CAAC,CAAC;QAEH,MAAM,oBAAoB,GAAG,4BAA4B,CAAC,YAAY,CAAC,CAAC;QAExE,IAAI,CAAC;YACH,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC;gBACnC,IAAI;gBACJ,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,oBAAoB;aACrB,CAAC,CAAC;YAEH,IAAI,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxC,OAAO;YACT,CAAC;YAED,MAAM,SAAS,CACb,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,MAAM,CAAC,QAAQ,IAAI,EAAE,EAAE,YAAY,CAAC,EACrE,IAAI,EACJ,OAAO,CACR,CAAC;YAEF,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC7D,MAAM,EAAE,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0EAA0E;YAC1E,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QAED,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,EAAE;gBAC3D,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YACH,MAAM,MAAM,CACV,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,CAAC,EAChC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAChD,CAAC;QACJ,CAAC;QAED,8BAA8B;QAC9B,MAAM,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEvC,OAAO;IACT,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAClC,CAAC"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"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"}

package/dist/vite/config.d.ts

@@ -1,18 +1,8 @@
 import { type ConfigEnv, type InlineConfig } from "vite";
-import type { LoadedConfig, ZudokuPluginOptions } from "../config/config.js";
 export type ZudokuConfigEnv = ConfigEnv & {
     mode: "development" | "production";
-    forceReload?: boolean;
 };
-export declare function loadZudokuConfig(configEnv: ConfigEnv, rootDir: string, forceReload?: boolean): Promise<{
-    config: LoadedConfig;
-    envPrefix: string[];
-    publicEnv: Record<string, string>;
-}>;
+export declare function getModuleDir(): string;
 export declare function getAppClientEntryPath(): string;
 export declare function getAppServerEntryPath(): string;
-export declare function getPluginOptions({ dir, mode, }: {
-    dir: string;
-    mode: ZudokuPluginOptions["mode"];
-}): ZudokuPluginOptions;
-export declare function getViteConfig(dir: string, configEnv: ZudokuConfigEnv, onConfigChange?: (config: LoadedConfig) => void): Promise<InlineConfig>;
+export declare function getViteConfig(dir: string, configEnv: ZudokuConfigEnv): Promise<InlineConfig>;

package/dist/vite/config.js

@@ -1,85 +1,16 @@
-import autoprefixer from "autoprefixer";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import colors from "picocolors";
-import tailwindcss from "tailwindcss";
-import { loadConfigFromFile, mergeConfig, loadEnv as viteLoadEnv, } from "vite";
-import tailwindConfig from "../app/tailwind.js";
+import { loadConfigFromFile, mergeConfig, } from "vite";
+import packageJson from "../../package.json" with { type: "json" };
+import { ZuploEnv } from "../app/env.js";
 import { logger } from "../cli/common/logger.js";
-import { isPortAvailable } from "../cli/common/utils/ports.js";
-import { tryLoadZudokuConfig } from "../config/loader.js";
-import { ZuploEnv } from "../zuplo/env.js";
+import { loadZudokuConfig } from "../config/loader.js";
+import { CdnUrlSchema } from "../config/validators/validate.js";
+import { defaultHighlightOptions, defaultLanguages } from "../lib/shiki.js";
+import { joinUrl } from "../lib/util/joinUrl.js";
 import vitePlugin from "./plugin.js";
-const getDocsConfigFiles = (docsConfig, baseDir) => {
-    if (!docsConfig)
-        return [];
-    const docsArray = Array.isArray(docsConfig) ? docsConfig : [docsConfig];
-    return docsArray.map((doc) => path.posix.join(baseDir, doc.files));
-};
-// We extend the dependencies with the files from configured APIs
-// so that the server restarts when these files change.
-const registerApiFileImportDependencies = (config, rootDir) => {
-    if (!config.apis)
-        return;
-    const apis = Array.isArray(config.apis) ? config.apis : [config.apis];
-    const files = apis
-        .filter((c) => c.type === "file")
-        .flatMap((c) => (Array.isArray(c.input) ? c.input : [c.input]))
-        .map((c) => path.posix.join(rootDir, c));
-    config.__meta.registerDependency(...files);
-};
-function loadEnv(configEnv, rootDir) {
-    const envPrefix = [
-        ...(ZuploEnv.isZuplo ? ["ZUPLO_PUBLIC_"] : []),
-        "ZUDOKU_PUBLIC_",
-    ];
-    const localEnv = viteLoadEnv(configEnv.mode, rootDir, envPrefix);
-    process.env = { ...localEnv, ...process.env };
-    const publicEnv = Object.entries(process.env).reduce((val, [key]) => {
-        if (envPrefix.some((prefix) => key.startsWith(prefix))) {
-            val[key] = JSON.stringify(process.env[key]);
-        }
-        return val;
-    }, {});
-    return { publicEnv, envPrefix };
-}
-let config;
-let envPrefix;
-let publicEnv;
-export async function loadZudokuConfig(configEnv, rootDir, forceReload) {
-    if (!forceReload && config && envPrefix && publicEnv) {
-        return { config, envPrefix, publicEnv };
-    }
-    ({ publicEnv, envPrefix } = loadEnv(configEnv, rootDir));
-    try {
-        const envVars = {};
-        for (const key in process.env) {
-            if (envPrefix.some((prefix) => key.startsWith(prefix))) {
-                envVars[key] = process.env[key];
-            }
-        }
-        const loadedConfig = await tryLoadZudokuConfig(rootDir, envVars);
-        registerApiFileImportDependencies(loadedConfig, rootDir);
-        logger.info(colors.yellow(`loaded config file `) +
-            colors.dim(loadedConfig.__meta.path), {
-            timestamp: true,
-        });
-        config = loadedConfig;
-        return { config, envPrefix, publicEnv };
-    }
-    catch (error) {
-        logger.error(colors.red(`Error loading Zudoku config`), {
-            timestamp: true,
-            error,
-        });
-    }
-    // Default config
-    logger.error(colors.red(`no zudoku config file found in project root.`), {
-        timestamp: true,
-    });
-    process.exit(1);
-}
-function getModuleDir() {
+export function getModuleDir() {
     // NOTE: This is relative to the /dist folder because the dev server
     // runs the compiled JS files, but vite uses the raw TS files
     const moduleDir = fileURLToPath(new URL("../../", import.meta.url))
@@ -97,34 +28,49 @@ export function getAppServerEntryPath() {
     const modDir = getModuleDir();
     return path.posix.join(modDir, "src", "app", "entry.server.tsx");
 }
-export function getPluginOptions({ dir, mode, }) {
-    const moduleDir = getModuleDir();
-    return {
-        ...config,
-        rootDir: dir,
-        moduleDir,
-        mode,
-    };
-}
-export async function getViteConfig(dir, configEnv, onConfigChange) {
+// the vite config gets loaded multiple times, so we only log the CDN info once
+let hasLoggedCdnInfo = false;
+const MEDIA_REGEX = /\.(a?png|jpe?g|gif|bmp|svg|webp|tiff|ico|webm|ogg|mp3|wav|m4a|avif|mp4)/i;
+export async function getViteConfig(dir, configEnv) {
     const { config, publicEnv, envPrefix } = await loadZudokuConfig(configEnv, dir);
-    const handleConfigChange = async () => {
-        const { config } = await loadZudokuConfig(configEnv, dir, true);
-        onConfigChange?.(config);
-        return config;
-    };
-    let websocketPort = 9800;
-    while (!(await isPortAvailable("localhost", websocketPort)) &&
-        websocketPort < 9999) {
-        websocketPort++;
-    }
-    const pluginOptions = getPluginOptions({
-        dir,
-        mode: process.env.ZUDOKU_INTERNAL_DEV ? "internal" : "module",
-    });
-    const base = config.cdnUrl
-        ? new URL(config.basePath ?? "/", config.cdnUrl).href
+    const cdnUrl = CdnUrlSchema.parse(config.cdnUrl);
+    const base = cdnUrl?.base
+        ? joinUrl(cdnUrl.base, config.basePath)
         : config.basePath;
+    if (cdnUrl && !hasLoggedCdnInfo) {
+        logger.info(colors.blue(`Using CDN URL:`));
+        logger.info(colors.blue(`  base:  `) + colors.dim(cdnUrl.base));
+        logger.info(colors.blue(`  media: `) + colors.dim(cdnUrl.media));
+        hasLoggedCdnInfo = true;
+    }
+    // These dependencies are listed explicitly to prevent cascading page reloads that occur during auto-discovery
+    const zudokuIncludeOptimizedDeps = [
+        "@sindresorhus/slugify",
+        "react-hook-form",
+        "cmdk",
+        "@radix-ui/react-tabs",
+        "@radix-ui/react-tooltip",
+        "@radix-ui/react-select",
+        "@radix-ui/react-popover",
+        "@radix-ui/react-checkbox",
+        "@radix-ui/react-label",
+        "@radix-ui/react-radio-group",
+        "@radix-ui/react-slot",
+        "@envelop/core",
+        "@pothos/core",
+        "graphql-yoga",
+        "graphql",
+        "graphql/index.js",
+        "graphql/error/index.js",
+        "openapi-types",
+        "@zudoku/httpsnippet",
+        "graphql-type-json",
+        "yaml",
+        "@clerk/clerk-js",
+        "@scalar/openapi-parser",
+        ...(config.syntaxHighlighting?.languages ?? defaultLanguages).map((lang) => `@shikijs/langs/${lang}`),
+        ...Object.values(config.syntaxHighlighting?.themes ?? defaultHighlightOptions.themes).map((theme) => `@shikijs/themes/${theme}`),
+    ].map((dep) => `zudoku > ${dep}`);
     const viteConfig = {
         root: dir,
         base,
@@ -136,11 +82,15 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
         envPrefix,
         resolve: {
             alias: {
-                "@mdx-js/react": path.resolve(pluginOptions.moduleDir, "node_modules/@mdx-js/react"),
+                "@mdx-js/react": import.meta.resolve("@mdx-js/react"),
             },
         },
         define: {
+            "process.env.ZUDOKU_VERSION": JSON.stringify(packageJson.version),
             "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
+            // This env var doesn't start with the public `ZUPLO_` prefix, so we need to manually define it here
+            "process.env.IS_ZUPLO": ZuploEnv.isZuplo,
+            "import.meta.env.IS_ZUPLO": ZuploEnv.isZuplo,
             ...publicEnv,
         },
         ssr: {
@@ -150,53 +100,64 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
         server: {
             middlewareMode: true,
             open: true,
-            hmr: {
-                port: websocketPort,
-            },
             watch: {
                 ignored: [
                     `${dir}/dist`,
                     `${dir}/lib`,
                     `${dir}/.git`,
-                    `${pluginOptions.moduleDir}/src/vite`,
-                    `${pluginOptions.moduleDir}/src/cli`,
+                    `${config.__meta.moduleDir}/src/vite`,
+                    `${config.__meta.moduleDir}/src/cli`,
                 ],
             },
         },
         build: {
             ssr: configEnv.isSsrBuild,
             sourcemap: true,
+            target: "es2022",
             outDir: path.resolve(path.join(dir, "dist", config.basePath ?? "", configEnv.isSsrBuild ? "server" : "")),
             emptyOutDir: true,
             rollupOptions: {
                 input: configEnv.command === "build"
                     ? configEnv.isSsrBuild
-                        ? ["zudoku/app/entry.server.tsx", config.__meta.path]
+                        ? ["zudoku/app/entry.server.tsx", config.__meta.configPath]
                         : "zudoku/app/entry.client.tsx"
                     : undefined,
+                external: [joinUrl(config.basePath, "/pagefind/pagefind.js")],
+            },
+            chunkSizeWarningLimit: 1500,
+        },
+        experimental: {
+            renderBuiltUrl(filename) {
+                if (cdnUrl?.base && [".js", ".css"].includes(path.extname(filename))) {
+                    return joinUrl(cdnUrl.base, filename);
+                }
+                if (cdnUrl?.media && MEDIA_REGEX.test(filename)) {
+                    return joinUrl(cdnUrl.media, filename);
+                }
+                return { relative: true };
             },
         },
-        experimental: config.cdnUrl
-            ? {
-                renderBuiltUrl(filename, { type, hostType }) {
-                    if (type === "asset" && (hostType === "js" || hostType === "css")) {
-                        return new URL(filename, config.cdnUrl).href;
-                    }
-                    return { relative: true };
-                },
-            }
-            : undefined,
         optimizeDeps: {
+            esbuildOptions: {
+                target: "es2022",
+            },
             entries: [
                 configEnv.isSsrBuild
                     ? getAppServerEntryPath()
                     : getAppClientEntryPath(),
             ],
-            include: ["react-dom/client", "@sentry/react"],
+            include: [
+                "react-dom/client",
+                ...(process.env.SENTRY_DSN ? ["@sentry/react"] : []),
+                ...zudokuIncludeOptimizedDeps,
+            ],
         },
-        // Workaround for Pre-transform error for "virtual" file: https://github.com/vitejs/vite/issues/15374
-        assetsInclude: ["/__z/entry.client.tsx"],
-        plugins: [vitePlugin(pluginOptions, handleConfigChange)],
+        assetsInclude: [
+            // Workaround for Pre-transform error for "virtual" file: https://github.com/vitejs/vite/issues/15374
+            "/__z/entry.client.tsx",
+            "**/pagefind.js",
+        ],
+        plugins: [vitePlugin()],
         future: {
             removeServerModuleGraph: "warn",
             removeSsrLoadModule: "warn",
@@ -205,34 +166,14 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
             removePluginHookSsrArgument: "warn",
             removeServerHot: "warn",
         },
-        css: {
-            postcss: {
-                plugins: [
-                    tailwindcss({
-                        ...tailwindConfig(config),
-                        content: [
-                            // Zudoku components and styles
-                            // Tailwind seems to crash if it tries to parse compiled .js files
-                            // as a workaround, we will just ship the source file and use those
-                            // `${moduleDir}/lib/**/*.{js,ts,jsx,tsx,md,mdx}`,
-                            `${pluginOptions.moduleDir}/src/lib/**/*.{js,ts,jsx,tsx,md,mdx}`,
-                            // Include the config file and every file it depends on
-                            config.__meta.path,
-                            ...config.__meta.dependencies.map((dep) => `${path.dirname(config.__meta.path)}/${dep}`),
-                            `${dir}/src/**/*.{js,ts,jsx,tsx,md,mdx}`,
-                            // All doc files
-                            ...getDocsConfigFiles(config.docs, dir),
-                        ],
-                    }),
-                    autoprefixer,
-                ],
-            },
-        },
     };
     // If the user has supplied a vite.config file, merge it with ours
-    const userConfig = await loadConfigFromFile(configEnv, undefined, dir);
+    const userConfig = await loadConfigFromFile(configEnv, undefined, dir, undefined, undefined, "runner");
     if (userConfig) {
-        const merged = mergeConfig(userConfig.config, viteConfig, true);
+        const merged = mergeConfig(viteConfig, userConfig.config, true);
+        logger.info(colors.blue(`merged with custom user Vite config`), {
+            timestamp: true,
+        });
         return merged;
     }
     return viteConfig;