wrangler 0.0.0-e7a0cd5b → 0.0.0-e7cf0caa

package/src/__tests__/publish.test.ts

@@ -1,44 +1,52 @@
-import { Buffer } from "node:buffer";
+import { Blob, Buffer } from "node:buffer";
 import { randomFillSync } from "node:crypto";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as TOML from "@iarna/toml";
 import * as esbuild from "esbuild";
+import { MockedRequest, rest } from "msw";
+import { FormData } from "undici";
 import {
 	printBundleSize,
 	printOffendingDependencies,
 } from "../bundle-reporter";
 import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import {
-	createFetchResult,
-	setMockRawResponse,
-	setMockResponse,
-	unsetAllMocks,
-	unsetSpecialMockFns,
-} from "./helpers/mock-cfetch";
+import { mockAuthDomain } from "./helpers/mock-auth-domain";
 import {
 	mockConsoleMethods,
 	normalizeSlashes,
 	normalizeTempDirs,
 } from "./helpers/mock-console";
-import { mockConfirm } from "./helpers/mock-dialogs";
+import { clearDialogs, mockConfirm } from "./helpers/mock-dialogs";
 import { mockGetZoneFromHostRequest } from "./helpers/mock-get-zone-from-host";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { mockCollectKnownRoutesRequest } from "./helpers/mock-known-routes";
 import { mockKeyListRequest } from "./helpers/mock-kv";
-import { mockGetMemberships, mockOAuthFlow } from "./helpers/mock-oauth-flow";
+import {
+	mockExchangeRefreshTokenForAccessToken,
+	mockGetMemberships,
+	mockOAuthFlow,
+} from "./helpers/mock-oauth-flow";
+import {
+	createFetchResult,
+	msw,
+	mswSuccessDeployments,
+	mswSuccessDeploymentScriptMetadata,
+} 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 { writeWorkerSource } from "./helpers/write-worker-source";
 import writeWranglerToml from "./helpers/write-wrangler-toml";
+
 import type { Config } from "../config";
 import type { WorkerMetadata } from "../create-worker-upload-form";
 import type { KVNamespaceInfo } from "../kv/helpers";
-import type { CustomDomainChangeset, CustomDomain } from "../publish/publish";
+import type { CustomDomain, CustomDomainChangeset } from "../publish/publish";
 import type { PutConsumerBody } from "../queues/client";
 import type { CfWorkerInit } from "../worker";
