fixup! create a wrangler.toml file for the user in case one is not already present

fix broken logic and add way to opt out of wrangler config check

Author: dario-piotrowicz

packages/cloudflare/env.d.ts

@@ -3,6 +3,7 @@ declare global {
     interface ProcessEnv {
       __NEXT_PRIVATE_STANDALONE_CONFIG?: string;
       SKIP_NEXT_APP_BUILD?: string;
+      SKIP_WRANGLER_CONFIG_CHECK?: string;
       NEXT_PRIVATE_DEBUG_CACHE?: string;
       OPEN_NEXT_ORIGIN: string;
       NODE_ENV?: string;

packages/cloudflare/src/cli/args.ts

@@ -4,10 +4,11 @@ import { parseArgs } from "node:util";
 
 export function getArgs(): {
   skipNextBuild: boolean;
+  skipWranglerConfigCheck: boolean;
   outputDir?: string;
   minify: boolean;
 } {
-  const { skipBuild, output, noMinify } = parseArgs({
+  const { skipBuild, skipWranglerConfigCheck, output, noMinify } = parseArgs({
     options: {
       skipBuild: {
         type: "boolean",
@@ -22,6 +23,10 @@ export function getArgs(): {
         type: "boolean",
         default: false,
       },
+      skipWranglerConfigCheck: {
+        type: "boolean",
+        default: false,
+      },
     },
     allowPositionals: false,
   }).values;
@@ -35,6 +40,9 @@ export function getArgs(): {
   return {
     outputDir,
     skipNextBuild: skipBuild || ["1", "true", "yes"].includes(String(process.env.SKIP_NEXT_APP_BUILD)),
+    skipWranglerConfigCheck:
+      skipWranglerConfigCheck ||
+      ["1", "true", "yes"].includes(String(process.env.SKIP_WRANGLER_CONFIG_CHECK)),
     minify: !noMinify,
   };
 }

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

@@ -37,8 +37,6 @@ export async function build(projectOpts: ProjectOptions): Promise<void> {
   const require = createRequire(import.meta.url);
   const openNextDistDir = dirname(require.resolve("@opennextjs/aws/index.js"));
 
-  await createWranglerConfigIfNotExistent(projectOpts);
-
   await createOpenNextConfigIfNotExistent(projectOpts);
 
   const { config, buildDir } = await compileOpenNextConfig(baseDir);
@@ -103,6 +101,10 @@ export async function build(projectOpts: ProjectOptions): Promise<void> {
   // TODO: rely on options only.
   await bundleServer(projConfig, options);
 
+  if (!projectOpts.skipWranglerConfigCheck) {
+    await createWranglerConfigIfNotExistent(projectOpts);
+  }
+
   logger.info("OpenNext build complete.");
 }
 
@@ -200,10 +202,17 @@ async function createWranglerConfigIfNotExistent(projectOpts: ProjectOptions): P
 
   const wranglerConfigPath = join(projectOpts.sourceDir, "wrangler.jsonc");
 
-  const answer = await askConfirmation("Missing required Wrangler config file, do you want to create one?");
+  const answer = await askConfirmation(
+    "No `wrangler.(toml|json|jsonc)` config file found, do you want to create one?"
+  );
 
   if (!answer) {
-    console.warn("No Wrangler config file created");
+    console.warn(
+      "No Wrangler config file created" +
+        "\n" +
+        "(to avoid this check use the `--skipWranglerConfigCheck` flag or set a `SKIP_WRANGLER_CONFIG_CHECK` environment variable to `yes`)"
+    );
+    return;
   }
 
   const wranglerConfigTemplate = readFileSync(

packages/cloudflare/src/cli/config.ts

@@ -114,6 +114,8 @@ export type ProjectOptions = {
   outputDir: string;
   // Whether the Next.js build should be skipped (i.e. if the `.next` dir is already built)
   skipNextBuild: boolean;
+  // Whether the check to see if a wrangler config file exists should be skipped
+  skipWranglerConfigCheck: boolean;
   // Whether minification of the worker should be enabled
   minify: boolean;
 };

packages/cloudflare/src/cli/index.ts

@@ -6,11 +6,12 @@ import { build } from "./build/index.js";
 
 const nextAppDir = process.cwd();
 
-const { skipNextBuild, outputDir, minify } = getArgs();
+const { skipNextBuild, skipWranglerConfigCheck, outputDir, minify } = getArgs();
 
 await build({
   sourceDir: nextAppDir,
   outputDir: resolve(outputDir ?? nextAppDir, ".open-next"),
   skipNextBuild,
+  skipWranglerConfigCheck,
   minify,
 });