wrangler 2.0.16 → 2.0.17

package/src/__tests__/secret.test.ts

@@ -73,9 +73,9 @@ describe("wrangler secret", () => {
 				mockPutRequest({ name: `secret-name`, text: `hunter2` });
 				await runWrangler("secret put secret-name --name script-name");
 				expect(std.out).toMatchInlineSnapshot(`
-          "🌀 Creating the secret for script script-name
-          ✨ Success! Uploaded secret secret-name"
-        `);
+			"🌀 Creating the secret for the Worker \\"script-name\\"
+			✨ Success! Uploaded secret secret-name"
+		`);
 			});
 
 			it("should create a secret", async () => {
@@ -89,9 +89,9 @@ describe("wrangler secret", () => {
 				await runWrangler("secret put the-key --name script-name");
 
 				expect(std.out).toMatchInlineSnapshot(`
-                  "🌀 Creating the secret for script script-name
-                  ✨ Success! Uploaded secret the-key"
-              `);
+			"🌀 Creating the secret for the Worker \\"script-name\\"
+			✨ Success! Uploaded secret the-key"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
@@ -112,9 +112,9 @@ describe("wrangler secret", () => {
 				);
 
 				expect(std.out).toMatchInlineSnapshot(`
-                  "🌀 Creating the secret for script script-name-some-env
-                  ✨ Success! Uploaded secret the-key"
-              `);
+			"🌀 Creating the secret for the Worker \\"script-name-some-env\\"
+			✨ Success! Uploaded secret the-key"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
@@ -135,9 +135,9 @@ describe("wrangler secret", () => {
 				);
 
 				expect(std.out).toMatchInlineSnapshot(`
-                  "🌀 Creating the secret for script script-name (some-env)
-                  ✨ Success! Uploaded secret the-key"
-              `);
+			"🌀 Creating the secret for the Worker \\"script-name\\" (some-env)
+			✨ Success! Uploaded secret the-key"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
@@ -149,15 +149,17 @@ describe("wrangler secret", () => {
 					error = e as Error;
 				}
 				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"
-        `);
+			          "
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		        `);
 				expect(std.err).toMatchInlineSnapshot(`
-          "X [ERROR] Missing script name
+			"X [ERROR] Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`
 
-          "
-        `);
-				expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
+			"
+		`);
+				expect(error).toMatchInlineSnapshot(
+					`[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`]`
+				);
 			});
 		});
 
@@ -176,9 +178,9 @@ describe("wrangler secret", () => {
 				await runWrangler("secret put the-key --name script-name");
 
 				expect(std.out).toMatchInlineSnapshot(`
-          "🌀 Creating the secret for script script-name
-          ✨ Success! Uploaded secret the-key"
-        `);
+			"🌀 Creating the secret for the Worker \\"script-name\\"
+			✨ Success! Uploaded secret the-key"
+		`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
@@ -190,9 +192,9 @@ describe("wrangler secret", () => {
 				await runWrangler("secret put the-key --name script-name");
 
 				expect(std.out).toMatchInlineSnapshot(`
-          "🌀 Creating the secret for script script-name
-          ✨ Success! Uploaded secret the-key"
-        `);
+			"🌀 Creating the secret for the Worker \\"script-name\\"
+			✨ Success! Uploaded secret the-key"
+		`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
@@ -205,9 +207,9 @@ describe("wrangler secret", () => {
 				).rejects.toThrowErrorMatchingInlineSnapshot(`"Error in stdin stream"`);
 
 				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"
-        `);
+			          "
+			          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		        `);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 
@@ -244,9 +246,9 @@ describe("wrangler secret", () => {
 					mockPutRequest({ name: "the-key", text: "the-secret" });
 					await runWrangler("secret put the-key --name script-name");
 					expect(std.out).toMatchInlineSnapshot(`
-            "🌀 Creating the secret for script script-name
-            ✨ Success! Uploaded secret the-key"
-          `);
+				"🌀 Creating the secret for the Worker \\"script-name\\"
+				✨ Success! Uploaded secret the-key"
+			`);
 					expect(std.warn).toMatchInlineSnapshot(`""`);
 					expect(std.err).toMatchInlineSnapshot(`""`);
 				});
