zudoku 0.3.0-dev.5 → 0.3.0-dev.50

package/dist/lib/util/MdxComponents.js

@@ -1,11 +1,12 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { Link } from "react-router-dom";
 import { Heading } from "../components/Heading.js";
+import { InlineCode } from "../components/InlineCode.js";
 import { SyntaxHighlight } from "../components/SyntaxHighlight.js";
 import { Callout } from "../ui/Callout.js";
-import { cn } from "./cn.js";
 export const MdxComponents = {
-    img: (props) => {
+    // @ts-expect-error Node is not in types but still gets passed
+    img: ({ node, ...props }) => {
         if (/\.(mp4|webm|mov|avi)$/.test(props.src ?? "")) {
             return _jsx("video", { src: props.src, controls: true, playsInline: true, autoPlay: true, loop: true });
         }
@@ -17,7 +18,8 @@ export const MdxComponents = {
     h4: ({ children, id }) => (_jsx(Heading, { level: 4, id: id, children: children })),
     h5: ({ children, id }) => (_jsx(Heading, { level: 5, id: id, children: children })),
     h6: ({ children, id }) => (_jsx(Heading, { level: 6, id: id, children: children })),
-    a: ({ href, ...props }) => href && !href.startsWith("http") ? (_jsx(Link, { to: href, relative: "path", ...props })) : (_jsx("a", { href: href, target: "_blank", ...props, rel: "noreferrer" })),
+    // @ts-expect-error Node is not in types but still gets passed
+    a: ({ href, node, ...props }) => href && !href.startsWith("http") ? (_jsx(Link, { to: href, relative: "path", ...props })) : (_jsx("a", { href: href, target: "_blank", ...props, rel: "noreferrer" })),
     Callout,
     tip: (props) => _jsx(Callout, { type: "tip", ...props }),
     info: (props) => _jsx(Callout, { type: "info", ...props }),
@@ -34,7 +36,7 @@ export const MdxComponents = {
             const match = className?.match(/language?-(\w+)/);
             return (_jsx(SyntaxHighlight, { language: match?.[1] ?? "markup", className: "rounded-xl overflow-x-auto p-4 border border-border dark:!bg-foreground/10 dark:border-transparent", showLanguageIndicator: true, code: String(children).trim() }));
         }
-        return (_jsx("code", { className: cn(className, "font-mono border border-border p-1 py-0.5 rounded bg-border/50 dark:bg-border/70"), children: children }));
+        return _jsx(InlineCode, { className: className, children: children });
     },
 };
 //# sourceMappingURL=MdxComponents.js.map

package/dist/lib/util/MdxComponents.js.map

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

package/dist/lib/util/groupBy.d.ts

@@ -1,6 +1 @@
-type MapValuesToKeysIfAllowed<T> = {
-    [K in keyof T]: T[K] extends PropertyKey ? K : never;
-};
-type Filter<T> = MapValuesToKeysIfAllowed<T>[keyof T];
-export declare const groupBy: <T extends Record<PropertyKey, any>, Key extends Filter<T>>(arr: T[], key: Key) => Record<T[Key], T[]>;
-export {};
+export declare const groupBy: <T extends Record<PropertyKey, any>, KeySelector extends (item: T) => PropertyKey>(arr: T[], keySelector: KeySelector) => Partial<Record<ReturnType<KeySelector>, T[]>>;

package/dist/lib/util/groupBy.js

@@ -1,9 +1,11 @@
-export const groupBy = (arr, key) => arr.reduce((accumulator, val) => {
-    const groupedKey = val[key];
-    if (!accumulator[groupedKey]) {
-        accumulator[groupedKey] = [];
-    }
-    accumulator[groupedKey].push(val);
-    return accumulator;
-}, {});
+export const groupBy = (arr, keySelector) => {
+    return arr.reduce((accumulator, val) => {
+        const groupedKey = keySelector(val);
+        if (!accumulator[groupedKey]) {
+            accumulator[groupedKey] = [];
+        }
+        accumulator[groupedKey].push(val);
+        return accumulator;
+    }, {});
+};
 //# sourceMappingURL=groupBy.js.map

package/dist/lib/util/groupBy.js.map

@@ -1 +1 @@
-{"version":3,"file":"groupBy.js","sourceRoot":"","sources":["../../../src/lib/util/groupBy.ts"],"names":[],"mappings":"AAKA,MAAM,CAAC,MAAM,OAAO,GAAG,CAKrB,GAAQ,EACR,GAAQ,EACa,EAAE,CACvB,GAAG,CAAC,MAAM,CACR,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE;IACnB,MAAM,UAAU,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;QAC7B,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IACD,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,WAAW,CAAC;AACrB,CAAC,EACD,EAAyB,CAC1B,CAAC"}
+{"version":3,"file":"groupBy.js","sourceRoot":"","sources":["../../../src/lib/util/groupBy.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,CAIrB,GAAQ,EACR,WAAwB,EACuB,EAAE;IACjD,OAAO,GAAG,CAAC,MAAM,CACf,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE;QACnB,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAA4B,CAAC;QAC/D,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7B,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;QAC/B,CAAC;QACD,WAAW,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,OAAO,WAAW,CAAC;IACrB,CAAC,EACD,EAA0C,CAC3C,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/util/logInit.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/lib/util/logInit.js

@@ -0,0 +1,9 @@
+import log from "loglevel";
+log.setDefaultLevel("silent");
+if (import.meta.env.DEV) {
+    log.setLevel("debug");
+}
+else if (localStorage.getItem("ENABLE_DEBUG_LOGS")) {
+    log.setLevel("debug");
+}
+//# sourceMappingURL=logInit.js.map

package/dist/lib/util/logInit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logInit.js","sourceRoot":"","sources":["../../../src/lib/util/logInit.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,UAAU,CAAC;AAE3B,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;AAE9B,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC;IACxB,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC;KAAM,IAAI,YAAY,CAAC,OAAO,CAAC,mBAAmB,CAAC,EAAE,CAAC;IACrD,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AACxB,CAAC"}

package/dist/lib/util/objectEntries.d.ts

@@ -0,0 +1,4 @@
+type ValueOf<T> = T[keyof T];
+type Entries<T> = [keyof T, ValueOf<T>][];
+export declare const objectEntries: <T extends object>(obj: T) => Entries<T>;
+export {};

package/dist/lib/util/objectEntries.js

@@ -0,0 +1,2 @@
+export const objectEntries = (obj) => Object.entries(obj);
+//# sourceMappingURL=objectEntries.js.map

package/dist/lib/util/objectEntries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"objectEntries.js","sourceRoot":"","sources":["../../../src/lib/util/objectEntries.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,aAAa,GAAG,CAAmB,GAAM,EAAc,EAAE,CACpE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAe,CAAC"}

package/dist/lib/util/renderIf.d.ts

@@ -0,0 +1 @@
+export declare const renderIf: <G, R>(variable: G | undefined | null, callback: (variable: G) => R) => R | undefined;

package/dist/lib/util/renderIf.js

@@ -0,0 +1,2 @@
+export const renderIf = (variable, callback) => (variable ? callback(variable) : undefined);
+//# sourceMappingURL=renderIf.js.map

package/dist/lib/util/renderIf.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderIf.js","sourceRoot":"","sources":["../../../src/lib/util/renderIf.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAA8B,EAC9B,QAA4B,EACb,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC"}

package/dist/vite/build.js

@@ -2,19 +2,39 @@ import { writeFile } from "fs/promises";
 import { build as viteBuild } from "vite";
 import { getViteConfig } from "./config.js";
 import { getBuildHtml } from "./html.js";
+import { prerender } from "./prerender.js";
 export async function runBuild(options) {
-    const viteConfig = await getViteConfig({ dir: options.dir, mode: "build" });
-    const result = await viteBuild(viteConfig);
-    if (Array.isArray(result)) {
+    // Shouldn't run in parallel because it's potentially racy
+    const viteClientConfig = await getViteConfig(options.dir, {
+        mode: "production",
+        command: "build",
+    });
+    const viteServerConfig = await getViteConfig(options.dir, {
+        mode: "production",
+        command: "build",
+        isSsrBuild: true,
+    });
+    // Don't run in parallel because it might overwrite itself
+    const clientResult = await viteBuild(viteClientConfig);
+    await viteBuild(viteServerConfig);
+    if (Array.isArray(clientResult)) {
         throw new Error("Build failed");
     }
-    if ("output" in result) {
-        const jsEntry = result.output.find((o) => "isEntry" in o && o.isEntry)?.fileName;
-        const cssEntry = result.output.find((o) => o.fileName.endsWith(".css"))?.fileName;
+    if ("output" in clientResult) {
+        const jsEntry = clientResult.output.find((o) => "isEntry" in o && o.isEntry)?.fileName;
+        const cssEntry = clientResult.output.find((o) => o.fileName.endsWith(".css"))?.fileName;
         const html = getBuildHtml({
             jsEntry: `/${jsEntry}`,
             cssEntry: `/${cssEntry}`,
         });
+        try {
+            await prerender(html, options.dir);
+        }
+        catch (e) {
+            // dynamic imports in prerender swallow the stack trace, so we log it here
+            // eslint-disable-next-line no-console
+            console.error(e);
+        }
         await writeFile(`${options.dir}/dist/index.html`, html, "utf-8");
         return;
     }

package/dist/vite/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/vite/build.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,QAAQ,CAAC,OAAwB;IACrD,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAE5E,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ,IAAI,MAAM,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAChC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CACnC,EAAE,QAAQ,CAAC;QACZ,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACxC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC5B,EAAE,QAAQ,CAAC;QAEZ,MAAM,IAAI,GAAG,YAAY,CAAC;YACxB,OAAO,EAAE,IAAI,OAAO,EAAE;YACtB,QAAQ,EAAE,IAAI,QAAQ,EAAE;SACzB,CAAC,CAAC;QAEH,MAAM,SAAS,CAAC,GAAG,OAAO,CAAC,GAAG,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACjE,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":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,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,SAAS,CAAC,gBAAgB,CAAC,CAAC;IAElC,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,QAAQ,IAAI,YAAY,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CACnC,EAAE,QAAQ,CAAC;QACZ,MAAM,QAAQ,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC5B,EAAE,QAAQ,CAAC;QAEZ,MAAM,IAAI,GAAG,YAAY,CAAC;YACxB,OAAO,EAAE,IAAI,OAAO,EAAE;YACtB,QAAQ,EAAE,IAAI,QAAQ,EAAE;SACzB,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0EAA0E;YAC1E,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QACD,MAAM,SAAS,CAAC,GAAG,OAAO,CAAC,GAAG,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAEjE,OAAO;IACT,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAClC,CAAC"}

package/dist/vite/config.d.ts

@@ -1,14 +1,15 @@
-import { InlineConfig } from "vite";
-import { ZudokuConfig } from "../config/config.js";
+import { ConfigEnv, InlineConfig } from "vite";
+import { ZudokuConfig, ZudokuPluginOptions } from "../config/config.js";
 export declare const zuploConfigFiles: string[];
-export interface ZudokuViteConfig extends InlineConfig {
-    root: string;
-}
-export declare function loadZuploConfig(rootDir: string): Promise<ZudokuConfig>;
-export declare function getModuleDir(): string;
-export declare function getAppMainTsxPath(): string;
-export declare function getViteConfig({ dir, mode, }: {
+export declare function getConfigFilePath(rootDir: string): Promise<string>;
+export type ZudokuConfigEnv = ConfigEnv & {
+    mode: "development" | "production";
+};
+export declare function loadZuploConfig(rootDir: string, configEnv: ZudokuConfigEnv): Promise<ZudokuConfig>;
+export declare function getAppClientEntryPath(): string;
+export declare function getAppServerEntryPath(): string;
+export declare function getPluginOptions({ dir, mode, }: {
     dir: string;
-    mode: "dev" | "build";
-}): Promise<ZudokuViteConfig>;
-export declare function loadConfig(rootPath: string, fileName: string): Promise<any>;
+    mode: ZudokuPluginOptions["mode"];
+}): ZudokuPluginOptions;
+export declare function getViteConfig(dir: string, configEnv: ZudokuConfigEnv): Promise<InlineConfig>;

package/dist/vite/config.js

@@ -1,15 +1,14 @@
+import { vitePluginSsrCss } from "@hiogawa/vite-plugin-ssr-css";
 import autoprefixer from "autoprefixer";
-import esbuild from "esbuild";
 import { stat } from "node:fs/promises";
 import path from "node:path";
 import colors from "picocolors";
 import tailwindcss from "tailwindcss";
+import { loadConfigFromFile, mergeConfig, } from "vite";
 import tailwindConfig from "../app/tailwind.js";
 import { logger } from "../cli/common/logger.js";
 import { isPortAvailable } from "../cli/common/utils/ports.js";
 import { validateConfig } from "../config/validators/validate.js";
-import { externalModules } from "./common.js";
-import { COMPILED_CONFIG_PATH } from "./plugin-config.js";
 import vitePlugin from "./plugin.js";
 export const zuploConfigFiles = [
     "zudoku.config.js",
@@ -21,19 +20,43 @@ export const zuploConfigFiles = [
 const fileExists = (path) => stat(path)
     .then(() => true)
     .catch(() => false);
-export async function loadZuploConfig(rootDir) {
+let configPath;
+export async function getConfigFilePath(rootDir) {
+    if (configPath) {
+        return configPath;
+    }
     for (const fileName of zuploConfigFiles) {
         const filepath = path.join(rootDir, fileName);
-        try {
-            if (await fileExists(filepath)) {
-                logger.info(colors.yellow(`loaded config file `) + colors.dim(filepath), { timestamp: true });
-                const config = await loadConfig(rootDir, fileName);
-                return config.default;
-            }
+        if (await fileExists(filepath)) {
+            configPath = filepath;
+            return filepath;
         }
-        catch (e) {
-            logger.error(e);
+    }
+    throw new Error(`No zudoku config file found in project root.`);
+}
+let config;
+export async function loadZuploConfig(rootDir, configEnv) {
+    if (config) {
+        return config;
+    }
+    const filepath = await getConfigFilePath(rootDir);
+    try {
+        logger.info(colors.yellow(`loaded config file `) + colors.dim(filepath), {
+            timestamp: true,
+        });
+        // NOTE: This function technically is for loading vite configs, but it
+        // doesn't actually have anything to do with vite config, it just loads
+        // typescript files. So we can use it to load our zudoku config file.
+        // It is possible they change this and it wont work in the future.
+        const loaded = await loadConfigFromFile(configEnv, filepath, rootDir);
+        if (!loaded) {
+            throw new Error(`Failed to load config file: ${filepath}`);
         }
+        config = loaded.config;
+        return config;
+    }
+    catch (e) {
+        logger.error(e);
     }
     // Default config
     logger.error(colors.red(`no zudoku config file found in project root.`), {
@@ -41,7 +64,7 @@ export async function loadZuploConfig(rootDir) {
     });
     process.exit(1);
 }
-export function getModuleDir() {
+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 = new URL("../../", import.meta.url).pathname;
@@ -52,24 +75,35 @@ export function getModuleDir() {
         return moduleDir;
     }
 }
-export function getAppMainTsxPath() {
+export function getAppClientEntryPath() {
     const modDir = getModuleDir();
-    return path.join(modDir, "src", "app", "main.tsx");
+    return path.join(modDir, "src", "app", "entry.client.tsx");
 }
-export async function getViteConfig({ dir, mode, }) {
+export function getAppServerEntryPath() {
+    const modDir = getModuleDir();
+    return path.join(modDir, "src", "app", "entry.server.tsx");
+}
+export function getPluginOptions({ dir, mode, }) {
     const moduleDir = getModuleDir();
-    const config = await loadZuploConfig(dir);
+    return {
+        ...config,
+        rootDir: dir,
+        moduleDir,
+        mode,
+    };
+}
+export async function getViteConfig(dir, configEnv) {
+    const config = await loadZuploConfig(dir, configEnv);
     validateConfig(config);
     let websocketPort = 9800;
     while (!(await isPortAvailable("localhost", websocketPort)) &&
         websocketPort < 9999) {
         websocketPort++;
     }
-    const pluginOptions = {
-        ...config,
-        rootDir: dir,
-        moduleDir,
-    };
+    const pluginOptions = getPluginOptions({
+        dir,
+        mode: process.env.ZUDOKU_INTERNAL_DEV ? "internal" : "module",
+    });
     const viteConfig = {
         root: dir,
         appType: "custom",
@@ -81,6 +115,10 @@ export async function getViteConfig({ dir, mode, }) {
         worker: {
             format: "es",
         },
+        ssr: {
+            target: "node",
+            noExternal: [],
+        },
         server: {
             middlewareMode: true,
             open: true,
@@ -92,37 +130,62 @@ export async function getViteConfig({ dir, mode, }) {
                     `${dir}/dist`,
                     `${dir}/lib`,
                     `${dir}/.git`,
-                    `${moduleDir}/src/vite`,
-                    `${moduleDir}/src/cli`,
+                    `${pluginOptions.moduleDir}/src/vite`,
+                    `${pluginOptions.moduleDir}/src/cli`,
                 ],
             },
         },
         build: {
-            outDir: path.resolve(dir, "dist"),
+            ssr: configEnv.isSsrBuild,
+            sourcemap: true,
+            outDir: path.resolve(path.join(dir, "dist", configEnv.isSsrBuild ? "server" : "")),
+            emptyOutDir: true,
             rollupOptions: {
-                external: [...externalModules],
-                input: mode === "build" ? "zudoku/app/main.tsx" : undefined,
+                input: configEnv.command === "build"
+                    ? configEnv.isSsrBuild
+                        ? [
+                            "zudoku/app/entry.server.tsx",
+                            "zudoku/app/zudoku-manifest.ts",
+                            configPath,
+                        ]
+                        : "zudoku/app/entry.client.tsx"
+                    : undefined,
             },
         },
         optimizeDeps: {
-            entries: [getAppMainTsxPath()],
+            entries: [
+                configEnv.isSsrBuild
+                    ? getAppServerEntryPath()
+                    : getAppClientEntryPath(),
+            ],
+            include: ["react-dom/client"],
             exclude: [
                 // Vite does not like optimizing the worker dependency
                 "zudoku/openapi-worker",
-                "virtual:zudoku-openapi-worker",
+                "worker",
             ],
         },
-        plugins: [vitePlugin(pluginOptions)],
+        plugins: [
+            vitePluginSsrCss({
+                entries: [`${pluginOptions.moduleDir}/src/app/entry.client.tsx`],
+            }),
+            ...vitePlugin(pluginOptions),
+        ],
         css: {
             postcss: {
                 plugins: [
                     tailwindcss({
                         ...tailwindConfig,
                         content: [
-                            `${moduleDir}/src/**/*.{js,ts,jsx,tsx,md,mdx}`,
+                            // 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}`,
+                            // Users custom components
+                            // NOTE: For now we are requiring components to be in `src` folder
+                            // would be good to make this more dynamic though because users
+                            // could put their components anywhere
                             `${dir}/src/**/*.{js,ts,jsx,tsx,md,mdx}`,
                         ],
                     }),
@@ -131,30 +194,12 @@ export async function getViteConfig({ dir, mode, }) {
             },
         },
     };
-    return viteConfig;
-}
-export async function loadConfig(rootPath, fileName) {
-    const compiledFilepath = path.join(rootPath, COMPILED_CONFIG_PATH);
-    const filepath = path.join(rootPath, fileName);
-    try {
-        await esbuild.build({
-            entryPoints: [filepath],
-            bundle: true,
-            keepNames: true,
-            treeShaking: true,
-            minifyIdentifiers: false,
-            minifySyntax: false,
-            minifyWhitespace: false,
-            platform: "node",
-            target: "es2022",
-            format: "esm",
-            outfile: compiledFilepath,
-        });
-    }
-    catch (error) {
-        error.message = `TypeScript Error in ${filepath}:\n${error.message}`;
-        throw error;
+    // If the user has supplied a vite.config file, merge it with ours
+    const userConfig = await loadConfigFromFile(configEnv, undefined, dir);
+    if (userConfig) {
+        const merged = mergeConfig(userConfig.config, viteConfig, true);
+        return merged;
     }
-    return await import(compiledFilepath);
+    return viteConfig;
 }
 //# sourceMappingURL=config.js.map

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,10 +1,13 @@
 import assert from "node:assert";
 import path from "node:path";
 import test from "node:test";
-import { loadConfig } from "./config.js";
-test("Should correctly load zudoku.config.ts file", async (t) => {
+import { loadZuploConfig } from "./config.js";
+test("Should correctly load zudoku.config.ts file", async () => {
     const rootPath = path.resolve("../../samples/with-config/");
-    const config = await loadConfig(rootPath, "zudoku.config.ts");
-    assert.equal(config.default.ui.headerTitle, "My Portal");
+    const config = await loadZuploConfig(rootPath, {
+        mode: "development",
+        command: "build",
+    });
+    assert.equal(config.metadata?.title, "My Portal");
 });
 //# 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,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,IAAI,CAAC,6CAA6C,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;IAC9D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;IAC9D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC"}
+{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/vite/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE;QAC7C,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IACH,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;AACpD,CAAC,CAAC,CAAC"}

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

@@ -1,10 +1,11 @@
 export declare class DevServer {
     private options;
     private server;
-    private viteServer;
+    private currentConfig;
     constructor(options: {
         port: number;
         dir: string;
+        ssr?: boolean;
     });
     watch(): Promise<void>;
     start(): Promise<void>;

package/dist/vite/dev-server.js

@@ -5,51 +5,79 @@ import { createServer as createViteServer } from "vite";
 import { logger } from "../cli/common/logger.js";
 import { printDiagnosticsToConsole } from "../cli/common/output.js";
 import { createGraphQLServer } from "../lib/oas/graphql/index.js";
-import { getAppMainTsxPath, getViteConfig, zuploConfigFiles, } from "./config.js";
+import { getAppClientEntryPath, getAppServerEntryPath, getViteConfig, loadZuploConfig, zuploConfigFiles, } from "./config.js";
 import { getDevHtml } from "./html.js";
 export class DevServer {
     options;
     server;
-    viteServer;
+    currentConfig;
     constructor(options) {
         this.options = options;
     }
     async watch() {
-        // Watches zudoku files for changes and restarts the server
+        // Watches files for changes and restarts the server
         const watcher = chokidar.watch(zuploConfigFiles.map((filename) => path.join(this.options.dir, filename)), {
             persistent: true,
         });
         watcher.on("change", async () => {
             await this.stop();
             await this.start();
+            this.currentConfig = await loadZuploConfig(this.options.dir, {
+                command: "serve",
+                mode: "development",
+            });
             printDiagnosticsToConsole(`Configuration file changed. Restarted server.`);
         });
         await this.start();
     }
     async start() {
         const app = express();
-        const viteConfig = await getViteConfig({
-            dir: this.options.dir,
-            mode: "dev",
+        const viteConfig = await getViteConfig(this.options.dir, {
+            mode: "development",
+            command: "serve",
+            isSsrBuild: this.options.ssr,
+        });
+        const vite = await createViteServer(viteConfig);
+        this.currentConfig = await loadZuploConfig(this.options.dir, {
+            command: "serve",
+            mode: "development",
         });
-        this.viteServer = await createViteServer(viteConfig);
         const graphql = createGraphQLServer({
             graphqlEndpoint: "/__z/graphql",
         });
         app.use(graphql.graphqlEndpoint, graphql);
-        app.use(this.viteServer.middlewares);
-        app.use("*", async (req, res) => {
+        app.use(vite.middlewares);
+        printDiagnosticsToConsole(`Server-side rendering ${this.options.ssr ? "enabled" : "disabled"}`);
+        app.use("*", async (request, response) => {
+            const url = request.originalUrl;
             try {
-                const entryJs = getAppMainTsxPath();
+                const entryJs = getAppClientEntryPath();
                 const rawHtml = getDevHtml(entryJs);
-                const indexHtml = await this.viteServer.transformIndexHtml(req.url, rawHtml);
-                // Send the transformed index.html back to the client
-                res.status(200).set({ "Content-Type": "text/html" }).end(indexHtml);
+                const template = await vite.transformIndexHtml(url, rawHtml);
+                if (this.options.ssr) {
+                    if (!this.currentConfig) {
+                        throw new Error("No config loaded");
+                    }
+                    const module = await vite.ssrLoadModule(getAppServerEntryPath());
+                    const render = module.render;
+                    void render({
+                        template,
+                        request,
+                        response,
+                        config: this.currentConfig,
+                    });
+                }
+                else {
+                    response
+                        .status(200)
+                        .set({ "Content-Type": "text/html" })
+                        .end(template);
+                }
             }
             catch (e) {
-                this.viteServer.ssrFixStacktrace(e);
+                vite.ssrFixStacktrace(e);
                 logger.error(e);
-                res.status(500).end(e.message);
+                response.status(500).end(e.message);
             }
         });
         return new Promise((resolve) => {