wrangler 2.6.2 → 2.7.1

package/src/__tests__/metrics.test.ts

@@ -13,7 +13,7 @@ import {
 } from "../metrics/metrics-config";
 import { writeAuthConfigFile } from "../user";
 import { mockConsoleMethods } from "./helpers/mock-console";
-import { mockConfirm } from "./helpers/mock-dialogs";
+import { mockConfirm, clearDialogs } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { msw, mswSuccessOauthHandlers } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
@@ -37,6 +37,7 @@ describe("metrics", () => {
 	afterEach(() => {
 		global.SPARROW_SOURCE_KEY = ORIGINAL_SPARROW_SOURCE_KEY;
 		purgeConfigCaches();
+		clearDialogs();
 	});
 
 	describe("getMetricsDispatcher()", () => {
@@ -311,7 +312,7 @@ describe("metrics", () => {
 			});
 
 			it("should accept and store permission granting to send metrics if the user agrees", async () => {
-				const checkConfirmations = mockConfirm({
+				mockConfirm({
 					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
 					result: true,
 				});
@@ -323,14 +324,13 @@ describe("metrics", () => {
 				).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({
+				mockConfirm({
 					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
 					result: false,
 				});
@@ -342,14 +342,13 @@ describe("metrics", () => {
 				).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({
+				mockConfirm({
 					text: "Would you like to help improve Wrangler by sending usage metrics to Cloudflare?",
 					result: false,
 				});
@@ -365,7 +364,6 @@ describe("metrics", () => {
 				).toMatchObject({
 					enabled: false,
 				});
-				checkConfirmations();
 				const { permission } = await readMetricsConfig();
 				expect(permission?.enabled).toBe(false);
 				// The date should be updated to today's date

package/src/__tests__/middleware.scheduled.test.ts

@@ -27,11 +27,12 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not intercept when middleware is not enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -41,11 +42,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should intercept when middleware is enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -55,11 +58,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not trigger scheduled event on wrong route", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/test");
 			let text;
@@ -91,11 +96,12 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not intercept when middleware is not enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -105,11 +111,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should intercept when middleware is enabled", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/__scheduled");
 			let text;
@@ -119,11 +127,13 @@ describe("run scheduled events with middleware", () => {
 		});
 
 		it("should not trigger scheduled event on wrong route", async () => {
-			const worker = await unstable_dev(
-				"index.js",
-				{ testScheduled: true },
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+					testScheduled: true,
+				},
+			});
 
 			const resp = await worker.fetch("/test");
 			let text;

package/src/__tests__/middleware.test.ts

@@ -27,11 +27,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -57,11 +58,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -90,11 +92,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -121,11 +124,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -150,11 +154,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -179,11 +184,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -211,11 +217,12 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -242,11 +249,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -267,11 +275,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -295,11 +304,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -328,11 +338,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -356,11 +367,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			const status = resp?.status;
@@ -396,11 +408,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -419,11 +432,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -443,11 +457,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -470,11 +485,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			if (resp) {
@@ -502,11 +518,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -532,11 +549,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -563,11 +581,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -593,11 +612,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -624,11 +644,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -649,11 +670,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			const status = resp?.status;
@@ -680,11 +702,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;
@@ -710,11 +733,12 @@ describe("unchanged functionality when wrapping with middleware", () => {
 			`;
 			fs.writeFileSync("index.js", scriptContent);
 
-			const worker = await unstable_dev(
-				"index.js",
-				{},
-				{ disableExperimentalWarning: true }
-			);
+			const worker = await unstable_dev("index.js", {
+				experimental: {
+					disableExperimentalWarning: true,
+					disableDevRegistry: true,
+				},
+			});
 
 			const resp = await worker.fetch();
 			let text;