wrangler 0.0.0-e33bea9b → 0.0.0-e351afcf

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

@@ -362,7 +362,7 @@ describe("wrangler", () => {
 				"wrangler
 
 				Commands:
-				  wrangler docs [command]              📚 Open wrangler's docs in your browser
+				  wrangler docs [command..]            📚 Open wrangler's docs in your browser
 				  wrangler init [name]                 📥 Initialize a basic Worker project, including a wrangler.toml file
 				  wrangler generate [name] [template]  ✨ Generate a new Worker project from an existing Worker template. See https://github.com/cloudflare/templates
 				  wrangler dev [script]                👂 Start a local server for developing your worker
@@ -379,20 +379,24 @@ describe("wrangler", () => {
 				  wrangler r2                          📦 Interact with an R2 store
 				  wrangler dispatch-namespace          📦 Interact with a dispatch namespace
 				  wrangler d1                          🗄  Interact with a D1 database
+				  wrangler constellation               🤖 Interact with Constellation AI models
 				  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
 				  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

@@ -449,4 +449,74 @@ export default {
 		hello.js:2:36: ERROR: Could not resolve \\"node:async_hooks\\""
 	`);
 	});
+
+	it("should compile a _worker.js/ directory", async () => {
+		mkdirSync("public");
+		mkdirSync("public/_worker.js");
+		writeFileSync(
+			"public/_worker.js/index.js",
+			`
+import { cat } from "./cat.js";
+
+export default {
+  async fetch(request, env) {
+		return new Response("Hello from _worker.js/index.js" + cat);
+	},
+};`
+		);
+		writeFileSync(
+			"public/_worker.js/cat.js",
+			`
+export const cat = "cat";`
+		);
+
+		await runWrangler(`pages functions build --outfile=public/_worker.bundle`);
+
+		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"
+	`);
+
+		const workerBundleContents = readFileSync("public/_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"],
+				[/bundledWorker-0.[0-9]*.map/g, "bundledWorker-0.test.map"],
+			]
+		);
+
+		expect(workerBundleWithConstantData).toMatchInlineSnapshot(`
+		"------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"metadata\\"
+
+		{\\"main_module\\":\\"bundledWorker-0.test.mjs\\"}
+		------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"bundledWorker-0.test.mjs\\"; filename=\\"bundledWorker-0.test.mjs\\"
+		Content-Type: application/javascript+module
+
+		import { cat } from \\"./cat.js\\";
+		var worker_default = {
+		  async fetch(request, env) {
+		    return new Response(\\"Hello from _worker.js/index.js\\" + cat);
+		  }
+		};
+		export {
+		  worker_default as default
+		};
+		//# sourceMappingURL=bundledWorker-0.test.mjs.map
+
+		------formdata-undici-0.test
+		Content-Disposition: form-data; name=\\"cat.js\\"; filename=\\"cat.js\\"
+		Content-Type: application/javascript+module
+
+
+		export const cat = \\"cat\\";
+		------formdata-undici-0.test--"
+	`);
+
+		expect(std.err).toMatchInlineSnapshot(`""`);
+	});
 });

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, "");
+}

package/src/__tests__/pages/publish.test.ts

@@ -1,22 +1,22 @@
-/* eslint-disable no-shadow */
 import { Blob } from "node:buffer";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { chdir } from "node:process";
 import { MockedRequest, rest } from "msw";
 import { FormData } from "undici";
