rename internal var to wranglerConfigPath

Author: james-elicx

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

@@ -28,7 +28,7 @@ export async function deployCommand(args: WithWranglerArgs<{ cacheChunkSize: num
 	const wranglerConfig = readWranglerConfig(args);
 
 	const envVars = await getEnvFromPlatformProxy({
-		configPath: args.configPath,
+		configPath: args.wranglerConfigPath,
 		environment: args.env,
 	});
 
@@ -37,7 +37,7 @@ export async function deployCommand(args: WithWranglerArgs<{ cacheChunkSize: num
 	await populateCache(options, config, wranglerConfig, {
 		target: "remote",
 		environment: args.env,
-		configPath: args.configPath,
+		wranglerConfigPath: args.wranglerConfigPath,
 		cacheChunkSize: args.cacheChunkSize,
 	});
 

packages/cloudflare/src/cli/commands/populate-cache.ts

@@ -107,7 +107,7 @@ export function getCacheAssets(opts: BuildOptions): CacheAsset[] {
 type PopulateCacheOptions = {
 	target: WranglerTarget;
 	environment?: string;
-	configPath?: string;
+	wranglerConfigPath?: string;
 	cacheChunkSize?: number;
 };
 
@@ -148,7 +148,7 @@ async function populateR2IncrementalCache(
 			],
 			{
 				target: populateCacheOptions.target,
-				configPath: populateCacheOptions.configPath,
+				configPath: populateCacheOptions.wranglerConfigPath,
 				// R2 does not support the environment flag and results in the following error:
 				// Incorrect type for the 'cacheExpiry' field on 'HttpMetadata': the provided value is not of type 'date'.
 				environment: undefined,
@@ -200,7 +200,7 @@ async function populateKVIncrementalCache(
 		runWrangler(options, ["kv bulk put", quoteShellMeta(chunkPath), `--binding ${KV_CACHE_BINDING_NAME}`], {
 			target: populateCacheOptions.target,
 			environment: populateCacheOptions.environment,
-			configPath: populateCacheOptions.configPath,
+			configPath: populateCacheOptions.wranglerConfigPath,
 			logging: "error",
 		});
 
@@ -232,7 +232,7 @@ function populateD1TagCache(
 		{
 			target: populateCacheOptions.target,
 			environment: populateCacheOptions.environment,
-			configPath: populateCacheOptions.configPath,
+			configPath: populateCacheOptions.wranglerConfigPath,
 			logging: "error",
 		}
 	);
@@ -313,7 +313,7 @@ async function populateCacheCommand(
 	await populateCache(options, config, wranglerConfig, {
 		target,
 		environment: args.env,
-		configPath: args.configPath,
+		wranglerConfigPath: args.wranglerConfigPath,
 		cacheChunkSize: args.cacheChunkSize,
 	});
 }

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

@@ -27,7 +27,7 @@ export async function previewCommand(args: WithWranglerArgs<{ cacheChunkSize: nu
 	await populateCache(options, config, wranglerConfig, {
 		target: "local",
 		environment: args.env,
-		configPath: args.configPath,
+		wranglerConfigPath: args.wranglerConfigPath,
 		cacheChunkSize: args.cacheChunkSize,
 	});
 

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

@@ -28,7 +28,7 @@ export async function uploadCommand(args: WithWranglerArgs<{ cacheChunkSize: num
 	const wranglerConfig = readWranglerConfig(args);
 
 	const envVars = await getEnvFromPlatformProxy({
-		configPath: args.configPath,
+		configPath: args.wranglerConfigPath,
 		environment: args.env,
 	});
 
@@ -37,7 +37,7 @@ export async function uploadCommand(args: WithWranglerArgs<{ cacheChunkSize: num
 	await populateCache(options, config, wranglerConfig, {
 		target: "remote",
 		environment: args.env,
-		configPath: args.configPath,
+		wranglerConfigPath: args.wranglerConfigPath,
 		cacheChunkSize: args.cacheChunkSize,
 	});
 

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

@@ -15,8 +15,7 @@ import { createOpenNextConfigIfNotExistent, ensureCloudflareConfig } from "../bu
 export type WithWranglerArgs<T = unknown> = T & {
 	// Array of arguments that can be given to wrangler commands, including the `--config` and `--env` args.
 	wranglerArgs: string[];
-	configPath: string | undefined;
-	config: string | undefined;
+	wranglerConfigPath: string | undefined;
 	env: string | undefined;
 };
 
@@ -90,7 +89,7 @@ export function getNormalizedOptions(config: OpenNextConfig, buildDir = nextAppD
  * @returns Wrangler config.
  */
 export function readWranglerConfig(args: WithWranglerArgs) {
-	return unstable_readConfig({ env: args.env, config: args.configPath });
+	return unstable_readConfig({ env: args.env, config: args.wranglerConfigPath });
 }
 
 /**
@@ -115,12 +114,18 @@ export function withWranglerOptions<T extends yargs.Argv>(args: T) {
 		});
 }
 
+type WranglerInputArgs = {
+	configPath: string | undefined;
+	config: string | undefined;
+	env: string | undefined;
+};
+
 /**
  *
  * @param args
  * @returns An array of arguments that can be given to wrangler commands, including the `--config` and `--env` args.
  */
-function getWranglerArgs(args: Omit<WithWranglerArgs<{ _: (string | number)[] }>, "wranglerArgs">): string[] {
+function getWranglerArgs(args: WranglerInputArgs & { _: (string | number)[] }): string[] {
 	if (args.configPath) {
 		logger.warn("The `--configPath` flag is deprecated, please use `--config` instead.");
 
@@ -146,8 +151,12 @@ function getWranglerArgs(args: Omit<WithWranglerArgs<{ _: (string | number)[] }>
  * @param args
  * @returns The inputted args, and an array of arguments that can be given to wrangler commands, including the `--config` and `--env` args.
  */
-export function withWranglerPassthroughArgs<
-	T extends yargs.ArgumentsCamelCase<Omit<WithWranglerArgs, "wranglerArgs">>,
->(args: T) {
-	return { ...args, wranglerArgs: getWranglerArgs(args) };
+export function withWranglerPassthroughArgs<T extends yargs.ArgumentsCamelCase<WranglerInputArgs>>(
+	args: T
+): WithWranglerArgs<T> {
+	return {
+		...args,
+		wranglerConfigPath: args.config ?? args.configPath,
+		wranglerArgs: getWranglerArgs(args),
+	};
 }