-import type { FormData, File } from "undici";
+import type { ResponseComposition, RestContext, RestRequest } from "msw";
 
 describe("publish", () => {
 	mockAccountId();
@@ -49,7 +57,7 @@ describe("publish", () => {
 	const {
 		mockOAuthServerCallback,
 		mockGrantAccessToken,
-		mockGrantAuthorization,
+		mockDomainUsesAccess,
 	} = mockOAuthFlow();
 
 	beforeEach(() => {
@@ -58,28 +66,15 @@ describe("publish", () => {
 			setImmediate(fn);
 		});
 		setIsTTY(true);
-		setMockResponse(
-			"/accounts/:accountId/workers/services/:scriptName",
-			() => ({
-				default_environment: { script: { last_deployed_from: "dash" } },
-			})
-		);
-		setMockResponse(
-			"/accounts/:accountId/workers/versions/by-script/:scriptTag",
-			() => ({
-				latest: { number: "2" },
-			})
-		);
+		mockLastDeploymentRequest();
+		mockDeploymentsListRequest();
 	});
 
 	afterEach(() => {
-		unsetAllMocks();
-		unsetSpecialMockFns();
+		clearDialogs();
 	});
 
 	describe("output additional script information", () => {
-		mockApiToken();
-
 		it("for first party workers, it should print worker information at log level", async () => {
 			setIsTTY(false);
 			fs.writeFileSync(
@@ -94,26 +89,33 @@ describe("publish", () => {
 			);
 			writeWorkerSource();
 			mockSubDomainRequest();
-			mockUploadWorkerRequest({ expectedType: "esm", sendScriptIds: true });
+			mockUploadWorkerRequest({ expectedType: "esm" });
 			mockOAuthServerCallback();
 
 			await runWrangler("publish ./index");
 
-			expect(std.out).toMatchInlineSnapshot(`
-			"Total Upload: xx KiB / gzip: xx KiB
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Worker ID:  abc12345
 			Worker ETag:  etag98765
 			Worker PipelineHash:  hash9999
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class",
+			  "warn": "",
+			}
 		`);
 		});
 	});
 
 	describe("authentication", () => {
 		mockApiToken({ apiToken: null });
+
 		beforeEach(() => {
 			// @ts-expect-error disable the mock we'd setup earlier
 			// or else our server won't bother listening for oauth requests
@@ -122,34 +124,73 @@ describe("publish", () => {
 		});
 
 		it("drops a user into the login flow if they're unauthenticated", async () => {
+			setIsTTY(true);
 			writeWranglerToml();
 			writeWorkerSource();
+			mockDomainUsesAccess({ usesAccess: false });
 			mockSubDomainRequest();
 			mockUploadWorkerRequest();
-			mockOAuthServerCallback();
-			const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
-			mockGrantAuthorization({ respondWith: "success" });
+			mockExchangeRefreshTokenForAccessToken({ respondWith: "refreshSuccess" });
+			mockOAuthServerCallback("success");
+			mockDeploymentsListRequest();
 
 			await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
 
-			expect(accessTokenRequest.actual.url).toEqual(
-				accessTokenRequest.expected.url
-			);
-
 			expect(std.out).toMatchInlineSnapshot(`
 			"Attempting to login via OAuth...
-			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
 			Successfully logged in.
 			Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
+		describe("with an alternative auth domain", () => {
+			mockAuthDomain({ domain: "dash.staging.cloudflare.com" });
+
+			it("drops a user into the login flow if they're unauthenticated", async () => {
+				writeWranglerToml();
+				writeWorkerSource();
+				mockDomainUsesAccess({
+					usesAccess: false,
+					domain: "dash.staging.cloudflare.com",
+				});
+				mockSubDomainRequest();
+				mockUploadWorkerRequest();
+				mockExchangeRefreshTokenForAccessToken({
+					respondWith: "refreshSuccess",
+				});
+				const accessTokenRequest = mockGrantAccessToken({
+					respondWith: "ok",
+					domain: "dash.staging.cloudflare.com",
+				});
+				mockOAuthServerCallback("success");
+				mockDeploymentsListRequest();
+
+				await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
+
+				expect(accessTokenRequest.actual).toEqual(accessTokenRequest.expected);
+
+				expect(std.out).toMatchInlineSnapshot(`
+			"Attempting to login via OAuth...
+			Opening a link in your default browser: https://dash.staging.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20d1%3Awrite%20pages%3Awrite%20zone%3Aread%20ssl_certs%3Awrite%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
+			Successfully logged in.
+			Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
+		`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+			});
+		});
+
 		it("warns a user when they're authenticated with an API token in wrangler config file", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
@@ -166,10 +207,10 @@ describe("publish", () => {
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
+			"▲ [WARNING] It looks like you have used Wrangler v1's \`config\` command to login with an API token.
 
 			  This is no longer supported in the current version of Wrangler.
 			  If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
@@ -207,7 +248,7 @@ describe("publish", () => {
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
@@ -232,7 +273,7 @@ describe("publish", () => {
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
@@ -257,12 +298,12 @@ describe("publish", () => {
 
 				await expect(runWrangler("publish index.js")).rejects
 					.toMatchInlineSnapshot(`
-						                [Error: More than one account available but unable to select one in non-interactive mode.
-						                Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
-						                Available accounts are ("<name>" - "<id>"):
-						                  "enterprise" - "1701")
-						                  "enterprise-nx" - "nx01")]
-					              `);
+			[Error: More than one account available but unable to select one in non-interactive mode.
+			Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+			Available accounts are (\`<name>\`: \`<account_id>\`):
+			  \`enterprise\`: \`1701\`
+			  \`enterprise-nx\`: \`nx01\`]
+		`);
 			});
 
 			it("should throw error in non-TTY if 'CLOUDFLARE_API_TOKEN' is missing", async () => {
@@ -286,7 +327,7 @@ describe("publish", () => {
 				await expect(runWrangler("publish index.js")).rejects.toThrowError();
 
 				expect(std.err).toMatchInlineSnapshot(`
-			          "X [ERROR] In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.
+			          "X [ERROR] In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.
 
 			          "
 		        `);
@@ -329,13 +370,14 @@ describe("publish", () => {
 				env: "some-env",
 				legacyEnv: true,
 			});
+
 			await runWrangler("publish index.js --env some-env");
 			expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name-some-env (TIMINGS)
 			Published test-name-some-env (TIMINGS)
 			  https://test-name-some-env.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -349,13 +391,14 @@ describe("publish", () => {
 				mockUploadWorkerRequest({
 					legacyEnv: true,
 				});
+
 				await runWrangler("publish index.js --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -369,13 +412,14 @@ describe("publish", () => {
 					env: "some-env",
 					legacyEnv: true,
 				});
+
 				await runWrangler("publish index.js --env some-env --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name-some-env (TIMINGS)
 			Published test-name-some-env (TIMINGS)
 			  https://test-name-some-env.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -389,13 +433,14 @@ describe("publish", () => {
 					env: "some-env",
 					legacyEnv: true,
 				});
+
 				await runWrangler("publish index.js --env some-env --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name-some-env (TIMINGS)
 			Published test-name-some-env (TIMINGS)
 			  https://test-name-some-env.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -460,13 +505,14 @@ describe("publish", () => {
 				mockUploadWorkerRequest({
 					legacyEnv: false,
 				});
+
 				await runWrangler("publish index.js --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -487,13 +533,14 @@ describe("publish", () => {
 					env: "some-env",
 					legacyEnv: false,
 				});
+
 				await runWrangler("publish index.js --env some-env --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (some-env) (TIMINGS)
 			Published test-name (some-env) (TIMINGS)
 			  https://some-env.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -540,7 +587,7 @@ describe("publish", () => {
 		Uploaded test-name (TIMINGS)
 		Published test-name (TIMINGS)
 		  https://test-name.test-sub-domain.workers.dev
-		Current Deployment: 2"
+		Current Deployment ID: Galaxy-Class"
 	`);
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
@@ -571,11 +618,12 @@ describe("publish", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - The \\"route\\" field in your configuration is an empty string and will be ignored.
@@ -618,6 +666,7 @@ describe("publish", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
@@ -626,7 +675,7 @@ describe("publish", () => {
 			  *another-boring-website.com (zone name: some-zone.com)
 			  example.com/some-route/* (zone id: JGHFHG654gjcj)
 			  more-examples.com/*
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -680,6 +729,7 @@ describe("publish", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (staging) (TIMINGS)
 			Published test-name (staging) (TIMINGS)
@@ -688,7 +738,7 @@ describe("publish", () => {
 			  *another-boring-website.com (zone name: some-zone.com)
 			  example.com/some-route/* (zone id: JGHFHG654gjcj)
 			  more-examples.com/*
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
@@ -745,7 +795,7 @@ describe("publish", () => {
 			await runWrangler("publish ./index --env dev --legacy-env false");
 		});
 
-		it("should fallback to the Wrangler 1 zone-based API if the bulk-routes API fails", async () => {
+		it("should fallback to the Wrangler v1 zone-based API if the bulk-routes API fails", async () => {
 			writeWranglerToml({
 				routes: ["example.com/some-route/*"],
 			});
@@ -770,28 +820,28 @@ describe("publish", () => {
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] The current authentication token does not have 'All Zones' permissions.
+			"▲ [WARNING] The current authentication token does not have 'All Zones' permissions.
 
-			          Falling back to using the zone-based API endpoint to update each route individually.
-			          Note that there is no access to routes associated with zones that the API token does not have
-			          permission for.
-			          Existing routes for this Worker in such zones will not be deleted.
+			  Falling back to using the zone-based API endpoint to update each route individually.
+			  Note that there is no access to routes associated with zones that the API token does not have
+			  permission for.
+			  Existing routes for this Worker in such zones will not be deleted.
 
 
-			        ▲ [WARNING] Previously deployed routes:
+			▲ [WARNING] Previously deployed routes:
 
-			          The following routes were already associated with this worker, and have not been deleted:
-			           - \\"foo.example.com/other-route\\"
-			          If these routes are not wanted then you can remove them in the dashboard.
+			  The following routes were already associated with this worker, and have not been deleted:
+			   - \\"foo.example.com/other-route\\"
+			  If these routes are not wanted then you can remove them in the dashboard.
 
-			        "
-		      `);
+			"
+		`);
 			expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  example.com/some-route/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 		});
 
@@ -1072,7 +1122,7 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1090,7 +1140,7 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1108,7 +1158,7 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1128,7 +1178,7 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1146,21 +1196,21 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - Deprecation: \\"build.upload.main\\":
-			              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-			              Then add the top level \`main\` field to your configuration file:
-			              \`\`\`
-			              main = \\"dist/index.js\\"
-			              \`\`\`
+			    - Deprecation: \\"build.upload.main\\":
+			      Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+			      Then add the top level \`main\` field to your configuration file:
+			      \`\`\`
+			      main = \\"dist/index.js\\"
+			      \`\`\`
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should use `build.upload.main` relative to `build.upload.dir`", async () => {
@@ -1183,24 +1233,24 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing ../wrangler.toml configuration:
+			"▲ [WARNING] Processing ../wrangler.toml configuration:
 
-			            - Deprecation: \\"build.upload.main\\":
-			              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-			              Then add the top level \`main\` field to your configuration file:
-			              \`\`\`
-			              main = \\"foo/index.js\\"
-			              \`\`\`
-			            - Deprecation: \\"build.upload.dir\\":
-			              Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the
-			          Worker.
+			    - Deprecation: \\"build.upload.main\\":
+			      Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+			      Then add the top level \`main\` field to your configuration file:
+			      \`\`\`
+			      main = \\"foo/index.js\\"
+			      \`\`\`
+			    - Deprecation: \\"build.upload.dir\\":
+			      Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the
+			  Worker.
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should error when both `main` and `build.upload.main` are used", async () => {
@@ -1234,7 +1284,7 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1254,7 +1304,7 @@ Update them to point to this script instead?`,
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1286,7 +1336,33 @@ export default{
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+
+		it("should allow cloudflare module import", async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"./index.js",
+				`
+import { EmailMessage } from "cloudflare:email";
+export default{
+  fetch(){
+    return new Response("all done");
+  }
+}
+`
+			);
+			mockUploadWorkerRequest();
+			mockSubDomainRequest();
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1304,7 +1380,7 @@ export default{
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1341,6 +1417,7 @@ export default {};`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			--dry-run: exiting now.",
 			  "warn": "",
@@ -1374,6 +1451,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			--dry-run: exiting now.",
 			  "warn": "▲ [WARNING] The entrypoint index.js has exports like an ES Module, but hasn't defined a default export like a module worker normally would. Building the worker using \\"service-worker\\" format...
@@ -1399,7 +1477,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1421,7 +1499,7 @@ addEventListener('fetch', event => {});`
 
 			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] Processing wrangler.toml configuration:
@@ -1473,6 +1551,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading file-1.txt...
 			Uploading as file-1.2ca234f380.txt...
 			Reading file-2.txt...
@@ -1482,7 +1561,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - Deprecation: \\"site.entry-point\\":
@@ -1535,21 +1614,21 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(normalizeSlashes(std.warn)).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing my-site/wrangler.toml configuration:
+			"▲ [WARNING] Processing my-site/wrangler.toml configuration:
 
-			            - Deprecation: \\"site.entry-point\\":
-			              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
-			          file:
-			              \`\`\`
-			              main = \\"my-entry/index.js\\"
-			              \`\`\`
+			    - Deprecation: \\"site.entry-point\\":
+			      Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
+			  file:
+			      \`\`\`
+			      main = \\"my-entry/index.js\\"
+			      \`\`\`
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should error if both main and site.entry-point are specified", async () => {
@@ -1583,7 +1662,7 @@ addEventListener('fetch', event => {});`
 
 			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] Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field.
@@ -1603,7 +1682,7 @@ addEventListener('fetch', event => {});`
 			};
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "no-op-worker.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1616,6 +1695,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading file-1.txt...
 			Uploading as file-1.2ca234f380.txt...
 			Reading file-2.txt...
@@ -1625,7 +1705,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
 
@@ -1674,7 +1754,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1694,7 +1774,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1706,6 +1786,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading file-1.txt...
 			Uploading as file-1.2ca234f380.txt...
 			Reading file-2.txt...
@@ -1715,7 +1796,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
 			",
@@ -1735,18 +1816,19 @@ addEventListener('fetch', event => {});`
 			);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "X [ERROR] You cannot use the service-worker format with an \`assets\` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/
+			Object {
+			  "debug": "",
+			  "err": "X [ERROR] You cannot use the service-worker format with an \`assets\` directory yet. For information on how to migrate to the module-worker format, see: https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/
 
-			        ",
-			          "out": "
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+			",
+			  "info": "",
+			  "out": "
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should error if --assets and --site are used together", async () => {
@@ -1761,16 +1843,17 @@ addEventListener('fetch', event => {});`
 			);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
-
-			        ",
-			          "out": "
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
+
+			",
+			  "info": "",
+			  "out": "
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should error if --assets and config.site are used together", async () => {
@@ -1788,16 +1871,17 @@ addEventListener('fetch', event => {});`
 			);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
-
-			        ",
-			          "out": "
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
+
+			",
+			  "info": "",
+			  "out": "
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should error if config.assets and --site are used together", async () => {
@@ -1814,20 +1898,21 @@ addEventListener('fetch', event => {});`
 			);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
+			Object {
+			  "debug": "",
+			  "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
 
-			        ",
-			          "out": "
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			",
+			  "info": "",
+			  "out": "
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose",
+			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"assets\\" fields are experimental and may change or break at any time.
+			    - \\"assets\\" fields are experimental and may change or break at any time.
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should error if config.assets and config.site are used together", async () => {
@@ -1847,20 +1932,21 @@ addEventListener('fetch', event => {});`
 			);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
+			Object {
+			  "debug": "",
+			  "err": "X [ERROR] Cannot use Assets and Workers Sites in the same Worker.
 
-			        ",
-			          "out": "
-			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			",
+			  "info": "",
+			  "out": "
+			If you think this is a bug then please create an issue at https://github.com/cloudflare/workers-sdk/issues/new/choose",
+			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"assets\\" fields are experimental and may change or break at any time.
+			    - \\"assets\\" fields are experimental and may change or break at any time.
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should warn if --assets is used", async () => {
@@ -1879,7 +1965,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1891,6 +1977,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading subdir/file-1.txt...
 			Uploading as subdir/file-1.2ca234f380.txt...
 			Reading subdir/file-2.txt...
@@ -1900,7 +1987,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
 			",
@@ -1926,7 +2013,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1938,6 +2025,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading subdir/file-1.txt...
 			Uploading as subdir/file-1.2ca234f380.txt...
 			Reading subdir/file-2.txt...
@@ -1947,7 +2035,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - \\"assets\\" fields are experimental and may change or break at any time.
@@ -2004,7 +2092,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2062,7 +2150,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2114,7 +2202,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2164,7 +2252,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (some-env) (TIMINGS)
 			Published test-name (some-env) (TIMINGS)
 			  https://some-env.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2215,7 +2303,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name-some-env (TIMINGS)
 			Published test-name-some-env (TIMINGS)
 			  https://test-name-some-env.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2259,7 +2347,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2300,7 +2388,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2341,7 +2429,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2383,7 +2471,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2425,7 +2513,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2467,7 +2555,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2509,7 +2597,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2553,7 +2641,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2601,7 +2689,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2647,7 +2735,7 @@ addEventListener('fetch', event => {});`
 			        Uploading as large-file.0ea0637a45.txt...
 			        Reading too-large-file.txt...
 
-			        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] File too-large-file.txt is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits
@@ -2706,6 +2794,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading file-00.txt...
 			Uploading as file-00.be5be5dd26.txt...
 			Reading file-01.txt...
@@ -2751,7 +2840,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -2788,7 +2877,7 @@ addEventListener('fetch', event => {});`
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Reading folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.txt...
 
-			        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] The asset path key \\"folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\",
@@ -2851,7 +2940,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2906,7 +2995,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2939,6 +3028,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading file-1.txt...
 			Uploading as file-1.2ca234f380.txt...
 			Reading file-2.txt...
@@ -2948,7 +3038,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -2969,7 +3059,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets, "my-assets");
 			mockUploadWorkerRequest({
-				expectedMainModule: "serve-static-assets.entry.js",
+				expectedMainModule: "index.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -2982,6 +3072,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Reading file-1.txt...
 			Uploading as file-1.2ca234f380.txt...
 			Reading file-2.txt...
@@ -2991,7 +3082,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
 			",
@@ -3014,7 +3105,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3035,7 +3126,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3055,7 +3146,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3074,7 +3165,7 @@ addEventListener('fetch', event => {});`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			No publish targets for test-name (TIMINGS)
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3095,7 +3186,7 @@ addEventListener('fetch', event => {});`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			No publish targets for test-name (TIMINGS)
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3120,7 +3211,7 @@ addEventListener('fetch', event => {});`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (dev) (TIMINGS)
 			No publish targets for test-name (dev) (TIMINGS)
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3146,7 +3237,7 @@ addEventListener('fetch', event => {});`
 			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (dev) (TIMINGS)
 			No publish targets for test-name (dev) (TIMINGS)
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3173,7 +3264,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (dev) (TIMINGS)
 			Published test-name (dev) (TIMINGS)
 			  https://dev.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3201,7 +3292,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (dev) (TIMINGS)
 			Published test-name (dev) (TIMINGS)
 			  https://dev.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3230,7 +3321,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (dev) (TIMINGS)
 			Published test-name (dev) (TIMINGS)
 			  https://dev.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3262,7 +3353,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (dev) (TIMINGS)
 			Published test-name (dev) (TIMINGS)
 			  https://dev.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3296,7 +3387,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (dev) (TIMINGS)
 			Published test-name (dev) (TIMINGS)
 			  https://dev.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3357,7 +3448,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3376,7 +3467,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3390,7 +3481,7 @@ addEventListener('fetch', event => {});`
 			mockSubDomainRequest("does-not-exist", false);
 
 			mockConfirm({
-				text: `Would you like to register a workers.dev subdomain now?`,
+				text: "Would you like to register a workers.dev subdomain now?",
 				result: false,
 			});
 
@@ -3419,7 +3510,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  http://example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3454,7 +3545,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name-production (TIMINGS)
 			Published test-name-production (TIMINGS)
 			  http://production.example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3488,7 +3579,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name-production (TIMINGS)
 			Published test-name-production (TIMINGS)
 			  http://production.example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3516,7 +3607,7 @@ addEventListener('fetch', event => {});`
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
 			  http://example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3552,7 +3643,7 @@ addEventListener('fetch', event => {});`
 			Published test-name-production (TIMINGS)
 			  https://test-name-production.test-sub-domain.workers.dev
 			  http://production.example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3588,7 +3679,7 @@ addEventListener('fetch', event => {});`
 			Published test-name-production (TIMINGS)
 			  https://test-name-production.test-sub-domain.workers.dev
 			  http://production.example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3623,7 +3714,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name-production (TIMINGS)
 			Published test-name-production (TIMINGS)
 			  http://production.example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3658,7 +3749,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name-production (TIMINGS)
 			Published test-name-production (TIMINGS)
 			  http://production.example.com/*
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3794,7 +3885,7 @@ addEventListener('fetch', event => {});`
 		it("should run a custom build before publishing", async () => {
 			writeWranglerToml({
 				build: {
-					command: `node -e "console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
+					command: `node -e "4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
 				},
 			});
 
@@ -3805,12 +3896,12 @@ addEventListener('fetch', event => {});`
 
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			"Running custom build: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\"
+			"Running custom build: node -e \\"4+4; require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\"
 			Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3820,7 +3911,7 @@ addEventListener('fetch', event => {});`
 			it("should run a custom build of multiple steps combined by && before publishing", async () => {
 				writeWranglerToml({
 					build: {
-						command: `echo "custom build" && echo "export default { fetch(){ return new Response(123) } }" > index.js`,
+						command: `echo "export default { fetch(){ return new Response(123) } }" > index.js`,
 					},
 				});
 
@@ -3831,12 +3922,12 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			"Running custom build: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js
+			"Running custom build: echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js
 			Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3847,22 +3938,22 @@ addEventListener('fetch', event => {});`
 			writeWranglerToml({
 				main: "index.js",
 				build: {
-					command: `node -e "console.log('custom build');"`,
+					command: `node -e "4+4;"`,
 				},
 			});
 
 			await expect(runWrangler("publish index.js")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-			              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"4+4;\\".
 			              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
 		            `);
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Running custom build: node -e \\"console.log('custom build');\\"
+			        "Running custom build: node -e \\"4+4;\\"
 
-			        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] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			        "X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"4+4;\\".
 
 			          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
 
@@ -3875,7 +3966,7 @@ addEventListener('fetch', event => {});`
 			writeWranglerToml({
 				main: "./",
 				build: {
-					command: `node -e "console.log('custom build');"`,
+					command: `node -e "4+4;"`,
 				},
 			});
 
@@ -3885,7 +3976,7 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-			              "The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			              "The expected output file at \\".\\" was not found after running custom build: node -e \\"4+4;\\".
 			              The \`main\` property in wrangler.toml should point to the file generated by the custom build.
 			              The provided entry-point path, \\".\\", points to a directory, rather than a file.
 
@@ -3896,12 +3987,12 @@ addEventListener('fetch', event => {});`
 			              \`\`\`"
 		            `);
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Running custom build: node -e \\"console.log('custom build');\\"
+			        "Running custom build: node -e \\"4+4;\\"
 
-			        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] The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			        "X [ERROR] The expected output file at \\".\\" was not found after running custom build: node -e \\"4+4;\\".
 
 			          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
 			          The provided entry-point path, \\".\\", points to a directory, rather than a file.
@@ -3943,7 +4034,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3983,7 +4074,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (testEnv) (TIMINGS)
 			Published test-name (testEnv) (TIMINGS)
 			  https://testEnv.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -4011,28 +4102,28 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass),
-			          but no [migrations] for them. This may not work as expected until you add a [migrations] section
-			          to your wrangler.toml. Add this configuration to your wrangler.toml:
+			    - In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass),
+			  but no [migrations] for them. This may not work as expected until you add a [migrations] section
+			  to your wrangler.toml. Add this configuration to your wrangler.toml:
 
-			                \`\`\`
-			                [[migrations]]
-			                tag = \\"v1\\" # Should be unique for each entry
-			                new_classes = [\\"SomeClass\\"]
-			                \`\`\`
+			        \`\`\`
+			        [[migrations]]
+			        tag = \\"v1\\" # Should be unique for each entry
+			        new_classes = [\\"SomeClass\\"]
+			        \`\`\`
 
-			              Refer to
-			          https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
-			          for more details.
+			      Refer to
+			  https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
+			  for more details.
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("does not warn if all the durable object bindings are to external classes", async () => {
@@ -4062,7 +4153,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4107,7 +4198,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4151,6 +4242,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Your worker has access to the following bindings:
 			- Durable Objects:
@@ -4159,7 +4251,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -4196,6 +4288,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Your worker has access to the following bindings:
 			- Durable Objects:
@@ -4204,7 +4297,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -4251,17 +4344,17 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
-			            the future. DO NOT USE IN PRODUCTION.
+			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
+			  the future. DO NOT USE IN PRODUCTION.
 
-			          "
-		        `);
+			"
+		`);
 			});
 
 			it("should publish all migrations on first publish (--env)", async () => {
@@ -4315,21 +4408,20 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (xyz) (TIMINGS)
 			Published test-name (xyz) (TIMINGS)
 			  https://xyz.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
-			            the future. DO NOT USE IN PRODUCTION.
+			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
+			  the future. DO NOT USE IN PRODUCTION.
 
-			          "
-		        `);
+			"
+		`);
 			});
 
 			it("should use a script's current migration tag when publishing migrations", async () => {
-				unsetAllMocks();
 				writeWranglerToml({
 					durable_objects: {
 						bindings: [
@@ -4348,32 +4440,29 @@ addEventListener('fetch', event => {});`
 				);
 				mockSubDomainRequest();
 				mockServiceScriptData({
-					script: { id: "test-name", migration_tag: "v1" },
+					script: { id: "test-name", migration_tag: "v2" },
 				});
 				mockUploadWorkerRequest({
 					legacyEnv: false,
 					expectedMigrations: {
-						old_tag: "v1",
 						new_tag: "v2",
 						steps: [
+							{
+								new_classes: ["SomeClass"],
+							},
 							{
 								new_classes: ["SomeOtherClass"],
 							},
 						],
 					},
 				});
-				setMockResponse(
-					"/accounts/:accountId/workers/versions/by-script/:scriptTag",
-					() => ({
-						latest: { number: "2" },
-					})
-				);
 
 				await runWrangler("publish index.js --legacy-env false");
 				expect(std).toMatchInlineSnapshot(`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Your worker has access to the following bindings:
 			- Durable Objects:
@@ -4382,7 +4471,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
@@ -4444,6 +4533,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Your worker has access to the following bindings:
 			- Durable Objects:
@@ -4452,7 +4542,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (xyz) (TIMINGS)
 			Published test-name (xyz) (TIMINGS)
 			  https://xyz.test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
@@ -4497,6 +4587,10 @@ addEventListener('fetch', event => {});`
 					{ binding: "R2_BUCKET_ONE", bucket_name: "r2-bucket-one-name" },
 					{ binding: "R2_BUCKET_TWO", bucket_name: "r2-bucket-two-name" },
 				],
+				analytics_engine_datasets: [
+					{ binding: "AE_DATASET_ONE", dataset: "ae-dataset-one-name" },
+					{ binding: "AE_DATASET_TWO", dataset: "ae-dataset-two-name" },
+				],
 				text_blobs: {
 					TEXT_BLOB_ONE: "./my-entire-app-depends-on-this.cfg",
 					TEXT_BLOB_TWO: "./the-entirety-of-human-knowledge.txt",
@@ -4514,6 +4608,10 @@ addEventListener('fetch', event => {});`
 							data: 1337,
 						},
 					],
+					metadata: {
+						extra_data: "interesting value",
+						more_data: "dubious value",
+					},
 				},
 				vars: {
 					ENV_VAR_ONE: 123,
@@ -4558,6 +4656,10 @@ addEventListener('fetch', event => {});`
 
 			mockUploadWorkerRequest({
 				expectedType: "sw",
+				expectedUnsafeMetaData: {
+					extra_data: "interesting value",
+					more_data: "dubious value",
+				},
 				expectedBindings: [
 					{ json: 123, name: "ENV_VAR_ONE", type: "json" },
 					{
@@ -4598,6 +4700,16 @@ addEventListener('fetch', event => {});`
 						name: "R2_BUCKET_TWO",
 						type: "r2_bucket",
 					},
+					{
+						dataset: "ae-dataset-one-name",
+						name: "AE_DATASET_ONE",
+						type: "analytics_engine",
+					},
+					{
+						dataset: "ae-dataset-two-name",
+						name: "AE_DATASET_TWO",
+						type: "analytics_engine",
+					},
 					{
 						name: "httplogs",
 						type: "logfwdr",
@@ -4656,6 +4768,9 @@ addEventListener('fetch', event => {});`
 			- logfwdr:
 			  - httplogs: httplogs
 			  - trace: trace
+			- Analytics Engine Datasets:
+			  - AE_DATASET_ONE: ae-dataset-one-name
+			  - AE_DATASET_TWO: ae-dataset-two-name
 			- Text Blobs:
 			  - TEXT_BLOB_ONE: my-entire-app-depends-on-this.cfg
 			  - TEXT_BLOB_TWO: the-entirety-of-human-knowledge.txt
@@ -4668,19 +4783,22 @@ addEventListener('fetch', event => {});`
 			- Wasm Modules:
 			  - WASM_MODULE_ONE: some_wasm.wasm
 			  - WASM_MODULE_TWO: more_wasm.wasm
+			- Unsafe Metadata:
+			  - extra_data: interesting value
+			  - more_data: dubious value
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - \\"unsafe\\" fields are experimental and may change or break at any time.
+			    - \\"unsafe\\" fields are experimental and may change or break at any time.
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should error when bindings of different types have the same name", async () => {
@@ -4713,6 +4831,12 @@ addEventListener('fetch', event => {});`
 						bucket_name: "r2-bucket-two-name",
 					},
 				],
+				analytics_engine_datasets: [
+					{
+						binding: "CONFLICTING_NAME_FOUR",
+						dataset: "analytics-engine-dataset-name",
+					},
+				],
 				text_blobs: {
 					CONFLICTING_NAME_THREE: "./my-entire-app-depends-on-this.cfg",
 					CONFLICTING_NAME_FOUR: "./the-entirety-of-human-knowledge.txt",
@@ -4730,6 +4854,7 @@ addEventListener('fetch', event => {});`
 							data: 1337,
 						},
 					],
+					metadata: undefined,
 				},
 				vars: {
 					ENV_VAR_ONE: 123,
@@ -4760,13 +4885,13 @@ addEventListener('fetch', event => {});`
 						                - CONFLICTING_NAME_ONE assigned to Durable Object, KV Namespace, and R2 Bucket bindings.
 						                - CONFLICTING_NAME_TWO assigned to Durable Object and KV Namespace bindings.
 						                - CONFLICTING_NAME_THREE assigned to R2 Bucket, Text Blob, Unsafe, Environment Variable, WASM Module, and Data Blob bindings.
-						                - CONFLICTING_NAME_FOUR assigned to Text Blob and Unsafe bindings.
+						                - CONFLICTING_NAME_FOUR assigned to Analytics Engine Dataset, Text Blob, and Unsafe bindings.
 						                - Bindings must have unique names, so that they can all be referenced in the worker.
 						                  Please change your bindings to have unique names.]
 					            `);
 			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] Processing wrangler.toml configuration:
@@ -4775,7 +4900,7 @@ addEventListener('fetch', event => {});`
 			            - CONFLICTING_NAME_TWO assigned to Durable Object and KV Namespace bindings.
 			            - CONFLICTING_NAME_THREE assigned to R2 Bucket, Text Blob, Unsafe, Environment Variable, WASM
 			          Module, and Data Blob bindings.
-			            - CONFLICTING_NAME_FOUR assigned to Text Blob and Unsafe bindings.
+			            - CONFLICTING_NAME_FOUR assigned to Analytics Engine Dataset, Text Blob, and Unsafe bindings.
 			            - Bindings must have unique names, so that they can all be referenced in the worker.
 			              Please change your bindings to have unique names.
 
@@ -4820,6 +4945,16 @@ addEventListener('fetch', event => {});`
 						bucket_name: "r2-bucket-two-name",
 					},
 				],
+				analytics_engine_datasets: [
+					{
+						binding: "CONFLICTING_AE_DATASET_NAME",
+						dataset: "ae-dataset-one-name",
+					},
+					{
+						binding: "CONFLICTING_AE_DATASET_NAME",
+						dataset: "ae-dataset-two-name",
+					},
+				],
 				unsafe: {
 					bindings: [
 						{
@@ -4833,6 +4968,7 @@ addEventListener('fetch', event => {});`
 							data: 1337,
 						},
 					],
+					metadata: undefined,
 				},
 				// text_blobs, vars, wasm_modules and data_blobs are fine because they're object literals,
 				// and by definition cannot have two keys of the same name
@@ -4859,13 +4995,14 @@ addEventListener('fetch', event => {});`
 						                - CONFLICTING_DURABLE_OBJECT_NAME assigned to multiple Durable Object bindings.
 						                - CONFLICTING_KV_NAMESPACE_NAME assigned to multiple KV Namespace bindings.
 						                - CONFLICTING_R2_BUCKET_NAME assigned to multiple R2 Bucket bindings.
+						                - CONFLICTING_AE_DATASET_NAME assigned to multiple Analytics Engine Dataset bindings.
 						                - CONFLICTING_UNSAFE_NAME assigned to multiple Unsafe bindings.
 						                - Bindings must have unique names, so that they can all be referenced in the worker.
 						                  Please change your bindings to have unique names.]
 					            `);
 			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] Processing wrangler.toml configuration:
@@ -4873,6 +5010,7 @@ addEventListener('fetch', event => {});`
 			            - CONFLICTING_DURABLE_OBJECT_NAME assigned to multiple Durable Object bindings.
 			            - CONFLICTING_KV_NAMESPACE_NAME assigned to multiple KV Namespace bindings.
 			            - CONFLICTING_R2_BUCKET_NAME assigned to multiple R2 Bucket bindings.
+			            - CONFLICTING_AE_DATASET_NAME assigned to multiple Analytics Engine Dataset bindings.
 			            - CONFLICTING_UNSAFE_NAME assigned to multiple Unsafe bindings.
 			            - Bindings must have unique names, so that they can all be referenced in the worker.
 			              Please change your bindings to have unique names.
@@ -4934,6 +5072,24 @@ addEventListener('fetch', event => {});`
 						bucket_name: "r2-bucket-four-name",
 					},
 				],
