wrangler 2.9.0 → 2.10.0

package/src/__tests__/helpers/string-dynamic-values-matcher.ts

@@ -0,0 +1,28 @@
+export type PatternReplacementPair = [string | RegExp, string];
+
+/**
+ * Sometimes, we might need to test strings that contain dynamic |
+ * random | generated data (such as file hashes, IDs, etc.).
+ *
+ * This helper function replaces the dynamic parts of such strings with
+ * static values, thus enabling us to properly test the contents of the
+ * string.
+ *
+ * see https://jestjs.io/docs/snapshot-testing#property-matchers
+ */
+export function replaceRandomWithConstantData(
+	stringWithRandomData: string,
+	patternReplacementPairs: Array<PatternReplacementPair>
+) {
+	let stringWithConstantData = stringWithRandomData;
+
+	patternReplacementPairs.forEach(
+		(pair) =>
+			(stringWithConstantData = stringWithConstantData.replace(
+				pair[0], // pattern
+				pair[1] // replacement
+			))
+	);
+
+	return stringWithConstantData;
+}

package/src/__tests__/index.test.ts

@@ -1,4 +1,5 @@
 import { getPackageManager } from "../package-manager";
+import { endEventLoop } from "./helpers/end-event-loop";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
@@ -49,6 +50,7 @@ describe("wrangler", () => {
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
+			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
 			  wrangler logout                      🚪 Logout from Cloudflare
 			  wrangler whoami                      🕵️  Retrieve your user info and test your auth config
@@ -98,6 +100,7 @@ describe("wrangler", () => {
 			  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 			  wrangler d1                          🗄  Interact with a D1 database
 			  wrangler pubsub                      📮 Interact and manage Pub/Sub Brokers
+			  wrangler mtls-certificate            🪪 Manage certificates used for mTLS connections
 			  wrangler login                       🔓 Login to Cloudflare
 			  wrangler logout                      🚪 Logout from Cloudflare
 			  wrangler whoami                      🕵️  Retrieve your user info and test your auth config
@@ -269,7 +272,3 @@ describe("wrangler", () => {
 	`);
 	});
 });
-
-function endEventLoop() {
-	return new Promise((resolve) => setImmediate(resolve));
-}

package/src/__tests__/init.test.ts

@@ -1392,7 +1392,7 @@ describe("init", () => {
 						contents: {
 							config: {
 								compilerOptions: expect.objectContaining({
-									types: ["@cloudflare/workers-types", "jest"],
+									types: ["@cloudflare/workers-types", "vitest"],
 								}),
 							},
 							error: undefined,

package/src/__tests__/kv.test.ts

@@ -747,7 +747,7 @@ describe("wrangler", () => {
 
 				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/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`
 			          "X [ERROR] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -769,7 +769,7 @@ describe("wrangler", () => {
 				);
 				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/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`
 			          "X [ERROR] someBinding has both a namespace ID and a preview ID. Specify \\"--preview\\" or \\"--preview false\\" to avoid writing data to the wrong namespace.
@@ -940,7 +940,7 @@ describe("wrangler", () => {
 		        `);
 				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/workers-sdk/issues/new/choose"
 		        `);
 			});
 		});
@@ -1190,7 +1190,7 @@ describe("wrangler", () => {
 				);
 				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/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`
 			          "X [ERROR] A namespace with binding name \\"otherBinding\\" was not found in the configured \\"kv_namespaces\\".
@@ -1453,7 +1453,7 @@ describe("wrangler", () => {
 					              `);
 				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/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -1515,7 +1515,7 @@ describe("wrangler", () => {
 
 				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/workers-sdk/issues/new/choose"
 		        `);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Unexpected key-value properties in \\"keys.json\\".
@@ -1657,7 +1657,7 @@ describe("wrangler", () => {
 					              `);
 				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/workers-sdk/issues/new/choose"
 		`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -1682,7 +1682,7 @@ describe("wrangler", () => {
 					              `);
 				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/workers-sdk/issues/new/choose"
 		`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});

package/src/__tests__/middleware.test.ts

@@ -748,3 +748,68 @@ describe("unchanged functionality when wrapping with middleware", () => {
 		});
 	});
 });
+
+describe("multiple middleware", () => {
+	it("should respond correctly with D1 databases, scheduled testing, and formatted dev errors", async () => {
+		// Kitchen sink test to check interaction between multiple middlewares
+		const scriptContent = `
+			export default {
+				async fetch(request, env, ctx) {
+					const { pathname } = new URL(request.url);
+					if (pathname === "/setup") {
+						await env.DB.exec("CREATE TABLE IF NOT EXISTS test (id INTEGER PRIMARY KEY, value TEXT);");
+						return new Response(null, { status: 204 });
+					} else if (pathname === "/query") {
+      			const rows = await env.DB.prepare("SELECT * FROM test;").all();
+      			return Response.json(rows.results);
+					}
+					throw new Error("Not found!");
+			  },
+			  async scheduled(controller, env, ctx) {
+					const stmt = await env.DB.prepare("INSERT INTO test (id, value) VALUES (?, ?)");
+					await stmt.bind(1, "one").run();
+			  }
+			}	
+		`;
+		fs.writeFileSync("index.js", scriptContent);
+
+		const originalFormatErrors = process.env.FORMAT_WRANGLER_ERRORS;
+		process.env.FORMAT_WRANGLER_ERRORS = "true";
+
+		const worker = await unstable_dev("index.js", {
+			experimental: {
+				disableExperimentalWarning: true,
+				disableDevRegistry: true,
+				testScheduled: true,
+				d1Databases: [
+					{
+						binding: "DB",
+						database_name: "db",
+						database_id: "00000000-0000-0000-0000-000000000000",
+					},
+				],
+			},
+		});
+
+		try {
+			let res = await worker.fetch("http://localhost/setup");
+			expect(res.status).toBe(204);
+
+			res = await worker.fetch("http://localhost/__scheduled");
+			expect(res.status).toBe(200);
+			expect(await res.text()).toBe("Ran scheduled event");
+
+			res = await worker.fetch("http://localhost/query");
+			expect(res.status).toBe(200);
+			expect(await res.json()).toEqual([{ id: 1, value: "one" }]);
+
+			res = await worker.fetch("http://localhost/bad");
+			expect(res.status).toBe(500);
+			expect(res.headers.get("Content-Type")).toBe("text/html");
+			expect(await res.text()).toContain("Error: Not found!");
+		} finally {
+			process.env.FORMAT_WRANGLER_ERRORS = originalFormatErrors;
+			await worker.stop();
+		}
+	});
+});