wrangler 2.0.18 → 2.0.19

package/bin/wrangler.js

@@ -3,7 +3,6 @@ const { spawn } = require("child_process");
 const path = require("path");
 const fs = require("fs");
 const os = require("os");
-const semiver = require("semiver");
 
 const MIN_NODE_VERSION = "16.7.0";
 const debug =
@@ -21,8 +20,8 @@ function runWrangler() {
 		// Note Volta and nvm are also recommended in the official docs:
 		// https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
 		console.error(
-			`Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}.
-You should use the latest Node.js version if possible, as Cloudflare Workers use a very up-to-date version of V8.
+			`Wrangler requires at least node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of node.js.
+
 Consider using a Node.js version manager such as https://volta.sh/ or https://github.com/nvm-sh/nvm.`
 		);
 		process.exitCode = 1;
@@ -128,10 +127,42 @@ async function main() {
 }
 
 process.on("SIGINT", () => {
-	wranglerProcess?.kill();
+	wranglerProcess && wranglerProcess.kill();
 });
 process.on("SIGTERM", () => {
-	wranglerProcess?.kill();
+	wranglerProcess && wranglerProcess.kill();
 });
 
+// semiver implementation via https://github.com/lukeed/semiver/blob/ae7eebe6053c96be63032b14fb0b68e2553fcac4/src/index.js
+
+/**
+MIT License
+
+Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ */
+
+var fn = new Intl.Collator(0, { numeric: 1 }).compare;
+
+function semiver(a, b, bool) {
+	a = a.split(".");
+	b = b.split(".");
+
+	return (
+		fn(a[0], b[0]) ||
+		fn(a[1], b[1]) ||
+		((b[2] = b.slice(2).join(".")),
+		(bool = /[.-]/.test((a[2] = a.slice(2).join(".")))),
+		bool == /[.-]/.test(b[2]) ? fn(a[2], b[2]) : bool ? -1 : 1)
+	);
+}
+
+// end semiver implementation
+
 void main();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.0.18",
+	"version": "2.0.19",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -93,7 +93,6 @@
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
-		"semiver": "^1.1.0",
 		"xxhash-wasm": "^1.0.1"
 	},
 	"devDependencies": {

package/src/__tests__/configuration.test.ts

@@ -40,6 +40,7 @@ describe("normalizeAndValidateConfig()", () => {
 			tsconfig: undefined,
 			kv_namespaces: [],
 			legacy_env: true,
+			send_metrics: undefined,
 			main: undefined,
 			migrations: [],
 			name: undefined,
@@ -76,6 +77,7 @@ describe("normalizeAndValidateConfig()", () => {
 		it("should override config defaults with provided values", () => {
 			const expectedConfig: Partial<ConfigFields<RawDevConfig>> = {
 				legacy_env: true,
+				send_metrics: false,
 				dev: {
 					ip: "255.255.255.255",
 					port: 9999,
@@ -98,6 +100,7 @@ describe("normalizeAndValidateConfig()", () => {
 		it("should error on invalid top level fields", () => {
 			const expectedConfig = {
 				legacy_env: "FOO",
+				send_metrics: "BAD",
 				dev: {
 					ip: 222,
 					port: "FOO",
@@ -117,13 +120,14 @@ describe("normalizeAndValidateConfig()", () => {
 			);
 			expect(diagnostics.hasWarnings()).toBe(false);
 			expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
-			        "Processing wrangler configuration:
-			          - Expected \\"legacy_env\\" to be of type boolean but got \\"FOO\\".
-			          - Expected \\"dev.ip\\" to be of type string but got 222.
-			          - Expected \\"dev.port\\" to be of type number but got \\"FOO\\".
-			          - Expected \\"dev.local_protocol\\" field to be one of [\\"http\\",\\"https\\"] but got \\"wss\\".
-			          - Expected \\"dev.upstream_protocol\\" field to be one of [\\"http\\",\\"https\\"] but got \\"ws\\"."
-		      `);
+			"Processing wrangler configuration:
+			  - Expected \\"legacy_env\\" to be of type boolean but got \\"FOO\\".
+			  - Expected \\"send_metrics\\" to be of type boolean but got \\"BAD\\".
+			  - Expected \\"dev.ip\\" to be of type string but got 222.
+			  - Expected \\"dev.port\\" to be of type number but got \\"FOO\\".
+			  - Expected \\"dev.local_protocol\\" field to be one of [\\"http\\",\\"https\\"] but got \\"wss\\".
+			  - Expected \\"dev.upstream_protocol\\" field to be one of [\\"http\\",\\"https\\"] but got \\"ws\\"."
+		`);
 		});
 
 		it("should warn on and remove unexpected top level fields", () => {

package/src/__tests__/helpers/run-in-tmp.ts

@@ -6,7 +6,7 @@ import { reinitialiseAuthTokens } from "../../user";
 const originalCwd = process.cwd();
 
 export function runInTempDir({ homedir } = { homedir: "./home" }) {
-	let tmpDir: string | undefined;
+	let tmpDir: string;
 
 	beforeEach(() => {
 		// Use realpath because the temporary path can point to a symlink rather than the actual path.
@@ -30,7 +30,7 @@ export function runInTempDir({ homedir } = { homedir: "./home" }) {
 	});
 
 	afterEach(() => {
-		if (tmpDir && fs.existsSync(tmpDir)) {
+		if (fs.existsSync(tmpDir)) {
 			process.chdir(originalCwd);
 			fs.rmSync(tmpDir, { recursive: true });
 		}

package/src/__tests__/metrics.test.ts

@@ -0,0 +1,415 @@
+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 { logger } from "../logger";
+import { getMetricsDispatcher, getMetricsConfig } from "../metrics";
+import {
+	CURRENT_METRICS_DATE,
+	readMetricsConfig,
+	USER_ID_CACHE_PATH,
+	writeMetricsConfig,
+} from "../metrics/metrics-config";
+import { writeAuthConfigFile } from "../user";
+import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
+import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConfirm } from "./helpers/mock-dialogs";
+import { useMockIsTTY } from "./helpers/mock-istty";
+import { runInTempDir } from "./helpers/run-in-tmp";
+
+declare const global: { SPARROW_SOURCE_KEY: string | undefined };
+
+describe("metrics", () => {
+	const ORIGINAL_SPARROW_SOURCE_KEY = global.SPARROW_SOURCE_KEY;
+	const std = mockConsoleMethods();
+	runInTempDir();
+
+	beforeEach(() => {
+		global.SPARROW_SOURCE_KEY = "MOCK_KEY";
+		logger.loggerLevel = "debug";
+		// Create a node_modules directory to store config-cache files
+		mkdirSync("node_modules");
+	});
+	afterEach(() => {
+		global.SPARROW_SOURCE_KEY = ORIGINAL_SPARROW_SOURCE_KEY;
+		fetchMock.resetMocks();
+		unsetAllMocks();
+		purgeConfigCaches();
+	});
+
+	describe("getMetricsDispatcher()", () => {
+		const MOCK_DISPATCHER_OPTIONS = {
+			// By setting this to true we avoid the `getMetricsConfig()` logic in these tests.
+			sendMetrics: true,
+			offline: false,
+		};
+
+		// These tests should never hit the `/user` API endpoint.
+		const userRequests = mockUserRequest();
+		afterEach(() => {
+			expect(userRequests.count).toBe(0);
+		});
+
+		describe("identify()", () => {
+			it("should send a request to the default URL", async () => {
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				fetchMock.mockResponse("");
+				await dispatcher.identify({ a: 1, b: 2 });
+				expect(fetchMock).toHaveBeenCalledTimes(1);
+				const [url, { body, headers }] = fetchMock.mock.calls[0];
+				expect(url).toEqual("https://sparrow.cloudflare.com/api/v1/identify");
+				expect(JSON.parse(body)).toEqual(
+					expect.objectContaining({
+						event: "identify",
+						properties: {
+							category: "Workers",
+							wranglerVersion,
+							a: 1,
+							b: 2,
+						},
+					})
+				);
+				expect(headers).toEqual(
+					expect.objectContaining({
+						"Sparrow-Source-Key": "MOCK_KEY",
+					})
+				);
+				expect(std.debug).toMatchInlineSnapshot(
+					`"Metrics dispatcher: Posting data {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}"`
+				);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should write a debug log if the dispatcher is disabled", async () => {
+				const dispatcher = await getMetricsDispatcher({
+					...MOCK_DISPATCHER_OPTIONS,
+					sendMetrics: false,
+				});
+				await dispatcher.identify({ a: 1, b: 2 });
+				expect(fetchMock).toHaveBeenCalledTimes(0);
+				expect(std.debug).toMatchInlineSnapshot(
+					`"Metrics dispatcher: Dispatching disabled - would have sent {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}."`
+				);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should write a debug log if the request fails", async () => {
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				fetchMock.mockReject(new Error("BAD REQUEST"));
+				await dispatcher.identify({ a: 1, b: 2 });
+				expect(std.debug).toMatchInlineSnapshot(`
+			"Metrics dispatcher: Posting data {\\"type\\":\\"identify\\",\\"name\\":\\"identify\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}
+			Metrics dispatcher: Failed to send request: BAD REQUEST"
+		`);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should write a warning log if no source key has been provided", async () => {
+				global.SPARROW_SOURCE_KEY = undefined;
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				await dispatcher.identify({ a: 1, b: 2 });
+				expect(fetchMock).toHaveBeenCalledTimes(0);
+				expect(std.debug).toMatchInlineSnapshot(
+					`"Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events. { type: 'identify', name: 'identify', properties: { a: 1, b: 2 } }"`
+				);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+		});
+
+		describe("sendEvent()", () => {
+			it("should send a request to the default URL", async () => {
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				fetchMock.mockResponse("");
+				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
+				expect(fetchMock).toHaveBeenCalledTimes(1);
+				const [url, { body, headers }] = fetchMock.mock.calls[0];
+				expect(url).toEqual("https://sparrow.cloudflare.com/api/v1/event");
+				expect(JSON.parse(body)).toEqual(
+					expect.objectContaining({
+						event: "some-event",
+						properties: {
+							category: "Workers",
+							wranglerVersion,
+							a: 1,
+							b: 2,
+						},
+					})
+				);
+				expect(headers).toEqual(
+					expect.objectContaining({
+						"Sparrow-Source-Key": "MOCK_KEY",
+					})
+				);
+				expect(std.debug).toMatchInlineSnapshot(
+					`"Metrics dispatcher: Posting data {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}"`
+				);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should write a debug log if the dispatcher is disabled", async () => {
+				const dispatcher = await getMetricsDispatcher({
+					...MOCK_DISPATCHER_OPTIONS,
+					sendMetrics: false,
+				});
+				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
+				expect(fetchMock).toHaveBeenCalledTimes(0);
+				expect(std.debug).toMatchInlineSnapshot(
+					`"Metrics dispatcher: Dispatching disabled - would have sent {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}."`
+				);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should write a debug log if the request fails", async () => {
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				fetchMock.mockReject(new Error("BAD REQUEST"));
+				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
+				expect(std.debug).toMatchInlineSnapshot(`
+			"Metrics dispatcher: Posting data {\\"type\\":\\"event\\",\\"name\\":\\"some-event\\",\\"properties\\":{\\"a\\":1,\\"b\\":2}}
+			Metrics dispatcher: Failed to send request: BAD REQUEST"
+		`);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+
+			it("should write a warning log if no source key has been provided", async () => {
+				global.SPARROW_SOURCE_KEY = undefined;
+				const dispatcher = await getMetricsDispatcher(MOCK_DISPATCHER_OPTIONS);
+				await dispatcher.sendEvent("some-event", { a: 1, b: 2 });
+				expect(fetchMock).toHaveBeenCalledTimes(0);
+				expect(std.debug).toMatchInlineSnapshot(
+					`"Metrics dispatcher: Source Key not provided. Be sure to initialize before sending events. { type: 'event', name: 'some-event', properties: { a: 1, b: 2 } }"`
+				);
+				expect(std.out).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+		});
+	});
+
+	describe("getMetricsConfig()", () => {
+		const { setIsTTY } = useMockIsTTY();
+		beforeEach(() => {
+			// Default the mock TTY to interactive for all these tests.
+			setIsTTY(true);
+		});
+
+		describe("enabled", () => {
+			it("should return the sendMetrics argument for enabled if it is defined", async () => {
+				expect(
+					await getMetricsConfig({ sendMetrics: false, offline: false })
+				).toMatchObject({
+					enabled: false,
+				});
+				expect(
+					await getMetricsConfig({ sendMetrics: true, offline: false })
+				).toMatchObject({
+					enabled: true,
+				});
+			});
+
+			it("should return enabled false if the process is not interactive", async () => {
+				setIsTTY(false);
+				expect(
+					await getMetricsConfig({
+						sendMetrics: undefined,
+						offline: false,
+					})
+				).toMatchObject({
+					enabled: false,
+				});
+			});
+
+			it("should return enabled true if the user on this device previously agreed to send metrics", async () => {
+				await writeMetricsConfig({
+					permission: {
+						enabled: true,
+						date: new Date(2022, 6, 4),
+					},
+				});
+				expect(
+					await getMetricsConfig({
+						sendMetrics: undefined,
+						offline: false,
+					})
+				).toMatchObject({
+					enabled: true,
+				});
+			});
+
+			it("should return enabled false if the user on this device previously refused to send metrics", async () => {
+				await writeMetricsConfig({
+					permission: {
+						enabled: false,
+						date: new Date(2022, 6, 4),
+					},
+				});
+				expect(
+					await getMetricsConfig({
+						sendMetrics: undefined,
+						offline: false,
+					})
+				).toMatchObject({
+					enabled: false,
+				});
+			});
+
+			it("should accept and store permission granting to send metrics if the user agrees", async () => {
+				const checkConfirmations = mockConfirm({
+					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
+					result: true,
+				});
+				expect(
+					await getMetricsConfig({
+						sendMetrics: undefined,
+						offline: false,
+					})
+				).toMatchObject({
+					enabled: true,
+				});
+				checkConfirmations();
+				expect((await readMetricsConfig()).permission).toMatchObject({
+					enabled: true,
+				});
+			});
+
+			it("should accept and store permission declining to send metrics if the user declines", async () => {
+				const checkConfirmations = mockConfirm({
+					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
+					result: false,
+				});
+				expect(
+					await getMetricsConfig({
+						sendMetrics: undefined,
+						offline: false,
+					})
+				).toMatchObject({
+					enabled: false,
+				});
+				checkConfirmations();
+				expect((await readMetricsConfig()).permission).toMatchObject({
+					enabled: false,
+				});
+			});
+
+			it("should ignore the config if the permission date is older than the current metrics date", async () => {
+				const checkConfirmations = mockConfirm({
+					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
+					result: false,
+				});
+				const OLD_DATE = new Date(2000);
+				await writeMetricsConfig({
+					permission: { enabled: true, date: OLD_DATE },
+				});
+				expect(
+					await getMetricsConfig({
+						sendMetrics: undefined,
+						offline: false,
+					})
+				).toMatchObject({
+					enabled: false,
+				});
+				checkConfirmations();
+				const { permission } = await readMetricsConfig();
+				expect(permission?.enabled).toBe(false);
+				// The date should be updated to today's date
+				expect(permission?.date).toEqual(CURRENT_METRICS_DATE);
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"Usage metrics tracking has changed since you last granted permission.
+			Your choice has been saved in the following file: home/.wrangler/config/metrics.json.
+
+			  You can override the user level setting for a project in \`wrangler.toml\`:
+
+			   - to disable sending metrics for a project: \`send_metrics = false\`
+			   - to enable sending metrics for a project: \`send_metrics = true\`"
+		`);
+			});
+		});
+
+		describe("deviceId", () => {
+			it("should return a deviceId found in the config file", async () => {
+				await writeMetricsConfig({ deviceId: "XXXX-YYYY-ZZZZ" });
+				const { deviceId } = await getMetricsConfig({
+					sendMetrics: true,
+					offline: false,
+				});
+				expect(deviceId).toEqual("XXXX-YYYY-ZZZZ");
+				expect((await readMetricsConfig()).deviceId).toEqual(deviceId);
+			});
+
+			it("should create and store a new deviceId if none is found in the config file", async () => {
+				await writeMetricsConfig({});
+				const { deviceId } = await getMetricsConfig({
+					sendMetrics: true,
+					offline: false,
+				});
+				expect(deviceId).toMatch(
+					/[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}/
+				);
+				expect((await readMetricsConfig()).deviceId).toEqual(deviceId);
+			});
+		});
+
+		describe("userId", () => {
+			const userRequests = mockUserRequest();
+			it("should return a userId found in a cache file", async () => {
+				await saveToConfigCache(USER_ID_CACHE_PATH, {
+					userId: "CACHED_USER_ID",
+				});
+				const { userId } = await getMetricsConfig({
+					sendMetrics: true,
+					offline: false,
+				});
+				expect(userId).toEqual("CACHED_USER_ID");
+				expect(userRequests.count).toBe(0);
+			});
+
+			it("should fetch the userId from Cloudflare and store it in a cache file", async () => {
+				writeAuthConfigFile({ oauth_token: "DUMMY_TOKEN" });
+				const { userId } = await getMetricsConfig({
+					sendMetrics: true,
+					offline: false,
+				});
+				expect(userId).toEqual("MOCK_USER_ID");
+				expect(userRequests.count).toBe(1);
+			});
+
+			it("should not fetch the userId from Cloudflare if running in `offline` mode", async () => {
+				writeAuthConfigFile({ oauth_token: "DUMMY_TOKEN" });
+				const { userId } = await getMetricsConfig({
+					sendMetrics: true,
+					offline: true,
+				});
+				expect(userId).toBe(undefined);
+				expect(userRequests.count).toBe(0);
+			});
+		});
+	});
+});
+
+function mockUserRequest() {
+	const requests = { count: 0 };
+	beforeEach(() => {
+		setMockResponse("/user", () => {
+			requests.count++;
+			return { id: "MOCK_USER_ID" };
+		});
+	});
+	afterEach(() => {
+		requests.count = 0;
+	});
+	return requests;
+}

package/src/__tests__/test-old-node-version.js

@@ -0,0 +1,31 @@
+// this test has to be run with a version of node.js older than 16.7 to pass
+
+const { spawn } = require("child_process");
+const path = require("path");
+
+const assert = require("assert");
+
+const wranglerProcess = spawn(
+	"node",
+	[path.join(__dirname, "../../bin/wrangler.js")],
+	{ stdio: "pipe" }
+);
+
+const messageToMatch = "Wrangler requires at least node.js v16.7.0";
+
+wranglerProcess.once("exit", (code) => {
+	try {
+		const errorMessage = wranglerProcess.stderr.read().toString();
+
+		assert(code === 1, "Expected exit code 1");
+		assert(
+			errorMessage.includes(messageToMatch),
+			`Expected error message to include "${messageToMatch}"`
+		);
+	} catch (err) {
+		console.error("Error:", err);
+		throw new Error(
+			"This test has to be run with a version of node.js under 16.7 to pass"
+		);
+	}
+});

package/src/config/config.ts

@@ -38,6 +38,14 @@ export interface ConfigFields<Dev extends RawDevConfig> {
 	 */
 	legacy_env: boolean;
 
+	/**
+	 * Whether Wrangler should send usage metrics to Cloudflare for this project.
+	 *
+	 * When defined this will override any user settings.
+	 * Otherwise, Wrangler will use the user's preference.
+	 */
+	send_metrics: boolean | undefined;
+
 	/**
 	 * Options to configure the development server that your worker will use.
 	 */

package/src/config/validation.ts

@@ -94,6 +94,14 @@ export function normalizeAndValidateConfig(
 		"boolean"
 	);
 
+	validateOptionalProperty(
+		diagnostics,
+		"",
+		"send_metrics",
+		rawConfig.send_metrics,
+		"boolean"
+	);
+
 	// TODO: set the default to false to turn on service environments as the default
 	const isLegacyEnv =
 		(args as { "legacy-env": boolean | undefined })["legacy-env"] ??
@@ -173,6 +181,7 @@ export function normalizeAndValidateConfig(
 	const config: Config = {
 		configPath,
 		legacy_env: isLegacyEnv,
+		send_metrics: rawConfig.send_metrics,
 		...activeEnv,
 		dev: normalizeAndValidateDev(diagnostics, rawConfig.dev ?? {}),
 		migrations: normalizeAndValidateMigrations(

package/src/config-cache.ts

@@ -6,7 +6,7 @@ import { logger } from "./logger";
 
 let cacheMessageShown = false;
 
-let __cacheFolder: string | null;
+let __cacheFolder: string | null | undefined;
 function getCacheFolder() {
 	if (__cacheFolder || __cacheFolder === null) return __cacheFolder;
 
@@ -80,4 +80,5 @@ export function purgeConfigCaches() {
 	if (cacheFolder) {
 		rmSync(cacheFolder, { recursive: true, force: true });
 	}
+	__cacheFolder = undefined;
 }

package/src/dev/local.tsx

@@ -195,9 +195,10 @@ function useLocalWorker({
 				),
 				...(localPersistencePath
 					? {
-							kvPersist: path.join(localPersistencePath, "kv"),
-							durableObjectsPersist: path.join(localPersistencePath, "do"),
 							cachePersist: path.join(localPersistencePath, "cache"),
+							durableObjectsPersist: path.join(localPersistencePath, "do"),
+							kvPersist: path.join(localPersistencePath, "kv"),
+							r2Persist: path.join(localPersistencePath, "r2"),
 					  }
 					: {
 							// We mark these as true, so that they'll
@@ -205,9 +206,10 @@ function useLocalWorker({
 							// This means they'll persist across a dev session,
 							// even if we change source and reload,
 							// and be deleted when the dev session ends
-							durableObjectsPersist: true,
 							cachePersist: true,
+							durableObjectsPersist: true,
 							kvPersist: true,
+							r2Persist: true,
 					  }),
 
 				sitePath: assetPaths?.assetDirectory