+import { version } from "../../../package.json";
+import { ROUTES_SPEC_VERSION } from "../../pages/constants";
+import { isRoutesJSONSpec } from "../../pages/functions/routes-validation";
+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 { version } from "./../../../package.json";
-import { ROUTES_SPEC_VERSION } from "./../../pages/constants";
-import { isRoutesJSONSpec } from "./../../pages/functions/routes-validation";
-import { endEventLoop } from "./../helpers/end-event-loop";
-import { mockAccountId, mockApiToken } from "./../helpers/mock-account-id";
-import { msw } from "./../helpers/msw";
-import { FileReaderSync } from "./../helpers/msw/read-file-sync";
-import { runInTempDir } from "./../helpers/run-in-tmp";
-import { runWrangler } from "./../helpers/run-wrangler";
-import type { Project, UploadPayloadFile } from "./../../pages/types";
+import { msw } from "../helpers/msw";
+import { FileReaderSync } from "../helpers/msw/read-file-sync";
+import { runInTempDir } from "../helpers/run-in-tmp";
+import { runWrangler } from "../helpers/run-wrangler";
+import { normalizeProgressSteps } from "./project-upload.test";
+import type { Project, UploadPayloadFile } from "../../pages/types";
 import type { RestRequest } from "msw";
 
 describe("deployment create", () => {
@@ -171,11 +171,11 @@ describe("deployment create", () => {
 
 		await runWrangler("pages publish . --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		      "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-		      ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	    `);
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 	});
 
 	it("should retry uploads", async () => {
@@ -300,11 +300,11 @@ describe("deployment create", () => {
 
 		await runWrangler("pages publish . --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		            "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-		            ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	        `);
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 	});
 
 	it("should refetch a JWT if it expires while uploading", async () => {
@@ -437,11 +437,11 @@ describe("deployment create", () => {
 			"Bearer <<funfetti-auth-jwt2>>"
 		);
 
-		expect(std.out).toMatchInlineSnapshot(`
-		            "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-		            ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	        `);
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 	});
 
 	it("should try to use multiple buckets (up to the max concurrency)", async () => {
@@ -592,11 +592,11 @@ describe("deployment create", () => {
 			])
 		);
 
-		expect(std.out).toMatchInlineSnapshot(`
-		            "✨ Success! Uploaded 4 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 4 files (TIMINGS)
 
-		            ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	        `);
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 	});
 
 	it("should resolve child directories correctly", async () => {
@@ -744,11 +744,11 @@ describe("deployment create", () => {
 			])
 		);
 
-		expect(std.out).toMatchInlineSnapshot(`
-		              "✨ Success! Uploaded 4 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 4 files (TIMINGS)
 
-		              ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	          `);
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 	});
 
 	it("should resolve the current directory correctly", async () => {
@@ -897,11 +897,11 @@ describe("deployment create", () => {
 			])
 		);
 
-		expect(std.out).toMatchInlineSnapshot(`
-		              "✨ Success! Uploaded 4 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 4 files (TIMINGS)
 
-		              ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	          `);
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 	});
 
 	it("should not error when directory names contain periods and houses a extensionless file", async () => {
@@ -1211,13 +1211,13 @@ describe("deployment create", () => {
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		    "✨ Compiled Worker successfully
-		    ✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Compiled Worker successfully
+		✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Uploading Functions bundle
-		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	    `);
+		✨ Uploading Functions bundle
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 
 		expect(std.err).toMatchInlineSnapshot('""');
 	});
@@ -1361,13 +1361,13 @@ describe("deployment create", () => {
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		    "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Compiled Worker successfully
-		    ✨ Uploading Worker bundle
-		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	  `);
+		✨ Compiled Worker successfully
+		✨ Uploading Worker bundle
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 
 		expect(std.err).toMatchInlineSnapshot('""');
 	});
@@ -1583,14 +1583,14 @@ describe("deployment create", () => {
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		    "✨ Compiled Worker successfully
-		    ✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Compiled Worker successfully
+		✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Uploading Functions bundle
-		    ✨ Uploading _routes.json
-		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	    `);
+		✨ Uploading Functions bundle
+		✨ Uploading _routes.json
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 
 		expect(std.warn).toMatchInlineSnapshot(`""`);
 		expect(std.err).toMatchInlineSnapshot('""');
@@ -1920,14 +1920,14 @@ and that at least one include rule is provided.
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		    "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Compiled Worker successfully
-		    ✨ Uploading Worker bundle
-		    ✨ Uploading _routes.json
-		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	  `);
+		✨ Compiled Worker successfully
+		✨ Uploading Worker bundle
+		✨ Uploading _routes.json
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 
 		expect(std.warn).toMatchInlineSnapshot(`""`);
 		expect(std.err).toMatchInlineSnapshot(`""`);
@@ -2229,13 +2229,13 @@ and that at least one include rule is provided.
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
-		    "✨ Success! Uploaded 1 files (TIMINGS)
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
+		"✨ Success! Uploaded 1 files (TIMINGS)
 
-		    ✨ Compiled Worker successfully
-		    ✨ Uploading Worker bundle
-		    ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-	  `);
+		✨ Compiled Worker successfully
+		✨ Uploading Worker bundle
+		✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+	`);
 
 		expect(std.err).toMatchInlineSnapshot('""');
 	});