@@ -317,14 +319,14 @@ describe("wrangler secret", () => {
 		it("should delete a secret", async () => {
 			mockDeleteRequest({ scriptName: "script-name", secretName: "the-key" });
 			mockConfirm({
-				text: "Are you sure you want to permanently delete the variable the-key on the script script-name?",
+				text: "Are you sure you want to permanently delete the secret the-key on the Worker script-name?",
 				result: true,
 			});
 			await runWrangler("secret delete the-key --name script-name");
 			expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name
-        ✨ Success! Deleted secret the-key"
-      `);
+			"🌀 Deleting the secret the-key on the Worker script-name
+			✨ Success! Deleted secret the-key"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -335,16 +337,16 @@ describe("wrangler secret", () => {
 				true
 			);
 			mockConfirm({
-				text: "Are you sure you want to permanently delete the variable the-key on the script script-name-some-env?",
+				text: "Are you sure you want to permanently delete the secret the-key on the Worker script-name-some-env?",
 				result: true,
 			});
 			await runWrangler(
 				"secret delete the-key --name script-name --env some-env --legacy-env"
 			);
 			expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name-some-env
-        ✨ Success! Deleted secret the-key"
-      `);
+			"🌀 Deleting the secret the-key on the Worker script-name-some-env
+			✨ Success! Deleted secret the-key"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -354,16 +356,16 @@ describe("wrangler secret", () => {
 				"some-env"
 			);
 			mockConfirm({
-				text: "Are you sure you want to permanently delete the variable the-key on the script script-name (some-env)?",
+				text: "Are you sure you want to permanently delete the secret the-key on the Worker script-name (some-env)?",
 				result: true,
 			});
 			await runWrangler(
 				"secret delete the-key --name script-name --env some-env --legacy-env false"
 			);
 			expect(std.out).toMatchInlineSnapshot(`
-        "🌀 Deleting the secret the-key on script script-name (some-env)
-        ✨ Success! Deleted secret the-key"
-      `);
+			"🌀 Deleting the secret the-key on the Worker script-name (some-env)
+			✨ Success! Deleted secret the-key"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -376,15 +378,17 @@ describe("wrangler secret", () => {
 				error = e as Error;
 			}
 			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"
-      `);
+			        "
+			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		      `);
 			expect(std.err).toMatchInlineSnapshot(`
-        "X [ERROR] Missing script name
+			"X [ERROR] Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`
 
-        "
-      `);
-			expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
+			"
+		`);
+			expect(error).toMatchInlineSnapshot(
+				`[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`]`
+			);
 		});
 	});
 
@@ -422,13 +426,13 @@ describe("wrangler secret", () => {
 			mockListRequest({ scriptName: "script-name" });
 			await runWrangler("secret list --name script-name");
 			expect(std.out).toMatchInlineSnapshot(`
-        "[
-          {
-            \\"name\\": \\"the-secret-name\\",
-            \\"type\\": \\"secret_text\\"
-          }
-        ]"
-      `);
+			        "[
+			          {
+			            \\"name\\": \\"the-secret-name\\",
+			            \\"type\\": \\"secret_text\\"
+			          }
+			        ]"
+		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -438,13 +442,13 @@ describe("wrangler secret", () => {
 				"secret list --name script-name --env some-env --legacy-env"
 			);
 			expect(std.out).toMatchInlineSnapshot(`
-        "[
-          {
-            \\"name\\": \\"the-secret-name\\",
-            \\"type\\": \\"secret_text\\"
-          }
-        ]"
-      `);
+			        "[
+			          {
+			            \\"name\\": \\"the-secret-name\\",
+			            \\"type\\": \\"secret_text\\"
+			          }
+			        ]"
+		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -454,13 +458,13 @@ describe("wrangler secret", () => {
 				"secret list --name script-name --env some-env --legacy-env false"
 			);
 			expect(std.out).toMatchInlineSnapshot(`
