config -> configPath

Author: james-elicx

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

@@ -3,16 +3,16 @@ import type yargs from "yargs";
 
 import { build as buildImpl } from "../build/build.js";
 import { createOpenNextConfigIfNotExistent } from "../build/utils/create-config-files.js";
+import type { WithWranglerArgs } from "./setup-cli.js";
 import { setupCLI, withWranglerOptions, withWranglerPassthroughArgs } from "./setup-cli.js";
 
-async function buildCommand(args: {
-	wranglerArgs: string[];
-	config: string | undefined;
-	env: string | undefined;
-	skipNextBuild: boolean;
-	noMinify: boolean;
-	skipWranglerConfigCheck: boolean;
-}) {
+async function buildCommand(
+	args: WithWranglerArgs<{
+		skipNextBuild: boolean;
+		noMinify: boolean;
+		skipWranglerConfigCheck: boolean;
+	}>
+) {
 	const { options, config, wranglerConfig, baseDir } = await setupCLI("build", args, async (baseDir) => {
 		await createOpenNextConfigIfNotExistent(baseDir);
 		return compileOpenNextConfig(baseDir, undefined, { compileEdge: true });

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

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

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

@@ -284,7 +284,7 @@ export async function populateCacheCommand(
 	await populateCache(options, config, wranglerConfig, {
 		target,
 		environment: args.env,
-		configPath: args.config,
+		configPath: args.configPath,
 		cacheChunkSize: args.cacheChunkSize,
 	});
 }

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

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

packages/cloudflare/src/cli/commands/setup-cli.ts

@@ -13,7 +13,7 @@ import { ensureCloudflareConfig } from "../build/utils/index.js";
 
 export type WithWranglerArgs<T = unknown> = T & {
 	wranglerArgs: string[];
-	config: string | undefined;
+	configPath: string | undefined;
 	env: string | undefined;
 };
 
@@ -77,9 +77,9 @@ export function setupCompiledAppCLI(command: string, args: WithWranglerArgs) {
 
 export function withWranglerOptions<T extends yargs.Argv>(args: T) {
 	return args
-		.options("config", {
+		.options("configPath", {
 			type: "string",
-			alias: "c",
+			alias: ["config", "c"],
 			desc: "Path to Wrangler configuration file",
 		})
 		.options("env", {
@@ -91,11 +91,11 @@ export function withWranglerOptions<T extends yargs.Argv>(args: T) {
 
 function getWranglerArgs(args: {
 	_: (string | number)[];
-	config: string | undefined;
+	configPath: string | undefined;
 	env: string | undefined;
 }): string[] {
 	return [
-		...(args.config ? ["--config", args.config] : []),
+		...(args.configPath ? ["--config", args.configPath] : []),
 		...(args.env ? ["--env", args.env] : []),
 		// Note: the first args in `_` will be the commands.
 		...args._.slice(args._[0] === "populateCache" ? 2 : 1).map((a) => `${a}`),
@@ -104,7 +104,7 @@ function getWranglerArgs(args: {
 
 export function withWranglerPassthroughArgs<
 	T extends yargs.ArgumentsCamelCase<{
-		config: string | undefined;
+		configPath: string | undefined;
 		env: string | undefined;
 	}>,
 >(args: T) {

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

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