fixup! proposal

Author: vicb

packages/cloudflare/src/cli/build/utils/create-config-files.ts

@@ -92,24 +92,23 @@ export async function getLatestCompatDate(): Promise<string | undefined> {
  *
  * If the user refuses an error is thrown (since the file is mandatory).
  *
- * @param configPath The path to the config file, relative to the source directory
  * @param sourceDir The source directory for the project
+ * @return The path to the created source file
  */
-export async function createOpenNextConfigIfNotExistent(
-	configPath: string,
-	sourceDir: string
-): Promise<void> {
-	const openNextConfigPath = join(sourceDir, configPath);
+export async function createOpenNextConfigIfNotExistent(sourceDir: string): Promise<string> {
+	const openNextConfigPath = join(sourceDir, "open-next.config.ts");
 
 	if (!existsSync(openNextConfigPath)) {
 		const answer = await askConfirmation(
-			`Missing required \`${configPath}\` file, do you want to create one?`
+			"Missing required `open-next.config.ts` file, do you want to create one?"
 		);
 
 		if (!answer) {
-			throw new Error(`The \`${configPath}\` file is required, aborting!`);
+			throw new Error("The `open-next.config.ts` file is required, aborting!");
 		}
 
 		cpSync(join(getPackageTemplatesDirPath(), "open-next.config.ts"), openNextConfigPath);
 	}
+
+	return openNextConfigPath;
 }

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

@@ -22,7 +22,7 @@ async function buildCommand(
 		skipNextBuild: boolean;
 		noMinify: boolean;
 		skipWranglerConfigCheck: boolean;
-		openNextConfigPath: string;
+		openNextConfigPath: string | undefined;
 	}>
 ): Promise<void> {
 	printHeaders("build");
@@ -69,8 +69,7 @@ export function addBuildCommand<T extends yargs.Argv>(y: T) {
 				})
 				.option("openNextConfigPath", {
 					type: "string",
-					default: "open-next.config.ts",
-					desc: "Path to OpenNext configuration file, relative to the source directory",
+					desc: "Path to the OpenNext configuration file",
 				}),
 		(args) => buildCommand(withWranglerPassthroughArgs(args))
 	);

packages/cloudflare/src/cli/commands/utils.ts

@@ -33,14 +33,27 @@ export function printHeaders(command: string) {
 }
 
 /**
- * Compile the OpenNext config, and ensure it is for Cloudflare.
+ * Compile the OpenNext config.
  *
+ * When users do not specify a custom config file (using `----openNextConfigPath`),
+ * the CLI will offer to create one.
+ *
+ * When users specify a custom config file but it doesn't exist, we throw an Error.
+ *
+ * @param configPath Optional path to the config file. Absolute or relative to cwd.
  * @returns OpenNext config.
  */
-export async function compileConfig(configPath: string) {
-	await createOpenNextConfigIfNotExistent(configPath, nextAppDir);
+export async function compileConfig(configPath: string | undefined) {
+	if (configPath && !existsSync(configPath)) {
+		throw new Error(`Custom config file not found at ${configPath}`);
+	}
+
+	if (!configPath) {
+		configPath = await createOpenNextConfigIfNotExistent(nextAppDir);
+	}
 
-	const { config, buildDir } = await compileOpenNextConfig(nextAppDir, configPath, { compileEdge: true });
+	// TODO: remove the hack passing the `configPath` as the `baseDir` when https://github.com/opennextjs/opennextjs-aws/pull/972 is merged
+	const { config, buildDir } = await compileOpenNextConfig(configPath, "", { compileEdge: true });
 	ensureCloudflareConfig(config);
 
 	return { config, buildDir };