zudoku 0.3.0-dev.13 → 0.3.0-dev.131

package/dist/lib/util/useScrollToAnchor.js

@@ -1,33 +1,47 @@
 import { useEffect } from "react";
 import { useLocation } from "react-router-dom";
 import { useViewportAnchor } from "../components/context/ViewportAnchorContext.js";
+import { DATA_ANCHOR_ATTR } from "../components/navigation/SidebarItem.js";
+const scrollIntoViewIfNeeded = (element, options = { block: "center" }) => {
+    if (!element)
+        return;
+    const rect = element.getBoundingClientRect();
+    const isInView = rect.top >= 0 &&
+        rect.left >= 0 &&
+        rect.bottom <=
+            (window.innerHeight || document.documentElement.clientHeight) &&
+        rect.right <= (window.innerWidth || document.documentElement.clientWidth);
+    if (isInView)
+        return;
+    element.scrollIntoView(options);
+};
 export const useScrollToAnchor = () => {
     const location = useLocation();
     const { setActiveAnchor } = useViewportAnchor();
     useEffect(() => {
         if (!location.hash)
             return;
-        const hash = location.hash.split("/")[0].slice(1);
-        const element = document.getElementById(decodeURIComponent(hash));
-        if (element) {
-            // on page navigation element might be in DOM but not yet scrollable, so wait for a frame
-            requestAnimationFrame(() => {
+        const hash = decodeURIComponent(location.hash.split("/")[0].slice(1));
+        const scrollToElement = () => {
+            const element = document.getElementById(hash);
+            const link = document.querySelector(`[${DATA_ANCHOR_ATTR}="${hash}"]`);
+            if (element) {
                 element.scrollIntoView();
+                scrollIntoViewIfNeeded(link);
                 requestIdleCallback(() => setActiveAnchor(hash));
+                return true;
+            }
+            return false;
+        };
+        if (!scrollToElement()) {
+            const observer = new MutationObserver((_, obs) => {
+                if (!scrollToElement())
+                    return;
+                obs.disconnect();
             });
-            return;
+            observer.observe(document.body, { childList: true, subtree: true });
+            return () => observer.disconnect();
         }
-        // on page load, the element might not be available yet
-        const observer = new MutationObserver((_mutations, obs) => {
-            const element = document.getElementById(decodeURIComponent(hash));
-            if (!element)
-                return;
-            element.scrollIntoView();
-            requestIdleCallback(() => setActiveAnchor(hash));
-            obs.disconnect();
-        });
-        observer.observe(document.body, { childList: true, subtree: true });
-        return () => observer.disconnect();
     }, [location.hash, setActiveAnchor]);
 };
 //# sourceMappingURL=useScrollToAnchor.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useScrollToAnchor.js","sourceRoot":"","sources":["../../../src/lib/util/useScrollToAnchor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AAEnF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,eAAe,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,CAAC,IAAI;YAAE,OAAO;QAE3B,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAElD,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAClE,IAAI,OAAO,EAAE,CAAC;YACZ,yFAAyF;YACzF,qBAAqB,CAAC,GAAG,EAAE;gBACzB,OAAO,CAAC,cAAc,EAAE,CAAC;gBACzB,mBAAmB,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YACnD,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,uDAAuD;QACvD,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,CAAC,UAAU,EAAE,GAAG,EAAE,EAAE;YACxD,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;YAClE,IAAI,CAAC,OAAO;gBAAE,OAAO;YAErB,OAAO,CAAC,cAAc,EAAE,CAAC;YACzB,mBAAmB,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YACjD,GAAG,CAAC,UAAU,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpE,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;IACrC,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;AACvC,CAAC,CAAC"}
+{"version":3,"file":"useScrollToAnchor.js","sourceRoot":"","sources":["../../../src/lib/util/useScrollToAnchor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAE3E,MAAM,sBAAsB,GAAG,CAC7B,OAAuB,EACvB,UAAiC,EAAE,KAAK,EAAE,QAAQ,EAAE,EACpD,EAAE;IACF,IAAI,CAAC,OAAO;QAAE,OAAO;IAErB,MAAM,IAAI,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAC7C,MAAM,QAAQ,GACZ,IAAI,CAAC,GAAG,IAAI,CAAC;QACb,IAAI,CAAC,IAAI,IAAI,CAAC;QACd,IAAI,CAAC,MAAM;YACT,CAAC,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC;QAC/D,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAE5E,IAAI,QAAQ;QAAE,OAAO;IAErB,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,eAAe,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,CAAC,IAAI;YAAE,OAAO;QAE3B,MAAM,IAAI,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtE,MAAM,eAAe,GAAG,GAAG,EAAE;YAC3B,MAAM,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC9C,MAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,IAAI,gBAAgB,KAAK,IAAI,IAAI,CAAC,CAAC;YAEvE,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,CAAC,cAAc,EAAE,CAAC;gBACzB,sBAAsB,CAAC,IAAI,CAAC,CAAC;gBAC7B,mBAAmB,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC;QAEF,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;YACvB,MAAM,QAAQ,GAAG,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;gBAC/C,IAAI,CAAC,eAAe,EAAE;oBAAE,OAAO;gBAC/B,GAAG,CAAC,UAAU,EAAE,CAAC;YACnB,CAAC,CAAC,CAAC;YAEH,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YAEpE,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QACrC,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;AACvC,CAAC,CAAC"}

package/dist/vite/build.js

@@ -2,20 +2,43 @@ 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}`,
         });
-        await writeFile(`${options.dir}/dist/index.html`, html, "utf-8");
+        try {
+            const writtenFiles = await prerender(html, options.dir);
+            if (writtenFiles.includes("index.html")) {
+                return;
+            }
+            await writeFile(`${options.dir}/dist/index.html`, html, "utf-8");
+        }
+        catch (e) {
+            // dynamic imports in prerender swallow the stack trace, so we log it here
+            // eslint-disable-next-line no-console
+            console.error(e);
+        }
         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,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,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAExD,IAAI,YAAY,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;gBACxC,OAAO;YACT,CAAC;YAED,MAAM,SAAS,CAAC,GAAG,OAAO,CAAC,GAAG,kBAAkB,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0EAA0E;YAC1E,sCAAsC;YACtC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;QAED,OAAO;IACT,CAAC;IAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAClC,CAAC"}

package/dist/vite/config.d.ts

@@ -1,14 +1,22 @@
-import { InlineConfig } from "vite";
-import { ZudokuConfig } from "../config/config.js";
+import { type ConfigEnv, type InlineConfig } from "vite";
+import type { 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";
+    forceReload?: boolean;
+};
+export type LoadedConfig = ZudokuConfig & {
+    vite: {
+        dependencies: string[];
+        path: string;
+    };
+};
+export declare function loadZudokuConfig(rootDir: string, configEnv: ZudokuConfigEnv): Promise<LoadedConfig>;
+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,54 @@ export const zuploConfigFiles = [
 const fileExists = (path) => stat(path)
     .then(() => true)
     .catch(() => false);
-export async function loadZuploConfig(rootDir) {
+let configPath;
+export async function getConfigFilePath(rootDir) {
+    // Also check if file exists, so renaming the file will trigger a restart as well
+    if (configPath && (await fileExists(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);
+    }
+    configPath = undefined;
+    throw new Error(`No zudoku config file found in project root.`);
+}
+let config;
+export async function loadZudokuConfig(rootDir, configEnv) {
+    if (!configEnv.forceReload && 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}`);
         }
+        // Using `loaded` directly breaks Vite in unexpected ways:
+        // Errors with: "(intermediate value).glob is not a function"
+        // Maybe worth revisiting at some point in time
+        config = {
+            ...loaded.config,
+            vite: {
+                dependencies: loaded.dependencies,
+                path: loaded.path,
+            },
+        };
+        return config;
+    }
+    catch (e) {
+        logger.error(e);
     }
     // Default config
     logger.error(colors.red(`no zudoku config file found in project root.`), {
@@ -41,7 +75,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 +86,36 @@ export function getModuleDir() {
         return moduleDir;
     }
 }
-export function getAppMainTsxPath() {
+export function getAppClientEntryPath() {
+    const modDir = getModuleDir();
+    return path.join(modDir, "src", "app", "entry.client.tsx");
+}
+export function getAppServerEntryPath() {
     const modDir = getModuleDir();
-    return path.join(modDir, "src", "app", "main.tsx");
+    return path.join(modDir, "src", "app", "entry.server.tsx");
 }
-export async function getViteConfig({ dir, mode, }) {
+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 loadZudokuConfig(dir, configEnv);
+    const onConfigChange = () => loadZudokuConfig(dir, { ...configEnv, forceReload: true });
     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 +127,10 @@ export async function getViteConfig({ dir, mode, }) {
         worker: {
             format: "es",
         },
+        ssr: {
+            target: "node",
+            noExternal: [],
+        },
         server: {
             middlewareMode: true,
             open: true,
@@ -92,37 +142,60 @@ 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", 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, onConfigChange),
+        ],
         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}`,
+                            config.vite.path,
+                            ...config.vite.dependencies.map((dep) => `${path.dirname(config.vite.path)}/${dep}`),
+                            `${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 +204,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";
+import { loadZudokuConfig } 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 rootPath = path.resolve("../../examples/with-config/");
+    const config = await loadZudokuConfig(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,IAAI,EAAE;IAC7D,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,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,IAAI,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC7D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,QAAQ,EAAE;QAC9C,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,12 +1,12 @@
 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>;
     stop(): Promise<void>;
 }

package/dist/vite/dev-server.js

@@ -1,55 +1,65 @@
-import chokidar from "chokidar";
 import express from "express";
-import path from "node:path";
 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, loadZudokuConfig, } 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
-        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();
-            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 loadZudokuConfig(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) => {

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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"}