Rename command definition behaviour from "useConfigRedirect" to "useC…

…onfigRedirectIfAvailable"
cloudflare · Jan 8, 2025 · 893f7e9 · 893f7e9
1 parent fc72a15
commit 893f7e9
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/packages/wrangler/src/core/register-yargs-command.ts b/packages/wrangler/src/core/register-yargs-command.ts
@@ -104,7 +104,8 @@ function createHandler(def: CommandDefinition) {
 						def.behaviour?.provideConfig ?? true
 							? readConfig(args, {
 									hideWarnings: !(def.behaviour?.printConfigWarnings ?? true),
-									useRedirectIfAvailable: def.behaviour?.useConfigRedirect,
+									useRedirectIfAvailable:
+										def.behaviour?.useConfigRedirectIfAvailable,
 								})
 							: defaultWranglerConfig,
 					errors: { UserError, FatalError },

diff --git a/packages/wrangler/src/core/types.ts b/packages/wrangler/src/core/types.ts
@@ -120,7 +120,7 @@ export type CommandDefinition<
 		/**
 		 * If true, then look for a redirect file at `.wrangler/deploy/config.json` and use that to find the Wrangler configuration file.
 		 */
-		useConfigRedirect?: boolean;
+		useConfigRedirectIfAvailable?: boolean;
 	};
 
 	/**

diff --git a/packages/wrangler/src/versions/deploy.ts b/packages/wrangler/src/versions/deploy.ts
@@ -8,7 +8,6 @@ import {
 	spinnerWhile,
 } from "@cloudflare/cli/interactive";
 import { fetchResult } from "../cfetch";
-import { readConfig } from "../config";
 import { createCommand } from "../core/create-command";
 import { UserError } from "../errors";
 import { isNonInteractiveOrCI } from "../is-interactive";
@@ -49,7 +48,7 @@ export const versionsDeployCommand = createCommand({
 		status: "stable",
 	},
 	behaviour: {
-		provideConfig: false,
+		useConfigRedirectIfAvailable: true,
 	},
 
 	args: {
@@ -101,8 +100,7 @@ export const versionsDeployCommand = createCommand({
 		},
 	},
 	positionalArgs: ["version-specs"],
-	handler: async function versionsDeployHandler(args) {
-		const config = readConfig(args, { useRedirectIfAvailable: true });
+	handler: async function versionsDeployHandler(args, { config }) {
 		metrics.sendMetricsEvent(
 			"deploy worker versions",
 			{},

diff --git a/packages/wrangler/src/versions/upload.ts b/packages/wrangler/src/versions/upload.ts
@@ -282,8 +282,7 @@ export const versionsUploadCommand = createCommand({
 		},
 	},
 	behaviour: {
-		provideConfig: true,
-		useConfigRedirect: true,
+		useConfigRedirectIfAvailable: true,
 	},
 	handler: async function versionsUploadHandler(args, { config }) {
 		const entry = await getEntry(args, config, "versions upload");
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ export type CommandDefinition< @@
     		/**
     		 * If true, then look for a redirect file at `.wrangler/deploy/config.json` and use that to find the Wrangler configuration file.
     		 */
-    		useConfigRedirect?: boolean;
+    		useConfigRedirectIfAvailable?: boolean;
     	};
     	/**
@@ Expand Down @@