zudoku 0.0.0-e5be921 → 0.0.0-e614aaa

package/dist/vite/config.js

@@ -1,14 +1,15 @@
-import { vitePluginSsrCss } from "@hiogawa/vite-plugin-ssr-css";
 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 packageJson from "../../package.json" with { type: "json" };
 import tailwindConfig from "../app/tailwind.js";
 import { logger } from "../cli/common/logger.js";
-import { isPortAvailable } from "../cli/common/utils/ports.js";
 import { tryLoadZudokuConfig } from "../config/loader.js";
+import { CdnUrlSchema } from "../config/validators/common.js";
+import { joinUrl } from "../lib/util/joinUrl.js";
 import { ZuploEnv } from "../zuplo/env.js";
 import vitePlugin from "./plugin.js";
 const getDocsConfigFiles = (docsConfig, baseDir) => {
@@ -17,17 +18,6 @@ const getDocsConfigFiles = (docsConfig, baseDir) => {
     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")
-        .map((c) => path.posix.join(rootDir, c.input));
-    config.__meta.registerDependency(...files);
-};
 function loadEnv(configEnv, rootDir) {
     const envPrefix = [
         ...(ZuploEnv.isZuplo ? ["ZUPLO_PUBLIC_"] : []),
@@ -46,6 +36,16 @@ function loadEnv(configEnv, rootDir) {
 let config;
 let envPrefix;
 let publicEnv;
+export const getStandaloneConfig = (rootDir) => ({
+    __meta: {
+        rootDir,
+        moduleDir: getModuleDir(),
+        mode: "standalone",
+        dependencies: [],
+        configPath: "",
+        registerDependency: () => { },
+    },
+});
 export async function loadZudokuConfig(configEnv, rootDir, forceReload) {
     if (!forceReload && config && envPrefix && publicEnv) {
         return { config, envPrefix, publicEnv };
@@ -58,13 +58,9 @@ export async function loadZudokuConfig(configEnv, rootDir, forceReload) {
                 envVars[key] = process.env[key];
             }
         }
-        const loadedConfig = await tryLoadZudokuConfig(rootDir, envVars);
-        registerApiFileImportDependencies(loadedConfig, rootDir);
+        config = await tryLoadZudokuConfig(rootDir, getModuleDir(), envVars);
         logger.info(colors.yellow(`loaded config file `) +
-            colors.dim(loadedConfig.__meta.path), {
-            timestamp: true,
-        });
-        config = loadedConfig;
+            colors.dim(config.__meta.configPath), { timestamp: true });
         return { config, envPrefix, publicEnv };
     }
     catch (error) {
@@ -73,7 +69,6 @@ export async function loadZudokuConfig(configEnv, rootDir, forceReload) {
             error,
         });
     }
-    // Default config
     logger.error(colors.red(`no zudoku config file found in project root.`), {
         timestamp: true,
     });
@@ -97,15 +92,9 @@ 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,
-    };
-}
+// 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, onConfigChange) {
     const { config, publicEnv, envPrefix } = await loadZudokuConfig(configEnv, dir);
     const handleConfigChange = async () => {
@@ -113,48 +102,49 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
         onConfigChange?.(config);
         return config;
     };
-    let websocketPort = 9800;
-    while (!(await isPortAvailable("localhost", websocketPort)) &&
-        websocketPort < 9999) {
-        websocketPort++;
+    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;
     }