+				analytics_engine_datasets: [
+					{
+						binding: "CONFLICTING_AE_DATASET_NAME",
+						dataset: "ae-dataset-one-name",
+					},
+					{
+						binding: "CONFLICTING_AE_DATASET_NAME",
+						dataset: "ae-dataset-two-name",
+					},
+					{
+						binding: "CONFLICTING_NAME_THREE",
+						dataset: "ae-dataset-three-name",
+					},
+					{
+						binding: "CONFLICTING_NAME_FOUR",
+						dataset: "ae-dataset-four-name",
+					},
+				],
 				text_blobs: {
 					CONFLICTING_NAME_THREE: "./my-entire-app-depends-on-this.cfg",
 					CONFLICTING_NAME_FOUR: "./the-entirety-of-human-knowledge.txt",
@@ -4961,6 +5117,7 @@ addEventListener('fetch', event => {});`
 							data: null,
 						},
 					],
+					metadata: undefined,
 				},
 				vars: {
 					ENV_VAR_ONE: 123,
@@ -4991,15 +5148,16 @@ addEventListener('fetch', event => {});`
 						                - CONFLICTING_DURABLE_OBJECT_NAME assigned to multiple Durable Object bindings.
 						                - CONFLICTING_KV_NAMESPACE_NAME assigned to multiple KV Namespace bindings.
 						                - CONFLICTING_R2_BUCKET_NAME assigned to multiple R2 Bucket bindings.
-						                - CONFLICTING_NAME_THREE assigned to R2 Bucket, Text Blob, Unsafe, Environment Variable, WASM Module, and Data Blob bindings.
-						                - CONFLICTING_NAME_FOUR assigned to R2 Bucket, Text Blob, and Unsafe bindings.
+						                - CONFLICTING_NAME_THREE assigned to R2 Bucket, Analytics Engine Dataset, Text Blob, Unsafe, Environment Variable, WASM Module, and Data Blob bindings.
+						                - CONFLICTING_NAME_FOUR assigned to R2 Bucket, Analytics Engine Dataset, Text Blob, and Unsafe bindings.
+						                - CONFLICTING_AE_DATASET_NAME assigned to multiple Analytics Engine Dataset bindings.
 						                - CONFLICTING_UNSAFE_NAME assigned to multiple Unsafe bindings.
 						                - Bindings must have unique names, so that they can all be referenced in the worker.
 						                  Please change your bindings to have unique names.]
 					            `);
 			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] Processing wrangler.toml configuration:
@@ -5007,9 +5165,11 @@ addEventListener('fetch', event => {});`
 			            - CONFLICTING_DURABLE_OBJECT_NAME assigned to multiple Durable Object bindings.
 			            - CONFLICTING_KV_NAMESPACE_NAME assigned to multiple KV Namespace bindings.
 			            - CONFLICTING_R2_BUCKET_NAME assigned to multiple R2 Bucket bindings.
