wrangler 2.12.3 → 2.14.0

package/src/init.ts

@@ -19,7 +19,10 @@ import { CommandLineArgsError, printWranglerBanner } from "./index";
 
 import type { RawConfig } from "./config";
 import type { Route, SimpleRoute } from "./config/environment";
-import type { WorkerMetadata } from "./create-worker-upload-form";
+import type {
+	WorkerMetadata,
+	WorkerMetadataBinding,
+} from "./create-worker-upload-form";
 import type { PackageManager } from "./package-manager";
 import type { PackageJSON } from "./parse";
 import type {
@@ -838,140 +841,7 @@ async function getWorkerConfig(
 			);
 		});
 
-	const mappedBindings = bindings
-		.filter((binding) => (binding.type as string) !== "secret_text")
-		// Combine the same types into {[type]: [binding]}
-		.reduce((configObj, binding) => {
-			// Some types have different names in wrangler.toml
-			// I want the type safety of the binding being destructured after the case narrowing the union but type is unused
-
-			switch (binding.type) {
-				case "plain_text":
-					{
-						configObj.vars = {
-							...(configObj.vars ?? {}),
-							[binding.name]: binding.text,
-						};
-					}
-					break;
-				case "json":
-					{
-						configObj.vars = {
-							...(configObj.vars ?? {}),
-							name: binding.name,
-							json: binding.json,
-						};
-					}
-					break;
-				case "kv_namespace":
-					{
-						configObj.kv_namespaces = [
-							...(configObj.kv_namespaces ?? []),
-							{ id: binding.namespace_id, binding: binding.name },
-						];
-					}
-					break;
-				case "durable_object_namespace":
-					{
-						configObj.durable_objects = {
-							bindings: [
-								...(configObj.durable_objects?.bindings ?? []),
-								{
-									name: binding.name,
-									class_name: binding.class_name,
-									script_name: binding.script_name,
-									environment: binding.environment,
-								},
-							],
-						};
-					}
-					break;
-				case "r2_bucket":
-					{
-						configObj.r2_buckets = [
-							...(configObj.r2_buckets ?? []),
-							{ binding: binding.name, bucket_name: binding.bucket_name },
-						];
-					}
-					break;
-				case "service":
-					{
-						configObj.services = [
-							...(configObj.services ?? []),
-							{
-								binding: binding.name,
-								service: binding.service,
-								environment: binding.environment,
-							},
-						];
-					}
-					break;
-				case "analytics_engine":
-					{
-						configObj.analytics_engine_datasets = [
-							...(configObj.analytics_engine_datasets ?? []),
-							{ binding: binding.name, dataset: binding.dataset },
-						];
-					}
-					break;
-				case "dispatch_namespace":
-					{
-						configObj.dispatch_namespaces = [
-							...(configObj.dispatch_namespaces ?? []),
-							{ binding: binding.name, namespace: binding.namespace },
-						];
-					}
-					break;
-				case "logfwdr":
-					{
-						configObj.logfwdr = {
-							// TODO: Messaging about adding schema file path
-							schema: "",
-							bindings: [
-								...(configObj.logfwdr?.bindings ?? []),
-								{ name: binding.name, destination: binding.destination },
-							],
-						};
-					}
-					break;
-				case "wasm_module":
-					{
-						configObj.wasm_modules = {
-							...(configObj.wasm_modules ?? {}),
-							[binding.name]: binding.part,
-						};
-					}
-					break;
-				case "text_blob":
-					{
-						configObj.text_blobs = {
-							...(configObj.text_blobs ?? {}),
-							[binding.name]: binding.part,
-						};
-					}
-					break;
-				case "data_blob":
-					{
-						configObj.data_blobs = {
-							...(configObj.data_blobs ?? {}),
-							[binding.name]: binding.part,
-						};
-					}
-					break;
-				default: {
-					// If we don't know what the type is, its an unsafe binding
-					// eslint-disable-next-line @typescript-eslint/no-explicit-any
-					if (!(binding as any)?.type) break;
-					configObj.unsafe = {
-						bindings: [...(configObj.unsafe?.bindings ?? []), binding],
-						metadata: configObj.unsafe?.metadata ?? undefined,
-					};
-				}
-			}
-
-			return configObj;
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		}, {} as RawConfig);
+	const mappedBindings = mapBindings(bindings);
 
 	const durableObjectClassNames = bindings
 		.filter((binding) => binding.type === "durable_object_namespace")
