zudoku 0.0.0-f3f6db5 → 0.0.0-f40ea27

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,54 @@ 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;
+const defineEnvVars = (vars) => Object.fromEntries(vars.flatMap((v) => [
+    [`process.env.${v}`, JSON.stringify(process.env[v])],
+    [`import.meta.env.${v}`, JSON.stringify(process.env[v])],
+]));
+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",
+        "allof-merge",
+        ...(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 +87,20 @@ 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.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
+            "process.env.ZUDOKU_VERSION": JSON.stringify(packageJson.version),
+            "process.env.IS_ZUPLO": ZuploEnv.isZuplo,
+            "import.meta.env.IS_ZUPLO": ZuploEnv.isZuplo,
+            ...defineEnvVars([
+                "SENTRY_DSN",
+                "ZUPLO_BUILD_ID",
+                "ZUPLO_BUILD_CONFIG",
+                "ZUPLO_ENVIRONMENT_TYPE",
+                "ZUPLO_SERVER_URL",
+            ]),
             ...publicEnv,
         },
         ssr: {
@@ -150,53 +110,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 +176,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;

package/dist/vite/config.js.map

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

package/dist/vite/config.test.js

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { expect, it } from "vitest";
-import { loadZudokuConfig } from "./config.js";
+import { loadZudokuConfig } from "../config/loader.js";
 it("Should correctly load zudoku.config.ts file", async () => {
     const rootPath = path.resolve("../../examples/with-config/");
     const { config } = await loadZudokuConfig({
@@ -8,7 +8,7 @@ it("Should correctly load zudoku.config.ts file", async () => {
         command: "serve",
     }, rootPath);
     // Normalize the path to Unix-style format
-    const normalizedPath = config.__meta.path
+    const normalizedPath = config.__meta.configPath
         .split(path.sep)
         .join(path.posix.sep);
     expect(normalizedPath).includes("/with-config/zudoku.config.");

package/dist/vite/config.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/vite/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CACvC;QACE,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,OAAO;KACjB,EACD,QAAQ,CACT,CAAC;IACF,0CAA0C;IAC1C,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI;SACtC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAExB,MAAM,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}
+{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/vite/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CACvC;QACE,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,OAAO;KACjB,EACD,QAAQ,CACT,CAAC;IACF,0CAA0C;IAC1C,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU;SAC5C,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SACf,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAExB,MAAM,CAAC,cAAc,CAAC,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AACjE,CAAC,CAAC,CAAC"}

package/dist/vite/create-pagefind-index.d.ts

@@ -0,0 +1,4 @@
+export declare const createPagefindIndex: (options: {
+    dir: string;
+    outDir?: string;
+}) => Promise<string>;

package/dist/vite/create-pagefind-index.js

@@ -0,0 +1,12 @@
+import path from "node:path";
+import invariant from "../lib/util/invariant.js";
+export const createPagefindIndex = async (options) => {
+    const pagefind = await import("pagefind");
+    const { index, errors } = await pagefind.createIndex();
+    invariant(index, `Failed to create pagefind index: ${errors.join(", ")}`);
+    const outputPath = path.join(options.outDir ?? options.dir, "pagefind");
+    await index.addDirectory({ path: options.dir });
+    await index.writeFiles({ outputPath });
+    return outputPath;
+};
+//# sourceMappingURL=create-pagefind-index.js.map

package/dist/vite/create-pagefind-index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-pagefind-index.js","sourceRoot":"","sources":["../../src/vite/create-pagefind-index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,SAAS,MAAM,0BAA0B,CAAC;AAEjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EAAE,OAGzC,EAAE,EAAE;IACH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,WAAW,EAAE,CAAC;IAEvD,SAAS,CAAC,KAAK,EAAE,oCAAoC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE1E,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;IAExE,MAAM,KAAK,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,KAAK,CAAC,UAAU,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;IAEvC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}

package/dist/vite/css/plugin.d.ts

@@ -1,5 +1,4 @@
 import { type Plugin } from "vite";
-import type { ZudokuPluginOptions } from "../../config/config.js";
-export declare function vitePluginSsrCss(getConfig: () => ZudokuPluginOptions, pluginOpts: {
+export declare function vitePluginSsrCss(pluginOpts: {
     entries: string[];
 }): Plugin;

package/dist/vite/css/plugin.js

@@ -2,11 +2,13 @@
 // https://github.com/hi-ogawa/vite-plugins/tree/main/packages/ssr-css
 import path from "node:path";
 import { isCSSRequest } from "vite";
+import { getCurrentConfig } from "../../config/loader.js";
+import { virtualModuleId as THEME_VIRTUAL_MODULE } from "../plugin-theme.js";
 import { collectStyle } from "./collect.js";
 const VIRTUAL_ENTRY = "virtual:ssr-css.css";
-export function vitePluginSsrCss(getConfig, pluginOpts) {
+export function vitePluginSsrCss(pluginOpts) {
     let server;
-    const config = getConfig();
+    const config = getCurrentConfig();
     const virtualHref = path.join(config.basePath ?? "", `/@id/__x00__${VIRTUAL_ENTRY}`);
     const cssModuleMap = new Map();
     return {
@@ -21,6 +23,16 @@ export function vitePluginSsrCss(getConfig, pluginOpts) {
                 }
                 next();
             });
+            // Clear CSS cache when config files change
+            server_.watcher.on("change", (file) => {
+                const currentConfig = getCurrentConfig();
+                if (currentConfig.__meta.dependencies.includes(file) ||
+                    file === currentConfig.__meta.configPath) {
+                    cssModuleMap.clear();
+                    invalidateModule(server, `\0${VIRTUAL_ENTRY}?direct`);
+                    invalidateModule(server, `\0${THEME_VIRTUAL_MODULE}`);
+                }
+            });
         },
         resolveId(id) {
             return id.startsWith(VIRTUAL_ENTRY) ? `\0${id}` : undefined;

package/dist/vite/css/plugin.js.map

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

package/dist/vite/dev-server.d.ts

@@ -2,15 +2,16 @@ import { type Express } from "express";
 import { type ViteDevServer } from "vite";
 export declare class DevServer {
     private options;
-    private server;
-    private currentConfig;
     private terminator;
+    resolvedPort: number;
+    protocol: string;
     constructor(options: {
-        port: number;
         dir: string;
         ssr?: boolean;
         open?: boolean;
+        argPort?: number;
     });
+    private createNodeServer;
     start(): Promise<{
         vite: ViteDevServer;
         express: Express;

package/dist/vite/dev-server.js

@@ -1,21 +1,41 @@
 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, 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 { loadZudokuConfig } from "../config/loader.js";
 import { createGraphQLServer } from "../lib/oas/graphql/index.js";
-import { getAppClientEntryPath, getAppServerEntryPath, getViteConfig, loadZudokuConfig, } from "./config.js";
+import { getAppClientEntryPath, getAppServerEntryPath, getViteConfig, } 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 configEnv = {
@@ -23,20 +43,23 @@ export class DevServer {
             command: "serve",
             isSsrBuild: this.options.ssr,
         };
-        const viteConfig = await getViteConfig(this.options.dir, configEnv, (zudokuConfig) => (this.currentConfig = zudokuConfig));
+        const viteConfig = await getViteConfig(this.options.dir, configEnv);
+        const { config } = await loadZudokuConfig(configEnv, this.options.dir);
+        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);
-        const { config } = await loadZudokuConfig(configEnv, this.options.dir);
-        this.currentConfig = config;
         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;
+        app.use(async (req, res, next) => {
+            const { config } = await loadZudokuConfig(configEnv, this.options.dir);
+            const base = config.basePath;
             if (req.method.toLowerCase() === "get" &&
                 req.url === "/" &&
                 base &&
@@ -57,26 +80,35 @@ export class DevServer {
         });
         app.use(vite.middlewares);
         printDiagnosticsToConsole(`Server-side rendering ${this.options.ssr ? "enabled" : "disabled"}`);
-        app.use("*", async (request, response, next) => {
+        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 { config } = await loadZudokuConfig(configEnv, this.options.dir);
+                const rawHtml = getDevHtml({
+                    jsEntry: "/__z/entry.client.tsx",
+                    dir: config.site?.dir,
+                });
                 const template = await vite.transformIndexHtml(url, rawHtml);
                 if (this.options.ssr) {
-                    if (!this.currentConfig) {
-                        throw new Error("Error loading configuration.");
-                    }
-                    const module = await ssrEnvironment.runner.import(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(config),
+                        basePath: config.basePath,
                     });
                 }
                 else {
@@ -92,12 +124,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();