-			            - CONFLICTING_NAME_THREE assigned to R2 Bucket, Text Blob, Unsafe, Environment Variable, WASM
-			          Module, and Data Blob bindings.
-			            - CONFLICTING_NAME_FOUR assigned to R2 Bucket, Text Blob, and Unsafe bindings.
+			            - CONFLICTING_NAME_THREE assigned to R2 Bucket, Analytics Engine Dataset, Text Blob, Unsafe,
+			          Environment Variable, WASM Module, and Data Blob bindings.
+			            - CONFLICTING_NAME_FOUR assigned to R2 Bucket, Analytics Engine Dataset, Text Blob, and Unsafe
+			          bindings.
+			            - CONFLICTING_AE_DATASET_NAME assigned to multiple Analytics Engine Dataset bindings.
 			            - CONFLICTING_UNSAFE_NAME assigned to multiple Unsafe bindings.
 			            - Bindings must have unique names, so that they can all be referenced in the worker.
 			              Please change your bindings to have unique names.
@@ -5043,6 +5203,7 @@ addEventListener('fetch', event => {});`
 					],
 				});
 				mockSubDomainRequest();
+
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
 			"Total Upload: xx KiB / gzip: xx KiB
@@ -5052,7 +5213,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5075,7 +5236,7 @@ addEventListener('fetch', event => {});`
 				);
 				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] You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
@@ -5123,7 +5284,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5157,7 +5318,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5195,7 +5356,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5218,7 +5379,7 @@ addEventListener('fetch', event => {});`
 				);
 				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] You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
@@ -5270,7 +5431,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5308,7 +5469,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5331,7 +5492,7 @@ addEventListener('fetch', event => {});`
 				);
 				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] You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
@@ -5383,7 +5544,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5427,7 +5588,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5443,6 +5604,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Your worker has access to the following bindings:
 			- Vars:
@@ -5451,7 +5613,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -5480,7 +5642,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5533,7 +5695,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5580,7 +5742,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5621,7 +5783,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5667,14 +5829,15 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 
-			it("should error when detecting a service-worker worker implementing durable objects", async () => {
+			it("should support durable objects and D1", async () => {
 				writeWranglerToml({
+					main: "index.js",
 					durable_objects: {
 						bindings: [
 							{
@@ -5683,39 +5846,109 @@ addEventListener('fetch', event => {});`
 							},
 						],
 					},
-				});
-				writeWorkerSource({ type: "sw" });
-				mockSubDomainRequest();
-
-				await expect(runWrangler("publish index.js")).rejects
-					.toThrowErrorMatchingInlineSnapshot(`
-			                              "You seem to be trying to use Durable Objects in a Worker written as a service-worker.
-			                              You can use Durable Objects defined in other Workers by specifying a \`script_name\` in your wrangler.toml, where \`script_name\` is the name of the Worker that implements that Durable Object. For example:
-			                              { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject } ==> { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject, script_name = example-do-binding-worker }
-			                              Alternatively, migrate your worker to ES Module syntax to implement a Durable Object in this Worker:
-			                              https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
-		                          `);
-			});
-		});
-
-		describe("[services]", () => {
-			it("should support service bindings", async () => {
-				writeWranglerToml({
-					services: [
+					migrations: [{ tag: "v1", new_classes: ["ExampleDurableObject"] }],
+					d1_databases: [
 						{
-							binding: "FOO",
-							service: "foo-service",
-							environment: "production",
+							binding: "DB",
+							database_name: "test-d1-db",
+							database_id: "UUID-1-2-3-4",
+							preview_database_id: "UUID-1-2-3-4",
 						},
 					],
 				});
-				writeWorkerSource();
+				const scriptContent = `export class ExampleDurableObject {}; export default{};`;
+				fs.writeFileSync("index.js", scriptContent);
 				mockSubDomainRequest();
+				mockLegacyScriptData({
+					scripts: [{ id: "test-name", migration_tag: "v1" }],
+				});
 				mockUploadWorkerRequest({
+					expectedType: "esm",
 					expectedBindings: [
 						{
-							type: "service",
-							name: "FOO",
+							name: "EXAMPLE_DO_BINDING",
+							class_name: "ExampleDurableObject",
+							type: "durable_object_namespace",
+						},
+						{ name: "DB", type: "d1_database" },
+					],
+				});
+
+				await runWrangler("publish index.js --outdir tmp --dry-run");
+				expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - EXAMPLE_DO_BINDING: ExampleDurableObject
+			- D1 Databases:
+			  - DB: test-d1-db (UUID-1-2-3-4), Preview: (UUID-1-2-3-4)
+			--dry-run: exiting now."
+		`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] Processing wrangler.toml configuration:
+
+			    - D1 Bindings are currently in alpha to allow the API to evolve before general availability.
+			      Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
+			      Note: Run this command with the environment variable NO_D1_WARNING=true to hide this message
+
+			      For example: \`export NO_D1_WARNING=true && wrangler <YOUR COMMAND HERE>\`
+
+			"
+		`);
+				const output = fs.readFileSync("tmp/index.js", "utf-8");
+				expect(output).toContain(
+					`var ExampleDurableObject2 = maskDurableObjectDefinition(ExampleDurableObject);`
+				);
+				expect(output).toContain(
+					`ExampleDurableObject2 as ExampleDurableObject,`
+				);
+				expect(output).toContain(`shim_default as default`);
+			});
+
+			it("should error when detecting a service-worker worker implementing durable objects", async () => {
+				writeWranglerToml({
+					durable_objects: {
+						bindings: [
+							{
+								name: "EXAMPLE_DO_BINDING",
+								class_name: "ExampleDurableObject",
+							},
+						],
+					},
+				});
+				writeWorkerSource({ type: "sw" });
+				mockSubDomainRequest();
+
+				await expect(runWrangler("publish index.js")).rejects
+					.toThrowErrorMatchingInlineSnapshot(`
+			                              "You seem to be trying to use Durable Objects in a Worker written as a service-worker.
+			                              You can use Durable Objects defined in other Workers by specifying a \`script_name\` in your wrangler.toml, where \`script_name\` is the name of the Worker that implements that Durable Object. For example:
+			                              { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject } ==> { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject, script_name = example-do-binding-worker }
+			                              Alternatively, migrate your worker to ES Module syntax to implement a Durable Object in this Worker:
+			                              https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
+		                          `);
+			});
+		});
+
+		describe("[services]", () => {
+			it("should support service bindings", async () => {
+				writeWranglerToml({
+					services: [
+						{
+							binding: "FOO",
+							service: "foo-service",
+							environment: "production",
+						},
+					],
+				});
+				writeWorkerSource();
+				mockSubDomainRequest();
+				mockUploadWorkerRequest({
+					expectedBindings: [
+						{
+							type: "service",
+							name: "FOO",
 							service: "foo-service",
 							environment: "production",
 						},
@@ -5731,16 +5964,47 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - \\"services\\" fields are experimental and may change or break at any time.
+			    - \\"services\\" fields are experimental and may change or break at any time.
 
-			          "
-		        `);
+			"
+		`);
+			});
+		});
+
+		describe("[analytics_engine_datasets]", () => {
+			it("should support analytics engine bindings", async () => {
+				writeWranglerToml({
+					analytics_engine_datasets: [
+						{ binding: "FOO", dataset: "foo-dataset" },
+					],
+				});
+				writeWorkerSource();
+				mockSubDomainRequest();
+				mockUploadWorkerRequest({
+					expectedBindings: [
+						{ dataset: "foo-dataset", name: "FOO", type: "analytics_engine" },
+					],
+				});
+
+				await runWrangler("publish index.js");
+				expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Analytics Engine Datasets:
+			  - FOO: foo-dataset
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
+		`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 		});
 
@@ -5759,7 +6023,7 @@ addEventListener('fetch', event => {});`
 				mockUploadWorkerRequest({
 					expectedBindings: [
 						{
-							type: "namespace",
+							type: "dispatch_namespace",
 							name: "foo",
 							namespace: "Foo",
 						},
@@ -5774,16 +6038,10 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
-				expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Processing wrangler.toml configuration:
-
-			    - \\"dispatch_namespaces\\" fields are experimental and may change or break at any time.
-
-			"
-		`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 		});
 
@@ -5798,6 +6056,7 @@ addEventListener('fetch', event => {});`
 								param: "binding-param",
 							},
 						],
+						metadata: undefined,
 					},
 				});
 				writeWorkerSource();
@@ -5821,16 +6080,16 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			              - \\"unsafe\\" fields are experimental and may change or break at any time.
+			    - \\"unsafe\\" fields are experimental and may change or break at any time.
 
-			          "
-		        `);
+			"
+		`);
 			});
 			it("should warn if using unsafe bindings already handled by wrangler", async () => {
 				writeWranglerToml({
@@ -5842,6 +6101,7 @@ addEventListener('fetch', event => {});`
 								text: "text",
 							},
 						],
+						metadata: undefined,
 					},
 				});
 				writeWorkerSource();
@@ -5865,48 +6125,21 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
-			          "▲ [WARNING] Processing wrangler.toml configuration:
-
-			              - \\"unsafe\\" fields are experimental and may change or break at any time.
-			              - \\"unsafe.bindings[0]\\": {\\"name\\":\\"my-binding\\",\\"type\\":\\"plain_text\\",\\"text\\":\\"text\\"}
-			                - The binding type \\"plain_text\\" is directly supported by wrangler.
-			                  Consider migrating this unsafe binding to a format for 'plain_text' bindings that is
-			            supported by wrangler for optimal support.
-			                  For more details, see https://developers.cloudflare.com/workers/cli-wrangler/configuration
-
-			          "
-		        `);
-			});
-		});
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-		describe("[metadata_binding]", () => {
-			it("should pass metadata binding to backend", async () => {
-				writeWranglerToml({
-					metadata_binding: "nasm_A19750603000",
-				});
-				writeWorkerSource();
-				mockSubDomainRequest();
-				mockUploadWorkerRequest({
-					expectedBindings: [{ name: "nasm_A19750603000", type: "metadata" }],
-				});
+			    - \\"unsafe\\" fields are experimental and may change or break at any time.
+			    - \\"unsafe.bindings[0]\\": {\\"name\\":\\"my-binding\\",\\"type\\":\\"plain_text\\",\\"text\\":\\"text\\"}
+			      - The binding type \\"plain_text\\" is directly supported by wrangler.
+			        Consider migrating this unsafe binding to a format for 'plain_text' bindings that is
+			  supported by wrangler for optimal support.
+			        For more details, see https://developers.cloudflare.com/workers/cli-wrangler/configuration
 
-				await runWrangler("publish index.js");
-				expect(std.out).toMatchInlineSnapshot(`
-			"Total Upload: xx KiB / gzip: xx KiB
-			Your worker has access to the following bindings:
-			- Metadata Binding:
-			  - metadata: nasm_A19750603000
-			Uploaded test-name (TIMINGS)
-			Published test-name (TIMINGS)
-			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			"
 		`);
-				expect(std.err).toMatchInlineSnapshot(`""`);
-				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
 		});
 	});
@@ -5939,7 +6172,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5969,7 +6202,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -6003,24 +6236,24 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Processing wrangler.toml configuration:
+			"▲ [WARNING] Processing wrangler.toml configuration:
 
-			            - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be
-			          specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration
-			          file, and add this:
-			              \`\`\`
-			              [[rules]]
-			              type = \\"Text\\"
-			              globs = [ \\"**/*.file\\" ]
-			              fallthrough = true
-			              \`\`\`
+			    - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be
+			  specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration
+			  file, and add this:
+			      \`\`\`
+			      [[rules]]
+			      type = \\"Text\\"
+			      globs = [ \\"**/*.file\\" ]
+			      fallthrough = true
+			      \`\`\`
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should be able to use fallthrough:true for multiple rules", async () => {
@@ -6053,7 +6286,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -6151,7 +6384,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -6182,14 +6415,14 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text.file\\" with \\"./text.file\\";
+			"▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text.file\\" with \\"./text.file\\";
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should work with legacy module specifiers, with a deprecation warning (2)", async () => {
@@ -6212,14 +6445,14 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"index.wasm\\" with \\"./index.wasm\\";
+			"▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"index.wasm\\" with \\"./index.wasm\\";
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should work with legacy module specifiers, with a deprecation warning (3)", async () => {
@@ -6244,18 +6477,18 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
-			        "▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text+name.file\\" with \\"./text+name.file\\";
+			"▲ [WARNING] Deprecation: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text+name.file\\" with \\"./text+name.file\\";
 
-			        "
-		      `);
+			"
+		`);
 		});
 
 		it("should not match regular module specifiers when there aren't any possible legacy module matches", async () => {
-			// see https://github.com/cloudflare/wrangler2/issues/655 for bug details
+			// see https://github.com/cloudflare/workers-sdk/issues/655 for bug details
 
 			fs.writeFileSync(
 				"./index.js",
@@ -6274,7 +6507,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -6312,19 +6545,33 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
 		});
 
-		it("should output to target es2020 even if tsconfig says otherwise", async () => {
+		it("should output to target es2022 even if tsconfig says otherwise", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
+			fs.writeFileSync(
+				"./index.js",
+				`
+			import { foo } from "./another";
+			const topLevelAwait = await new Promise((resolve) => setTimeout(resolve, 0));
+
+			export default {
+  			async fetch(request) {
+
+    			return new Response("Hello world!");
+  			},
+			};`
+			);
 			fs.writeFileSync(
 				"tsconfig.json",
 				JSON.stringify({
@@ -6335,19 +6582,26 @@ addEventListener('fetch', event => {});`
 				})
 			);
 			mockSubDomainRequest();
