wrangler 2.0.26 → 2.0.29

package/bin/wrangler.js

@@ -4,7 +4,7 @@ const path = require("path");
 const fs = require("fs");
 const os = require("os");
 
-const MIN_NODE_VERSION = "16.7.0";
+const MIN_NODE_VERSION = "16.13.0";
 const debug =
 	process.env["WRANGLER_LOG"] === "debug"
 		? (...args) => console.log(...args)

package/miniflare-dist/index.mjs

@@ -4934,9 +4934,57 @@ var FatalError = class extends Error {
 };
 
 // src/miniflare-cli/assets.ts
-var import_mime = __toESM(require_mime());
 import { existsSync, lstatSync, readFileSync as readFileSync4 } from "node:fs";
 import { join } from "node:path";
+
+// ../pages-shared/src/asset-server/rulesEngine.ts
+var ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
+var escapeRegex = (str) => {
+  return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
+};
+var HOST_PLACEHOLDER_REGEX = /(?<=^https:\\\/\\\/[^/]*?):([^\\]+)(?=\\)/g;
+var PLACEHOLDER_REGEX = /:(\w+)/g;
+var replacer = (str, replacements) => {
+  for (const [replacement, value] of Object.entries(replacements)) {
+    str = str.replaceAll(`:${replacement}`, value);
+  }
+  return str;
+};
+var generateRulesMatcher = (rules, replacerFn = (match) => match) => {
+  if (!rules)
+    return () => [];
+  const compiledRules = Object.entries(rules).map(([rule, match]) => {
+    const crossHost = rule.startsWith("https://");
+    rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
+    const host_matches = rule.matchAll(HOST_PLACEHOLDER_REGEX);
+    for (const host_match of host_matches) {
+      rule = rule.split(host_match[0]).join(`(?<${host_match[1]}>[^/.]+)`);
+    }
+    const path_matches = rule.matchAll(PLACEHOLDER_REGEX);
+    for (const path_match of path_matches) {
+      rule = rule.split(path_match[0]).join(`(?<${path_match[1]}>[^/]+)`);
+    }
+    rule = "^" + rule + "$";
+    try {
+      const regExp = new RegExp(rule);
+      return [{ crossHost, regExp }, match];
+    } catch {
+    }
+  }).filter((value) => value !== void 0);
+  return ({ request }) => {
+    const { pathname, host } = new URL(request.url);
+    return compiledRules.map(([{ crossHost, regExp }, match]) => {
+      const test = crossHost ? `https://${host}${pathname}` : pathname;
+      const result = regExp.exec(test);
+      if (result) {
+        return replacerFn(match, result.groups || {});
+      }
+    }).filter((value) => value !== void 0);
+  };
+};
+
+// src/miniflare-cli/assets.ts
+var import_mime = __toESM(require_mime());
 import { fetch as miniflareFetch } from "@miniflare/core";
 import { watch } from "chokidar";
 import { Response } from "miniflare";
@@ -4967,49 +5015,6 @@ async function generateASSETSBinding(options) {
     }
   };
 }
