BREAKING(core): move FreshConfig.build.outDir to FreshConfig.buildOutDir

src/app_test.tsx

@@ -469,9 +469,7 @@ Deno.test.ignore("App - 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/build_cache_test.ts

@@ -21,9 +21,7 @@ Deno.test({
       mode: "production",
       basePath: "/",
       staticDir: path.join(tmp, "static"),
-      build: {
-        outDir: path.join(tmp, "dist"),
-      },
+      buildOutDir: path.join(tmp, "dist"),
     };
     await Deno.mkdir(path.join(tmp, "static", ".well-known"), {
       recursive: true,

src/config.ts

@@ -9,16 +9,14 @@ export interface FreshConfig {
    * @default Deno.cwd()
    */
   root?: string;
-  build?: {
-    /**
-     * The directory to write generated files to when `dev.ts build` is run.
-     *
-     * This can be an absolute path, a file URL or a relative path.
-     * Relative paths are resolved against the `root` option.
-     * @default "_fresh"
-     */
-    outDir?: string;
-  };
+  /**
+   * The directory to write generated files to when `dev.ts build` is run.
+   *
+   * This can be an absolute path, a file URL or a relative path.
+   * Relative paths are resolved against the `root` option.
+   * @default "_fresh"
+   */
+  buildOutDir?: string;
   /**
    * Serve fresh from a base path instead of from the root.
    *   "/foo/bar" -> http://localhost:8000/foo/bar
@@ -38,17 +36,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;
-  };
-  /**
-   * Serve fresh from a base path instead of from the root.
-   * "/foo/bar" -> http://localhost:8000/foo/bar
-   */
-  basePath: string;
-  staticDir: string;
+export interface ResolvedFreshConfig extends Required<FreshConfig> {
   /**
    * The mode Fresh can run in.
    */
@@ -92,15 +80,13 @@ export function normalizeConfig(options: FreshConfig): ResolvedFreshConfig {
 
   return {
     root,
-    build: {
-      outDir: parseDirPath(options.build?.outDir ?? "_fresh", root),
-    },
+    buildOutDir: parseDirPath(options.buildOutDir ?? "_fresh", root),
     basePath: options.basePath ?? "",
     staticDir: parseDirPath(options.staticDir ?? "static", root),
     mode: "production",
   };
 }
 
 export function getSnapshotPath(config: ResolvedFreshConfig): string {
-  return path.join(config.build.outDir, "snapshot.json");
+  return path.join(config.buildOutDir, "snapshot.json");
 }

src/config_test.ts

@@ -49,30 +49,29 @@ Deno.test("normalizeConfig - root", () => {
 
 Deno.test("normalizeConfig - build.outDir", () => {
   const cwd = Deno.cwd().replaceAll("\\", "/");
-  const outDir = (options: FreshConfig) =>
-    normalizeConfig(options).build.outDir;
+  const outDir = (options: FreshConfig) => normalizeConfig(options).buildOutDir;
 
   // Default outDir
   expect(outDir({ root: "./src" })).toEqual(`${cwd}/src/_fresh`);
   expect(outDir({ root: "/src" })).toEqual("/src/_fresh");
   expect(outDir({ root: "file:///src" })).toEqual("/src/_fresh");
 
   // Relative outDir
-  expect(outDir({ root: "/src", build: { outDir: "dist" } })).toEqual(
+  expect(outDir({ root: "/src", buildOutDir: "dist" })).toEqual(
     "/src/dist",
   );
-  expect(outDir({ root: "/src", build: { outDir: "./dist" } })).toEqual(
+  expect(outDir({ root: "/src", buildOutDir: "./dist" })).toEqual(
     "/src/dist",
   );
 
   // Absolute outDir
-  expect(outDir({ root: "/src", build: { outDir: "/dist" } })).toEqual(
+  expect(outDir({ root: "/src", buildOutDir: "/dist" })).toEqual(
     "/dist",
   );
-  expect(outDir({ root: "/src", build: { outDir: "/dist/fresh" } })).toEqual(
+  expect(outDir({ root: "/src", buildOutDir: "/dist/fresh" })).toEqual(
     "/dist/fresh",
   );
-  expect(outDir({ root: "/src", build: { outDir: "file:///dist" } })).toEqual(
+  expect(outDir({ root: "/src", buildOutDir: "file:///dist" })).toEqual(
     "/dist",
   );
 });

src/dev/builder.ts

@@ -103,8 +103,8 @@ export class Builder {
   }
 
   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;
@@ -209,7 +209,7 @@ export class Builder {
     if (!dev) {
       // deno-lint-ignore no-console
       console.log(
-        `Assets written to: ${colors.cyan(build.outDir)}`,
+        `Assets written to: ${colors.cyan(buildOutDir)}`,
       );
     }
   }