-    const pluginOptions = getPluginOptions({
-        dir,
-        mode: process.env.ZUDOKU_INTERNAL_DEV ? "internal" : "module",
-    });
     const viteConfig = {
         root: dir,
-        base: config.basePath,
+        base,
         appType: "custom",
         configFile: false,
         clearScreen: false,
         logLevel: (process.env.LOG_LEVEL ?? "info"),
         customLogger: logger,
         envPrefix,
-        worker: {
-            format: "es",
+        resolve: {
+            alias: {
+                "@mdx-js/react": path.resolve(config.__meta.moduleDir, "node_modules/@mdx-js/react"),
+            },
         },
         define: {
+            "process.env.ZUDOKU_VERSION": JSON.stringify(packageJson.version),
             "process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
             ...publicEnv,
         },
         ssr: {
             target: "node",
-            noExternal: [],
+            noExternal: ["@mdx-js/react"],
         },
         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`,
                 ],
             },
         },
@@ -166,9 +156,22 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
             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 };
             },
         },
         optimizeDeps: {
@@ -177,20 +180,25 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
                     ? getAppServerEntryPath()
                     : getAppClientEntryPath(),
             ],
-            include: ["react-dom/client", "@sentry/react"],
-            exclude: [
-                // Vite does not like optimizing the worker dependency
-                "zudoku/openapi-worker",
+            include: [
+                "react-dom/client",
+                ...(process.env.SENTRY_DSN ? ["@sentry/react"] : []),
             ],
         },
-        // Workaround for Pre-transform error for "virtual" file: https://github.com/vitejs/vite/issues/15374
-        assetsInclude: ["/__z/entry.client.tsx"],
-        plugins: [
-            vitePluginSsrCss({
-                entries: [`${pluginOptions.moduleDir}/src/app/entry.client.tsx`],
-            }),
-            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(config, handleConfigChange)],
+        future: {
+            removeServerModuleGraph: "warn",
+            removeSsrLoadModule: "warn",
+            removeServerTransformRequest: "warn",
+            removePluginHookHandleHotUpdate: "warn",
+            removePluginHookSsrArgument: "warn",
+            removeServerHot: "warn",
+        },
         css: {
             postcss: {
                 plugins: [
@@ -201,10 +209,10 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
                             // 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}`,
+                            `${config.__meta.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}`),
+                            config.__meta.configPath,
+                            ...config.__meta.dependencies.map((dep) => `${path.dirname(config.__meta.configPath)}/${dep}`),
                             `${dir}/src/**/*.{js,ts,jsx,tsx,md,mdx}`,
                             // All doc files
                             ...getDocsConfigFiles(config.docs, dir),

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

@@ -7,6 +7,10 @@ it("Should correctly load zudoku.config.ts file", async () => {
         mode: "development",
         command: "serve",
     }, rootPath);
-    expect(config.__meta.path).includes("/with-config/zudoku.config.");
+    // Normalize the path to Unix-style format
+    const normalizedPath = config.__meta.configPath
+        .split(path.sep)
+        .join(path.posix.sep);
+    expect(normalizedPath).includes("/with-config/zudoku.config.");
 });
 //# sourceMappingURL=config.test.js.map

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,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AACrE,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,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,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/css/collect.d.ts

@@ -0,0 +1,2 @@
+import { type DevEnvironment } from "vite";
+export declare function collectStyle(server: DevEnvironment, entries: string[], cssModuleMap: Map<string, string>): Promise<string>;

package/dist/vite/css/collect.js

@@ -0,0 +1,27 @@
+import { isCSSRequest } from "vite";
+export async function collectStyle(server, entries, cssModuleMap) {
+    const urls = await collectStyleUrls(server, entries);
+    return urls.map((url) => cssModuleMap.get(url) ?? "").join("\n");
+}
+async function collectStyleUrls(server, entries) {
+    const visited = new Set();
+    async function traverse(url) {
+        const [, id] = await server.moduleGraph.resolveUrl(url);
+        if (visited.has(id)) {
+            return;
+        }
+        visited.add(id);
+        const mod = server.moduleGraph.getModuleById(id);
+        if (!mod) {
+            return;
+        }
+        await Promise.all([...mod.importedModules].map((childMod) => traverse(childMod.url)));
+    }
+    // ensure vite's import analysis is ready _only_ for top entries to not go too aggresive
+    await Promise.all(entries.map((e) => server.transformRequest(e)));
+    // traverse
+    await Promise.all(entries.map((url) => traverse(url)));
+    // filter
+    return [...visited].filter((url) => isCSSRequest(url));
+}
+//# sourceMappingURL=collect.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../src/vite/css/collect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuB,YAAY,EAAE,MAAM,MAAM,CAAC;AAEzD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAsB,EACtB,OAAiB,EACjB,YAAiC;IAEjC,MAAM,IAAI,GAAG,MAAM,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAErD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,MAAsB,EACtB,OAAiB;IAEjB,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,UAAU,QAAQ,CAAC,GAAW;QACjC,MAAM,CAAC,EAAE,EAAE,CAAC,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACxD,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAChB,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO;QACT,CAAC;QACD,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACnE,CAAC;IACJ,CAAC;IAED,wFAAwF;IACxF,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAElE,WAAW;IACX,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvD,SAAS;IACT,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;AACzD,CAAC"}

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

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

