refactor: use source dir to get app path in config

Author: james-elicx

packages/cloudflare/src/cli/build/index.ts

@@ -1,7 +1,7 @@
-import { containsDotNextDir, getConfig } from "../config";
-import type { ProjectOptions } from "../config";
+import type { Config } from "../config";
 import { buildNextjsApp } from "./build-next-app";
 import { buildWorker } from "./build-worker";
+import { containsDotNextDir } from "../config";
 import { cpSync } from "node:fs";
 import { join } from "node:path";
 import { rm } from "node:fs/promises";
@@ -11,25 +11,23 @@ import { rm } from "node:fs/promises";
  *
  * It saves the output in a `.worker-next` directory
  *
- * @param projectOpts The options for the project
+ * @param config Build config
  */
-export async function build(projectOpts: ProjectOptions): Promise<void> {
-  if (!projectOpts.skipNextBuild) {
+export async function build(config: Config): Promise<void> {
+  if (!config.build.skipNextBuild) {
     // Build the next app
-    await buildNextjsApp(projectOpts.sourceDir);
+    await buildNextjsApp(config.paths.sourceDir);
   }
 
-  if (!containsDotNextDir(projectOpts.sourceDir)) {
-    throw new Error(`.next folder not found in ${projectOpts.sourceDir}`);
+  if (!containsDotNextDir(config.paths.sourceDir)) {
+    throw new Error(`.next folder not found in ${config.paths.sourceDir}`);
   }
 
   // Clean the output directory
-  await cleanDirectory(projectOpts.outputDir);
+  await cleanDirectory(config.paths.outputDir);
 
   // Copy the .next directory to the output directory so it can be mutated.
-  cpSync(join(projectOpts.sourceDir, ".next"), join(projectOpts.outputDir, ".next"), { recursive: true });
-
-  const config = getConfig(projectOpts);
+  cpSync(join(config.paths.sourceDir, ".next"), join(config.paths.outputDir, ".next"), { recursive: true });
 
   await buildWorker(config);
 }

packages/cloudflare/src/cli/config.ts

@@ -49,8 +49,9 @@ export type Config = {
  * @returns The configuration, see `Config`
  */
 export function getConfig(projectOpts: ProjectOptions): Config {
+  const sourceDirDotNext = join(projectOpts.sourceDir, ".next");
   const dotNext = join(projectOpts.outputDir, ".next");
-  const appPath = getNextjsApplicationPath(dotNext).replace(/\/$/, "");
+  const appPath = getNextjsApplicationPath(sourceDirDotNext).replace(/\/$/, "");
   const standaloneRoot = join(dotNext, "standalone");
   const standaloneApp = join(standaloneRoot, appPath);
   const standaloneAppDotNext = join(standaloneApp, ".next");

packages/cloudflare/src/cli/index.ts

@@ -2,6 +2,7 @@
 import { build } from "./build";
 import { existsSync } from "node:fs";
 import { getArgs } from "./args";
+import { getConfig } from "./config";
 import { resolve } from "node:path";
 
 const nextAppDir = resolve(".");
@@ -18,9 +19,11 @@ if (!["js", "cjs", "mjs", "ts"].some((ext) => existsSync(`./next.config.${ext}`)
 
 const { skipNextBuild, outputDir, minify } = getArgs();
 
-await build({
+const config = getConfig({
   sourceDir: nextAppDir,
   outputDir: resolve(outputDir ?? nextAppDir, ".worker-next"),
   skipNextBuild,
   minify,
 });
+
+await build(config);