wrangler 2.0.27 → 2.1.0

package/src/miniflare-cli/index.ts

@@ -59,41 +59,45 @@ async function main() {
 
 	config.bindings = {
 		...config.bindings,
-		...Object.fromEntries(
-			Object.entries(
-				config.externalDurableObjects as Record<
-					string,
-					{ name: string; host: string; port: number }
-				>
-			).map(([binding, { name, host, port }]) => {
-				const factory = () => {
-					throw new FatalError(
-						"An external Durable Object instance's state has somehow been attempted to be accessed.",
-						1
-					);
-				};
-				const namespace = new DurableObjectNamespace(name as string, factory);
-				namespace.get = (id) => {
-					const stub = new DurableObjectStub(factory, id);
-					stub.fetch = (...reqArgs) => {
-						const requestFromArgs = new MiniflareRequest(...reqArgs);
-						const url = new URL(requestFromArgs.url);
-						url.host = host;
-						if (port !== undefined) url.port = port.toString();
-						const request = new MiniflareRequest(
-							url.toString(),
-							requestFromArgs
+		...(config.externalDurableObjects &&
+			Object.fromEntries(
+				Object.entries(
+					config.externalDurableObjects as Record<
+						string,
+						{ name: string; host: string; port: number }
+					>
+				).map(([binding, { name, host, port }]) => {
+					const factory = () => {
+						throw new FatalError(
+							"An external Durable Object instance's state has somehow been attempted to be accessed.",
+							1
 						);
-						request.headers.set("x-miniflare-durable-object-name", name);
-						request.headers.set("x-miniflare-durable-object-id", id.toString());
+					};
+					const namespace = new DurableObjectNamespace(name as string, factory);
+					namespace.get = (id) => {
+						const stub = new DurableObjectStub(factory, id);
+						stub.fetch = (...reqArgs) => {
+							const requestFromArgs = new MiniflareRequest(...reqArgs);
+							const url = new URL(requestFromArgs.url);
+							url.host = host;
+							if (port !== undefined) url.port = port.toString();
+							const request = new MiniflareRequest(
+								url.toString(),
+								requestFromArgs
+							);
+							request.headers.set("x-miniflare-durable-object-name", name);
+							request.headers.set(
+								"x-miniflare-durable-object-id",
+								id.toString()
+							);
 
-						return fetch(request);
+							return fetch(request);
+						};
+						return stub;
 					};
-					return stub;
-				};
-				return [binding, namespace];
-			})
-		),
+					return [binding, namespace];
+				})
+			)),
 	};
 
 	let mf: Miniflare | undefined;
@@ -125,7 +129,8 @@ async function main() {
 		}
 		mf = new Miniflare(config);
 		// Start Miniflare development server
-		await mf.startServer();
+		const mfServer = await mf.startServer();
+		const mfPort = (mfServer.address() as AddressInfo).port;
 		await mf.startScheduler();
 
 		const internalDurableObjectClassNames = Object.values(
@@ -191,6 +196,7 @@ async function main() {
 		process.send &&
 			process.send(
 				JSON.stringify({
+					mfPort: mfPort,
 					ready: true,
 					durableObjectsPort: durableObjectsMfPort,
 				})

package/src/pages/constants.ts

@@ -1,3 +1,5 @@
+import { version as wranglerVersion } from "../../package.json";
+
 export const PAGES_CONFIG_CACHE_FILENAME = "pages.json";
 export const MAX_BUCKET_SIZE = 50 * 1024 * 1024;
 export const MAX_BUCKET_FILE_COUNT = 5000;
@@ -10,3 +12,4 @@ export const isInPagesCI = !!process.env.CF_PAGES;
 export const MAX_FUNCTIONS_ROUTES_RULES = 100;
 export const MAX_FUNCTIONS_ROUTES_RULE_LENGTH = 100;
 export const ROUTES_SPEC_VERSION = 1;
+export const ROUTES_SPEC_DESCRIPTION = `Generated by wrangler@${wranglerVersion}`;

package/src/pages/dev.tsx

@@ -8,6 +8,7 @@ import { unstable_dev } from "../api";
 import { FatalError } from "../errors";
 import { logger } from "../logger";
 import * as metrics from "../metrics";
+import { getBasePath } from "../paths";
 import { buildFunctions } from "./build";
 import { SECONDS_TO_WAIT_FOR_PROXY } from "./constants";
 import { FunctionsNoRoutesError, getFunctionsNoRoutesWarning } from "./errors";
@@ -274,7 +275,7 @@ export const Handler = async ({
 
 		if (!existsSync(scriptPath)) {
 			logger.log("No functions. Shimming...");
-			scriptPath = resolve(__dirname, "../templates/pages-shim.ts");
+			scriptPath = resolve(getBasePath(), "templates/pages-shim.ts");
 		} else {
 			const runBuild = async () => {
 				try {
@@ -363,7 +364,7 @@ export const Handler = async ({
 			logLevel: "error",
 			logPrefix: "pages",
 		},
-		true
+		{ testMode: false, disableExperimentalWarning: true }
 	);
 	await metrics.sendMetricsEvent("run pages dev");
 
@@ -450,9 +451,13 @@ async function spawnProxyProcess({
 	command: (string | number)[];
 }): Promise<undefined | number> {
 	if (command.length === 0) {
+		if (port !== undefined) {
+			return port;
+		}
+
 		CLEANUP();
 		throw new FatalError(
-			"Must specify a directory of static assets to serve or a command to run.",
+			"Must specify a directory of static assets to serve or a command to run or a proxy port.",
 			1
 		);
 	}

package/src/pages/functions/buildPlugin.ts

@@ -3,6 +3,7 @@ import { dirname, relative, resolve } from "node:path";
 import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
 import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
 import { build } from "esbuild";
+import { getBasePath } from "../../paths";
 
 type Options = {
 	routesModule: string;
@@ -24,7 +25,7 @@ export function buildPlugin({
 	onEnd = () => {},
 }: Options) {
 	return build({
-		entryPoints: [resolve(__dirname, "../templates/pages-template-plugin.ts")],
+		entryPoints: [resolve(getBasePath(), "templates/pages-template-plugin.ts")],
 		inject: [routesModule],
 		bundle: true,
 		format: "esm",

package/src/pages/functions/buildWorker.ts

@@ -4,6 +4,7 @@ import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
 import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
 import { build } from "esbuild";
 import { nanoid } from "nanoid";
+import { getBasePath } from "../../paths";
 
 type Options = {
 	routesModule: string;
@@ -29,7 +30,7 @@ export function buildWorker({
 	nodeCompat,
 }: Options) {
 	return build({
-		entryPoints: [resolve(__dirname, "../templates/pages-template-worker.ts")],
+		entryPoints: [resolve(getBasePath(), "templates/pages-template-worker.ts")],
 		inject: [routesModule],
 		bundle: true,
 		format: "esm",

package/src/pages/functions/routes-transformation.test.ts

@@ -1,5 +1,9 @@
 import { toUrlPath } from "../../paths";
-import { MAX_FUNCTIONS_ROUTES_RULES, ROUTES_SPEC_VERSION } from "../constants";
+import {
+	MAX_FUNCTIONS_ROUTES_RULES,
+	ROUTES_SPEC_VERSION,
+	ROUTES_SPEC_DESCRIPTION,
+} from "../constants";
 import {
 	compareRoutes,
 	convertRoutesToGlobPatterns,
@@ -164,6 +168,7 @@ describe("route-paths-to-glob-patterns", () => {
 				])
 			).toEqual({
 				version: ROUTES_SPEC_VERSION,
+				description: ROUTES_SPEC_DESCRIPTION,
 				include: ["/middleware/*", "/foo/*", "/api/foo/bar"],
 				exclude: [],
 			});
@@ -176,6 +181,7 @@ describe("route-paths-to-glob-patterns", () => {
 			}
 			expect(convertRoutesToRoutesJSONSpec(routes)).toEqual({
 				version: ROUTES_SPEC_VERSION,
+				description: ROUTES_SPEC_DESCRIPTION,
 				include: ["/*"],
 				exclude: [],
 			});
@@ -197,6 +203,7 @@ describe("route-paths-to-glob-patterns", () => {
 			expect(
 				optimizeRoutesJSONSpec({
 					version: ROUTES_SPEC_VERSION,
+					description: ROUTES_SPEC_DESCRIPTION,
 					exclude: [],
 					include: [
 						"/api/foo/bar",
@@ -208,6 +215,7 @@ describe("route-paths-to-glob-patterns", () => {
 				})
 			).toEqual({
 				version: ROUTES_SPEC_VERSION,
+				description: ROUTES_SPEC_DESCRIPTION,
 				include: ["/middleware/*", "/foo/*", "/api/foo/bar"],
 				exclude: [],
 			});
@@ -221,11 +229,13 @@ describe("route-paths-to-glob-patterns", () => {
 			expect(
 				optimizeRoutesJSONSpec({
 					version: ROUTES_SPEC_VERSION,
+					description: ROUTES_SPEC_DESCRIPTION,
 					include,
 					exclude: [],
 				})
 			).toEqual({
 				version: ROUTES_SPEC_VERSION,
+				description: ROUTES_SPEC_DESCRIPTION,
 				include: ["/*"],
 				exclude: [],
 			});
@@ -239,6 +249,7 @@ describe("route-paths-to-glob-patterns", () => {
 			expect(
 				optimizeRoutesJSONSpec({
 					version: ROUTES_SPEC_VERSION,
+					description: ROUTES_SPEC_DESCRIPTION,
 					include,
 					exclude: [],
 				}).include.length

package/src/pages/functions/routes-transformation.ts

@@ -1,12 +1,17 @@
 import { join as pathJoin } from "node:path";
 import { toUrlPath } from "../../paths";
-import { MAX_FUNCTIONS_ROUTES_RULES, ROUTES_SPEC_VERSION } from "../constants";
+import {
+	MAX_FUNCTIONS_ROUTES_RULES,
+	ROUTES_SPEC_DESCRIPTION,
+	ROUTES_SPEC_VERSION,
+} from "../constants";
 import { consolidateRoutes } from "./routes-consolidation";
 import type { RouteConfig } from "./routes";
 
 /** Interface for _routes.json */
 interface RoutesJSONSpec {
 	version: typeof ROUTES_SPEC_VERSION;
+	description?: string;
 	include: string[];
 	exclude: string[];
 }
@@ -53,6 +58,7 @@ export function convertRoutesToRoutesJSONSpec(
 	const include = convertRoutesToGlobPatterns(reversedRoutes);
 	return optimizeRoutesJSONSpec({
 		version: ROUTES_SPEC_VERSION,
+		description: ROUTES_SPEC_DESCRIPTION,
 		include,
 		exclude: [],
 	});

package/src/pages/hash.tsx

@@ -0,0 +1,13 @@
+import { readFileSync } from "node:fs";
+import { extname } from "node:path";
+import { hash as blake3hash } from "blake3-wasm";
+
+export const hashFile = (filepath: string) => {
+	const contents = readFileSync(filepath);
+	const base64Contents = contents.toString("base64");
+	const extension = extname(filepath).substring(1);
+
+	return blake3hash(base64Contents + extension)
+		.toString("hex")
+		.slice(0, 32);
+};

package/src/pages/publish.tsx

@@ -15,12 +15,9 @@ import { logger } from "../logger";
 import * as metrics from "../metrics";
 import { requireAuth } from "../user";
 import { buildFunctions } from "./build";
-import { PAGES_CONFIG_CACHE_FILENAME } from "./constants";
+import { PAGES_CONFIG_CACHE_FILENAME, ROUTES_SPEC_VERSION } from "./constants";
 import { FunctionsNoRoutesError, getFunctionsNoRoutesWarning } from "./errors";
-import {
-	isRoutesJSONSpec,
-	optimizeRoutesJSONSpec,
-} from "./functions/routes-transformation";
+import { isRoutesJSONSpec } from "./functions/routes-transformation";
 import { listProjects } from "./projects";
 import { upload } from "./upload";
 import { pagesBetaWarning } from "./utils";
@@ -254,7 +251,10 @@ export const Handler = async ({
 
 	let builtFunctions: string | undefined = undefined;
 	const functionsDirectory = join(cwd(), "functions");
-	const routesOutputPath = join(tmpdir(), `_routes-${Math.random()}.json`);
+	const routesOutputPath = !existsSync(join(directory, "_routes.json"))
+		? join(tmpdir(), `_routes-${Math.random()}.json`)
+		: undefined;
+
 	if (existsSync(functionsDirectory)) {
 		const outfile = join(tmpdir(), `./functionsWorker-${Math.random()}.js`);
 		try {
@@ -265,6 +265,7 @@ export const Handler = async ({
 				buildOutputDirectory: dirname(outfile),
 				routesOutputPath,
 			});
+
 			builtFunctions = readFileSync(outfile, "utf-8");
 		} catch (e) {
 			if (e instanceof FunctionsNoRoutesError) {
@@ -301,7 +302,8 @@ export const Handler = async ({
 
 	let _headers: string | undefined,
 		_redirects: string | undefined,
-		_routes: string | undefined,
+		_routesGenerated: string | undefined,
+		_routesCustom: string | undefined,
 		_workerJS: string | undefined;
 
 	try {
@@ -312,6 +314,12 @@ export const Handler = async ({
 		_redirects = readFileSync(join(directory, "_redirects"), "utf-8");
 	} catch {}
 
+	try {
+		// Developers can specify a custom _routes.json file, for projects with Pages
+		// Functions or projects in Advanced Mode
+		_routesCustom = readFileSync(join(directory, "_routes.json"), "utf-8");
+	} catch {}
+
 	try {
 		_workerJS = readFileSync(join(directory, "_worker.js"), "utf-8");
 	} catch {}
@@ -327,47 +335,65 @@ export const Handler = async ({
 	}
 
 	if (builtFunctions) {
+		// with Pages Functions
+		// https://developers.cloudflare.com/pages/platform/functions/
 		formData.append("_worker.js", new File([builtFunctions], "_worker.js"));
 		logger.log(`✨ Uploading Functions`);
-		try {
-			_routes = readFileSync(routesOutputPath, "utf-8");
-			if (_routes) {
-				formData.append("_routes.json", new File([_routes], "_routes.json"));
+
+		if (_routesCustom) {
+			// user provided a custom _routes.json file
+			try {
+				validateRoutesFile(_routesCustom, join(directory, "_routes.json"));
+
+				formData.append(
+					"_routes.json",
+					new File([_routesCustom], "_routes.json")
+				);
+				logger.log(`✨ Uploading _routes.json`);
+				logger.warn(
+					`_routes.json is an experimental feature and is subject to change. Please use with care.`
+				);
+			} catch (err) {
+				if (err instanceof FatalError) {
+					throw err;
+				}
 			}
-		} catch {}
+		} else if (routesOutputPath) {
+			// no custom _routes.json file found, so fallback to the generated one
+			try {
+				_routesGenerated = readFileSync(routesOutputPath, "utf-8");
+
+				if (_routesGenerated) {
+					formData.append(
+						"_routes.json",
+						new File([_routesGenerated], "_routes.json")
+					);
+				}
+			} catch {}
+		}
 	} else if (_workerJS) {
 		// Advanced Mode
 		// https://developers.cloudflare.com/pages/platform/functions/#advanced-mode
 		formData.append("_worker.js", new File([_workerJS], "_worker.js"));
 		logger.log(`✨ Uploading _worker.js`);
 
-		try {
-			// In advanced mode, developers can specify a custom _routes.json
-			// file. In which case, we need to run it through optimization
-			// to potentially reduce the overall worker pipeline size
-			const routesPath = join(directory, "_routes.json");
-			const advancedModeRoutesString = readFileSync(routesPath, "utf-8");
-			const advancedModeRoutes = JSON.parse(advancedModeRoutesString);
-
-			if (!isRoutesJSONSpec(advancedModeRoutes)) {
-				throw new FatalError(
-					"Invalid _routes.json file found at:" + routesPath,
-					1
-				);
-			}
+		if (_routesCustom) {
+			// user provided a custom _routes.json file
+			try {
+				validateRoutesFile(_routesCustom, join(directory, "_routes.json"));
 
-			_routes = JSON.stringify(optimizeRoutesJSONSpec(advancedModeRoutes));
-			formData.append("_routes.json", new File([_routes], "_routes.json"));
-			logger.log(`✨ Uploading _routes.json`);
-
-			logger.warn(
-				`🚨 _routes.json is an experimental feature and is subject to change. Don't use unless you really must!`
-			);
-		} catch (e) {
-			// Ignore file not existing errors for _routes.json but forward the potential
-			// FatalError from an invalid spec
-			if (e instanceof FatalError) {
-				throw e;
+				formData.append(
+					"_routes.json",
+					new File([_routesCustom], "_routes.json")
+				);
+				logger.log(`✨ Uploading _routes.json`);
+				logger.warn(
+					`_routes.json is an experimental feature and is subject to change. Please use with care.`
+				);
+			} catch (err) {
+				if (err instanceof FatalError) {
+					throw err;
+				}
 			}
 		}
 	}
@@ -389,3 +415,21 @@ export const Handler = async ({
 	);
 	await metrics.sendMetricsEvent("create pages deployment");
 };
+
+function validateRoutesFile(_routes: string, routesPath: string) {
+	const routes = JSON.parse(_routes);
+
+	if (!isRoutesJSONSpec(routes)) {
+		throw new FatalError(
+			`Invalid _routes.json file found at: ${routesPath}. Please make sure the JSON object has the following format:
+      {
+        version: ${ROUTES_SPEC_VERSION};
+        include: string[];
+        exclude: string[];
+      }
+and that at least one include rule is provided.
+      `,
+			1
+		);
+	}
+}

package/src/pages/upload.tsx

@@ -1,14 +1,5 @@
 import { mkdir, readdir, readFile, stat, writeFile } from "node:fs/promises";
-import {
-	basename,
-	dirname,
-	extname,
-	join,
-	relative,
-	resolve,
-	sep,
-} from "node:path";
-import { hash as blake3hash } from "blake3-wasm";
+import { dirname, join, relative, resolve, sep } from "node:path";
 import { render, Text } from "ink";
 import Spinner from "ink-spinner";
 import { getType } from "mime";
@@ -25,6 +16,7 @@ import {
 	MAX_CHECK_MISSING_ATTEMPTS,
 	MAX_UPLOAD_ATTEMPTS,
 } from "./constants";
+import { hashFile } from "./hash";
 import { pagesBetaWarning } from "./utils";
 import type { UploadPayloadFile, YargsOptionsToInterface } from "./types";
 import type { Argv } from "yargs";
@@ -144,11 +136,6 @@ export const upload = async (
 				} else {
 					const name = relative(startingDir, filepath).split(sep).join("/");
 
-					const fileContent = await readFile(filepath);
-
-					const base64Content = fileContent.toString("base64");
-					const extension = extname(basename(name)).substring(1);
-
 					if (filestat.size > 25 * 1024 * 1024) {
 						throw new FatalError(
 							`Error: Pages only supports files up to ${prettyBytes(
@@ -163,9 +150,7 @@ export const upload = async (
 						path: filepath,
 						contentType: getType(name) || "application/octet-stream",
 						sizeInBytes: filestat.size,
-						hash: blake3hash(base64Content + extension)
-							.toString("hex")
-							.slice(0, 32),
+						hash: hashFile(filepath),
 					});
 				}
 			})

package/src/paths.ts

@@ -1,4 +1,5 @@
-import { assert } from "console";
+import { assert } from "node:console";
+import { resolve } from "node:path";
 
 type DiscriminatedPath<Discriminator extends string> = string & {
 	_discriminator: Discriminator;
@@ -24,3 +25,21 @@ export function toUrlPath(path: string): UrlPath {
 	);
 	return path.replace(/\\/g, "/") as UrlPath;
 }
+
+/**
+ * The __RELATIVE_PACKAGE_PATH__ is defined either in the esbuild config (for production)
+ * or the jest.setup.ts (for unit testing).
+ */
+declare const __RELATIVE_PACKAGE_PATH__: string;
+
+/**
+ * Use this function (rather than node.js constants like `__dirname`) to specify
+ * paths that are relative to the base path of the Wrangler package.
+ *
+ * It is important to use this function because it reliably maps to the root of the package
+ * no matter whether the code has been bundled or not.
+ */
+export function getBasePath(): string {
+	// eslint-disable-next-line no-restricted-globals
+	return resolve(__dirname, __RELATIVE_PACKAGE_PATH__);
+}

package/src/publish.ts

@@ -8,7 +8,7 @@ import { printBundleSize } from "./bundle-reporter";
 import { fetchListResult, fetchResult } from "./cfetch";
 import { printBindings } from "./config";
 import { createWorkerUploadForm } from "./create-worker-upload-form";
-import { confirm } from "./dialogs";
+import { confirm, fromDashMessagePrompt } from "./dialogs";
 import { getMigrationsToUpload } from "./durable";
 import { logger } from "./logger";
 import { getMetricsUsageHeaders } from "./metrics";
@@ -36,6 +36,8 @@ type Props = {
 	compatibilityDate: string | undefined;
 	compatibilityFlags: string[] | undefined;
 	assetPaths: AssetPaths | undefined;
+	vars: Record<string, string> | undefined;
+	defines: Record<string, string> | undefined;
 	triggers: string[] | undefined;
 	routes: string[] | undefined;
 	legacyEnv: boolean | undefined;
@@ -216,11 +218,30 @@ Update them to point to this script instead?`;
 
 export default async function publish(props: Props): Promise<void> {
 	// TODO: warn if git/hg has uncommitted changes
-	const { config, accountId } = props;
+	const { config, accountId, name } = props;
+	if (accountId && name) {
+		const serviceMetaData = await fetchResult(
+			`/accounts/${accountId}/workers/services/${name}`
+		);
+		const { default_environment } = serviceMetaData as {
+			default_environment: {
+				script: { last_deployed_from: "dash" | "wrangler" | "api" };
+			};
+		};
+
+		if (
+			(await fromDashMessagePrompt(
+				default_environment.script.last_deployed_from
+			)) === false
+		)
+			return;
+	}
 
 	if (!(props.compatibilityDate || config.compatibility_date)) {
 		const compatibilityDateStr = `${new Date().getFullYear()}-${(
-			new Date().getMonth() + ""
+			new Date().getMonth() +
+			1 +
+			""
 		).padStart(2, "0")}-${(new Date().getDate() + "").padStart(2, "0")}`;
 
 		throw new Error(`A compatibility_date is required when publishing. Add the following to your wrangler.toml file:.
@@ -382,7 +403,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 						tsconfig: props.tsconfig ?? config.tsconfig,
 						minify,
 						nodeCompat,
-						define: config.define,
+						define: { ...config.define, ...props.defines },
 						checkFetch: false,
 						assets: config.assets && {
 							...config.assets,
@@ -395,6 +416,9 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 						// facades on top of it
 						workerDefinitions: undefined,
 						firstPartyWorkerDevFacade: false,
+						// We want to know if the build is for development or publishing
+						// This could potentially cause issues as we no longer have identical behaviour between dev and publish?
+						targetConsumer: "publish",
 					}
 			  );
 
@@ -430,7 +454,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 					? { binding: "__STATIC_CONTENT", id: assets.namespace }
 					: []
 			),
-			vars: config.vars,
+			vars: { ...config.vars, ...props.vars },
 			wasm_modules: config.wasm_modules,
 			text_blobs: {
 				...config.text_blobs,
@@ -443,7 +467,7 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			durable_objects: config.durable_objects,
 			r2_buckets: config.r2_buckets,
 			services: config.services,
-			worker_namespaces: config.worker_namespaces,
+			dispatch_namespaces: config.dispatch_namespaces,
 			logfwdr: config.logfwdr,
 			unsafe: config.unsafe?.bindings,
 		};
@@ -470,19 +494,36 @@ See https://developers.cloudflare.com/workers/platform/compatibility-dates for m
 			compatibility_flags:
 				props.compatibilityFlags ?? config.compatibility_flags,
 			usage_model: config.usage_model,
+			keep_bindings: true,
 		};
 
-		void printBundleSize(
+		// As this is not deterministic for testing, we detect if in a jest environment and run asynchronously
+		// We do not care about the timing outside of testing
+		const bundleSizePromise = printBundleSize(
 			{ name: path.basename(resolvedEntryPointPath), content: content },
 			modules
 		);
+		if (process.env.JEST_WORKER_ID !== undefined) await bundleSizePromise;
+		else void bundleSizePromise;
 
 		const withoutStaticAssets = {
 			...bindings,
 			kv_namespaces: config.kv_namespaces,
 			text_blobs: config.text_blobs,
 		};
-		printBindings(withoutStaticAssets);
+
+		// mask anything that was overridden in cli args
+		// so that we don't log potential secrets into the terminal
+		const maskedVars = { ...withoutStaticAssets.vars };
+		for (const key of Object.keys(maskedVars)) {
+			if (maskedVars[key] !== config.vars[key]) {
+				// This means it was overridden in cli args
+				// so let's mask it
+				maskedVars[key] = "(hidden)";
+			}
+		}
+
+		printBindings({ ...withoutStaticAssets, vars: maskedVars });
 
 		if (!props.dryRun) {
 			// Upload the script so it has time to propagate.