wrangler 2.0.22 → 2.0.23

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.22",
+	"version": "2.0.23",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -53,7 +53,7 @@
 		"bundle": "node -r esbuild-register scripts/bundle.ts",
 		"check:type": "tsc",
 		"clean": "rm -rf wrangler-dist miniflare-dist emitted-types",
-		"dev": "npm run clean && concurrently -c black,blue 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
+		"dev": "npm run clean && concurrently -c black,blue --kill-others-on-fail false 'npm run bundle -- --watch' 'npm run check:type -- --watch --preserveWatchOutput'",
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
@@ -61,6 +61,13 @@
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch"
 	},
 	"jest": {
+		"collectCoverage": true,
+		"coverageReporters": [
+			"json",
+			"html",
+			"text",
+			"cobertura"
+		],
 		"moduleNameMapper": {
 			"clipboardy": "<rootDir>/src/__tests__/helpers/clipboardy-mock.js",
 			"miniflare/cli": "<rootDir>/../../node_modules/miniflare/dist/src/cli.js"
@@ -88,6 +95,7 @@
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
 		"blake3-wasm": "^2.1.5",
+		"chokidar": "^3.5.3",
 		"esbuild": "0.14.47",
 		"miniflare": "^2.6.0",
 		"nanoid": "^3.3.3",
@@ -109,7 +117,6 @@
 		"@types/ws": "^8.5.3",
 		"@types/yargs": "^17.0.10",
 		"@webcontainer/env": "^1.0.1",
-		"chokidar": "^3.5.3",
 		"clipboardy": "^3.0.0",
 		"cmd-shim": "^4.1.0",
 		"command-exists": "^1.2.9",

package/src/__tests__/dev.test.tsx

@@ -525,9 +525,9 @@ describe("wrangler dev", () => {
 
 			await expect(runWrangler("dev")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
-              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
-            `);
+						              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+						              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
+					            `);
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Running custom build: node -e \\"console.log('custom build');\\"
 
@@ -673,6 +673,78 @@ describe("wrangler dev", () => {
 		});
 	});
 
+	describe("inspector port", () => {
+		it("should use 9229 as the default port", async () => {
+			writeWranglerToml({
+				main: "index.js",
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await runWrangler("dev");
+			expect((Dev as jest.Mock).mock.calls[0][0].inspectorPort).toEqual(9229);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "",
+			  "warn": "",
+			}
+		`);
+		});
+
+		it("should read --inspector-port", async () => {
+			writeWranglerToml({
+				main: "index.js",
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await runWrangler("dev --inspector-port=9999");
+			expect((Dev as jest.Mock).mock.calls[0][0].inspectorPort).toEqual(9999);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "",
+			  "warn": "",
+			}
+		`);
+		});
+
+		it("should read dev.inspector_port from wrangler.toml", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				dev: {
+					inspector_port: 9999,
+				},
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await runWrangler("dev");
+			expect((Dev as jest.Mock).mock.calls[0][0].inspectorPort).toEqual(9999);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "",
+			  "warn": "",
+			}
+		`);
+		});
+
+		it("should error if a bad dev.inspector_port config is provided", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				dev: {
+					// @ts-expect-error intentionally bad port
+					inspector_port: "some string",
+				},
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await expect(runWrangler("dev")).rejects
+				.toThrowErrorMatchingInlineSnapshot(`
+						"Processing wrangler.toml configuration:
+						  - Expected \\"dev.inspector_port\\" to be of type number but got \\"some string\\"."
+					`);
+		});
+	});
+
 	describe("port", () => {
 		it("should default port to 8787 if it is not in use", async () => {
 			writeWranglerToml({
@@ -686,7 +758,7 @@ describe("wrangler dev", () => {
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
-		it("should use to `port` from `wrangler.toml`, if available", async () => {
+		it("should use `port` from `wrangler.toml`, if available", async () => {
 			writeWranglerToml({
 				main: "index.js",
 				dev: {
@@ -704,6 +776,22 @@ describe("wrangler dev", () => {
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
+		it("should error if a bad dev.port config is provided", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				dev: {
+					// @ts-expect-error intentionally bad port
+					port: "some string",
+				},
+			});
+			fs.writeFileSync("index.js", `export default {};`);
+			await expect(runWrangler("dev")).rejects
+				.toThrowErrorMatchingInlineSnapshot(`
+						"Processing wrangler.toml configuration:
+						  - Expected \\"dev.port\\" to be of type number but got \\"some string\\"."
+					`);
+		});
+
 		it("should use --port command line arg, if provided", async () => {
 			writeWranglerToml({
 				main: "index.js",

package/src/__tests__/kv.test.ts

@@ -6,6 +6,8 @@ import {
 	unsetAllMocks,
 	unsetMockFetchKVGetValues,
 	setMockFetchKVGetValue,
+	setMockRawResponse,
+	createFetchResult,
 } from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { clearConfirmMocks, mockConfirm } from "./helpers/mock-dialogs";
@@ -280,9 +282,9 @@ describe("wrangler", () => {
 				writeWranglerConfig();
 				await expect(runWrangler("kv:namespace delete --binding otherBinding"))
 					.rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Not able to delete namespace.
-                A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
-              `);
+						                "Not able to delete namespace.
+						                A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\"."
+					              `);
 				expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] Not able to delete namespace.
 
@@ -299,7 +301,10 @@ describe("wrangler", () => {
 					"kv:namespace delete --binding someBinding --env some-environment --preview false"
 				);
 
-				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.out).toMatchInlineSnapshot(`
+					"Deleting KV namespace env-bound-id.
+					Deleted KV namespace env-bound-id."
+				`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(requests.count).toEqual(1);
 			});
@@ -1181,12 +1186,12 @@ describe("wrangler", () => {
 					setIsTTY({ stdin: false, stdout: true });
 					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"one\\" - \\"1\\")
-                    \\"two\\" - \\"2\\")"
-                `);
+							                  "More than one account available but unable to select one in non-interactive mode.
+							                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+							                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+							                    \\"one\\" - \\"1\\")
+							                    \\"two\\" - \\"2\\")"
+						                `);
 				});
 
 				it("should error if there are multiple accounts available but not interactive on stdout", async () => {
@@ -1197,12 +1202,28 @@ describe("wrangler", () => {
 					setIsTTY({ stdin: true, stdout: false });
 					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"one\\" - \\"1\\")
-                    \\"two\\" - \\"2\\")"
-                `);
+							                  "More than one account available but unable to select one in non-interactive mode.
+							                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+							                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+							                    \\"one\\" - \\"1\\")
+							                    \\"two\\" - \\"2\\")"
+						                `);
+				});
+
+				it("should recommend using a configuration if unable to fetch memberships", async () => {
+					setMockRawResponse("/memberships", () => {
+						return createFetchResult(undefined, false, [
+							{
+								code: 9109,
+								message: "Uauthorized to access requested resource",
+							},
+						]);
+					});
+					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
+						.rejects.toThrowErrorMatchingInlineSnapshot(`
+							"Failed to automatically retrieve account IDs for the logged in user.
+							You may have incorrect permissions on your API token. You can skip this account check by adding an \`account_id\` in your \`wrangler.toml\`, or by setting the value of CLOUDFLARE_ACCOUNT_ID\\""
+						`);
 				});
 
 				it("should error if there are multiple accounts available but not interactive at all", async () => {
@@ -1213,12 +1234,12 @@ describe("wrangler", () => {
 					setIsTTY(false);
 					await expect(runWrangler("kv:key get key --namespace-id=xxxx"))
 						.rejects.toThrowErrorMatchingInlineSnapshot(`
-                  "More than one account available but unable to select one in non-interactive mode.
-                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
-                    \\"one\\" - \\"1\\")
-                    \\"two\\" - \\"2\\")"
-                `);
+							                  "More than one account available but unable to select one in non-interactive mode.
+							                  Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+							                  Available accounts are (\\"<name>\\" - \\"<id>\\"):
+							                    \\"one\\" - \\"1\\")
+							                    \\"two\\" - \\"2\\")"
+						                `);
 				});
 			});
 		});
@@ -1390,9 +1411,9 @@ describe("wrangler", () => {
 				await expect(
 					runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Expected an array of key-value objects but got type \\"object\\"."
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Expected an array of key-value objects but got type \\"object\\"."
+					              `);
 				expect(std.out).toMatchInlineSnapshot(`
           "
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
@@ -1430,30 +1451,30 @@ describe("wrangler", () => {
 				await expect(
 					runWrangler(`kv:bulk put --namespace-id some-namespace-id keys.json`)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Each item in the array should be an object that matches:
-
-                interface KeyValue {
-                  key: string;
-                  value: string;
-                  expiration?: number;
-                  expiration_ttl?: number;
-                  metadata?: object;
-                  base64?: boolean;
-                }
-
-                The item at index 0 is 123
-                The item at index 1 is \\"a string\\"
-                The item at index 2 is {\\"key\\":\\"someKey\\"}
-                The item at index 3 is {\\"value\\":\\"someValue\\"}
-                The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
-                The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
-                The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
-                The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
-                The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
-                The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
-                The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Each item in the array should be an object that matches:
+
+						                interface KeyValue {
+						                  key: string;
+						                  value: string;
+						                  expiration?: number;
+						                  expiration_ttl?: number;
+						                  metadata?: object;
+						                  base64?: boolean;
+						                }
+
+						                The item at index 0 is 123
+						                The item at index 1 is \\"a string\\"
+						                The item at index 2 is {\\"key\\":\\"someKey\\"}
+						                The item at index 3 is {\\"value\\":\\"someValue\\"}
+						                The item at index 6 is {\\"key\\":123,\\"value\\":\\"somevalue\\"}
+						                The item at index 7 is {\\"key\\":\\"somekey\\",\\"value\\":123}
+						                The item at index 8 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration\\":\\"string\\"}
+						                The item at index 9 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"expiration_ttl\\":\\"string\\"}
+						                The item at index 10 is {\\"key\\":123,\\"value\\":{\\"a\\":{\\"nested\\":\\"object\\"}}}
+						                The item at index 11 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"metadata\\":123}
+						                The item at index 12 is {\\"key\\":\\"someKey1\\",\\"value\\":\\"someValue1\\",\\"base64\\":\\"string\\"}"
+					              `);
 
 				expect(std.out).toMatchInlineSnapshot(`
           "
@@ -1592,10 +1613,10 @@ describe("wrangler", () => {
 						`kv:bulk delete --namespace-id some-namespace-id keys.json`
 					)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Expected an array of strings but got:
-                12354"
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Expected an array of strings but got:
+						                12354"
+					              `);
 				expect(std.out).toMatchInlineSnapshot(`
           "
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
@@ -1615,12 +1636,12 @@ describe("wrangler", () => {
 						`kv:bulk delete --namespace-id some-namespace-id keys.json`
 					)
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Unexpected JSON input from \\"keys.json\\".
-                Expected an array of strings.
-                The item at index 1 is type: \\"number\\" - 12354
-                The item at index 2 is type: \\"object\\" - {\\"key\\":\\"someKey\\"}
-                The item at index 3 is type: \\"object\\" - null"
-              `);
+						                "Unexpected JSON input from \\"keys.json\\".
+						                Expected an array of strings.
+						                The item at index 1 is type: \\"number\\" - 12354
+						                The item at index 2 is type: \\"object\\" - {\\"key\\":\\"someKey\\"}
+						                The item at index 3 is type: \\"object\\" - null"
+					              `);
 				expect(std.out).toMatchInlineSnapshot(`
           "
           If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"

package/src/__tests__/publish.test.ts

@@ -6108,6 +6108,82 @@ addEventListener('fetch', event => {});`
 			expect(fs.readFileSync("dist/index.js", "utf-8")).toMatch(scriptContent);
 		});
 	});
+
+	describe("--no-bundle --minify", () => {
+		it("should warn that no-bundle and minify can't be used together", async () => {
+			writeWranglerToml();
+			const scriptContent = `
+			const xyz = 123; // a statement that would otherwise be compiled out
+		`;
+			fs.writeFileSync("index.js", scriptContent);
+			await runWrangler(
+				"publish index.js --no-bundle --minify --dry-run --outdir dist"
+			);
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] \`--minify\` and \`--no-bundle\` can't be used together. If you want to minify your Worker and disable Wrangler's bundling, please minify as part of your own bundling process.
+
+			"
+		`);
+		});
+
+		it("should warn that no-bundle and minify can't be used together", async () => {
+			writeWranglerToml({
+				no_bundle: true,
+				minify: true,
+			});
+			const scriptContent = `
+			const xyz = 123; // a statement that would otherwise be compiled out
+		`;
+			fs.writeFileSync("index.js", scriptContent);
+			await runWrangler("publish index.js --dry-run --outdir dist");
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] \`--minify\` and \`--no-bundle\` can't be used together. If you want to minify your Worker and disable Wrangler's bundling, please minify as part of your own bundling process.
+
+			"
+		`);
+		});
+	});
+
+	describe("--no-bundle --node-compat", () => {
+		it("should warn that no-bundle and node-compat can't be used together", async () => {
+			writeWranglerToml();
+			const scriptContent = `
+			const xyz = 123; // a statement that would otherwise be compiled out
+		`;
+			fs.writeFileSync("index.js", scriptContent);
+			await runWrangler(
+				"publish index.js --no-bundle --node-compat --dry-run --outdir dist"
+			);
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+
+
+			▲ [WARNING] \`--node-compat\` and \`--no-bundle\` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process.
+
+			"
+		`);
+		});
+
+		it("should warn that no-bundle and node-compat can't be used together", async () => {
+			writeWranglerToml({
+				no_bundle: true,
+				node_compat: true,
+			});
+			const scriptContent = `
+			const xyz = 123; // a statement that would otherwise be compiled out
+		`;
+			fs.writeFileSync("index.js", scriptContent);
+			await runWrangler("publish index.js --dry-run --outdir dist");
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+
+
+			▲ [WARNING] \`--node-compat\` and \`--no-bundle\` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process.
+
+			"
+		`);
+		});
+	});
 });
 
 /** Write mock assets to the file system so they can be uploaded. */

