update

Author: iuioiua

src/app_test.tsx

@@ -426,9 +426,7 @@ Deno.test.ignore("FreshApp - finish setup", async () => {
     app,
     await ProdBuildCache.fromSnapshot({
       ...app.config,
-      build: {
-        outDir: "foo",
-      },
+      buildOutDir: "foo",
     }, getIslandRegistry(app).size),
   );
 

src/build_cache.ts

@@ -104,7 +104,7 @@ export class ProdBuildCache implements BuildCache {
     if (info === undefined) return null;
 
     const base = info.generated
-      ? this.#config.build.outDir
+      ? this.#config.buildOutDir
       : this.#config.staticDir;
     const filePath = info.generated
       ? path.join(base, "static", pathname)

src/config.ts

@@ -20,13 +20,7 @@ export interface FreshConfig {
 /**
  * The final resolved Fresh configuration where fields the user didn't specify are set to the default values.
  */
-export interface ResolvedFreshConfig {
-  root: string;
-  build: {
-    outDir: string;
-  };
-  basePath: string;
-  staticDir: string;
+export interface ResolvedFreshConfig extends Required<FreshConfig> {
   /**
    * Tells you in which mode Fresh is currently running in.
    */
@@ -58,15 +52,13 @@ export function normalizeConfig(options: FreshConfig): ResolvedFreshConfig {
 
   return {
     root,
-    build: {
-      outDir: options.buildOutDir ?? path.join(root, "_fresh"),
-    },
+    buildOutDir: options.buildOutDir ?? path.join(root, "_fresh"),
     basePath: options.basePath ?? "",
     staticDir: options.staticDir ?? path.join(root, "static"),
     mode: "production",
   };
 }
 
 export function getSnapshotPath(config: ResolvedFreshConfig): string {
-  return path.join(config.build.outDir, "snapshot.json");
+  return path.join(config.buildOutDir, "snapshot.json");
 }

src/dev/builder.ts

@@ -104,8 +104,8 @@ export class Builder implements FreshBuilder {
   }
 
   async #build<T>(app: App<T>, dev: boolean): Promise<void> {
-    const { build } = app.config;
-    const staticOutDir = path.join(build.outDir, "static");
+    const { buildOutDir } = app.config;
+    const staticOutDir = path.join(buildOutDir, "static");
 
     if (!this.#addedInternalTransforms) {
       this.#addedInternalTransforms = true;
@@ -206,7 +206,7 @@ export class Builder implements FreshBuilder {
     if (!dev) {
       // deno-lint-ignore no-console
       console.log(
-        `Assets written to: ${colors.cyan(build.outDir)}`,
+        `Assets written to: ${colors.cyan(buildOutDir)}`,
       );
     }
   }

src/dev/dev_build_cache.ts

@@ -188,8 +188,8 @@ export class DiskBuildCache implements DevBuildCache {
     this.#processedFiles.set(pathname, hash);
 
     const outDir = pathname === "/metafile.json"
-      ? this.config.build.outDir
-      : path.join(this.config.build.outDir, "static");
+      ? this.config.buildOutDir
+      : path.join(this.config.buildOutDir, "static");
     const filePath = path.join(outDir, pathname);
     assertInDir(filePath, outDir);
 
@@ -204,7 +204,7 @@ export class DiskBuildCache implements DevBuildCache {
 
   async flush(): Promise<void> {
     const staticDir = this.config.staticDir;
-    const outDir = this.config.build.outDir;
+    const outDir = this.config.buildOutDir;
 
     if (await fsAdapter.isDirectory(staticDir)) {
       const entries = fsAdapter.walk(staticDir, {
@@ -272,7 +272,7 @@ export class DiskBuildCache implements DevBuildCache {
       }
 
       if (maybeHash === null) {
-        const filePath = path.join(this.config.build.outDir, "static", name);
+        const filePath = path.join(this.config.buildOutDir, "static", name);
         const file = await Deno.open(filePath);
         hash = await hashContent(file.readable);
       }

src/middlewares/static_files_test.ts

@@ -136,9 +136,7 @@ Deno.test("static files - disables caching in development", async () => {
       buildCache,
       config: {
         basePath: "",
-        build: {
-          outDir: "",
-        },
+        buildOutDir: "",
         mode: "development",
         root: ".",
         staticDir: "",
@@ -164,9 +162,7 @@ Deno.test("static files - enables caching in production", async () => {
       buildCache,
       config: {
         basePath: "",
-        build: {
-          outDir: "",
-        },
+        buildOutDir: "",
         mode: "production",
         root: ".",
         staticDir: "",

src/test_utils.ts

@@ -52,9 +52,7 @@ export class FakeServer {
 }
 
 const DEFAULT_CONFIG: ResolvedFreshConfig = {
-  build: {
-    outDir: "",
-  },
+  buildOutDir: "",
   mode: "production",
   basePath: "",
   root: "",

tests/test_utils.tsx

@@ -64,7 +64,7 @@ export function Doc(props: { children?: ComponentChildren; title?: string }) {
 export async function buildProd(app: App<unknown>) {
   const outDir = await Deno.makeTempDir();
   // FIXME: Sharing build output path is weird
-  app.config.build.outDir = outDir;
+  app.config.buildOutDir = outDir;
   const builder = new Builder({});
   await builder.build(app);
   const cache = await ProdBuildCache.fromSnapshot(