+			/**
+			 * When we compile with es2022, we should preserve the export statement and top level await
+			 * If you attempt to target es2020 top level await will cause a build error
+			 * @error Build failed with 1 error:
+			 * index.js:3:25: ERROR: Top-level await is not available in the configured target environment ("es2020")
+			 */
 			mockUploadWorkerRequest({
-				expectedEntry: "export {", // just check that the export is preserved
+				expectedEntry: "export {", // check that the export is preserved
 			});
 			await runWrangler("publish index.js"); // this would throw if we tried to compile with es5
 			expect(std).toMatchInlineSnapshot(`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -6367,11 +6621,110 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class",
+			  "warn": "",
+			}
+		`);
+		});
+
+		it("should preserve the entry point file name, even when using a facade", async () => {
+			writeWranglerToml();
+			writeWorkerSource();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			const assets = [
+				{ filePath: "file-1.txt", content: "Content of file-1" },
+				{ filePath: "file-2.txt", content: "Content of file-2" },
+			];
+			const kvNamespace = {
+				title: "__test-name-workers_sites_assets",
+				id: "__test-name-workers_sites_assets-id",
+			};
+			writeAssets(assets);
+			mockListKVNamespacesRequest(kvNamespace);
+			mockKeyListRequest(kvNamespace.id, []);
+			mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+			await runWrangler("publish index.js --outdir some-dir --assets assets");
+			expect(fs.existsSync("some-dir/index.js")).toBe(true);
+			expect(fs.existsSync("some-dir/index.js.map")).toBe(true);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Reading file-1.txt...
+			Uploading as file-1.2ca234f380.txt...
+			Reading file-2.txt...
+			Uploading as file-2.5938485188.txt...
+			↗️  Done syncing assets
+			Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+
+			",
+			}
+		`);
+		});
+
+		it("should copy any module imports related assets to --outdir if specified", async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"./index.js",
+				`
+import txt from './textfile.txt';
+import hello from './hello.wasm';
+export default{
+  async fetch(){
+		const module = await WebAssembly.instantiate(hello);
+    return new Response(txt + module.exports.hello);
+  }
+}
+`
+			);
+			fs.writeFileSync("./textfile.txt", "Hello, World!");
+			fs.writeFileSync("./hello.wasm", "Hello wasm World!");
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedModules: {
+					"./0a0a9f2a6772942557ab5355d76af442f8f65e01-textfile.txt":
+						"Hello, World!",
+					"./d025a03cd31e98e96fb5bd5bce87f9bca4e8ce2c-hello.wasm":
+						"Hello wasm World!",
+				},
+			});
+			await runWrangler("publish index.js --outdir some-dir");
+
+			expect(fs.existsSync("some-dir/index.js")).toBe(true);
+			expect(fs.existsSync("some-dir/index.js.map")).toBe(true);
+			expect(fs.existsSync("some-dir/README.md")).toBe(true);
+			expect(
+				fs.existsSync(
+					"some-dir/0a0a9f2a6772942557ab5355d76af442f8f65e01-textfile.txt"
+				)
+			).toBe(true);
+			expect(
+				fs.existsSync(
+					"some-dir/d025a03cd31e98e96fb5bd5bce87f9bca4e8ce2c-hello.wasm"
+				)
+			).toBe(true);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
@@ -6395,6 +6748,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Your worker has access to the following bindings:
 			- Durable Objects:
@@ -6412,16 +6766,17 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			await runWrangler("publish index.js --node-compat --dry-run");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: xx KiB / gzip: xx KiB
-			        --dry-run: exiting now.",
-			          "warn": "▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
-
-			        ",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			--dry-run: exiting now.",
+			  "warn": "▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+
+			",
+			}
+		`);
 		});
 
 		it("should recommend node compatibility mode when using node builtins and node-compat isn't enabled", async () => {
@@ -6459,22 +6814,96 @@ addEventListener('fetch', event => {});`
 			);
 			await runWrangler("publish index.js --node-compat --dry-run"); // this would throw if node compatibility didn't exist
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: xx KiB / gzip: xx KiB
-			        --dry-run: exiting now.",
-			          "warn": "▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
-
-			        ",
-			        }
-		      `);
-		});
-	});
-
-	describe("bundle reporter", () => {
-		it("should print the bundle size", async () => {
-			fs.writeFileSync(
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			--dry-run: exiting now.",
+			  "warn": "▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+
+			",
+			}
+		`);
+		});
+	});
+
+	describe("`nodejs_compat` compatibility flag", () => {
+		it('when absent, should error on any "external" `node:*` imports', async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"index.js",
+				`
+      import AsyncHooks from 'node:async_hooks';
+      console.log(AsyncHooks);
+      export default {}
+      `
+			);
+			let err: esbuild.BuildFailure | undefined;
+			try {
+				await runWrangler("publish index.js --dry-run"); // expecting this to throw, as node compatibility isn't enabled
+			} catch (e) {
+				err = e as esbuild.BuildFailure;
+			}
+			expect(
+				esbuild.formatMessagesSync(err?.errors ?? [], { kind: "error" }).join()
+			).toMatch(/Could not resolve "node:async_hooks"/);
+		});
+
+		it('when present, should support any "external" `node:*` imports', async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"index.js",
+				`
+      import AsyncHooks from 'node:async_hooks';
+      console.log(AsyncHooks);
+      export default {}
+      `
+			);
+
+			await runWrangler(
+				"publish index.js --dry-run --outdir=dist --compatibility-flag=nodejs_compat"
+			);
+
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			--dry-run: exiting now.",
+			  "warn": "",
+			}
+		`);
+			expect(fs.readFileSync("dist/index.js", { encoding: "utf-8" })).toContain(
+				`import AsyncHooks from "node:async_hooks";`
+			);
+		});
+
+		it("should conflict with the --node-compat option", async () => {
+			writeWranglerToml();
+			fs.writeFileSync(
+				"index.js",
+				`
+      import AsyncHooks from 'node:async_hooks';
+      console.log(AsyncHooks);
+      export default {}
+      `
+			);
+
+			await expect(
+				runWrangler(
+					"publish index.js --dry-run --outdir=dist --compatibility-flag=nodejs_compat --node-compat"
+				)
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"The \`nodejs_compat\` compatibility flag cannot be used in conjunction with the legacy \`--node-compat\` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the \`--node-compat\` argument from your CLI command or \`node_compat = true\` from your config file."`
+			);
+		});
+	});
+
+	describe("bundle reporter", () => {
+		it("should print the bundle size", async () => {
+			fs.writeFileSync(
 				"./text.txt",
 				`${new Array(100)
 					.fill("Try not. Do or do not. There is no try.")
@@ -6508,34 +6937,45 @@ addEventListener('fetch', event => {});`
 			mockSubDomainRequest();
 			mockUploadWorkerRequest();
 			await runWrangler("publish");
+
 			expect(std).toMatchInlineSnapshot(`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2",
+			Current Deployment ID: Galaxy-Class",
 			  "warn": "",
 			}
 		`);
 		});
 
 		it("should print the bundle size, with API errors", async () => {
-			setMockRawResponse(
-				"/accounts/:accountId/workers/scripts/:scriptName",
-				"PUT",
-				() => {
-					return createFetchResult({}, false, [
-						{
-							code: 11337,
-							message:
-								"Script startup timed out. This could be due to script exceeding size limits or expensive code in the global scope.",
-						},
-					]);
-				}
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			// Override PUT call to error out from previous helper functions
+			msw.use(
+				rest.put(
+					"*/accounts/:accountId/workers/scripts/:scriptName",
+					(_, res, ctx) => {
+						return res(
+							ctx.json(
+								createFetchResult(null, false, [
+									{
+										code: 11337,
+										message:
+											"Script startup timed out. This could be due to script exceeding size limits or expensive code in the global scope.",
+									},
+								])
+							)
+						);
+					}
+				)
 			);
+
 			fs.writeFileSync(
 				"./hello.html",
 				`<!DOCTYPE html>
@@ -6556,35 +6996,57 @@ addEventListener('fetch', event => {});`
         },
       };`
 			);
+
 			writeWranglerToml({
 				main: "index.js",
 			});
-			mockSubDomainRequest();
-			mockUploadWorkerRequest();
+
 			await expect(runWrangler("publish")).rejects.toMatchInlineSnapshot(
 				`[ParseError: A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.]`
 			);
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: xx KiB / gzip: xx KiB
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "info": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
 
-			        X [ERROR] A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.
+			X [ERROR] A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.
 
-			          Script startup timed out. This could be due to script exceeding size limits or expensive code in
-			          the global scope. [code: 11337]
+			  Script startup timed out. This could be due to script exceeding size limits or expensive code in
+			  the global scope. [code: 11337]
 
-			          If you think this is a bug, please open an issue at:
-			          https://github.com/cloudflare/wrangler2/issues/new/choose
+			  If you think this is a bug, please open an issue at:
+			  https://github.com/cloudflare/workers-sdk/issues/new/choose
 
-			        ",
-			          "warn": "",
-			        }
-		      `);
+			",
+			  "warn": "",
+			}
+		`);
 		});
 
 		test("should check biggest dependencies when upload fails with script size error", async () => {
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			// Override PUT call to error out from previous helper functions
+			msw.use(
+				rest.put(
+					"*/accounts/:accountId/workers/scripts/:scriptName",
+					(req, res, ctx) => {
+						return res(
+							ctx.json(
+								createFetchResult({}, false, [
+									{
+										code: 10027,
+										message: "workers.api.error.script_too_large",
+									},
+								])
+							)
+						);
+					}
+				)
+			);
+
 			fs.writeFileSync("dependency.js", `export const thing = "a string dep";`);
 
 			fs.writeFileSync(
@@ -6597,27 +7059,20 @@ addEventListener('fetch', event => {});`
           }
         }`
 			);
-			setMockRawResponse(
-				"/accounts/:accountId/workers/scripts/:scriptName",
-				"PUT",
-				() => {
-					return createFetchResult({}, false, [
-						{ code: 10027, message: "workers.api.error.script_too_large" },
-					]);
-				}
-			);
+
 			writeWranglerToml({
 				main: "index.js",
 			});
-			mockSubDomainRequest();
-			mockUploadWorkerRequest();
+
 			await expect(runWrangler("publish")).rejects.toMatchInlineSnapshot(
 				`[ParseError: A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.]`
 			);
+
 			expect(std).toMatchInlineSnapshot(`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 
 			X [ERROR] A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.
@@ -6625,7 +7080,7 @@ addEventListener('fetch', event => {});`
 			  workers.api.error.script_too_large [code: 10027]
 
 			  If you think this is a bug, please open an issue at:
-			  https://github.com/cloudflare/wrangler2/issues/new/choose
+			  https://github.com/cloudflare/workers-sdk/issues/new/choose
 
 			",
 			  "warn": "▲ [WARNING] Here are the 2 largest dependencies included in your script:
@@ -6639,7 +7094,27 @@ addEventListener('fetch', event => {});`
 		`);
 		});
 