@@ -2245,20 +2245,22 @@ and that at least one include rule is provided.
 		mkdirSync("public");
 		writeFileSync("public/README.md", "This is a readme");
 
-		// set up hello.wasm
-		mkdirSync("wasm");
-		writeFileSync("wasm/hello.wasm", "HELLO WORLD");
+		// set up some "external" modules
+		mkdirSync("external");
+		writeFileSync("external/hello.wasm", "Hello Wasm modules world!");
+		writeFileSync("external/hello.txt", "Hello Text modules world!");
 
 		// set up Functions
 		mkdirSync("functions");
 		writeFileSync(
 			"functions/hello.js",
 			`
-			import hello from "./../wasm/hello.wasm";
+			import wasm from "./../external/hello.wasm";
+			import text from "./../external/hello.txt"
 			export async function onRequest() {
-				const helloModule = await WebAssembly.instantiate(hello);
-				const greeting = helloModule.exports.hello;
-				return new Response(greeting);
+				const helloModule = await WebAssembly.instantiate(wasm);
+				const wasmGreeting = helloModule.exports.hello;
+				return new Response(wasmGreeting + text);
 			}
 			`
 		);
@@ -2363,6 +2365,10 @@ and that at least one include rule is provided.
 						/[0-9a-z]*-hello.wasm/g,
 						"test-hello.wasm"
 					);
+					workerBundleWithConstantData = workerBundleWithConstantData.replace(
+						/[0-9a-z]*-hello.txt/g,
+						"test-hello.txt"
+					);
 
 					// check we appended the metadata
 					expect(workerBundleWithConstantData).toContain(
@@ -2377,18 +2383,29 @@ and that at least one include rule is provided.
 						`Content-Disposition: form-data; name="functionsWorker-0.test.js"; filename="functionsWorker-0.test.js"`
 					);
 					expect(workerBundleWithConstantData).toContain(`
-import hello from "./test-hello.wasm";
+import wasm from "./test-hello.wasm";
+import text from "./test-hello.txt";
 async function onRequest() {
-  const helloModule = await WebAssembly.instantiate(hello);
-  const greeting = helloModule.exports.hello;
-  return new Response(greeting);
+  const helloModule = await WebAssembly.instantiate(wasm);
+  const wasmGreeting = helloModule.exports.hello;
+  return new Response(wasmGreeting + text);
 }`);
 
 					// check we appended the wasm module
 					expect(workerBundleWithConstantData).toContain(
 						`Content-Disposition: form-data; name="./test-hello.wasm"; filename="./test-hello.wasm"`
 					);
