wrangler 0.0.0-e6e1daba → 0.0.0-e7cf0caa

package/src/__tests__/middleware.test.ts

@@ -51,7 +51,7 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			export default {
 				middleware: [middleware],
 				scheduled(controller, env, ctx) {
-					console.log("Scheduled worker called");
+					// Scheduled worker called
 				}
 			}
 			`;
@@ -178,7 +178,7 @@ describe("workers change behaviour with middleware with wrangler dev", () => {
 			addMiddleware(middleware);
 
 			addEventListener("scheduled", (event) => {
-				console.log("Scheduled worker called");
+				// Scheduled worker called
 			});
 			`;
 
@@ -750,6 +750,7 @@ describe("unchanged functionality when wrapping with middleware", () => {
 });
 
 describe("multiple middleware", () => {
+	runInTempDir();
 	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 = `
@@ -769,7 +770,7 @@ describe("multiple middleware", () => {
 					const stmt = await env.DB.prepare("INSERT INTO test (id, value) VALUES (?, ?)");
 					await stmt.bind(1, "one").run();
 			  }
-			}	
+			}
 		`;
 		fs.writeFileSync("index.js", scriptContent);
 

package/src/__tests__/mtls-certificates.test.ts

@@ -385,14 +385,17 @@ describe("wrangler", () => {
 				  wrangler logout                      🚪 Logout from Cloudflare
 				  wrangler whoami                      🕵️  Retrieve your user info and test your auth config
 				  wrangler types                       📝 Generate types from bindings & module rules in config
-				  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
+				  wrangler deployments                 🚢 List and view details for deployments
+				  wrangler rollback [deployment-id]    🔙 Rollback a deployment
 
 				Flags:
 				  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
 				  -c, --config                    Path to .toml configuration file  [string]
 				  -e, --env                       Environment to use for operations and .env files  [string]
 				  -h, --help                      Show help  [boolean]
-				  -v, --version                   Show version number  [boolean]"
+				  -v, --version                   Show version number  [boolean]
+
+				🚧\`wrangler rollback\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose"
 			`);
 				});
 			});

package/src/__tests__/pages/deployment-list.test.ts

@@ -1,5 +1,6 @@
 import { rest } from "msw";
 import { endEventLoop } from "../helpers/end-event-loop";
+import { mockConsoleMethods } from "../helpers/mock-console";
 import { mockAccountId, mockApiToken } from "./../helpers/mock-account-id";
 import { msw } from "./../helpers/msw";
 import { runInTempDir } from "./../helpers/run-in-tmp";
