Rename more things

Author: penalosa

.changeset/brave-paws-build.md

@@ -1,5 +1,5 @@
 ---
-"wrangler": patch
+"wrangler": minor
 ---
 
 Turn on `wrangler.json(c)` support by default

packages/wrangler/README.md

@@ -43,7 +43,7 @@ $ npm install wrangler --save-dev
 
 ## Configuration:
 
-Wrangler is configured via a `wrangler.toml` file in the project root. When utilizing the `wrangler init` command, a `wrangler.toml` file will be created for you.
+Wrangler is configured via a `wrangler.toml` or `wrangler.json` file in the project root. When utilizing the `wrangler init` command, a `wrangler.toml` file will be created for you.
 
 Example:
 

packages/wrangler/docs/how-to/add-a-binding.md

@@ -1,6 +1,6 @@
 # How to register a binding
 
-1. Register `wrangler.toml` section in: `packages/wrangler/src/config/environment.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/config/environment.ts#L431-L451)
+1. Register Wrangler configuration section in: `packages/wrangler/src/config/environment.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/config/environment.ts#L431-L451)
 1. Register validation functions in: `packages/wrangler/src/config/validation.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/config/validation.ts#L1297-L1306)
 1. Add empty state for bindings, as necessary (tip: use typescript to guide you -- either via your editor or run: `pnpm check:type` from within `packages/wrangler`)
 1. Add type for deployment bundle to:
@@ -14,5 +14,5 @@
    - `convertBindingsToCfWorkerInitBindings` in: `packages/wrangler/src/api/startDevWorker/utils.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/api/startDevWorker/utils.ts#L303-L305)
 1. Test binding is deployed and printed in: `packages/wrangler/src/**tests**/deploy.test.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/__tests__/deploy.test.ts#L7604)
 1. Test your validation in: `packages/wrangler/src/**tests**/configuration.test.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/__tests__/configuration.test.ts#L2234)