-function escapeRegex(str) {
-  return str.replace(/[-/\\^$*+?.()|[]{}]/g, "\\$&");
-}
-function replacer(str, replacements) {
-  for (const [replacement, value] of Object.entries(replacements)) {
-    str = str.replace(`:${replacement}`, value);
-  }
-  return str;
-}
-function generateRulesMatcher(rules, replacerFn = (match) => match) {
-  if (!rules)
-    return () => [];
-  const compiledRules = Object.entries(rules).map(([rule, match]) => {
-    const crossHost = rule.startsWith("https://");
-    rule = rule.split("*").map(escapeRegex).join("(?<splat>.*)");
-    const host_matches = rule.matchAll(
-      /(?<=^https:\\\/\\\/[^/]*?):([^\\]+)(?=\\)/g
-    );
-    for (const hostMatch of host_matches) {
-      rule = rule.split(hostMatch[0]).join(`(?<${hostMatch[1]}>[^/.]+)`);
-    }
-    const path_matches = rule.matchAll(/:(\w+)/g);
-    for (const pathMatch of path_matches) {
-      rule = rule.split(pathMatch[0]).join(`(?<${pathMatch[1]}>[^/]+)`);
-    }
-    rule = "^" + rule + "$";
-    try {
-      const regExp = new RegExp(rule);
-      return [{ crossHost, regExp }, match];
-    } catch {
-    }
-  }).filter((value) => value !== void 0);
-  return ({ request }) => {
-    const { pathname, host } = new URL(request.url);
-    return compiledRules.map(([{ crossHost, regExp }, match]) => {
-      const test = crossHost ? `https://${host}${pathname}` : pathname;
-      const result = regExp.exec(test);
-      if (result) {
-        return replacerFn(match, result.groups || {});
-      }
-    }).filter((value) => value !== void 0);
-  };
-}
 function generateHeadersMatcher(headersFile) {
   if (existsSync(headersFile)) {
     const contents = readFileSync4(headersFile).toString();
@@ -5403,7 +5408,7 @@ async function main() {
   }
   config.bindings = {
     ...config.bindings,
-    ...Object.fromEntries(
+    ...config.externalDurableObjects && Object.fromEntries(
       Object.entries(
         config.externalDurableObjects
       ).map(([binding, { name, host, port }]) => {
@@ -5427,7 +5432,10 @@ async function main() {
               requestFromArgs
             );
             request.headers.set("x-miniflare-durable-object-name", name);
-            request.headers.set("x-miniflare-durable-object-id", id.toString());
+            request.headers.set(
+              "x-miniflare-durable-object-id",
+              id.toString()
+            );
             return fetch(request);
           };
           return stub;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.26",
+	"version": "2.0.29",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -97,7 +97,7 @@
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
 		"esbuild": "0.14.51",
-		"miniflare": "^2.6.0",
+		"miniflare": "^2.7.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -107,6 +107,7 @@
 	"devDependencies": {
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
+		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
 		"@types/express": "^4.17.13",
 		"@types/glob-to-regexp": "0.4.1",
@@ -120,6 +121,7 @@
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
 		"body-parser": "^1.20.0",
+		"busboy": "^1.6.0",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",
@@ -158,7 +160,7 @@
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "^5.5.1",
+		"undici": "^5.9.1",
 		"update-check": "^1.5.4",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",
@@ -168,6 +170,6 @@
 		"fsevents": "~2.3.2"
 	},
 	"engines": {
-		"node": ">=16.7.0"
+		"node": ">=16.13.0"
 	}
 }

package/src/__tests__/api-dev.test.ts

@@ -0,0 +1,19 @@
+import { unstable_dev } from "../api";
+
+jest.unmock("undici");
+
+describe("unstable_dev", () => {
+	it("should return Hello World", async () => {
+		const worker = await unstable_dev(
+			"src/__tests__/helpers/hello-world-worker.js",
+			{},
+			{ disableExperimentalWarning: true }
+		);
+		const resp = await worker.fetch();
+		if (resp) {
+			const text = await resp.text();
+			expect(text).toMatchInlineSnapshot(`"Hello World!"`);
+		}
+		await worker.stop();
+	});
+});

package/src/__tests__/configuration.test.ts

@@ -61,7 +61,7 @@ describe("normalizeAndValidateConfig()", () => {
 			unsafe: {
 				bindings: [],
 			},
-			worker_namespaces: [],
+			dispatch_namespaces: [],
 			usage_model: undefined,
 			vars: {},
 			define: {},
@@ -1635,6 +1635,7 @@ describe("normalizeAndValidateConfig()", () => {
 								id: "KV_ID_2",
 								preview_id: 2222,
 							},
+							{ binding: "VALID", id: "" },
 						],
 					} as unknown as RawConfig,
 					undefined,
@@ -1654,7 +1655,8 @@ describe("normalizeAndValidateConfig()", () => {
 			            - \\"kv_namespaces[1]\\" bindings should have a string \\"id\\" field but got {\\"binding\\":\\"VALID\\"}.
 			            - \\"kv_namespaces[2]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2000,\\"id\\":2111}.
 			            - \\"kv_namespaces[2]\\" bindings should have a string \\"id\\" field but got {\\"binding\\":2000,\\"id\\":2111}.
-			            - \\"kv_namespaces[3]\\" bindings should, optionally, have a string \\"preview_id\\" field but got {\\"binding\\":\\"KV_BINDING_2\\",\\"id\\":\\"KV_ID_2\\",\\"preview_id\\":2222}."
+			            - \\"kv_namespaces[3]\\" bindings should, optionally, have a string \\"preview_id\\" field but got {\\"binding\\":\\"KV_BINDING_2\\",\\"id\\":\\"KV_ID_2\\",\\"preview_id\\":2222}.
+			            - \\"kv_namespaces[4]\\" bindings should have a string \\"id\\" field but got {\\"binding\\":\\"VALID\\",\\"id\\":\\"\\"}."
 		        `);
 			});
 		});
@@ -1740,6 +1742,7 @@ describe("normalizeAndValidateConfig()", () => {
 								bucket_name: "R2_BUCKET_2",
 								preview_bucket_name: 2555,
 							},
+							{ binding: "R2_BINDING_1", bucket_name: "" },
 						],
 					} as unknown as RawConfig,
 					undefined,
@@ -1759,7 +1762,8 @@ describe("normalizeAndValidateConfig()", () => {
 			            - \\"r2_buckets[1]\\" bindings should have a string \\"bucket_name\\" field but got {\\"binding\\":\\"R2_BINDING_1\\"}.
 			            - \\"r2_buckets[2]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":2333,\\"bucket_name\\":2444}.
 			            - \\"r2_buckets[2]\\" bindings should have a string \\"bucket_name\\" field but got {\\"binding\\":2333,\\"bucket_name\\":2444}.
-			            - \\"r2_buckets[3]\\" bindings should, optionally, have a string \\"preview_bucket_name\\" field but got {\\"binding\\":\\"R2_BINDING_2\\",\\"bucket_name\\":\\"R2_BUCKET_2\\",\\"preview_bucket_name\\":2555}."
+			            - \\"r2_buckets[3]\\" bindings should, optionally, have a string \\"preview_bucket_name\\" field but got {\\"binding\\":\\"R2_BINDING_2\\",\\"bucket_name\\":\\"R2_BUCKET_2\\",\\"preview_bucket_name\\":2555}.
+			            - \\"r2_buckets[4]\\" bindings should have a string \\"bucket_name\\" field but got {\\"binding\\":\\"R2_BINDING_1\\",\\"bucket_name\\":\\"\\"}."
 		        `);
 			});
 		});
@@ -1909,11 +1913,11 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
-		describe("[worker_namespaces]", () => {
-			it("should log an experimental warning when worker_namespaces is used", () => {
+		describe("[dispatch_namespaces]", () => {
+			it("should log an experimental warning when dispatch_namespaces is used", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
 					{
-						worker_namespaces: [
+						dispatch_namespaces: [
 							{
 								binding: "BINDING_1",
 								namespace: "NAMESPACE_1",
@@ -1924,44 +1928,44 @@ describe("normalizeAndValidateConfig()", () => {
 					{ env: undefined }
 				);
 				expect(config).toEqual(
-					expect.not.objectContaining({ worker_namespaces: expect.anything })
+					expect.not.objectContaining({ dispatch_namespaces: expect.anything })
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(false);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - \\"worker_namespaces\\" fields are experimental and may change or break at any time."
+			  - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
 		`);
 			});
 
-			it("should error if worker_namespaces is not an array", () => {
+			it("should error if dispatch_namespaces is not an array", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
 					{
-						worker_namespaces: "just a string",
+						dispatch_namespaces: "just a string",
 					} as unknown as RawConfig,
 					undefined,
 					{ env: undefined }
 				);
 
 				expect(config).toEqual(
-					expect.not.objectContaining({ worker_namespaces: expect.anything })
+					expect.not.objectContaining({ dispatch_namespaces: expect.anything })
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(true);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			          "Processing wrangler configuration:
-			            - \\"worker_namespaces\\" fields are experimental and may change or break at any time."
+			            - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
 		        `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - The field \\"worker_namespaces\\" should be an array but got \\"just a string\\"."
+			  - The field \\"dispatch_namespaces\\" should be an array but got \\"just a string\\"."
 		`);
 			});
 
-			it("should error on non valid worker_namespaces", () => {
+			it("should error on non valid dispatch_namespaces", () => {
 				const { config, diagnostics } = normalizeAndValidateConfig(
 					{
-						worker_namespaces: [
+						dispatch_namespaces: [
 							"a string",
 							123,
 							{
@@ -1969,17 +1973,17 @@ describe("normalizeAndValidateConfig()", () => {
 								namespace: 456,
 							},
 							{
-								binding: "WORKER_NAMESPACE_BINDING_1",
+								binding: "DISPATCH_NAMESPACE_BINDING_1",
 								namespace: 456,
 							},
 							// this one is valid
 							{
-								binding: "WORKER_NAMESPACE_BINDING_1",
-								namespace: "WORKER_NAMESPACE_BINDING_NAMESPACE_1",
+								binding: "DISPATCH_NAMESPACE_BINDING_1",
+								namespace: "DISPATCH_NAMESPACE_BINDING_NAMESPACE_1",
 							},
 							{
 								binding: 123,
-								namespace: "WORKER_NAMESPACE_BINDING_SERVICE_1",
+								namespace: "DISPATCH_NAMESPACE_BINDING_SERVICE_1",
 							},
 							{
 								binding: 123,
@@ -1992,25 +1996,25 @@ describe("normalizeAndValidateConfig()", () => {
 				);
 				expect(config).toEqual(
 					expect.not.objectContaining({
-						worker_namespaces: expect.anything,
+						dispatch_namespaces: expect.anything,
 					})
 				);
 				expect(diagnostics.hasWarnings()).toBe(true);
 				expect(diagnostics.hasErrors()).toBe(true);
 				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - \\"worker_namespaces\\" fields are experimental and may change or break at any time."
+			  - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time."
 		`);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
 			"Processing wrangler configuration:
-			  - \\"worker_namespaces[0]\\" binding should be objects, but got \\"a string\\"
-			  - \\"worker_namespaces[1]\\" binding should be objects, but got 123
-			  - \\"worker_namespaces[2]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
-			  - \\"worker_namespaces[2]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
-			  - \\"worker_namespaces[3]\\" should have a string \\"namespace\\" field but got {\\"binding\\":\\"WORKER_NAMESPACE_BINDING_1\\",\\"namespace\\":456}.
-			  - \\"worker_namespaces[5]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":\\"WORKER_NAMESPACE_BINDING_SERVICE_1\\"}.
-			  - \\"worker_namespaces[6]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456}.
-			  - \\"worker_namespaces[6]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"service\\":456}."
+			  - \\"dispatch_namespaces[0]\\" binding should be objects, but got \\"a string\\"
+			  - \\"dispatch_namespaces[1]\\" binding should be objects, but got 123
+			  - \\"dispatch_namespaces[2]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
+			  - \\"dispatch_namespaces[2]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"namespace\\":456}.
+			  - \\"dispatch_namespaces[3]\\" should have a string \\"namespace\\" field but got {\\"binding\\":\\"DISPATCH_NAMESPACE_BINDING_1\\",\\"namespace\\":456}.
+			  - \\"dispatch_namespaces[5]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":\\"DISPATCH_NAMESPACE_BINDING_SERVICE_1\\"}.
+			  - \\"dispatch_namespaces[6]\\" should have a string \\"binding\\" field but got {\\"binding\\":123,\\"service\\":456}.
+			  - \\"dispatch_namespaces[6]\\" should have a string \\"namespace\\" field but got {\\"binding\\":123,\\"service\\":456}."
 		`);
 			});
 		});

package/src/__tests__/dev.test.tsx

@@ -668,12 +668,12 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
-					ip: "0.0.0.0",
+					ip: "1.2.3.4",
 				},
 			});
 			fs.writeFileSync("index.js", `export default {};`);
 			await runWrangler("dev");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
+			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("1.2.3.4");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -683,12 +683,12 @@ describe("wrangler dev", () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
-					ip: "1.1.1.1",
+					ip: "1.2.3.4",
 				},
 			});
 			fs.writeFileSync("index.js", `export default {};`);
-			await runWrangler("dev --ip=0.0.0.0");
-			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("0.0.0.0");
+			await runWrangler("dev --ip=5.6.7.8");
+			expect((Dev as jest.Mock).mock.calls[0][0].ip).toEqual("5.6.7.8");
 			expect(std.out).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -1005,7 +1005,7 @@ describe("wrangler dev", () => {
 			      --compatibility-date                         Date to use for compatibility checks  [string]
 			      --compatibility-flags, --compatibility-flag  Flags to use for compatibility checks  [array]
 			      --latest                                     Use the latest version of the worker runtime  [boolean] [default: true]
-			      --ip                                         IP address to listen on  [string] [default: \\"0.0.0.0\\"]
+			      --ip                                         IP address to listen on  [string]
 			      --port                                       Port to listen on  [number]
 			      --inspector-port                             Port for devtools to connect to  [number]
 			      --routes, --route                            Routes to upload  [array]
@@ -1017,6 +1017,8 @@ describe("wrangler dev", () => {
 			      --site-include                               Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.  [array]
 			      --site-exclude                               Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.  [array]
 			      --upstream-protocol                          Protocol to forward requests to host on, defaults to https.  [choices: \\"http\\", \\"https\\"]
+			      --var                                        A key-value pair to be injected into the script as a variable  [array]
+			      --define                                     A key-value pair to be substituted in the script  [array]
 			      --jsx-factory                                The function that is called for each JSX element  [string]
 			      --jsx-fragment                               The function that is called for each JSX fragment  [string]
 			      --tsconfig                                   Path to a custom tsconfig.json file  [string]

package/src/__tests__/generate.test.ts

@@ -1,6 +1,4 @@
 import fs from "node:fs";
-import path from "node:path";
-import process from "node:process";
 import { setup } from "create-cloudflare";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { mockConfirm, clearConfirmMocks } from "./helpers/mock-dialogs";
@@ -73,7 +71,7 @@ describe("generate", () => {
 		).resolves.toBeUndefined();
 
 		expect(createCloudflareMock).lastCalledWith(
-			path.resolve(process.cwd(), "my-worker-1"),
+			"my-worker-1",
 			"some-template",
 			{ debug: false, force: false, init: true }
 		);
@@ -85,7 +83,7 @@ describe("generate", () => {
 		).resolves.toBeUndefined();
 
 		expect(createCloudflareMock).lastCalledWith(
-			path.resolve(process.cwd(), "my-worker-2"),
+			"my-worker-2",
 			"some-template",
 			{ debug: false, force: false, init: true }
 		);

package/src/__tests__/helpers/hello-world-worker.js

@@ -0,0 +1,5 @@
+export default {
+	async fetch() {
+		return new Response("Hello World!");
+	},
+};

package/src/__tests__/helpers/mock-get-zone-from-host.ts

@@ -0,0 +1,8 @@
+import { setMockResponse } from "./mock-cfetch";
+
+export function mockGetZoneFromHostRequest(host: string, zone?: string) {
+	setMockResponse("/zones", (_uri, _init, queryParams) => {
+		expect(queryParams.get("name")).toEqual(host);
+		return zone ? [{ id: zone }] : [];
+	});
+}

package/src/__tests__/helpers/mock-known-routes.ts

@@ -0,0 +1,7 @@
+import { setMockResponse } from "./mock-cfetch";
+
+export function mockCollectKnownRoutesRequest(
+	routes: { pattern: string; script: string }[]
+) {
+	setMockResponse(`/zones/:zoneId/workers/routes`, "GET", () => routes);
+}

package/src/__tests__/index.test.ts

@@ -31,21 +31,21 @@ describe("wrangler", () => {
 			"wrangler
 
 			Commands:
-			  wrangler init [name]       📥 Create a wrangler.toml configuration file
-			  wrangler dev [script]      👂 Start a local server for developing your worker
-			  wrangler publish [script]  🆙 Publish your Worker to Cloudflare.
-			  wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
-			  wrangler secret            🤫 Generate a secret that can be referenced in a Worker
-			  wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
-			  wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
-			  wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
-			  wrangler pages             ⚡️ Configure Cloudflare Pages
-			  wrangler r2                📦 Interact with an R2 store
-			  wrangler worker-namespace  📦 Interact with a worker namespace
-			  wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
-			  wrangler login             🔓 Login to Cloudflare
-			  wrangler logout            🚪 Logout from Cloudflare
-			  wrangler whoami            🕵️  Retrieve your user info and test your auth config
+			  wrangler init [name]         📥 Create a wrangler.toml configuration file
+			  wrangler dev [script]        👂 Start a local server for developing your worker
+			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
+			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
+			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
+			  wrangler kv:namespace        🗂️  Interact with your Workers KV Namespaces
+			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
+			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
+			  wrangler pages               ⚡️ Configure Cloudflare Pages
+			  wrangler r2                  📦 Interact with an R2 store
+			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
+			  wrangler pubsub              📮 Interact and manage Pub/Sub Brokers
+			  wrangler login               🔓 Login to Cloudflare
+			  wrangler logout              🚪 Logout from Cloudflare
+			  wrangler whoami              🕵️  Retrieve your user info and test your auth config
 
 			Flags:
 			  -c, --config   Path to .toml configuration file  [string]
@@ -70,21 +70,21 @@ describe("wrangler", () => {
 			wrangler
 
 			Commands:
-			  wrangler init [name]       📥 Create a wrangler.toml configuration file
-			  wrangler dev [script]      👂 Start a local server for developing your worker
-			  wrangler publish [script]  🆙 Publish your Worker to Cloudflare.
-			  wrangler tail [name]       🦚 Starts a log tailing session for a published Worker.
-			  wrangler secret            🤫 Generate a secret that can be referenced in a Worker
-			  wrangler kv:namespace      🗂️  Interact with your Workers KV Namespaces
-			  wrangler kv:key            🔑 Individually manage Workers KV key-value pairs
-			  wrangler kv:bulk           💪 Interact with multiple Workers KV key-value pairs at once
-			  wrangler pages             ⚡️ Configure Cloudflare Pages
-			  wrangler r2                📦 Interact with an R2 store
-			  wrangler worker-namespace  📦 Interact with a worker namespace
-			  wrangler pubsub            📮 Interact and manage Pub/Sub Brokers
-			  wrangler login             🔓 Login to Cloudflare
-			  wrangler logout            🚪 Logout from Cloudflare
-			  wrangler whoami            🕵️  Retrieve your user info and test your auth config
+			  wrangler init [name]         📥 Create a wrangler.toml configuration file
+			  wrangler dev [script]        👂 Start a local server for developing your worker
+			  wrangler publish [script]    🆙 Publish your Worker to Cloudflare.
+			  wrangler tail [worker]       🦚 Starts a log tailing session for a published Worker.
+			  wrangler secret              🤫 Generate a secret that can be referenced in a Worker
+			  wrangler kv:namespace        🗂️  Interact with your Workers KV Namespaces
+			  wrangler kv:key              🔑 Individually manage Workers KV key-value pairs
+			  wrangler kv:bulk             💪 Interact with multiple Workers KV key-value pairs at once
+			  wrangler pages               ⚡️ Configure Cloudflare Pages
+			  wrangler r2                  📦 Interact with an R2 store
+			  wrangler dispatch-namespace  📦 Interact with a dispatch namespace
+			  wrangler pubsub              📮 Interact and manage Pub/Sub Brokers
+			  wrangler login               🔓 Login to Cloudflare
+			  wrangler logout              🚪 Logout from Cloudflare
+			  wrangler whoami              🕵️  Retrieve your user info and test your auth config
 
 			Flags:
 			  -c, --config   Path to .toml configuration file  [string]

package/src/__tests__/jest.setup.ts

@@ -15,6 +15,19 @@ import {
 } from "./helpers/mock-cfetch";
 import { MockWebSocket } from "./helpers/mock-web-socket";
 
+/**
+ * The relative path between the bundled code and the Wrangler package.
+ * This is used as a reliable way to compute paths relative to the Wrangler package
+ * in the source files, rather than relying upon `__dirname` which can change depending
+ * on whether the source files have been bundled and the location of the outdir.
+ *
+ * This is exposed in the source via the `getBasePath()` function, which should be used
+ * in place of `__dirname` and similar Node.js constants.
+ */
+(
+	global as unknown as { __RELATIVE_PACKAGE_PATH__: string }
+).__RELATIVE_PACKAGE_PATH__ = "..";
+
 // Mock out getPort since we don't actually care about what ports are open in unit tests.
 jest.mock("get-port", () => {
 	return {
@@ -109,6 +122,10 @@ jest.mock("../user/generate-auth-url", () => {
 	};
 });
 
+jest.mock("../is-ci", () => {
+	return { CI: { isCI: jest.fn().mockImplementation(() => false) } };
+});
+
 jest.mock("../user/generate-random-state", () => {
 	return {
 		generateRandomState: jest.fn().mockImplementation(() => "MOCK_STATE_PARAM"),

package/src/__tests__/metrics.test.ts

@@ -2,9 +2,9 @@ import { mkdirSync } from "node:fs";
 import fetchMock from "jest-fetch-mock";
 import { version as wranglerVersion } from "../../package.json";
 import { purgeConfigCaches, saveToConfigCache } from "../config-cache";
+import { CI } from "../is-ci";
 import { logger } from "../logger";
 import { getMetricsDispatcher, getMetricsConfig } from "../metrics";
-import { CI } from "../metrics/is-ci";
 import {
 	CURRENT_METRICS_DATE,
 	readMetricsConfig,