Apply feedback

Author: dan-lee

packages/zudoku/src/config/loader.ts

@@ -2,7 +2,6 @@ import { stat } from "node:fs/promises";
 import path from "node:path";
 import colors from "picocolors";
 import {
-  type build,
   type ConfigEnv,
   runnerImport,
   loadEnv as viteLoadEnv,
@@ -106,23 +105,6 @@ async function loadZudokuConfigWithMeta(
   return configWithMetadata;
 }
 
-type BuildResult = Awaited<ReturnType<typeof build>>;
-
-export function findOutputPathOfServerConfig(output: BuildResult) {
-  if (Array.isArray(output)) {
-    throw new Error("Expected a single output, but got an array");
-  }
-  if ("output" in output) {
-    const result = output.output.find(
-      (o) => "isEntry" in o && o.isEntry && o.fileName === "zudoku.config.js",
-    );
-    if (result) {
-      return result.fileName;
-    }
-  }
-  throw new Error("Could not find server config output file");
-}
-
 function loadEnv(configEnv: ConfigEnv, rootDir: string) {
   const envPrefix = ["ZUPLO_PUBLIC_", "ZUDOKU_PUBLIC_"];
   const localEnv = viteLoadEnv(configEnv.mode, rootDir, envPrefix);

packages/zudoku/src/vite/build.ts

@@ -1,13 +1,10 @@
 import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import path from "node:path";
 import { build as esbuild } from "esbuild";
-import { createBuilder } from "vite";
+import { createBuilder, type Rolldown } from "vite";
 import { ZuploEnv } from "../app/env.js";
 import { getZudokuRootDir } from "../cli/common/package-json.js";
-import {
-  findOutputPathOfServerConfig,
-  loadZudokuConfig,
-} from "../config/loader.js";
+import { type ConfigWithMeta, loadZudokuConfig } from "../config/loader.js";
 import { getIssuer } from "../lib/auth/issuer.js";
 import invariant from "../lib/util/invariant.js";
 import { joinUrl } from "../lib/util/joinUrl.js";
@@ -37,6 +34,9 @@ export async function runBuild(options: BuildOptions) {
   invariant(builder.environments.client, "Client environment is missing");
   invariant(builder.environments.ssr, "SSR environment is missing");
 
+  const distDir = path.resolve(path.join(dir, "dist"));
+  await rm(distDir, { recursive: true, force: true });
+
   const [clientResult, serverResult] = await Promise.all([
     builder.build(builder.environments.client),
     builder.build(builder.environments.ssr),
@@ -46,7 +46,11 @@ export async function runBuild(options: BuildOptions) {
     clientResult && !Array.isArray(clientResult) && "output" in clientResult,
     "Client build failed to produce valid output",
   );
-  invariant(serverResult, "SSR build failed to produce valid output");
+
+  invariant(
+    serverResult && !Array.isArray(serverResult) && "output" in serverResult,
+    "SSR build failed to produce valid output",
+  );
 
   const { config } = await loadZudokuConfig(
     { mode: "production", command: "build" },
@@ -102,18 +106,27 @@ export async function runBuild(options: BuildOptions) {
 
 type PrerenderOptions = {
   dir: string;
-  config: Awaited<ReturnType<typeof loadZudokuConfig>>["config"];
+  config: ConfigWithMeta;
   html: string;
   clientOutDir: string;
   serverOutDir: string;
-  serverResult: Awaited<ReturnType<typeof import("vite").build>>;
+  serverResult: Rolldown.RolldownOutput;
+};
+
+const findServerConfigFilename = (result: Rolldown.RolldownOutput) => {
+  const entry = result.output.find(
+    (o) => o.type === "chunk" && o.isEntry && o.fileName === "zudoku.config.js",
+  );
+  invariant(entry, "Could not find zudoku.config entry in server build output");
+
+  return entry.fileName;
 };
 
 const runPrerender = async (options: PrerenderOptions) => {
   const { dir, config, html, clientOutDir, serverOutDir, serverResult } =
     options;
   const issuer = await getIssuer(config);
-  const serverConfigFilename = findOutputPathOfServerConfig(serverResult);
+  const serverConfigFilename = findServerConfigFilename(serverResult);
 
   try {
     const { workerResults, rewrites } = await prerender({

packages/zudoku/src/vite/config.ts

@@ -142,7 +142,7 @@ export async function getViteConfig(
       client: {
         build: {
           outDir: path.resolve(path.join(dir, "dist", config.basePath ?? "")),
-          emptyOutDir: true,
+          emptyOutDir: false,
           rolldownOptions: {
             input:
               configEnv.command === "build"
@@ -157,7 +157,7 @@ export async function getViteConfig(
           outDir: path.resolve(
             path.join(dir, "dist", config.basePath ?? "", "server"),
           ),
-          emptyOutDir: true,
+          emptyOutDir: false,
           rolldownOptions: {
             logLevel: "warn",
             checks: {