[wrangler] Preserve tree-shaking across workspace package boundaries

.changeset/lean-bundles-shake.md

@@ -0,0 +1,9 @@
+---
+"@cloudflare/workers-utils": patch
+"miniflare": patch
+"wrangler": patch
+---
+
+Reduce the installed bundle sizes of Wrangler and Miniflare
+
+Wrangler now resolves bundled workspace dependencies from source during monorepo builds so unused exports can be removed. Miniflare, its shared CLI and container dependencies now use granular `@cloudflare/workers-utils` entry points instead of loading the package barrel, reducing the raw Wrangler and Miniflare artifacts by 6.16 MiB (31.4%) and 1.06 MiB (22.9%) respectively without changing runtime behavior or installed dependencies.

packages/cli/check-macos-version.ts

@@ -1,5 +1,5 @@
 import os from "node:os";
-import { UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils/errors";
 import ci from "ci-info";
 
 /**

packages/containers-shared/src/build.ts

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { readFileSync } from "node:fs";
-import { UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils/errors";
 import { verifyDockerInstalled } from "./utils";
 import type {
 	BuildArgs,

packages/containers-shared/src/images.ts

@@ -1,4 +1,4 @@
-import { UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils/errors";
 import { buildImage } from "./build";
 import { ExternalRegistryKind } from "./client/models/ExternalRegistryKind";
 import { getCloudflareContainerRegistry } from "./knobs";
@@ -16,7 +16,7 @@ import type {
 	ViteLogger,
 	WranglerLogger,
 } from "./types";
-import type { ComplianceConfig } from "@cloudflare/workers-utils";
+import type { ComplianceConfig } from "@cloudflare/workers-utils/compliance";
 
 export const DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE =
 	"cloudflare/proxy-everything:3cb1195@sha256:0ef6716c52430096900b150d84a3302057d6cd2319dae7987128c85d0733e3c8";

packages/containers-shared/src/inspect.ts

@@ -1,5 +1,5 @@
 import { spawn } from "node:child_process";
-import { UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils/errors";
 
 export async function dockerImageInspect(
 	dockerPath: string,

packages/containers-shared/src/knobs.ts

@@ -1,9 +1,9 @@
 import {
 	COMPLIANCE_REGION_CONFIG_UNKNOWN,
 	getComplianceRegionSubdomain,
-} from "@cloudflare/workers-utils";
+} from "@cloudflare/workers-utils/compliance";
 import { MF_DEV_CONTAINER_PREFIX } from "./registry";
-import type { ComplianceConfig } from "@cloudflare/workers-utils";
+import type { ComplianceConfig } from "@cloudflare/workers-utils/compliance";
 
 /**
  * Returns the managed container registry for the configured API environment and compliance region.

packages/containers-shared/src/login.ts

@@ -1,5 +1,5 @@
 import { spawn } from "node:child_process";
-import { UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils/errors";
 import { ImageRegistriesService, ImageRegistryPermissions } from "./client";
 import { OpenAPI } from "./client/core/OpenAPI";
 

packages/containers-shared/src/registry.ts

@@ -1,5 +1,5 @@
 import { getCloudflareContainerRegistry } from "./knobs";
-import type { ComplianceConfig } from "@cloudflare/workers-utils";
+import type { ComplianceConfig } from "@cloudflare/workers-utils/compliance";
 
 /**
  * Adds the Cloudflare account namespace to an image tag in the managed registry.

packages/containers-shared/src/utils.ts

@@ -7,7 +7,7 @@ import {
 import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { release } from "node:os";
-import { UserError } from "@cloudflare/workers-utils";
+import { UserError } from "@cloudflare/workers-utils/errors";
 import { dockerImageInspect } from "./inspect";
 import type { ContainerDevOptions } from "./types";
 

packages/miniflare/src/index.ts

@@ -10,8 +10,8 @@ import { setTimeout as wait } from "node:timers/promises";
 import util from "node:util";
 import zlib from "node:zlib";
 import { checkMacOSVersion } from "@cloudflare/cli-shared-helpers";
-import { removeDir, removeDirSync } from "@cloudflare/workers-utils";
-import { formatZodError } from "@cloudflare/workers-utils";
+import { removeDir, removeDirSync } from "@cloudflare/workers-utils/fs-helpers";
+import { formatZodError } from "@cloudflare/workers-utils/zod-format";
 import { $ as colors$, bold, dim, green, yellow } from "kleur/colors";
 import stoppable from "stoppable";
 import { getGlobalDispatcher, Pool } from "undici";

packages/miniflare/src/plugins/browser-rendering/index.ts

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { brandColor, dim, red } from "@cloudflare/cli-shared-helpers/colors";
 import { spinner } from "@cloudflare/cli-shared-helpers/interactive";
-import { removeDir } from "@cloudflare/workers-utils";
+import { removeDir } from "@cloudflare/workers-utils/fs-helpers";
 import { CDP_WEBSOCKET_ENDPOINT_REGEX, launch } from "@puppeteer/browsers";
 import BROWSER_RENDERING_WORKER from "worker:browser-rendering/binding";
 import { kVoid } from "../../runtime";

packages/miniflare/src/plugins/browser-rendering/install.ts

@@ -1,9 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
-import {
-	getGlobalWranglerCachePath,
-	removeDir,
-} from "@cloudflare/workers-utils";
+import { removeDir } from "@cloudflare/workers-utils/fs-helpers";
+import { getGlobalWranglerCachePath } from "@cloudflare/workers-utils/global-wrangler-config-path";
 import {
 	Browser,
 	detectBrowserPlatform,

packages/miniflare/src/plugins/core/container.ts

@@ -2,7 +2,7 @@ import {
 	containerPrivilegesAllowed,
 	FUSE_CONTAINER_PRIVILEGES,
 } from "@cloudflare/containers-shared";
-import { getDockerPath } from "@cloudflare/workers-utils";
+import { getDockerPath } from "@cloudflare/workers-utils/docker-path";
 import type {
 	Worker_ContainerEngine,
 	Worker_DurableObjectNamespace_ContainerOptions_ContainerPrivileges,

packages/miniflare/src/plugins/core/index.ts

@@ -15,9 +15,9 @@ import { TextEncoder } from "node:util";
 import { DEFAULT_CONTAINER_EGRESS_INTERCEPTOR_IMAGE } from "@cloudflare/containers-shared";
 import {
 	getTodaysCompatDate,
-	removeDirSync,
 	stripRedundantNodejsCompatFlags,
-} from "@cloudflare/workers-utils";
+} from "@cloudflare/workers-utils/compatibility-date";
+import { removeDirSync } from "@cloudflare/workers-utils/fs-helpers";
 import SCRIPT_ACCESS_IDENTITY from "worker:access/access-identity";
 import SCRIPT_DEV_CONTROL from "worker:core/dev-control";
 import SCRIPT_ENTRY from "worker:core/entry";

packages/miniflare/src/plugins/core/node-compat.ts

@@ -1,4 +1,4 @@
-import { resolveNodejsCompat } from "@cloudflare/workers-utils";
+import { resolveNodejsCompat } from "@cloudflare/workers-utils/compatibility-date";
 
 /**
  * We can provide Node.js compatibility in a number of different modes:

packages/miniflare/src/shared/dev-registry.ts

@@ -10,7 +10,7 @@ import {
 	writeFileSync,
 } from "node:fs";
 import path from "node:path";
-import { getGlobalConfigPath } from "@cloudflare/workers-utils";
+import { getGlobalConfigPath } from "@cloudflare/workers-utils/global-wrangler-config-path";
 import { watch } from "chokidar";
 import type { WorkerDefinition, WorkerRegistry } from "./dev-registry-types";
 export type { WorkerDefinition, WorkerRegistry };

packages/miniflare/test/plugins/browser/install.spec.ts

@@ -13,11 +13,16 @@ const PLATFORM = "linux64";
 
 let cacheDir: string;
 
-vi.mock("@cloudflare/workers-utils", async (importOriginal) => ({
-	...(await importOriginal<typeof import("@cloudflare/workers-utils")>()),
-	// Keep the real `removeDir`; only the cache location is faked.
-	getGlobalWranglerCachePath: () => cacheDir,
-}));
+vi.mock(
+	"@cloudflare/workers-utils/global-wrangler-config-path",
+	async (importOriginal) => ({
+		...(await importOriginal<
+			typeof import("@cloudflare/workers-utils/global-wrangler-config-path")
+		>()),
+		// Keep the real filesystem helper; only the cache location is faked.
+		getGlobalWranglerCachePath: () => cacheDir,
+	})
+);
 
 const install = vi.hoisted(() => vi.fn());
 

packages/miniflare/test/plugins/core/container.spec.ts

@@ -2,7 +2,7 @@ import {
 	containerPrivilegesAllowed,
 	FUSE_CONTAINER_PRIVILEGES,
 } from "@cloudflare/containers-shared";
-import { getDockerPath } from "@cloudflare/workers-utils";
+import { getDockerPath } from "@cloudflare/workers-utils/docker-path";
 import { beforeEach, test, vi } from "vitest";
 import {
 	ContainerPrivilegesCache,
@@ -13,8 +13,10 @@ vi.mock("@cloudflare/containers-shared", async (importOriginal) => ({
 	...(await importOriginal<typeof import("@cloudflare/containers-shared")>()),
 	containerPrivilegesAllowed: vi.fn(),
 }));
-vi.mock("@cloudflare/workers-utils", async (importOriginal) => ({
-	...(await importOriginal<typeof import("@cloudflare/workers-utils")>()),
+vi.mock("@cloudflare/workers-utils/docker-path", async (importOriginal) => ({
+	...(await importOriginal<
+		typeof import("@cloudflare/workers-utils/docker-path")
+	>()),
 	getDockerPath: vi.fn(),
 }));
 

packages/workers-utils/package.json

@@ -27,6 +27,10 @@
 			"import": "./dist/prometheus-metrics.mjs",
 			"types": "./dist/prometheus-metrics.d.mts"
 		},
+		"./compliance": {
+			"import": "./dist/compliance.mjs",
+			"types": "./dist/compliance.d.mts"
+		},
 		"./test-helpers": {
 			"import": "./dist/test-helpers/index.mjs",
 			"types": "./dist/test-helpers/index.d.mts"
@@ -35,9 +39,25 @@
 			"import": "./dist/fs-helpers.mjs",
 			"types": "./dist/fs-helpers.d.mts"
 		},
+		"./compatibility-date": {
+			"import": "./dist/compatibility-date.mjs",
+			"types": "./dist/compatibility-date.d.mts"
+		},
+		"./docker-path": {
+			"import": "./dist/docker-path.mjs",
+			"types": "./dist/docker-path.d.mts"
+		},
+		"./errors": {
+			"import": "./dist/errors.mjs",
+			"types": "./dist/errors.d.mts"
+		},
 		"./global-wrangler-config-path": {
 			"import": "./dist/global-wrangler-config-path.mjs",
 			"types": "./dist/global-wrangler-config-path.d.mts"
+		},
+		"./zod-format": {
+			"import": "./dist/zod-format.mjs",
+			"types": "./dist/zod-format.d.mts"
 		}
 	},
 	"scripts": {

packages/workers-utils/src/compliance.ts

@@ -0,0 +1,8 @@
+export {
+	COMPLIANCE_REGION_CONFIG_PUBLIC,
+	COMPLIANCE_REGION_CONFIG_UNKNOWN,
+	getCloudflareApiBaseUrl,
+	getCloudflareComplianceRegion,
+	getComplianceRegionSubdomain,
+} from "./environment-variables/misc-variables";
+export type { ComplianceConfig } from "./environment-variables/misc-variables";

packages/workers-utils/src/docker-path.ts

@@ -0,0 +1,13 @@
+import { getEnvironmentVariableFactory } from "./environment-variables/factory";
+
+/**
+ * Returns the configured path to the Docker binary.
+ *
+ * @returns The value of `WRANGLER_DOCKER_BIN`, or `docker` when unset.
+ */
+export const getDockerPath = getEnvironmentVariableFactory({
+	variableName: "WRANGLER_DOCKER_BIN",
+	defaultValue() {
+		return "docker";
+	},
+});

packages/workers-utils/src/environment-variables/misc-variables.ts

@@ -310,12 +310,7 @@ export const getD1ExtraLocationChoices: () => string | undefined =
  *
  * By default it's `docker`.
  */
-export const getDockerPath = getEnvironmentVariableFactory({
-	variableName: "WRANGLER_DOCKER_BIN",
-	defaultValue() {
-		return "docker";
-	},
-});
+export { getDockerPath } from "../docker-path";
 
 export const getSubdomainMixedStateCheckDisabled =
 	getBooleanEnvironmentVariableFactory({

packages/workers-utils/tsup.config.ts

@@ -9,11 +9,15 @@ export default defineConfig(() => [
 			"src/browser.ts",
 			"src/prometheus-metrics.ts",
 			"src/test-helpers/index.ts",
-			// Leaf entry points that only depend on Node.js builtins, so they can
-			// be imported by packages bundling to ESM (e.g. via Vite) without
-			// pulling in the barrel's CommonJS dependencies.
+			// Leaf entry points let consumers bundle individual utilities without
+			// pulling in the broad package barrel and its transitive dependencies.
+			"src/compliance.ts",
+			"src/compatibility-date.ts",
+			"src/docker-path.ts",
+			"src/errors.ts",
 			"src/fs-helpers.ts",
 			"src/global-wrangler-config-path.ts",
+			"src/zod-format.ts",
 		],
 		platform: "node",
 		format: "esm",

packages/wrangler/tsup.config.ts

@@ -5,6 +5,30 @@ import { EXTERNAL_DEPENDENCIES } from "./scripts/deps";
 import type { Options } from "tsup";
 
 const TEMPLATES_DIR = path.join(__dirname, "templates");
+const MONOREPO_PACKAGE_ALIASES = {
+	"@cloudflare/autoconfig": path.join(__dirname, "../autoconfig/src/index.ts"),
+	"@cloudflare/deploy-helpers/context": path.join(
+		__dirname,
+		"../deploy-helpers/src/shared/context.ts"
+	),
+	"@cloudflare/deploy-helpers/create-worker-upload-form": path.join(
+		__dirname,
+		"../deploy-helpers/src/deploy/helpers/create-worker-upload-form.ts"
+	),
+	"@cloudflare/deploy-helpers": path.join(
+		__dirname,
+		"../deploy-helpers/src/index.ts"
+	),
+	"@cloudflare/pages-functions": path.join(
+		__dirname,
+		"../pages-functions/src/index.ts"
+	),
+	"@cloudflare/runtime-types": path.join(
+		__dirname,
+		"../runtime-types/src/index.ts"
+	),
+	"@cloudflare/workers-utils": path.join(__dirname, "../workers-utils/src"),
+};
 const workersContexts = new Map<string, esbuild.BuildContext>();
 function embedWorkersPlugin({
 	isWatch,
@@ -113,6 +137,14 @@ export default defineConfig((options) => [
 		},
 		esbuildPlugins: [embedWorkersPlugin({ isWatch: !!options.watch })],
 		esbuildOptions(esbuildOptions) {
+			// These workspace packages publish bundles for npm consumers. Resolving
+			// their sources here gives Wrangler's monorepo build enough module
+			// structure to tree-shake exports it doesn't use, without changing the
+			// dependencies installed with the published package.
+			esbuildOptions.alias = {
+				...esbuildOptions.alias,
+				...MONOREPO_PACKAGE_ALIASES,
+			};
 			esbuildOptions.logOverride = {
 				...esbuildOptions.logOverride,
 				// Suppress the warning for the intentional runtime dynamic