package/dist/vite/css/plugin.js

@@ -0,0 +1,79 @@
+// Taken and adapted from
+// https://github.com/hi-ogawa/vite-plugins/tree/main/packages/ssr-css
+import path from "node:path";
+import { isCSSRequest } from "vite";
+import { collectStyle } from "./collect.js";
+const VIRTUAL_ENTRY = "virtual:ssr-css.css";
+export function vitePluginSsrCss(getConfig, pluginOpts) {
+    let server;
+    const config = getConfig();
+    const virtualHref = path.join(config.basePath ?? "", `/@id/__x00__${VIRTUAL_ENTRY}`);
+    const cssModuleMap = new Map();
+    return {
+        name: "zudoku-ssr-css",
+        apply: "serve",
+        configureServer(server_) {
+            server = server_.environments.ssr;
+            // invalidate virtual modules for each inline request
+            server_.middlewares.use((req, _res, next) => {
+                if (req.url === virtualHref) {
+                    invalidateModule(server, `\0${VIRTUAL_ENTRY}?direct`);
+                }
+                next();
+            });
+        },
+        resolveId(id) {
+            return id.startsWith(VIRTUAL_ENTRY) ? `\0${id}` : undefined;
+        },
+        transform(code, id) {
+            if (!isCSSRequest(id))
+                return;
+            cssModuleMap.set(id, code);
+        },
+        async load(id) {
+            if (!id.startsWith(`\0${VIRTUAL_ENTRY}`))
+                return;
+            const url = new URL(id.slice(1), "https://test.local");
+            let code = await collectStyle(server, pluginOpts.entries, cssModuleMap);
+            if (!url.searchParams.has("direct")) {
+                code = `export default ${JSON.stringify(code)};`;
+            }
+            return code;
+        },
+        // also expose via transformIndexHtml
+        transformIndexHtml: {
+            handler: async () => {
+                return [
+                    {
+                        tag: "link",
+                        injectTo: "head",
+                        attrs: {
+                            rel: "stylesheet",
+                            href: virtualHref,
+                            "data-ssr-css": true,
+                        },
+                    },
+                    {
+                        tag: "script",
+                        injectTo: "head",
+                        attrs: { type: "module" },
+                        children: `
+              import { createHotContext } from "/@vite/client";
+              const hot = createHotContext("/__clear_ssr_css");
+              hot.on("vite:afterUpdate", () => {
+                document.querySelectorAll("[data-ssr-css]").forEach(node => node.remove());
+              });
+            `,
+                    },
+                ];
+            },
+        },
+    };
+}
+function invalidateModule(server, id) {
+    const mod = server.moduleGraph.getModuleById(id);
+    if (mod) {
+        server.moduleGraph.invalidateModule(mod);
+    }
+}
+//# sourceMappingURL=plugin.js.map

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

@@ -0,0 +1 @@
+{"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,14 +2,17 @@ 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 } 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 configEnv = {
@@ -24,23 +44,33 @@ export class DevServer {
             isSsrBuild: this.options.ssr,
         };
         const viteConfig = await getViteConfig(this.options.dir, configEnv, (zudokuConfig) => (this.currentConfig = zudokuConfig));
-        const vite = await createViteServer(viteConfig);
         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);
         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) {
+            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
@@ -50,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);
@@ -59,7 +101,7 @@ export class DevServer {
                     if (!this.currentConfig) {
                         throw new Error("Error loading configuration.");
                     }
-                    const module = await vite.ssrLoadModule(getAppServerEntryPath());
+                    const module = await ssrEnvironment.runner.import(getAppServerEntryPath());
                     const render = module.render;
                     void render({
                         template,
@@ -81,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"}