-		test("should check biggest dependencies when upload fails with script startup error", async () => {
+		test("should offer some helpful advice when upload fails with script startup error", async () => {
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			// Override PUT call to error out from previous helper functions
+			msw.use(
+				rest.put(
+					"*/accounts/:accountId/workers/scripts/:scriptName",
+					(req, res, ctx) => {
+						return res(
+							ctx.json(
+								createFetchResult({}, false, [
+									{
+										code: 10021,
+										message: "Error: Script startup exceeded CPU time limit.",
+									},
+								])
+							)
+						);
+					}
+				)
+			);
 			fs.writeFileSync("dependency.js", `export const thing = "a string dep";`);
 
 			fs.writeFileSync(
@@ -6652,23 +7127,11 @@ addEventListener('fetch', event => {});`
           }
         }`
 			);
-			setMockRawResponse(
-				"/accounts/:accountId/workers/scripts/:scriptName",
-				"PUT",
-				() => {
-					return createFetchResult({}, false, [
-						{
-							code: 10021,
-							message: "Error: Script startup exceeded CPU time limit.",
-						},
-					]);
-				}
-			);
+
 			writeWranglerToml({
 				main: "index.js",
 			});
-			mockSubDomainRequest();
-			mockUploadWorkerRequest();
+
 			await expect(runWrangler("publish")).rejects.toMatchInlineSnapshot(
 				`[ParseError: A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.]`
 			);
@@ -6676,6 +7139,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB
 
 			X [ERROR] A request to the Cloudflare API (/accounts/some-account-id/workers/scripts/test-name) failed.
@@ -6683,14 +7147,16 @@ addEventListener('fetch', event => {});`
 			  Error: Script startup exceeded CPU time limit. [code: 10021]
 
 			  If you think this is a bug, please open an issue at:
-			  https://github.com/cloudflare/wrangler2/issues/new/choose
+			  https://github.com/cloudflare/workers-sdk/issues/new/choose
 
 			",
-			  "warn": "▲ [WARNING] Here are the 2 largest dependencies included in your script:
+			  "warn": "▲ [WARNING] Your Worker failed validation because it exceeded startup limits.
 
-			  - index.js - xx KiB
-			  - dependency.js - xx KiB
-			  If these are unnecessary, consider removing them
+			  To ensure fast responses, we place constraints on Worker startup -- like how much CPU it can use,
+			  or how long it can take.
+			  Your Worker failed validation, which means it hit one of these startup limits.
+			  Try reducing the amount of work done during startup (outside the event handler), either by
+			  removing code or relocating it inside the event handler.
 
 			",
 			}
@@ -6712,6 +7178,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB",
 			  "warn": "▲ [WARNING] We recommend keeping your script less than 1MiB (1024 KiB) after gzip. Exceeding past this can affect cold start time
 
@@ -6734,6 +7201,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "Total Upload: xx KiB / gzip: xx KiB",
 			  "warn": "",
 			}
@@ -6762,6 +7230,7 @@ addEventListener('fetch', event => {});`
 			Object {
 			  "debug": "",
 			  "err": "",
+			  "info": "",
 			  "out": "",
 			  "warn": "▲ [WARNING] Here are the 5 largest dependencies included in your script:
 
@@ -6851,7 +7320,7 @@ addEventListener('fetch', event => {});`
 				"publish index.js --no-bundle --node-compat --dry-run --outdir dist"
 			);
 			expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+			"▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
 
 
 			▲ [WARNING] \`--node-compat\` and \`--no-bundle\` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process.
@@ -6871,7 +7340,7 @@ addEventListener('fetch', event => {});`
 			fs.writeFileSync("index.js", scriptContent);
 			await runWrangler("publish index.js --dry-run --outdir dist");
 			expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+			"▲ [WARNING] Enabling Node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
 
 
 			▲ [WARNING] \`--node-compat\` and \`--no-bundle\` can't be used together. If you want to polyfill Node.js built-ins and disable Wrangler's bundling, please polyfill as part of your own bundling process.
@@ -6881,63 +7350,37 @@ addEventListener('fetch', event => {});`
 		});
 	});
 
-	it("should publish if the last deployed source check fails", async () => {
-		unsetAllMocks();
-		writeWorkerSource();
-		writeWranglerToml();
-		mockSubDomainRequest();
-		mockUploadWorkerRequest();
-		setMockResponse(
-			"/accounts/:accountId/workers/versions/by-script/:scriptTag",
-			() => ({
-				latest: { number: "2" },
-			})
-		);
-		setMockRawResponse(
-			"/accounts/:accountId/workers/services/:scriptName",
-			"GET",
-			() => {
-				return createFetchResult(null, false, [
-					{ code: 10090, message: "workers.api.error.service_not_found" },
-				]);
-			}
-		);
-
-		await runWrangler("publish index.js");
-		expect(std).toMatchInlineSnapshot(`
-		Object {
-		  "debug": "",
-		  "err": "",
-		  "out": "Total Upload: xx KiB / gzip: xx KiB
-		Uploaded test-name (TIMINGS)
-		Published test-name (TIMINGS)
-		  https://test-name.test-sub-domain.workers.dev
-		Current Deployment: 2",
-		  "warn": "",
-		}
-	`);
-	});
-
 	it("should not publish if there's any other kind of error when checking deployment source", async () => {
-		unsetAllMocks();
 		writeWorkerSource();
 		writeWranglerToml();
 		mockSubDomainRequest();
 		mockUploadWorkerRequest();
-		setMockRawResponse(
-			"/accounts/:accountId/workers/services/:scriptName",
-			"GET",
-			() => {
-				return createFetchResult(null, false, [
-					{ code: 10000, message: "Authentication error" },
-				]);
-			}
-		);
-		setMockResponse(
-			"/accounts/:accountId/workers/versions/by-script/:scriptTag",
-			() => ({
-				latest: { number: "2" },
-			})
+
+		msw.use(
+			rest.get(
+				"*/accounts/:accountId/workers/services/:scriptName",
+				(_, res, ctx) => {
+					return res(
+						ctx.json(
+							createFetchResult(null, false, [
+								{ code: 10000, message: "Authentication error" },
+							])
+						)
+					);
+				}
+			),
+			rest.get(
+				"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
+				(_, res, ctx) => {
+					return res(
+						ctx.json(
+							createFetchResult({
+								latest: { number: "2" },
+							})
+						)
+					);
+				}
+			)
 		);
 
 		await runWrangler("publish index.js");
@@ -6975,7 +7418,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 		});
 
@@ -7012,7 +7455,84 @@ addEventListener('fetch', event => {});`
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
 			  Consumer for queue1
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
+		`);
+		});
+
+		it("should support queue consumer concurrency with a max concurrency specified", async () => {
+			writeWranglerToml({
+				queues: {
+					consumers: [
+						{
+							queue: "queue1",
+							dead_letter_queue: "myDLQ",
+							max_batch_size: 5,
+							max_batch_timeout: 3,
+							max_retries: 10,
+							max_concurrency: 5,
+						},
+					],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			mockGetQueue("queue1");
+			mockPutQueueConsumer("queue1", "test-name", {
+				dead_letter_queue: "myDLQ",
+				settings: {
+					batch_size: 5,
+					max_retries: 10,
+					max_wait_time_ms: 3000,
+					max_concurrency: 5,
+				},
+			});
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			  Consumer for queue1
+			Current Deployment ID: Galaxy-Class"
+		`);
+		});
+
+		it("should support queue consumer concurrency with a null max concurrency", async () => {
+			writeWranglerToml({
+				queues: {
+					consumers: [
+						{
+							queue: "queue1",
+							dead_letter_queue: "myDLQ",
+							max_batch_size: 5,
+							max_batch_timeout: 3,
+							max_retries: 10,
+							max_concurrency: null,
+						},
+					],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			mockGetQueue("queue1");
+			mockPutQueueConsumer("queue1", "test-name", {
+				dead_letter_queue: "myDLQ",
+				settings: {
+					batch_size: 5,
+					max_retries: 10,
+					max_wait_time_ms: 3000,
+				},
+			});
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			  Consumer for queue1
+			Current Deployment ID: Galaxy-Class"
 		`);
 		});
 
@@ -7063,6 +7583,37 @@ addEventListener('fetch', event => {});`
 		});
 	});
 
+	describe("mtls_certificates", () => {
+		it("should upload mtls_certificate bindings", async () => {
+			writeWranglerToml({
+				mtls_certificates: [{ binding: "CERT_ONE", certificate_id: "1234" }],
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedBindings: [
+					{
+						type: "mtls_certificate",
+						name: "CERT_ONE",
+						certificate_id: "1234",
+					},
+				],
+			});
+
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- mTLS Certificates:
+			  - CERT_ONE: 1234
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
+		`);
+		});
+	});
+
 	describe("--keep-vars", () => {
 		it("should send keepVars when keep-vars is passed in", async () => {
 			process.env = {
@@ -7084,7 +7635,7 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -7109,7 +7660,34 @@ addEventListener('fetch', event => {});`
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
 			  https://test-name.test-sub-domain.workers.dev
-			Current Deployment: 2"
+			Current Deployment ID: Galaxy-Class"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+
+		it("should send keepVars when `keep_vars = true`", async () => {
+			process.env = {
+				CLOUDFLARE_API_TOKEN: "hunter2",
+				CLOUDFLARE_ACCOUNT_ID: "some-account-id",
+			};
+			setIsTTY(false);
+			writeWranglerToml({
+				keep_vars: true,
+			});
+			writeWorkerSource();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({ keepVars: true });
+			mockOAuthServerCallback();
+			mockGetMemberships([]);
+
+			await runWrangler("publish index.js");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: Galaxy-Class"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -7129,12 +7707,19 @@ function writeAssets(
 		fs.writeFileSync(filePathDestination, asset.content);
 	}
 }
+function mockDeploymentsListRequest() {
+	msw.use(...mswSuccessDeployments);
+}
+
+function mockLastDeploymentRequest() {
+	msw.use(...mswSuccessDeploymentScriptMetadata);
+}
 
 /** Create a mock handler for the request to upload a worker script. */
 function mockUploadWorkerRequest(
 	options: {
 		available_on_subdomain?: boolean;
-		expectedEntry?: string;
+		expectedEntry?: string | RegExp;
 		expectedMainModule?: string;
 		expectedType?: "esm" | "sw";
 		expectedBindings?: unknown;
@@ -7142,9 +7727,9 @@ function mockUploadWorkerRequest(
 		expectedCompatibilityDate?: string;
 		expectedCompatibilityFlags?: string[];
 		expectedMigrations?: CfWorkerInit["migrations"];
+		expectedUnsafeMetaData?: Record<string, string>;
 		env?: string;
 		legacyEnv?: boolean;
-		sendScriptIds?: boolean;
 		keepVars?: boolean;
 		tag?: string;
 	} = {}
@@ -7161,76 +7746,97 @@ function mockUploadWorkerRequest(
 		env = undefined,
 		legacyEnv = false,
 		expectedMigrations,
-		sendScriptIds,
+		expectedUnsafeMetaData,
 		keepVars,
 	} = options;
-	setMockResponse(
-		env && !legacyEnv
-			? "/accounts/:accountId/workers/services/:scriptName/environments/:envName"
-			: "/accounts/:accountId/workers/scripts/:scriptName",
-		"PUT",
-		async ([_url, accountId, scriptName, envName], { body }, queryParams) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(scriptName).toEqual(
-				legacyEnv && env ? `test-name-${env}` : "test-name"
-			);
-			if (!legacyEnv) {
-				expect(envName).toEqual(env);
-			}
-			expect(queryParams.get("include_subdomain_availability")).toEqual("true");
-			expect(queryParams.get("excludeScript")).toEqual("true");
-			const formBody = body as FormData;
-			if (expectedEntry !== undefined) {
-				expect(await (formBody.get("index.js") as File).text()).toMatch(
-					expectedEntry
-				);
-			}
-			const metadata = JSON.parse(
-				formBody.get("metadata") as string
-			) as WorkerMetadata;
-			if (expectedType === "esm") {
-				expect(metadata.main_module).toEqual(expectedMainModule);
-			} else {
-				expect(metadata.body_part).toEqual("index.js");
-			}
+	if (env && !legacyEnv) {
+		msw.use(
+			rest.put(
+				"*/accounts/:accountId/workers/services/:scriptName/environments/:envName",
+				handleUpload
+			)
+		);
+	} else {
+		msw.use(
+			rest.put(
+				"*/accounts/:accountId/workers/scripts/:scriptName",
+				handleUpload
+			)
+		);
+	}
 
-			if (keepVars) {
-				expect(metadata.keep_bindings).toEqual(["plain_text", "json"]);
-			} else {
-				expect(metadata.keep_bindings).toBeFalsy();
-			}
+	async function handleUpload(
+		req: RestRequest,
+		res: ResponseComposition,
+		ctx: RestContext
+	) {
+		expect(req.params.accountId).toEqual("some-account-id");
+		expect(req.params.scriptName).toEqual(
+			legacyEnv && env ? `test-name-${env}` : "test-name"
+		);
+		if (!legacyEnv) {
+			expect(req.params.envName).toEqual(env);
+		}
+		expect(req.url.searchParams.get("include_subdomain_availability")).toEqual(
+			"true"
+		);
+		expect(req.url.searchParams.get("excludeScript")).toEqual("true");
 
-			if ("expectedBindings" in options) {
-				expect(metadata.bindings).toEqual(expectedBindings);
-			}
-			if ("expectedCompatibilityDate" in options) {
-				expect(metadata.compatibility_date).toEqual(expectedCompatibilityDate);
-			}
-			if ("expectedCompatibilityFlags" in options) {
-				expect(metadata.compatibility_flags).toEqual(
-					expectedCompatibilityFlags
-				);
-			}
-			if ("expectedMigrations" in options) {
-				expect(metadata.migrations).toEqual(expectedMigrations);
-			}
-			for (const [name, content] of Object.entries(expectedModules)) {
-				expect(await (formBody.get(name) as File).text()).toEqual(content);
-			}
+		const formBody = await (
+			req as MockedRequest as RestRequestWithFormData
+		).formData();
+		if (expectedEntry !== undefined) {
+			expect(formBody.get("index.js")).toMatch(expectedEntry);
+		}
+		const metadata = JSON.parse(
+			formBody.get("metadata") as string
+		) as WorkerMetadata;
+		if (expectedType === "esm") {
+			expect(metadata.main_module).toEqual(expectedMainModule);
+		} else {
+			expect(metadata.body_part).toEqual("index.js");
+		}
 
-			return {
-				available_on_subdomain,
-				...(sendScriptIds
-					? {
-							id: "abc12345",
-							etag: "etag98765",
-							pipeline_hash: "hash9999",
-							tag: "sample-tag",
-					  }
-					: {}),
-			};
+		if (keepVars) {
+			expect(metadata.keep_bindings).toEqual(["plain_text", "json"]);
+		} else {
+			expect(metadata.keep_bindings).toBeFalsy();
 		}
-	);
+
+		if ("expectedBindings" in options) {
+			expect(metadata.bindings).toEqual(expectedBindings);
+		}
+		if ("expectedCompatibilityDate" in options) {
+			expect(metadata.compatibility_date).toEqual(expectedCompatibilityDate);
+		}
+		if ("expectedCompatibilityFlags" in options) {
+			expect(metadata.compatibility_flags).toEqual(expectedCompatibilityFlags);
+		}
+		if ("expectedMigrations" in options) {
+			expect(metadata.migrations).toEqual(expectedMigrations);
+		}
+		if (expectedUnsafeMetaData !== undefined) {
+			Object.keys(expectedUnsafeMetaData).forEach((key) => {
+				expect(metadata[key]).toEqual(expectedUnsafeMetaData[key]);
+			});
+		}
+		for (const [name, content] of Object.entries(expectedModules)) {
+			expect(formBody.get(name)).toEqual(content);
+		}
+
+		return res(
+			ctx.json(
+				createFetchResult({
+					available_on_subdomain,
+					id: "abc12345",
+					etag: "etag98765",
+					pipeline_hash: "hash9999",
+					tag: "sample-tag",
+					deployment_id: "Galaxy-Class",
+				})
+			)
+		);
+	}
 }
 
 /** Create a mock handler for the request to get the account's subdomain. */
@@ -7239,18 +7845,30 @@ function mockSubDomainRequest(
 	registeredWorkersDev = true
 ) {
 	if (registeredWorkersDev) {
-		setMockResponse("/accounts/:accountId/workers/subdomain", "GET", () => {
-			return { subdomain };
-		});
+		msw.use(
+			rest.get("*/accounts/:accountId/workers/subdomain", (req, res, ctx) => {
+				return res.once(ctx.json(createFetchResult({ subdomain })));
+			})
+		);
 	} else {
-		setMockRawResponse("/accounts/:accountId/workers/subdomain", "GET", () => {
-			return createFetchResult(null, false, [
-				{ code: 10007, message: "haven't registered workers.dev" },
-			]);
-		});
+		msw.use(
+			rest.get("*/accounts/:accountId/workers/subdomain", (req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(null, false, [
+							{ code: 10007, message: "haven't registered workers.dev" },
+						])
+					)
+				);
+			})
+		);
 	}
 }
-
+//
+//
+//
+//
+//
 /** Create a mock handler to toggle a <script>.<user>.workers.dev subdomain */
 function mockUpdateWorkerRequest({
 	env,
@@ -7264,20 +7882,22 @@ function mockUpdateWorkerRequest({
 	const requests = { count: 0 };
 	const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
-	setMockResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/subdomain`,
-		"POST",
-		([_url, accountId, scriptName, envName], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(scriptName).toEqual(
-				legacyEnv && env ? `test-name-${env}` : "test-name"
-			);
-			if (!legacyEnv) {
-				expect(envName).toEqual(env);
+	msw.use(
+		rest.post(
+			`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/subdomain`,
+			async (req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.scriptName).toEqual(
+					legacyEnv && env ? `test-name-${env}` : "test-name"
+				);
+				if (!legacyEnv) {
+					expect(req.params.envName).toEqual(env);
+				}
+				const body = await req.json();
+				expect(body).toEqual({ enabled });
+				return res.once(ctx.json(createFetchResult(null)));
 			}
-			expect(JSON.parse(body as string)).toEqual({ enabled });
-			return null;
-		}
+		)
 	);
 	return requests;
 }
@@ -7294,25 +7914,26 @@ function mockPublishRoutesRequest({
 	const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
 
-	setMockResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/routes`,
-		"PUT",
-		([_url, accountId, scriptName, envName], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(scriptName).toEqual(
-				legacyEnv && env ? `test-name-${env}` : "test-name"
-			);
-			if (!legacyEnv) {
-				expect(envName).toEqual(env);
+	msw.use(
+		rest.put(
+			`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/routes`,
+			async (req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.scriptName).toEqual(
+					legacyEnv && env ? `test-name-${env}` : "test-name"
+				);
+				if (!legacyEnv) {
+					expect(req.params.envName).toEqual(env);
+				}
+				const body = await req.json();
+				expect(body).toEqual(
+					routes.map((route) =>
+						typeof route !== "object" ? { pattern: route } : route
+					)
+				);
+				return res.once(ctx.json(createFetchResult(null)));
 			}
-
-			expect(JSON.parse(body as string)).toEqual(
-				routes.map((route) =>
-					typeof route !== "object" ? { pattern: route } : route
-				)
-			);
-			return null;
-		}
+		)
 	);
 }
 
@@ -7326,13 +7947,19 @@ function mockUnauthorizedPublishRoutesRequest({
 	const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
 
-	setMockRawResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/routes`,
-		"PUT",
-		() =>
-			createFetchResult(null, false, [
-				{ message: "Authentication error", code: 10000 },
-			])
+	msw.use(
+		rest.put(
+			`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/routes`,
+			(req, res, ctx) => {
+				return res.once(
+					ctx.json(
+						createFetchResult(null, false, [
+							{ message: "Authentication error", code: 10000 },
+						])
+					)
+				);
+			}
+		)
 	);
 }
 
@@ -7340,22 +7967,27 @@ function mockPublishRoutesFallbackRequest(route: {
 	pattern: string;
 	script: string;
 }) {
-	setMockResponse(`/zones/:zoneId/workers/routes`, "POST", (_url, { body }) => {
-		expect(JSON.parse(body as string)).toEqual(route);
-		return route.pattern;
-	});
+	msw.use(
+		rest.post(`*/zones/:zoneId/workers/routes`, async (req, res, ctx) => {
+			const body = await req.json();
+			expect(body).toEqual(route);
+			return res.once(ctx.json(createFetchResult(route.pattern)));
+		})
+	);
 }
 
 function mockCustomDomainLookup(origin: CustomDomain) {
-	setMockResponse(
-		`/accounts/:accountId/workers/domains/records/:domainTag`,
-		"GET",
-		([_url, accountId, domainTag]) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(domainTag).toEqual(origin.id);
-
-			return origin;
-		}
+	msw.use(
+		rest.get(
+			`*/accounts/:accountId/workers/domains/records/:domainTag`,
+
+			(req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.domainTag).toEqual(origin.id);
+
+				return res.once(ctx.json(createFetchResult(origin)));
+			}
+		)
 	);
 }
 
@@ -7372,47 +8004,47 @@ function mockCustomDomainsChangesetRequest({
 }) {
 	const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
+	msw.use(
+		rest.post(
+			`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains/changeset`,
+			async (req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.scriptName).toEqual(
+					legacyEnv && env ? `test-name-${env}` : "test-name"
+				);
+				if (!legacyEnv) {
+					expect(req.params.envName).toEqual(env);
+				}
 
-	setMockResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains/changeset`,
-		"POST",
-		([_url, accountId, scriptName, envName], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(scriptName).toEqual(
-				legacyEnv && env ? `test-name-${env}` : "test-name"
-			);
-			if (!legacyEnv) {
-				expect(envName).toEqual(env);
-			}
+				const domains: Array<
+					{ hostname: string } & ({ zone_id?: string } | { zone_name?: string })
+				> = await req.json();
 
-			const domains: Array<
-				{ hostname: string } & ({ zone_id?: string } | { zone_name?: string })
-			> = JSON.parse(body as string);
-
-			const changeset: CustomDomainChangeset = {
-				added: domains.map((domain) => {
-					return {
-						...domain,
-						id: "",
-						service: scriptName,
-						environment: envName,
-						zone_name: "",
-						zone_id: "",
-					};
-				}),
-				removed: [],
-				updated:
-					originConflicts?.map((domain) => {
+				const changeset: CustomDomainChangeset = {
+					added: domains.map((domain) => {
 						return {
 							...domain,
-							modified: true,
+							id: "",
+							service: req.params.scriptName as string,
+							environment: req.params.envName as string,
+							zone_name: "",
+							zone_id: "",
 						};
-					}) ?? [],
-				conflicting: dnsRecordConflicts,
-			};
+					}),
+					removed: [],
+					updated:
+						originConflicts?.map((domain) => {
+							return {
+								...domain,
+								modified: true,
+							};
+						}) ?? [],
+					conflicting: dnsRecordConflicts,
+				};
 
-			return changeset;
-		}
+				return res.once(ctx.json(createFetchResult(changeset)));
+			}
+		)
 	);
 }
 
@@ -7436,37 +8068,36 @@ function mockPublishCustomDomainsRequest({
 	const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
 
-	setMockResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains/records`,
-		"PUT",
-		([_url, accountId, scriptName, envName], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(scriptName).toEqual(
-				legacyEnv && env ? `test-name-${env}` : "test-name"
-			);
-			if (!legacyEnv) {
-				expect(envName).toEqual(env);
-			}
-
-			expect(JSON.parse(body as string)).toEqual({
-				...publishFlags,
-				origins: domains,
-			});
+	msw.use(
+		rest.put(
+			`*/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains/records`,
+			async (req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.scriptName).toEqual(
+					legacyEnv && env ? `test-name-${env}` : "test-name"
+				);
+				if (!legacyEnv) {
+					expect(req.params.envName).toEqual(env);
+				}
+				const body = await req.json();
+				expect(body).toEqual({
+					...publishFlags,
+					origins: domains,
+				});
 
-			return null;
-		}
+				return res.once(ctx.json(createFetchResult(null)));
+			}
+		)
 	);
 }
 
 /** Create a mock handler for the request to get a list of all KV namespaces. */
 function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
-	setMockResponse(
-		"/accounts/:accountId/storage/kv/namespaces",
-		"GET",
-		([_url, accountId]) => {
-			expect(accountId).toEqual("some-account-id");
-			return namespaces;
-		}
+	msw.use(
+		rest.get("*/accounts/:accountId/storage/kv/namespaces", (req, res, ctx) => {
+			expect(req.params.accountId).toEqual("some-account-id");
+			return res.once(ctx.json(createFetchResult(namespaces)));
+		})
 	);
 }
 
@@ -7485,6 +8116,7 @@ interface StaticAssetUpload {
 }
 
 /** Create a mock handler for the request that tries to do a bulk upload of assets to a KV namespace. */
+//TODO: This is getting called multiple times in the test, we need to check if that is happening in Production --Jacob 2021-03-02
 function mockUploadAssetsToKVRequest(
 	expectedNamespaceId: string,
 	assets?: ExpectedAsset[]
@@ -7492,22 +8124,24 @@ function mockUploadAssetsToKVRequest(
 	const requests: {
 		uploads: StaticAssetUpload[];
 	}[] = [];
-	setMockResponse(
-		"/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
-		"PUT",
-		([_url, accountId, namespaceId], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(namespaceId).toEqual(expectedNamespaceId);
-			const uploads = JSON.parse(body as string);
-			if (assets) {
-				expect(assets.length).toEqual(uploads.length);
-				for (let i = 0; i < uploads.length; i++) {
-					checkAssetUpload(assets[i], uploads[i]);
+	msw.use(
+		rest.put(
+			"*/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
+			async (req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.namespaceId).toEqual(expectedNamespaceId);
+				const uploads = await req.json();
+				if (assets) {
+					expect(assets.length).toEqual(uploads.length);
+					for (let i = 0; i < uploads.length; i++) {
+						checkAssetUpload(assets[i], uploads[i]);
+					}
 				}
-			} else {
+
 				requests.push({ uploads });
+				return res(ctx.json(createFetchResult([])));
 			}
-		}
+		)
 	);
 	return requests;
 }
@@ -7531,16 +8165,24 @@ function mockDeleteUnusedAssetsRequest(
 	expectedNamespaceId: string,
 	assets: string[]
 ) {
-	setMockResponse(
-		"/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
-		"DELETE",
-		([_url, accountId, namespaceId], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(namespaceId).toEqual(expectedNamespaceId);
-			const deletes = JSON.parse(body as string);
-			expect(assets).toEqual(deletes);
-			return null;
-		}
+	msw.use(
+		rest.delete(
+			"*/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
+			async (req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.namespaceId).toEqual(expectedNamespaceId);
+				const deletes = await req.json();
+				expect(assets).toEqual(deletes);
+				return res.once(
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: null,
+					})
+				);
+			}
+		)
 	);
 }
 
@@ -7548,13 +8190,18 @@ type LegacyScriptInfo = { id: string; migration_tag?: string };
 
 function mockLegacyScriptData(options: { scripts: LegacyScriptInfo[] }) {
 	const { scripts } = options;
-	setMockResponse(
-		"/accounts/:accountId/workers/scripts",
-		"GET",
-		([_url, accountId]) => {
-			expect(accountId).toEqual("some-account-id");
-			return scripts;
-		}
+	msw.use(
+		rest.get("*/accounts/:accountId/workers/scripts", (req, res, ctx) => {
+			expect(req.params.accountId).toEqual("some-account-id");
+			return res.once(
+				ctx.json({
+					success: true,
+					errors: [],
+					messages: [],
+					result: scripts,
+				})
+			);
+		})
 	);
 }
 
@@ -7568,74 +8215,140 @@ function mockServiceScriptData(options: {
 	const { script } = options;
 	if (options.env) {
 		if (!script) {
-			setMockRawResponse(
-				"/accounts/:accountId/workers/services/:scriptName/environments/:envName",
-				"GET",
-				() => {
-					return createFetchResult(null, false, [
-						{ code: 10092, message: "workers.api.error.environment_not_found" },
-					]);
-				}
+			msw.use(
+				rest.get(
+					"*/accounts/:accountId/workers/services/:scriptName/environments/:envName",
+					(_, res, ctx) => {
+						return res.once(
+							ctx.json({
+								success: false,
+								errors: [
+									{
+										code: 10092,
+										message: "workers.api.error.environment_not_found",
+									},
+								],
+								messages: [],
+								result: null,
+							})
+						);
+					}
+				)
 			);
 			return;
 		}
-		setMockResponse(
-			"/accounts/:accountId/workers/services/:scriptName/environments/:envName",
-			"GET",
-			([_url, accountId, scriptName, envName]) => {
-				expect(accountId).toEqual("some-account-id");
-				expect(scriptName).toEqual(options.scriptName || "test-name");
-				expect(envName).toEqual(options.env);
-				return { script };
-			}
+		msw.use(
+			rest.get(
+				"*/accounts/:accountId/workers/services/:scriptName/environments/:envName",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					expect(req.params.scriptName).toEqual(
+						options.scriptName || "test-name"
+					);
+					expect(req.params.envName).toEqual(options.env);
+					return res.once(
+						ctx.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: { script },
+						})
+					);
+				}
+			)
 		);
 	} else {
 		if (!script) {
-			setMockRawResponse(
-				"/accounts/:accountId/workers/services/:scriptName",
-				"GET",
-				() => {
-					return createFetchResult(null, false, [
-						{ code: 10090, message: "workers.api.error.service_not_found" },
-					]);
-				}
+			msw.use(
+				rest.get(
+					"*/accounts/:accountId/workers/services/:scriptName",
+					(req, res, ctx) => {
+						return res.once(
+							ctx.json({
+								success: false,
+								errors: [
+									{
+										code: 10090,
+										message: "workers.api.error.service_not_found",
+									},
+								],
+								messages: [],
+								result: null,
+							})
+						);
+					}
+				)
 			);
 			return;
 		}
-		setMockResponse(
-			"/accounts/:accountId/workers/services/:scriptName",
-			"GET",
-			([_url, accountId, scriptName]) => {
-				expect(accountId).toEqual("some-account-id");
-				expect(scriptName).toEqual(options.scriptName || "test-name");
-				return { default_environment: { script } };
-			}
+		msw.use(
+			rest.get(
+				"*/accounts/:accountId/workers/services/:scriptName",
+				(req, res, ctx) => {
+					expect(req.params.accountId).toEqual("some-account-id");
+					expect(req.params.scriptName).toEqual(
+						options.scriptName || "test-name"
+					);
+					return res.once(
+						ctx.json({
+							success: true,
+							errors: [],
+							messages: [],
+							result: { default_environment: { script } },
+						})
+					);
+				}
+			)
 		);
 	}
 }
 
 function mockGetQueue(expectedQueueName: string) {
 	const requests = { count: 0 };
-	setMockResponse(
-		`/accounts/:accountId/workers/queues/${expectedQueueName}`,
-		"GET",
-		([_url, accountId]) => {
-			expect(accountId).toEqual("some-account-id");
-			requests.count += 1;
-			return { queue: expectedQueueName };
-		}
+	msw.use(
+		rest.get(
+			`*/accounts/:accountId/workers/queues/${expectedQueueName}`,
+			(req, res, ctx) => {
+				expect(req.params.accountId).toEqual("some-account-id");
+				requests.count += 1;
+				return res(
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: { queue: expectedQueueName },
+					})
+				);
+			}
+		)
 	);
 	return requests;
 }
 
 function mockGetQueueMissing(expectedQueueName: string) {
 	const requests = { count: 0 };
-	setMockResponse(
-		`/accounts/:accountId/workers/queues/${expectedQueueName}`,
-		"GET",
-		([_url, _accountId]) => {
-			throw { code: 100123 };
-		}
+	msw.use(
+		rest.get(
+			`*/accounts/:accountId/workers/queues/${expectedQueueName}`,
+			(req, res, ctx) => {
+				requests.count += 1;
+				expect(req.params.accountId).toEqual("some-account-id");
+
+				return res(
+					ctx.json({
+						success: false,
+						errors: [
+							{
+								code: 11000,
+								message: "workers.api.error.queue_not_found",
+							},
+						],
+						messages: [],
+						result: null,
+					})
+				);
+			}
+		)
 	);
 	return requests;
 }
@@ -7646,15 +8359,65 @@ function mockPutQueueConsumer(
 	expectedBody: PutConsumerBody
 ) {
 	const requests = { count: 0 };
-	setMockResponse(
-		`/accounts/:accountId/workers/queues/${expectedQueueName}/consumers/${expectedConsumerName}`,
-		"PUT",
-		([_url, accountId], { body }) => {
-			expect(accountId).toEqual("some-account-id");
-			expect(JSON.parse(body as string)).toEqual(expectedBody);
-			requests.count += 1;
-			return { queue: expectedQueueName };
-		}
+	msw.use(
+		rest.put(
+			`*/accounts/:accountId/workers/queues/${expectedQueueName}/consumers/${expectedConsumerName}`,
+			async (req, res, ctx) => {
+				const body = await req.json();
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(body).toEqual(expectedBody);
+				requests.count += 1;
+				return res(
+					ctx.json({
+						success: true,
+						errors: [],
+						messages: [],
+						result: { queue: expectedQueueName },
+					})
+				);
+			}
+		)
 	);
 	return requests;
 }
+
+// MSW FormData & Blob polyfills to test FormData requests
+function mockFormDataToString(this: FormData) {
+	const entries = [];
+	for (const [key, value] of this.entries()) {
+		if (value instanceof Blob) {
+			const reader = new FileReaderSync();
+			reader.readAsText(value);
+			const result = reader.result;
+			entries.push([key, result]);
+		} else {
+			entries.push([key, value]);
+		}
+	}
+	return JSON.stringify({
+		__formdata: entries,
+	});
+}
+
+async function mockFormDataFromString(this: MockedRequest): Promise<FormData> {
+	const { __formdata } = await this.json();
+	expect(__formdata).toBeInstanceOf(Array);
+
+	const form = new FormData();
+	for (const [key, value] of __formdata) {
+		form.set(key, value);
+	}
+	return form;
+}
+
+// The following two functions workaround the fact that MSW does not yet support FormData in requests.
+// We use the fact that MSW relies upon `node-fetch` internally, which will call `toString()` on the FormData object,
+// rather than passing it through or serializing it as a proper FormData object.
+// The hack is to serialize FormData to a JSON string by overriding `FormData.toString()`.
+// And then to deserialize back to a FormData object by monkey-patching a `formData()` helper onto `MockedRequest`.
+FormData.prototype.toString = mockFormDataToString;
+export interface RestRequestWithFormData extends MockedRequest, RestRequest {
+	formData(): Promise<FormData>;
+}
+(MockedRequest.prototype as RestRequestWithFormData).formData =
+	mockFormDataFromString;