-					expect(workerBundleWithConstantData).toContain(`HELLO WORLD`);
+					expect(workerBundleWithConstantData).toContain(
+						`Hello Wasm modules world!`
+					);
+
+					// check we appended the text module
+					expect(workerBundleWithConstantData).toContain(
+						`Content-Disposition: form-data; name="./test-hello.txt"; filename="./test-hello.txt"`
+					);
+					expect(workerBundleWithConstantData).toContain(
+						`Hello Text modules world!`
+					);
 
 					return res.once(
 						ctx.status(200),
@@ -2427,7 +2444,7 @@ async function onRequest() {
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
 		"✨ Compiled Worker successfully
 		✨ Success! Uploaded 1 files (TIMINGS)
 
@@ -2445,20 +2462,31 @@ async function onRequest() {
 		writeFileSync("public/README.md", "This is a readme");
 
 		// set up hello.wasm
-		mkdirSync("wasm");
-		writeFileSync("wasm/hello.wasm", "HELLO");
+		mkdirSync("external");
+		writeFileSync("external/hello.wasm", "Hello wasm modules");
+		writeFileSync(
+			"external/hello.html",
+			"<html><body>Hello text modules</body></html>"
+		);
 
 		// set up _worker.js
 		writeFileSync(
 			"public/_worker.js",
 			`
-			import hello from "./../wasm/hello.wasm";
+			import wasm from "./../external/hello.wasm";
+			import html from "./../external/hello.html";
 			export default {
 				async fetch(request, env) {
 					const url = new URL(request.url);
-					const helloModule = await WebAssembly.instantiate(hello);
-					const greeting = helloModule.exports.hello;
-					return url.pathname.startsWith('/hello') ? new Response(greeting) : env.ASSETS.fetch(request);
+					const helloModule = await WebAssembly.instantiate(wasm);
+					const wasmGreeting = helloModule.exports.hello;
+					if(url.pathname.startsWith('/hello-wasm')) {
+						return new Response(wasmGreeting);
+					}
+					if(url.pathname.startsWith('/hello-text')) {
+						return new Response(html);
+					}
+					return env.ASSETS.fetch(request);
 				}
 			};
 		`
@@ -2558,6 +2586,10 @@ async function onRequest() {
 						/[0-9a-z]*-hello.wasm/g,
 						"test-hello.wasm"
 					);
+					workerBundleWithConstantData = workerBundleWithConstantData.replace(
+						/[0-9a-z]*-hello.html/g,
+						"test-hello.html"
+					);
 
 					// we care about a couple of things here, like the presence of `metadata`,
 					// `bundledWorker`, the wasm import, etc., and since `workerBundle` is
@@ -2572,13 +2604,20 @@ async function onRequest() {
 				Content-Type: application/javascript+module
 
 				// _worker.js
-				import hello from \\"./test-hello.wasm\\";
+				import wasm from \\"./test-hello.wasm\\";
+				import html from \\"./test-hello.html\\";
 				var worker_default = {
 				  async fetch(request, env) {
 				    const url = new URL(request.url);
-				    const helloModule = await WebAssembly.instantiate(hello);
-				    const greeting = helloModule.exports.hello;
-				    return url.pathname.startsWith(\\"/hello\\") ? new Response(greeting) : env.ASSETS.fetch(request);
+				    const helloModule = await WebAssembly.instantiate(wasm);
+				    const wasmGreeting = helloModule.exports.hello;
+				    if (url.pathname.startsWith(\\"/hello-wasm\\")) {
+				      return new Response(wasmGreeting);
+				    }
+				    if (url.pathname.startsWith(\\"/hello-text\\")) {
+				      return new Response(html);
+				    }
+				    return env.ASSETS.fetch(request);
 				  }
 				};
 				export {
@@ -2590,7 +2629,12 @@ async function onRequest() {
 				Content-Disposition: form-data; name=\\"./test-hello.wasm\\"; filename=\\"./test-hello.wasm\\"
 				Content-Type: application/wasm
 
-				HELLO
+				Hello wasm modules
+				------formdata-undici-0.test
+				Content-Disposition: form-data; name=\\"./test-hello.html\\"; filename=\\"./test-hello.html\\"
+				Content-Type: text/plain
+
+				<html><body>Hello text modules</body></html>
 				------formdata-undici-0.test--"
 			`);
 
@@ -2631,7 +2675,7 @@ async function onRequest() {
 
 		await runWrangler("pages publish public --project-name=foo");
 
-		expect(std.out).toMatchInlineSnapshot(`
+		expect(normalizeProgressSteps(std.out)).toMatchInlineSnapshot(`
 		"✨ Success! Uploaded 1 files (TIMINGS)
 
 		✨ Compiled Worker successfully