package/src/__tests__/version.test.ts

@@ -0,0 +1,35 @@
+import { version } from "./../../package.json";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { useMockIsTTY } from "./helpers/mock-istty";
+import { runWrangler } from "./helpers/run-wrangler";
+
+describe("version", () => {
+	const std = mockConsoleMethods();
+	const { setIsTTY } = useMockIsTTY();
+
+	// We cannot test output of version banner,
+	// as it is disabled in jest environments
+
+	// it("should output version banner", async () => {
+	// 	await runWrangler("-v");
+	// 	expect(std.out).toMatchInlineSnapshot(`
+	// 	" ⛅️ wrangler 2.0.22
+	// 	--------------------"
+	// `);
+	// });
+
+	it("should output current version if !isTTY calling -v", async () => {
+		setIsTTY(false);
+
+		await runWrangler("-v");
+		expect(std.out).toMatch(version);
+	});
+
+	// This run separately as command handling is different
+	it("should output current version if !isTTY calling --version", async () => {
+		setIsTTY(false);
+
+		await runWrangler("--version");
+		expect(std.out).toMatch(version);
+	});
+});

package/src/api/dev.ts

@@ -1,6 +1,7 @@
 import { startDev } from "../dev";
 import { logger } from "../logger";
 
+import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli";
 import type { RequestInit, Response } from "undici";
 
 interface DevOptions {
@@ -13,39 +14,72 @@ interface DevOptions {
 	siteInclude?: string[];
 	siteExclude?: string[];
 	nodeCompat?: boolean;
+	compatibilityDate?: string;
 	experimentalEnableLocalPersistence?: boolean;
-	_: (string | number)[]; //yargs wants this
-	$0: string; //yargs wants this
+	liveReload?: boolean;
+	watch?: boolean;
+	vars: {
+		[key: string]: unknown;
+	};
+	kv?: {
+		binding: string;
+		id: string;
+		preview_id?: string;
+	}[];
+	durableObjects?: {
+		name: string;
+		class_name: string;
+		script_name?: string | undefined;
+		environment?: string | undefined;
+	}[];
+	showInteractiveDevSession?: boolean;
+	logLevel?: "none" | "error" | "log" | "warn" | "debug";
+	logPrefix?: string;
+	inspect?: boolean;
+	forceLocal?: boolean;
+	enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
+	_?: (string | number)[]; //yargs wants this
+	$0?: string; //yargs wants this
 }
 /**
  *  unstable_dev starts a wrangler dev server, and returns a promise that resolves with utility functions to interact with it.
  *  @param {string} script
  *  @param {DevOptions} options
  */
-export async function unstable_dev(script: string, options: DevOptions) {
-	logger.warn(
-		`unstable_dev() is experimental\nunstable_dev()'s behaviour will likely change in future releases`
-	);
+export async function unstable_dev(
+	script: string,
+	options: DevOptions,
+	disableExperimentalWarning?: boolean
+) {
+	if (!disableExperimentalWarning) {
+		logger.warn(
+			`unstable_dev() is experimental\nunstable_dev()'s behaviour will likely change in future releases`
+		);
+	}
 
 	return new Promise<{
 		stop: () => void;
 		fetch: (init?: RequestInit) => Promise<Response | undefined>;
+		waitUntilExit: () => Promise<void>;
 	}>((resolve) => {
 		//lmao
 		return new Promise<Awaited<ReturnType<typeof startDev>>>((ready) => {
 			const devServer = startDev({
 				script: script,
-				...options,
-				local: true,
-				onReady: () => ready(devServer),
 				inspect: false,
 				logLevel: "none",
 				showInteractiveDevSession: false,
+				_: [],
+				$0: "",
+				...options,
+				local: true,
+				onReady: () => ready(devServer),
 			});
 		}).then((devServer) => {
 			resolve({
 				stop: devServer.stop,
 				fetch: devServer.fetch,
+				waitUntilExit: devServer.devReactElement.waitUntilExit,
 			});
 		});
 	});

package/src/bundle.ts

@@ -1,6 +1,7 @@
 import assert from "node:assert";
 import * as fs from "node:fs";
 import { builtinModules } from "node:module";
+import * as os from "node:os";
 import * as path from "node:path";
 import NodeGlobalsPolyfills from "@esbuild-plugins/node-globals-polyfill";
 import NodeModulesPolyfills from "@esbuild-plugins/node-modules-polyfill";
@@ -92,14 +93,37 @@ export async function bundleWorker(
 		rules,
 	});
 
+	// In dev, we want to patch `fetch()` with a special version that looks
+	// for bad usages and can warn the user about them; so we inject
+	// `checked-fetch.js` to do so. However, with yarn 3 style pnp,
+	// we need to extract that file to an accessible place before injecting
+	// it in, hence this code here.
+	const osTempDir = os.tmpdir();
+	const checkedFetchFileToInject = path.join(
+		osTempDir,
+		"--temp-wrangler-files--",
+		"checked-fetch.js"
+	);
+
+	if (checkFetch && !fs.existsSync(checkedFetchFileToInject)) {
+		fs.mkdirSync(path.join(osTempDir, "--temp-wrangler-files--"), {
+			recursive: true,
+		});
+		fs.writeFileSync(
+			checkedFetchFileToInject,
+			fs.readFileSync(path.resolve(__dirname, "../templates/checked-fetch.js"))
+		);
+	}
+	// TODO: we need to have similar logic like above for other files
+	// like the static asset facade, and other middleware that we
+	// plan on injecting/referencing.
+
 	const result = await esbuild.build({
 		...getEntryPoint(entry.file, serveAssetsFromWorker),
 		bundle: true,
 		absWorkingDir: entry.directory,
 		outdir: destination,
-		inject: checkFetch
-			? [path.resolve(__dirname, "../templates/checked-fetch.js")]
-			: [],
+		inject: checkFetch ? [checkedFetchFileToInject] : [],
 		external: ["__STATIC_CONTENT_MANIFEST"],
 		format: entry.format === "modules" ? "esm" : "iife",
 		target: "es2020",
@@ -109,7 +133,9 @@ export async function bundleWorker(
 		conditions: ["worker", "browser"],
 		...(process.env.NODE_ENV && {
 			define: {
-				"process.env.NODE_ENV": `"${process.env.NODE_ENV}"`,
+				// use process.env["NODE_ENV" + ""] so that esbuild doesn't replace it
+				// when we do a build of wrangler. (re: https://github.com/cloudflare/wrangler2/issues/1477)
+				"process.env.NODE_ENV": `"${process.env["NODE_ENV" + ""]}"`,
 				...(nodeCompat ? { global: "globalThis" } : {}),
 				...(checkFetch ? { fetch: "checkedFetch" } : {}),
 				...options.define,

package/src/config/config.ts

@@ -180,6 +180,13 @@ export interface DevConfig {
 	 */
 	port: number | undefined;
 
+	/**
+	 * Port for the local dev server's inspector to listen on
+	 *
+	 * @default `9229`
+	 */
+	inspector_port: number | undefined;
+
 	/**
 	 * Protocol that local wrangler dev server listens to requests on.
 	 *