-        "[
-          {
-            \\"name\\": \\"the-secret-name\\",
-            \\"type\\": \\"secret_text\\"
-          }
-        ]"
-      `);
+			        "[
+			          {
+			            \\"name\\": \\"the-secret-name\\",
+			            \\"type\\": \\"secret_text\\"
+			          }
+			        ]"
+		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -472,15 +476,17 @@ describe("wrangler secret", () => {
 				error = e as Error;
 			}
 			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"
-      `);
+			        "
+			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		      `);
 			expect(std.err).toMatchInlineSnapshot(`
-        "X [ERROR] Missing script name
+			"X [ERROR] Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`
 
-        "
-      `);
-			expect(error).toMatchInlineSnapshot(`[Error: Missing script name]`);
+			"
+		`);
+			expect(error).toMatchInlineSnapshot(
+				`[Error: Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`--name <worker-name>\`]`
+			);
 		});
 	});
 });

package/src/__tests__/tail.test.ts

@@ -27,6 +27,14 @@ describe("tail", () => {
 	 * deletion, and connection.
 	 */
 	describe("API interaction", () => {
+		it("should throw an error if name isn't provided", async () => {
+			await expect(
+				runWrangler("tail")
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"Required Worker name missing. Please specify the Worker name in wrangler.toml, or pass it as an argument with \`wrangler tail <worker-name>\`"`
+			);
+		});
+
 		it("creates and then delete tails", async () => {
 			const api = mockWebsocketAPIs();
 			expect(api.requests.creation.count).toStrictEqual(0);

package/src/__tests__/user.test.ts

@@ -18,7 +18,7 @@ import type { Config } from "../config";
 import type { UserAuthConfig } from "../user";
 
 describe("User", () => {
-	runInTempDir({ homedir: "./home" });
+	runInTempDir();
 	const std = mockConsoleMethods();
 	const {
 		mockOAuthServerCallback,
@@ -94,13 +94,10 @@ describe("User", () => {
 	// TODO: Improve OAuth mocking to handle `/token` endpoints from different calls
 	it("should handle errors for failed token refresh", async () => {
 		setIsTTY(false);
-		mockOAuthServerCallback();
 		writeAuthConfigFile({
 			oauth_token: "hunter2",
 			refresh_token: "Order 66",
 		});
-		mockGrantAuthorization({ respondWith: "success" });
-
 		mockExchangeRefreshTokenForAccessToken({
 			respondWith: "badResponse",
 		});
@@ -109,7 +106,7 @@ describe("User", () => {
 		await expect(
 			requireAuth({} as Config)
 		).rejects.toThrowErrorMatchingInlineSnapshot(
-			`"Did not login, quitting..."`
+			`"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN."`
 		);
 	});
 

package/src/__tests__/whoami.test.tsx

@@ -16,7 +16,7 @@ import type { UserInfo } from "../whoami";
 describe("getUserInfo()", () => {
 	const ENV_COPY = process.env;
 
-	runInTempDir({ homedir: "./home" });
+	runInTempDir();
 	const std = mockConsoleMethods();
 	const { setIsTTY } = useMockIsTTY();
 
@@ -173,6 +173,16 @@ describe("getUserInfo()", () => {
 
 	it("should display a warning message if the config file contains a legacy api_token field", async () => {
 		writeAuthConfigFile({ api_token: "API_TOKEN" });
+		setMockResponse("/user", () => {
+			return { email: "user@example.com" };
+		});
+		setMockResponse("/accounts", () => {
+			return [
+				{ name: "Account One", id: "account-1" },
+				{ name: "Account Two", id: "account-2" },
+				{ name: "Account Three", id: "account-3" },
+			];
+		});
 		await getUserInfo();
 		expect(std.warn).toMatchInlineSnapshot(`
       "▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.

package/src/api/dev.ts

@@ -43,7 +43,10 @@ export async function unstable_dev(script: string, options: DevOptions) {
 				showInteractiveDevSession: false,
 			});
 		}).then((devServer) => {
-			resolve({ stop: devServer.stop, fetch: devServer.fetch });
+			resolve({
+				stop: devServer.stop,
+				fetch: devServer.fetch,
+			});
 		});
 	});
 }

package/src/cli.ts

@@ -24,4 +24,4 @@ if (typeof jest === "undefined" && require.main) {
  * It makes it possible to import wrangler from 'wrangler',
  * and call wrangler.unstable_dev().
  */
-module.exports = { unstable_dev };
+export default { unstable_dev };

package/src/dev/local.tsx

@@ -1,4 +1,4 @@
-import { spawn } from "node:child_process";
+import { fork } from "node:child_process";
 import { realpathSync } from "node:fs";
 import { writeFile } from "node:fs/promises";
 import path from "node:path";
@@ -13,7 +13,7 @@ import type { AssetPaths } from "../sites";
 import type { CfWorkerInit, CfScriptFormat } from "../worker";
 import type { EsbuildBundle } from "./use-esbuild";
 import type { MiniflareOptions } from "miniflare";
-
+import type { ChildProcess } from "node:child_process";
 interface LocalProps {
 	name: string | undefined;
 	bundle: EsbuildBundle | undefined;
@@ -67,7 +67,7 @@ function useLocalWorker({
 	logLevel,
 }: LocalProps) {
 	// TODO: pass vars via command line
-	const local = useRef<ReturnType<typeof spawn>>();
+	const local = useRef<ChildProcess>();
 	const removeSignalExitListener = useRef<() => void>();
 	const [inspectorUrl, setInspectorUrl] = useState<string | undefined>();
 	// if we're using local persistence for data, we should use the cwd
@@ -187,6 +187,7 @@ function useLocalWorker({
 				compatibilityDate,
 				compatibilityFlags,
 				kvNamespaces: bindings.kv_namespaces?.map((kv) => kv.binding),
+				r2Buckets: bindings.r2_buckets?.map((r2) => r2.binding),
 				durableObjects: Object.fromEntries(
 					(bindings.durable_objects?.bindings ?? []).map<[string, string]>(
 						(value) => [value.name, value.class_name]
@@ -236,43 +237,45 @@ function useLocalWorker({
 				__dirname,
 				"../miniflare-dist/index.mjs"
 			);
-			const optionsArg = JSON.stringify(options, null);
+			const miniflareOptions = JSON.stringify(options, null);
 
 			logger.log("⎔ Starting a local server...");
-			const localServerOptions = [
+			const nodeOptions = [
 				"--experimental-vm-modules", // ensures that Miniflare can run ESM Workers
 				"--no-warnings", // hide annoying Node warnings
-				miniflareCLIPath,
-				optionsArg,
 				// "--log=VERBOSE", // uncomment this to Miniflare to log "everything"!
 			];
 			if (inspect) {
-				localServerOptions.push("--inspect"); // start Miniflare listening for a debugger to attach
+				nodeOptions.push("--inspect"); // start Miniflare listening for a debugger to attach
 			}
-			// spawn isn't technically synchronous here
-			local.current = spawn("node", localServerOptions, {
-				cwd: path.dirname(scriptPath),
+			const child = (local.current = fork(
+				miniflareCLIPath,
+				[miniflareOptions],
+				{
+					cwd: path.dirname(scriptPath),
+					execArgv: nodeOptions,
+				}
+			));
+			child.on("message", (message) => {
+				if (message === "ready") {
+					onReady?.();
+				}
 			});
-			//TODO: instead of being lucky with spawn's timing, have miniflare-cli notify wrangler that it's ready in packages/wrangler/src/miniflare-cli/index.ts, after the mf.startScheduler promise resolves
-			if (onReady) {
-				await new Promise((resolve) => setTimeout(resolve, 500));
-				onReady();
-			}
 
-			local.current.on("close", (code) => {
+			child.on("close", (code) => {
 				if (code) {
 					logger.log(`Miniflare process exited with code ${code}`);
 				}
 			});
 
-			local.current.stdout?.on("data", (data: Buffer) => {
+			child.stdout?.on("data", (data: Buffer) => {
 				process.stdout.write(data);
 			});
 
 			// parse the node inspector url (which may be received in chunks) from stderr
 			let stderrData = "";
 			let inspectorUrlFound = false;
-			local.current.stderr?.on("data", (data: Buffer) => {
+			child.stderr?.on("data", (data: Buffer) => {
 				if (!inspectorUrlFound) {
 					stderrData += data.toString();
 					const matches =
@@ -288,20 +291,20 @@ function useLocalWorker({
 				process.stderr.write(data);
 			});
 
-			local.current.on("exit", (code) => {
+			child.on("exit", (code) => {
 				if (code) {
 					logger.error(`Miniflare process exited with code ${code}`);
 				}
 			});
 
-			local.current.on("error", (error: Error) => {
+			child.on("error", (error: Error) => {
 				logger.error(`Miniflare process failed to spawn`);
 				logger.error(error);
 			});
 
 			removeSignalExitListener.current = onExit((_code, _signal) => {
 				logger.log("⎔ Shutting down local server.");
-				local.current?.kill();
+				child.kill();
 				local.current = undefined;
 			});
 		}
@@ -328,6 +331,7 @@ function useLocalWorker({
 		ip,
 		bindings.durable_objects?.bindings,
 		bindings.kv_namespaces,
+		bindings.r2_buckets,
 		bindings.vars,
 		bindings.services,
 		compatibilityDate,

package/src/dev/remote.tsx

@@ -53,7 +53,7 @@ export function Remote(props: {
 	zone: string | undefined;
 	host: string | undefined;
 	routes: Route[] | undefined;
-	onReady?: () => void;
+	onReady?: (() => void) | undefined;
 }) {
 	const [accountId, setAccountId] = useState(props.accountId);
 	const accountChoicesRef = useRef<Promise<ChooseAccountItem[]>>();
@@ -158,7 +158,7 @@ export function useWorker(props: {
 	zone: string | undefined;
 	host: string | undefined;
 	routes: Route[] | undefined;
-	onReady?: () => void;
+	onReady: (() => void) | undefined;
 }): CfPreviewToken | undefined {
 	const {
 		name,

package/src/entry.ts

@@ -39,7 +39,7 @@ export async function getEntry(
 				? path.resolve(config.site?.["entry-point"])
 				: // site.entry-point could be a directory
 				  path.resolve(config.site?.["entry-point"], "index.js");
-		} else if (args.assets) {
+		} else if (args.assets || config.assets) {
 			file = path.resolve(__dirname, "../templates/no-op-worker.js");
 		} else {
 			throw new Error(

package/src/https-options.ts

@@ -1,5 +1,5 @@
 import * as fs from "node:fs";
-import { homedir, networkInterfaces } from "node:os";
+import os from "node:os";
 import * as path from "node:path";
 import { promisify } from "node:util";
 import { logger } from "./logger";
@@ -17,7 +17,7 @@ const ONE_DAY_IN_MS = 86400000;
  * The certificates are self-signed and generated locally, and cached in the `CERT_ROOT` directory.
  */
 export async function getHttpsOptions() {
-	const certDirectory = path.join(homedir(), ".wrangler/local-cert");
+	const certDirectory = path.join(os.homedir(), ".wrangler/local-cert");
 	const keyPath = path.join(certDirectory, "key.pem");
 	const certPath = path.join(certDirectory, "cert.pem");
 
@@ -37,7 +37,10 @@ export async function getHttpsOptions() {
 		} catch (e) {
 			const message = e instanceof Error ? e.message : `${e}`;
 			logger.warn(
-				`Unable to cache generated self-signed certificate in ${certDirectory}.\n${message}`
+				`Unable to cache generated self-signed certificate in ${path.relative(
+					process.cwd(),
+					certDirectory
+				)}.\n${message}`
 			);
 		}
 		return { key, cert };
@@ -114,7 +117,7 @@ async function generateCertificate() {
  */
 function getAccessibleHosts(ipv4 = false): string[] {
 	const hosts: string[] = [];
-	Object.values(networkInterfaces()).forEach((net) =>
+	Object.values(os.networkInterfaces()).forEach((net) =>
 		net?.forEach(({ family, address }) => {
 			if (!ipv4 || family === "IPv4") hosts.push(address);
 		})