-1. Enable `wrangler init --from-dash` to include your binding in the `wrangler.toml` it generates in: `packages/wrangler/src/init.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/init.ts#L1036-L1043)
+1. Enable `wrangler init --from-dash` to include your binding in the Wrangler configuration file it generates in: `packages/wrangler/src/init.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/init.ts#L1036-L1043)
 1. Enable `wrangler types` to emit your binding type in: `packages/src/type-generation/index.ts` [ref](https://github.com/cloudflare/workers-sdk/blob/ce7db9d9cb4f5bcd5a326b86dde051cb54b999fb/packages/wrangler/src/type-generation/index.ts#L115)

packages/wrangler/src/api/integrations/deprecated/getBindingsProxy.ts

@@ -19,7 +19,7 @@ export type BindingsProxy<
 };
 
 /**
- * By reading from a `wrangler.toml` file this function generates proxy binding objects that can be
+ * By reading from a Wrangler configuration file this function generates proxy binding objects that can be
  * used to simulate the interaction with bindings during local development in a Node.js environment
  *
  * @deprecated use `getPlatformProxy` instead

packages/wrangler/src/api/integrations/platform/index.ts

@@ -31,7 +31,7 @@ export type GetPlatformProxyOptions = {
 	/**
 	 * The path to the config file to use.
 	 * If no path is specified the default behavior is to search from the
-	 * current directory up the filesystem for a `wrangler.toml` to use.
+	 * current directory up the filesystem for a Wrangler configuration file to use.
 	 *
 	 * Note: this field is optional but if a path is specified it must
 	 *       point to a valid file on the filesystem
@@ -81,7 +81,7 @@ export type PlatformProxy<
 };
 
 /**
- * By reading from a `wrangler.toml` file this function generates proxy objects that can be
+ * By reading from a Wrangler configuration file this function generates proxy objects that can be
  * used to simulate the interaction with the Cloudflare platform during local development
  * in a Node.js environment
  *

packages/wrangler/src/api/startDevWorker/BundlerController.ts

@@ -55,10 +55,15 @@ export class BundlerController extends Controller<BundlerControllerEventMap> {
 		logger.log(`The file ${filePath} changed, restarting build...`);
 		this.emitBundleStartEvent(config);
 		try {
-			await runCustomBuild(config.entrypoint, relativeFile, {
-				cwd: config.build?.custom?.workingDirectory,
-				command: config.build?.custom?.command,
-			});
+			await runCustomBuild(
+				config.entrypoint,
+				relativeFile,
+				{
+					cwd: config.build?.custom?.workingDirectory,
+					command: config.build?.custom?.command,
+				},
+				config.config
+			);
 			if (buildAborter.signal.aborted) {
 				return;
 			}

packages/wrangler/src/api/startDevWorker/ConfigController.ts

@@ -119,7 +119,7 @@ async function resolveDevConfig(
 		origin: {
 			secure:
 				input.dev?.origin?.secure ?? config.dev.upstream_protocol === "https",
-			hostname: host ?? getInferredHost(routes),
+			hostname: host ?? getInferredHost(routes, config.configPath),
 		},
 		liveReload: input.dev?.liveReload || false,
 		testScheduled: input.dev?.testScheduled,
@@ -253,6 +253,7 @@ async function resolveConfig(
 
 	const resolved = {
 		name: getScriptName({ name: input.name, env: input.env }, config),
+		config: config.configPath,
 		compatibilityDate: getDevCompatibilityDate(config, input.compatibilityDate),
 		compatibilityFlags: input.compatibilityFlags ?? config.compatibility_flags,
 		entrypoint: entry.file,

packages/wrangler/src/api/startDevWorker/DevEnv.ts

@@ -117,7 +117,7 @@ export class DevEnv extends EventEmitter {
 			logger.debug(`Error in ${ev.source}: ${ev.reason}\n`, ev.cause);
 			logger.debug("=> Error contextual data:", ev.data);
 		}
-		// Parse errors are recoverable by changing your `wrangler.toml` and saving
+		// Parse errors are recoverable by changing your Wrangler configuration file and saving
 		// All other errors from the ConfigController are non-recoverable
 		else if (
 			ev.source === "ConfigController" &&

packages/wrangler/src/api/startDevWorker/RemoteRuntimeController.ts

@@ -87,6 +87,7 @@ export class RemoteRuntimeController extends RuntimeController {
 					host: props.host,
 					routes: props.routes,
 					sendMetrics: props.sendMetrics,
+					configPath: props.configPath,
 				}
 			);
 			if (!this.#session) {
@@ -157,6 +158,7 @@ export class RemoteRuntimeController extends RuntimeController {
 				host: config.dev.origin?.hostname,
 				routes,
 				sendMetrics: config.sendMetrics,
+				configPath: config.config,
 			});
 
 			const bindings = (
@@ -187,6 +189,7 @@ export class RemoteRuntimeController extends RuntimeController {
 				routes,
 				host: config.dev.origin?.hostname,
 				sendMetrics: config.sendMetrics,
+				configPath: config.config,
 			});
 
 			// If we received a new `bundleComplete` event before we were able to

packages/wrangler/src/api/startDevWorker/types.ts

@@ -60,7 +60,7 @@ export interface StartDevWorkerInput {
 	name?: string;
 	/**
 	 * The javascript or typescript entry-point of the worker.
-	 * This is the `main` property of a wrangler.toml.
+	 * This is the `main` property of a Wrangler configuration file.
 	 * You can specify a file path or provide the contents directly.
 	 */
 	entrypoint?: string;
@@ -173,7 +173,7 @@ export interface StartDevWorkerInput {
 }
 
 export type StartDevWorkerOptions = Omit<StartDevWorkerInput, "assets"> & {
-	/** A worker's directory. Usually where the wrangler.toml file is located */
+	/** A worker's directory. Usually where the Wrangler configuration file is located */
 	projectRoot: string;
 	build: StartDevWorkerInput["build"] & {
 		nodejsCompatMode: NodeJSCompatMode;
@@ -192,7 +192,7 @@ export type StartDevWorkerOptions = Omit<StartDevWorkerInput, "assets"> & {
 	};
 	dev: StartDevWorkerInput["dev"] & {
 		persist: string;
-		auth?: AsyncHook<CfAccount>; // redefine without config.account_id hook param (can only be provided by ConfigController with access to wrangler.toml, not by other controllers eg RemoteRuntimeContoller)
+		auth?: AsyncHook<CfAccount>; // redefine without config.account_id hook param (can only be provided by ConfigController with access to the Wrangler configuration file, not by other controllers eg RemoteRuntimeContoller)
 	};
 	entrypoint: string;
 	assets?: AssetsOptions;