@@ -1021,3 +891,142 @@ async function getWorkerConfig(
 		...mappedBindings,
 	};
 }
+
+export function mapBindings(bindings: WorkerMetadataBinding[]): RawConfig {
+	return (
+		bindings
+			.filter((binding) => (binding.type as string) !== "secret_text")
+			// Combine the same types into {[type]: [binding]}
+			.reduce((configObj, binding) => {
+				// Some types have different names in wrangler.toml
+				// I want the type safety of the binding being destructured after the case narrowing the union but type is unused
+
+				switch (binding.type) {
+					case "plain_text":
+						{
+							configObj.vars = {
+								...(configObj.vars ?? {}),
+								[binding.name]: binding.text,
+							};
+						}
+						break;
+					case "json":
+						{
+							configObj.vars = {
+								...(configObj.vars ?? {}),
+								name: binding.name,
+								json: binding.json,
+							};
+						}
+						break;
+					case "kv_namespace":
+						{
+							configObj.kv_namespaces = [
+								...(configObj.kv_namespaces ?? []),
+								{ id: binding.namespace_id, binding: binding.name },
+							];
+						}
+						break;
+					case "durable_object_namespace":
+						{
+							configObj.durable_objects = {
+								bindings: [
+									...(configObj.durable_objects?.bindings ?? []),
+									{
+										name: binding.name,
+										class_name: binding.class_name,
+										script_name: binding.script_name,
+										environment: binding.environment,
+									},
+								],
+							};
+						}
+						break;
+					case "r2_bucket":
+						{
+							configObj.r2_buckets = [
+								...(configObj.r2_buckets ?? []),
+								{ binding: binding.name, bucket_name: binding.bucket_name },
+							];
+						}
+						break;
+					case "service":
+						{
+							configObj.services = [
+								...(configObj.services ?? []),
+								{
+									binding: binding.name,
+									service: binding.service,
+									environment: binding.environment,
+								},
+							];
+						}
+						break;
+					case "analytics_engine":
+						{
+							configObj.analytics_engine_datasets = [
+								...(configObj.analytics_engine_datasets ?? []),
+								{ binding: binding.name, dataset: binding.dataset },
+							];
+						}
+						break;
+					case "dispatch_namespace":
+						{
+							configObj.dispatch_namespaces = [
+								...(configObj.dispatch_namespaces ?? []),
+								{ binding: binding.name, namespace: binding.namespace },
+							];
+						}
+						break;
+					case "logfwdr":
+						{
+							configObj.logfwdr = {
+								// TODO: Messaging about adding schema file path
+								schema: "",
+								bindings: [
+									...(configObj.logfwdr?.bindings ?? []),
+									{ name: binding.name, destination: binding.destination },
+								],
+							};
+						}
+						break;
+					case "wasm_module":
+						{
+							configObj.wasm_modules = {
+								...(configObj.wasm_modules ?? {}),
+								[binding.name]: binding.part,
+							};
+						}
+						break;
+					case "text_blob":
+						{
+							configObj.text_blobs = {
+								...(configObj.text_blobs ?? {}),
+								[binding.name]: binding.part,
+							};
+						}
+						break;
+					case "data_blob":
+						{
+							configObj.data_blobs = {
+								...(configObj.data_blobs ?? {}),
+								[binding.name]: binding.part,
+							};
+						}
+						break;
+					default: {
+						// If we don't know what the type is, its an unsafe binding
+						// eslint-disable-next-line @typescript-eslint/no-explicit-any
+						if (!(binding as any)?.type) break;
+						configObj.unsafe = {
+							bindings: [...(configObj.unsafe?.bindings ?? []), binding],
+							metadata: configObj.unsafe?.metadata ?? undefined,
+						};
+					}
+				}
+
+				return configObj;
+				// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			}, {} as RawConfig)
+	);
+}

package/src/metrics/send-event.ts

@@ -57,7 +57,8 @@ export type EventNames =
 	| "run dev (api)"
 	| "run pages dev"
 	| "view docs"
-	| "view deployments";
+	| "view deployments"
+	| "rollback deployments";
 
 /**
  * Send a metrics event, with no extra properties, to Cloudflare, if usage tracking is enabled.

package/src/module-collection.ts

@@ -1,6 +1,7 @@
 import crypto from "node:crypto";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
+import chalk from "chalk";
 import globToRegExp from "glob-to-regexp";
 import { logger } from "./logger";
 import type { Config, ConfigModuleRuleType } from "./config";
@@ -38,28 +39,8 @@ export const DEFAULT_MODULE_RULES: Config["rules"] = [
 	{ type: "CompiledWasm", globs: ["**/*.wasm"] },
 ];
 
-export default function createModuleCollector(props: {
-	format: CfScriptFormat;
-	rules?: Config["rules"];
-	// a collection of "legacy" style module references, which are just file names
-	// we will eventually deprecate this functionality, hence the verbose greppable name
-	wrangler1xlegacyModuleReferences: {
-		rootDirectory: string;
-		fileNames: Set<string>;
-	};
-}): {
-	modules: CfModule[];
-	plugin: esbuild.Plugin;
-} {
-	const rules: Config["rules"] = [
-		...(props.rules || []),
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		...DEFAULT_MODULE_RULES!,
-	];
-
-	// First, we want to add some validations to the module rules
-	// We want to warn if rules are accidentally configured in such a way that
-	// subsequent rules will never match because `fallthrough` hasn't been set
+export function parseRules(userRules: Config["rules"] = []) {
+	const rules: Config["rules"] = [...userRules, ...DEFAULT_MODULE_RULES];
 
 	const completedRuleLocations: Record<string, number> = {};
 	let index = 0;
@@ -67,7 +48,7 @@ export default function createModuleCollector(props: {
 	for (const rule of rules) {
 		if (rule.type in completedRuleLocations) {
 			if (rules[completedRuleLocations[rule.type]].fallthrough !== false) {
-				if (index < (props.rules || []).length) {
+				if (index < userRules.length) {
 					logger.warn(
 						`The module rule at position ${index} (${JSON.stringify(
 							rule
@@ -101,6 +82,89 @@ export default function createModuleCollector(props: {
 	// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 	rulesToRemove.forEach((rule) => rules!.splice(rules!.indexOf(rule), 1));
 
+	return { rules, removedRules: rulesToRemove };
+}
+
+export async function matchFiles(
+	files: string[],
+	relativeTo: string,
+	{
+		rules,
+		removedRules,
+	}: { rules: Config["rules"]; removedRules: Config["rules"] }
+) {
+	const modules: CfModule[] = [];
+
+	// Deduplicate modules. This is usually a poorly specified `wrangler.toml` configuration, but duplicate modules will cause a crash at runtime
+	const moduleNames = new Set<string>();
+	for (const rule of rules) {
+		for (const glob of rule.globs) {
+			const regexp = globToRegExp(glob, {
+				globstar: true,
+			});
+			const newModules = await Promise.all(
+				files
+					.filter((f) => regexp.test(f))
+					.map(async (name) => {
+						const filePath = name;
+						const fileContent = await readFile(path.join(relativeTo, filePath));
+
+						return {
+							name: filePath,
+							content: fileContent,
+							type: RuleTypeToModuleType[rule.type],
+						};
+					})
+			);
+			for (const module of newModules) {
+				if (!moduleNames.has(module.name)) {
+					moduleNames.add(module.name);
+					modules.push(module);
+				} else {
+					logger.warn(
+						`Ignoring duplicate module: ${chalk.blue(
+							module.name
+						)} (${chalk.green(module.type ?? "")})`
+					);
+				}
+			}
+		}
+	}
+
+	// This is just a sanity check verifying that no files match rules that were removed
+	for (const rule of removedRules) {
+		for (const glob of rule.globs) {
+			const regexp = globToRegExp(glob);
+			for (const file of files) {
+				if (regexp.test(file)) {
+					throw new Error(
+						`The file ${file} matched a module rule in your configuration (${JSON.stringify(
+							rule
+						)}), but was ignored because a previous rule with the same type was not marked as \`fallthrough = true\`.`
+					);
+				}
+			}
+		}
+	}
+	return modules;
+}
+
+export default function createModuleCollector(props: {
+	format: CfScriptFormat;
+	rules?: Config["rules"];
+	// a collection of "legacy" style module references, which are just file names
+	// we will eventually deprecate this functionality, hence the verbose greppable name
+	wrangler1xlegacyModuleReferences: {
+		rootDirectory: string;
+		fileNames: Set<string>;
+	};
+	preserveFileNames?: boolean;
+}): {
+	modules: CfModule[];
+	plugin: esbuild.Plugin;
+} {
+	const { rules, removedRules } = parseRules(props.rules);
+
 	const modules: CfModule[] = [];
 	return {
 		modules,
@@ -206,7 +270,9 @@ export default function createModuleCollector(props: {
 									.createHash("sha1")
 									.update(fileContent)
 									.digest("hex");
-								const fileName = `./${fileHash}-${path.basename(args.path)}`;
+								const fileName = props.preserveFileNames
+									? filePath
+									: `./${fileHash}-${path.basename(args.path)}`;
 
 								// add the module to the array
 								modules.push({
@@ -245,7 +311,7 @@ export default function createModuleCollector(props: {
 					});
 				});
 
-				rulesToRemove.forEach((rule) => {
+				removedRules.forEach((rule) => {
 					rule.globs.forEach((glob) => {
 						build.onResolve(
 							{ filter: globToRegExp(glob) },

package/src/pages/functions/buildPlugin.ts

@@ -28,6 +28,7 @@ export function buildPlugin({
 			file: resolve(getBasePath(), "templates/pages-template-plugin.ts"),
 			directory: functionsDirectory,
 			format: "modules",
+			moduleRoot: functionsDirectory,
 		},
 		resolve(outdir),
 		{

package/src/pages/functions/buildWorker.ts

@@ -48,6 +48,7 @@ export function buildWorker({
 			file: resolve(getBasePath(), "templates/pages-template-worker.ts"),
 			directory: functionsDirectory,
 			format: "modules",
+			moduleRoot: functionsDirectory,
 		},
 		outdir ? resolve(outdir) : resolve(outfile),
 		{
@@ -58,10 +59,6 @@ export function buildWorker({
 			watch,
 			legacyNodeCompat,
 			nodejsCompat,
-			loader: {
-				".txt": "text",
-				".html": "text",
-			},
 			define: {
 				__FALLBACK_SERVICE__: JSON.stringify(fallbackService),
 			},
@@ -202,6 +199,7 @@ export function buildRawWorker({
 			file: workerScriptPath,
 			directory: resolve(directory),
 			format: "modules",
+			moduleRoot: resolve(directory),
 		},
 		outdir ? resolve(outdir) : resolve(outfile),
 		{
@@ -210,10 +208,6 @@ export function buildRawWorker({
 			watch,
 			legacyNodeCompat,
 			nodejsCompat,
-			loader: {
-				".txt": "text",
-				".html": "text",
-			},
 			define: {},
 			betaD1Shims: (betaD1Shims || []).map(
 				(binding) => `${D1_BETA_PREFIX}${binding}`

package/src/publish/publish.ts

@@ -12,6 +12,7 @@ import {
 import { fetchListResult, fetchResult } from "../cfetch";
 import { printBindings } from "../config";
 import { createWorkerUploadForm } from "../create-worker-upload-form";
+import { addHyphens } from "../deployments";
 import { confirm } from "../dialogs";
 import { getMigrationsToUpload } from "../durable";
 import { logger } from "../logger";
@@ -20,6 +21,7 @@ import { ParseError } from "../parse";
 import { getQueue, putConsumer } from "../queues/client";
 import { getWorkersDevSubdomain } from "../routes";
 import { syncAssets } from "../sites";
+import traverseModuleGraph from "../traverse-module-graph";
 import { identifyD1BindingsAsBeta } from "../worker";
 import { getZoneForRoute } from "../zones";
 import type { FetchError } from "../cfetch";
@@ -30,7 +32,6 @@ import type {
 	ZoneNameRoute,
 	CustomDomainRoute,
 } from "../config/environment";
-import type { DeploymentListResult } from "../deployments";
 import type { Entry } from "../entry";
 import type { PutConsumerBody } from "../queues/client";
 import type { AssetPaths } from "../sites";
@@ -335,7 +336,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 
 	const jsxFactory = props.jsxFactory || config.jsx_factory;
 	const jsxFragment = props.jsxFragment || config.jsx_fragment;
-	const keepVars = props.keepVars ?? config.keep_vars;
+	const keepVars = props.keepVars || config.keep_vars;
 
 	const minify = props.minify ?? config.minify;
 
@@ -401,7 +402,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		: `/accounts/${accountId}/workers/scripts/${scriptName}`;
 
 	let available_on_subdomain: boolean | undefined = undefined; // we'll set this later
-	let scriptTag: string | null = null;
+	let deploymentId: string | null = null;
 
 	const { format } = props.entry;
 
@@ -463,14 +464,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			resolvedEntryPointPath,
 			bundleType,
 		}: Awaited<ReturnType<typeof bundleWorker>> = props.noBundle
-			? // we can skip the whole bundling step and mock a bundle here
-			  {
-					modules: [],
-					dependencies: {},
-					resolvedEntryPointPath: props.entry.file,
-					bundleType: props.entry.format === "modules" ? "esm" : "commonjs",
-					stop: undefined,
-			  }
+			? await traverseModuleGraph(props.entry, props.rules)
 			: await bundleWorker(
 					props.entry,
 					typeof destination === "string" ? destination : destination.path,
@@ -541,6 +535,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 					? { binding: "__STATIC_CONTENT", id: assets.namespace }
 					: []
 			),
+			send_email: config.send_email,
 			vars: { ...config.vars, ...props.vars },
 			wasm_modules: config.wasm_modules,
 			text_blobs: {
@@ -632,7 +627,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 					id: string | null;
 					etag: string | null;
 					pipeline_hash: string | null;
-					tag: string | null;
+					deployment_id: string | null;
 				}>(
 					workerUrl,
 					{
@@ -649,7 +644,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 				);
 
 				available_on_subdomain = result.available_on_subdomain;
-				scriptTag = result.tag;
+				deploymentId = addHyphens(result.deployment_id) ?? result.deployment_id;
 
 				if (config.first_party_worker) {
 					// Print some useful information returned after publishing
@@ -839,19 +834,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 		logger.log("No publish targets for", workerName, formatTime(deployMs));
 	}
 
-	try {
-		const deploymentsList = await fetchResult<DeploymentListResult>(
-			`/accounts/${accountId}/workers/deployments/by-script/${scriptTag}`
-		);
-
-		logger.log("Current Deployment ID:", deploymentsList.latest.id);
-	} catch (e) {
-		if ((e as { code: number }).code === 10023) {
-			// TODO: remove this try/catch once deployments is completely rolled out
-		} else {
-			throw e;
-		}
-	}
+	logger.log("Current Deployment ID:", deploymentId);
 }
 
 export function helpIfErrorIsSizeOrScriptStartup(
@@ -1060,6 +1043,7 @@ function updateQueueConsumers(config: Config): Promise<string[]>[] {
 				max_wait_time_ms: consumer.max_batch_timeout
 					? 1000 * consumer.max_batch_timeout
 					: undefined,
+				max_concurrency: consumer.max_concurrency,
 			},
 		};
 

package/src/queues/cli/commands/consumer/add.ts

@@ -37,6 +37,11 @@ export function options(yargs: CommonYargsArgv) {
 				type: "string",
 				describe: "Queue to send messages that failed to be consumed",
 			},
+			"max-concurrency": {
+				type: "number",
+				describe:
+					"The maximum number of concurrent consumer Worker invocations. Must be a positive integer",
+			},
 		});
 }
 
@@ -55,6 +60,7 @@ export async function handler(
 			max_wait_time_ms: args.batchTimeout // API expects milliseconds
 				? 1000 * args.batchTimeout
 				: undefined,
+			max_concurrency: args.maxConcurrency,
 		},
 		dead_letter_queue: args.deadLetterQueue,
 	};

package/src/queues/client.ts

@@ -90,6 +90,7 @@ export interface ConsumerSettings {
 	batch_size?: number;
 	max_retries?: number;
 	max_wait_time_ms?: number;
+	max_concurrency?: number | null;
 }
 
 export interface ConsumerResponse extends PostConsumerBody {

package/src/secret/index.ts

@@ -100,6 +100,7 @@ export const secret = (secretYargs: CommonYargsArgv) => {
 								},
 								bindings: {
 									kv_namespaces: [],
+									send_email: [],
 									vars: {},
 									durable_objects: { bindings: [] },
 									queues: [],