@@ -10,6 +11,7 @@ describe("deployment list", () => {
 	runInTempDir();
 	mockAccountId();
 	mockApiToken();
+	mockConsoleMethods();
 
 	afterEach(async () => {
 		// Force a tick to ensure that all promises resolve

package/src/__tests__/pages/functions-build.test.ts

@@ -1,3 +1,4 @@
+import { execSync } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { endEventLoop } from "../helpers/end-event-loop";
 import { mockConsoleMethods } from "../helpers/mock-console";
@@ -39,7 +40,7 @@ describe("functions build", () => {
 		/* --------------------------------- */
 		await runWrangler(`pages functions build`);
 
-		expect(existsSync("_worker.js")).toBe(true);
+		expect(existsSync("_worker.bundle")).toBe(true);
 		expect(std.out).toMatchInlineSnapshot(`
 		"🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		✨ Compiled Worker successfully"
@@ -47,7 +48,7 @@ describe("functions build", () => {
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 
-	it("should include any external modules imported by functions in the output bundle when the [--experimental-worker-bundle] flag is set", async () => {
+	it("should include any external modules imported by functions in the output bundle", async () => {
 		/* ---------------------------- */
 		/*       Set up wasm files      */
 		/* ---------------------------- */
@@ -76,9 +77,7 @@ describe("functions build", () => {
 		/* --------------------------------- */
 		/*     Run cmd & make assertions     */
 		/* --------------------------------- */
-		await runWrangler(
-			`pages functions build --outfile=_worker.bundle --experimental-worker-bundle=true`
-		);
+		await runWrangler(`pages functions build --outfile=_worker.bundle`);
 
 		expect(existsSync("_worker.bundle")).toBe(true);
 		expect(std.out).toMatchInlineSnapshot(`
@@ -126,12 +125,13 @@ describe("functions build", () => {
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 
-	it("should fail building if functions use external module imports, but the [--experimental-worker-bundle] flag is not set", async () => {
+	it("should output a directory with --outdir", async () => {
 		/* ---------------------------- */
 		/*       Set up wasm files      */
 		/* ---------------------------- */
 		mkdirSync("wasm");
-		writeFileSync("wasm/greeting.wasm", "Hello wasm Functions!");
+		writeFileSync("wasm/greeting.wasm", "Hello");
+		writeFileSync("wasm/name.wasm", "wasm Functions");
 
 		/* ---------------------------- */
 		/*       Set up Functions       */
@@ -141,10 +141,12 @@ describe("functions build", () => {
 			"functions/hello.js",
 			`
     import hello from "./../wasm/greeting.wasm";
+    import name from "./../wasm/name.wasm";
 
     export async function onRequest() {
-      const module = await WebAssembly.instantiate(greeting);
-      return new Response(module.exports.hello);
+      const greetingModule = await WebAssembly.instantiate(greeting);
+			const nameModule = await WebAssembly.instantiate(name);
+      return new Response(greetingModule.exports.hello + " " + nameModule.exports.name);
     }
     `
 		);
@@ -152,13 +154,23 @@ describe("functions build", () => {
 		/* --------------------------------- */
 		/*     Run cmd & make assertions     */
 		/* --------------------------------- */
-		await expect(runWrangler(`pages functions build`)).rejects.toThrowError();
-		expect(std.err).toContain(
-			`ERROR: No loader is configured for ".wasm" files: ../wasm/greeting.wasm`
-		);
+		await runWrangler(`pages functions build --outdir=dist`);
+
+		expect(existsSync("dist")).toBe(true);
+		expect(std.out).toMatchInlineSnapshot(`
+		"🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		✨ Compiled Worker successfully"
+	`);
+
+		expect(execSync("ls dist", { encoding: "utf-8" })).toMatchInlineSnapshot(`
+		"e8f0f80fe25d71a0fc2b9a08c877020211192308-name.wasm
+		f7ff9e8b7bb2e09b70935a5d785e0cc5d9d0abf0-greeting.wasm
+		index.js
+		"
+	`);
 	});
 
-	it("should build _worker.js if the [--experimental-worker-bundle] flag is set", async () => {
+	it("should build _worker.js", async () => {
 		/* ---------------------------- */
 		/*       Set up js files        */
 		/* ---------------------------- */
@@ -190,7 +202,7 @@ export default {
 		/*     Run cmd & make assertions     */
 		/* --------------------------------- */
 		await runWrangler(
-			`pages functions build --build-output-directory=public --outfile=_worker.bundle --experimental-worker-bundle=true`
+			`pages functions build --build-output-directory=public --outfile=_worker.bundle`
 		);
 		expect(existsSync("_worker.bundle")).toBe(true);
 		expect(std.out).toMatchInlineSnapshot(`
@@ -206,7 +218,7 @@ export default {
 			workerBundleContents,
 			[
 				[/------formdata-undici-0.[0-9]*/g, "------formdata-undici-0.test"],
-				[/bundledWorker-0.[0-9]*.mjs/g, "bundledWorker-0.test.mjs"],
+				[/functionsWorker-0.[0-9]*.js/g, "functionsWorker-0.test.js"],
 			]
 		);
 
@@ -214,9 +226,9 @@ export default {
 		"------formdata-undici-0.test
 		Content-Disposition: form-data; name=\\"metadata\\"
 
-		{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+		{\\"main_module\\":\\"functionsWorker-0.test.js\\"}
 		------formdata-undici-0.test
-		Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+		Content-Disposition: form-data; name=\\"functionsWorker-0.test.js\\"; filename=\\"functionsWorker-0.test.js\\"
 		Content-Type: application/javascript+module
 
 		// ../utils/meaning-of-life.js
@@ -231,18 +243,10 @@ export default {
 		export {
 		  worker_default as default
 		};
-		//# sourceMappingURL=bundledWorker-0.test.mjs.map
 
 		------formdata-undici-0.test--"
 	`);
 		expect(std.err).toMatchInlineSnapshot(`""`);
-
-		await expect(
-			runWrangler(`pages functions build --build-output-directory=public`)
-		).rejects.toThrowError();
-		expect(std.err).toMatch(
-			/ENOENT: no such file or directory, scandir '.*functions'/
-		);
 	});
 
 	it("should include all external modules imported by _worker.js in the output bundle, when bundling _worker.js", async () => {
@@ -275,12 +279,10 @@ export default {
 		/* --------------------------------- */
 		/*     Run cmd & make assertions     */
 		/* --------------------------------- */
-		await runWrangler(
-			`pages functions build --build-output-directory=public --experimental-worker-bundle=true`
-		);
+		await runWrangler(`pages functions build --build-output-directory=public`);
 
 		// built to _worker.js by default
-		expect(existsSync("_worker.js")).toBe(true);
+		expect(existsSync("_worker.bundle")).toBe(true);
 		expect(std.out).toMatchInlineSnapshot(`
 		"🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		✨ Compiled Worker successfully"
@@ -289,12 +291,12 @@ export default {
 		// some values in workerBundleContents, such as the undici form boundary
 		// or the file hashes, are randomly generated. Let's replace them
 		// with static values so we can test the file contents
-		const workerBundleContents = readFileSync("_worker.js", "utf-8");
+		const workerBundleContents = readFileSync("_worker.bundle", "utf-8");
 		const workerBundleWithConstantData = replaceRandomWithConstantData(
 			workerBundleContents,
 			[
 				[/------formdata-undici-0.[0-9]*/g, "------formdata-undici-0.test"],
-				[/bundledWorker-0.[0-9]*.mjs/g, "bundledWorker-0.test.mjs"],
+				[/functionsWorker-0.[0-9]*.js/g, "functionsWorker-0.test.js"],
 				[/[0-9a-z]*-greeting.wasm/g, "test-greeting.wasm"],
 				[/[0-9a-z]*-name.wasm/g, "test-name.wasm"],
 			]
@@ -305,7 +307,7 @@ export default {
 			`Content-Disposition: form-data; name="metadata"`
 		);
 		expect(workerBundleWithConstantData).toContain(
-			`{"main_module":"bundledWorker-0.test.mjs"}`
+			`{"main_module":"functionsWorker-0.test.js"}`
 		);
 
 		// check we appended the wasm modules
@@ -321,7 +323,7 @@ export default {
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 
-	it("should build _worker.js over /functions, if both are present and the [--experimental-worker-bundle] flag is set", async () => {
+	it("should build _worker.js over /functions, if both are present", async () => {
 		/* ---------------------------- */
 		/*       Set up _worker.js      */
 		/* ---------------------------- */
@@ -352,9 +354,7 @@ export default {
 		/* --------------------------------- */
 		/*     Run cmd & make assertions     */
 		/* --------------------------------- */
-		await runWrangler(
-			`pages functions build --outfile=public/_worker.bundle --experimental-worker-bundle=true`
-		);
+		await runWrangler(`pages functions build --outfile=public/_worker.bundle`);
 
 		expect(existsSync("public/_worker.bundle")).toBe(true);
 		expect(std.out).toMatchInlineSnapshot(`
@@ -370,7 +370,7 @@ export default {
 			workerBundleContents,
 			[
 				[/------formdata-undici-0.[0-9]*/g, "------formdata-undici-0.test"],
-				[/bundledWorker-0.[0-9]*.mjs/g, "bundledWorker-0.test.mjs"],
+				[/functionsWorker-0.[0-9]*.js/g, "functionsWorker-0.test.js"],
 			]
 		);
 
@@ -378,9 +378,9 @@ export default {
 		"------formdata-undici-0.test
 		Content-Disposition: form-data; name=\\"metadata\\"
 
-		{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+		{\\"main_module\\":\\"functionsWorker-0.test.js\\"}
 		------formdata-undici-0.test
-		Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+		Content-Disposition: form-data; name=\\"functionsWorker-0.test.js\\"; filename=\\"functionsWorker-0.test.js\\"
 		Content-Type: application/javascript+module
 
 		// _worker.js
@@ -392,11 +392,61 @@ export default {
 		export {
 		  worker_default as default
 		};
-		//# sourceMappingURL=bundledWorker-0.test.mjs.map
 
 		------formdata-undici-0.test--"
 	`);
 
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
+
+	it("should leave Node.js imports when the `nodejs_compat` compatibility flag is set", async () => {
+		mkdirSync("functions");
+		writeFileSync(
+			"functions/hello.js",
+			`
+		import { AsyncLocalStorage } from 'node:async_hooks';
+
+    export async function onRequest() {
+			console.log(AsyncLocalStorage);
+      return new Response("Hello from Pages Functions");
+    }
+    `
+		);
+
+		await runWrangler(
+			`pages functions build --outfile=public/_worker.bundle --compatibility-flag=nodejs_compat`
+		);
+
+		expect(existsSync("public/_worker.bundle")).toBe(true);
+		expect(std.out).toMatchInlineSnapshot(`
+		"🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+		✨ Compiled Worker successfully"
+	`);
+
+		expect(readFileSync("public/_worker.bundle", "utf-8")).toContain(
+			`import { AsyncLocalStorage } from "node:async_hooks";`
+		);
+	});
+
+	it("should error at Node.js imports when the `nodejs_compat` compatibility flag is not set", async () => {
+		mkdirSync("functions");
+		writeFileSync(
+			"functions/hello.js",
+			`
+		import { AsyncLocalStorage } from 'node:async_hooks';
+
+    export async function onRequest() {
+			console.log(AsyncLocalStorage);
+      return new Response("Hello from Pages Functions");
+    }
+    `
+		);
+
+		await expect(
+			runWrangler(`pages functions build --outfile=public/_worker.bundle`)
+		).rejects.toThrowErrorMatchingInlineSnapshot(`
+		"Build failed with 1 error:
+		hello.js:2:36: ERROR: Could not resolve \\"node:async_hooks\\""
+	`);
+	});
 });

package/src/__tests__/pages/project-list.test.ts

@@ -1,5 +1,6 @@
 import { rest } from "msw";
 import { endEventLoop } from "../helpers/end-event-loop";
+import { mockConsoleMethods } from "../helpers/mock-console";
 import { mockAccountId, mockApiToken } from "./../helpers/mock-account-id";
 import { msw } from "./../helpers/msw";
 import { runInTempDir } from "./../helpers/run-in-tmp";
@@ -8,6 +9,7 @@ import type { Project } from "./../../pages/types";
 
 describe("project list", () => {
 	runInTempDir();
+	mockConsoleMethods();
 	mockAccountId();
 	mockApiToken();
 

package/src/__tests__/pages/project-upload.test.ts

@@ -1,15 +1,15 @@
-/* eslint-disable no-shadow */
+// /* eslint-disable no-shadow */
 import { mkdirSync, writeFileSync } from "node:fs";
 import { rest } from "msw";
 import { endEventLoop } from "../helpers/end-event-loop";
+import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
+import { mockConsoleMethods } from "../helpers/mock-console";
 import { mockGetUploadTokenRequest } from "../helpers/mock-get-pages-upload-token";
 import { mockSetTimeout } from "../helpers/mock-set-timeout";
-import { mockAccountId, mockApiToken } from "./../helpers/mock-account-id";
-import { mockConsoleMethods } from "./../helpers/mock-console";
-import { msw } from "./../helpers/msw";
-import { runInTempDir } from "./../helpers/run-in-tmp";
-import { runWrangler } from "./../helpers/run-wrangler";
-import type { UploadPayloadFile } from "./../../pages/types";
+import { msw } from "../helpers/msw";
+import { runInTempDir } from "../helpers/run-in-tmp";
+import { runWrangler } from "../helpers/run-wrangler";
+import type { UploadPayloadFile } from "../../pages/types";
 import type { RestRequest } from "msw";
 
 describe("project upload", () => {
@@ -92,11 +92,11 @@ describe("project upload", () => {
 
 		await runWrangler("pages project upload .");
 
-		expect(std.out).toMatchInlineSnapshot(`
-            "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-            ✨ Upload complete!"
-        `);
+		✨ Upload complete!"
+	`);
 	});
 
 	it("should avoid uploading some files", async () => {
@@ -172,7 +172,7 @@ describe("project upload", () => {
 
 		const requestMap = resolvedRequests.reduce<{
 			[key: string]: UploadPayloadFile;
-		}>((requestMap, req) => Object.assign(requestMap, { [req.key]: req }), {});
+		}>((map, req) => Object.assign(map, { [req.key]: req }), {});
 
 		for (const req of requests) {
 			expect(req.headers.get("Authorization")).toBe(
@@ -209,11 +209,11 @@ describe("project upload", () => {
 			value: "ZnVuYw==",
 		});
 
-		expect(std.out).toMatchInlineSnapshot(`
-            "✨ Success! Uploaded 3 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 3 files (TIMINGS)
 
-            ✨ Upload complete!"
-        `);
+		✨ Upload complete!"
+	`);
 	});
 
 	it("should retry uploads", async () => {
@@ -296,11 +296,11 @@ describe("project upload", () => {
 			]);
 		}
 
-		expect(std.out).toMatchInlineSnapshot(`
-            "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-            ✨ Upload complete!"
-        `);
+		✨ Upload complete!"
+	`);
 	});
 
 	it("should try to use multiple buckets (up to the max concurrency)", async () => {
@@ -402,11 +402,11 @@ describe("project upload", () => {
 			])
 		);
 
-		expect(std.out).toMatchInlineSnapshot(`
-            "✨ Success! Uploaded 4 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 4 files (TIMINGS)
 
-            ✨ Upload complete!"
-        `);
+		✨ Upload complete!"
+	`);
 	});
 
 	it("should not error when directory names contain periods and houses a extensionless file", async () => {
@@ -479,3 +479,22 @@ describe("project upload", () => {
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 });
+
+/**
+ * When uploading assets we print out progress messages that look like:
+ *
+ * Uploading... (1/4)
+ * Uploading... (2/4)
+ * Uploading... (4/4)
+ *
+ * Note that we don't always get a progress message for every item uploaded.
+ * These upload counts are not deterministic and can change from test run to test run.
+ *
+ * Also if you run the tests in --runInBand mode then we never see any of
+ * these progress messages in the tests!!
+ *
+ * So this helper removes these message from the snapshots to keep them consistent.
+ */
+export function normalizeProgressSteps(str: string): string {
+	return str.replace(/Uploading... \(\d\/\d\)\r?\n?/g, "");
+}