wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

package/src/__tests__/publish.test.ts

@@ -1,19 +1,32 @@
+import { 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 {
+	printBundleSize,
+	printOffendingDependencies,
+} from "../bundle-reporter";
 import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
+import { mockAuthDomain } from "./helpers/mock-auth-domain";
 import {
 	createFetchResult,
 	setMockRawResponse,
 	setMockResponse,
 	unsetAllMocks,
-	unsetMockFetchKVGetValues,
+	unsetSpecialMockFns,
 } from "./helpers/mock-cfetch";
-import { mockConsoleMethods, normalizeSlashes } from "./helpers/mock-console";
+import {
+	mockConsoleMethods,
+	normalizeSlashes,
+	normalizeTempDirs,
+} from "./helpers/mock-console";
 import { 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 { runInTempDir } from "./helpers/run-in-tmp";
@@ -22,7 +35,9 @@ 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";
+import type { KVNamespaceInfo } from "../kv/helpers";
+import type { CustomDomainChangeset, CustomDomain } from "../publish/publish";
+import type { PutConsumerBody } from "../queues/client";
 import type { CfWorkerInit } from "../worker";
 import type { FormData, File } from "undici";
 
@@ -33,6 +48,7 @@ describe("publish", () => {
 	const { setIsTTY } = useMockIsTTY();
 	const std = mockConsoleMethods();
 	const {
+		mockDomainUsesAccess,
 		mockOAuthServerCallback,
 		mockGrantAccessToken,
 		mockGrantAuthorization,
@@ -44,19 +60,40 @@ describe("publish", () => {
 			setImmediate(fn);
 		});
 		setIsTTY(true);
+		setMockResponse(
+			"/accounts/:accountId/workers/services/:scriptName",
+			() => ({
+				default_environment: { script: { last_deployed_from: "dash" } },
+			})
+		);
+		setMockResponse(
+			"/accounts/:accountId/workers/deployments/by-script/:scriptTag",
+			() => ({
+				latest: { number: "2" },
+			})
+		);
 	});
 
 	afterEach(() => {
 		unsetAllMocks();
-		unsetMockFetchKVGetValues();
+		unsetSpecialMockFns();
 	});
 
 	describe("output additional script information", () => {
 		mockApiToken();
 
-		it("should print worker information at log level", async () => {
+		it("for first party workers, it should print worker information at log level", async () => {
 			setIsTTY(false);
-			writeWranglerToml();
+			fs.writeFileSync(
+				"./wrangler.toml",
+				TOML.stringify({
+					compatibility_date: "2022-01-12",
+					name: "test-name",
+					first_party_worker: true,
+				}),
+
+				"utf-8"
+			);
 			writeWorkerSource();
 			mockSubDomainRequest();
 			mockUploadWorkerRequest({ expectedType: "esm", sendScriptIds: true });
@@ -65,13 +102,14 @@ describe("publish", () => {
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			"Total Upload: 0xx KiB / gzip: 0xx KiB
+			"Total Upload: xx KiB / gzip: xx KiB
 			Worker ID:  abc12345
 			Worker ETag:  etag98765
 			Worker PipelineHash:  hash9999
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
-			  test-name.test-sub-domain.workers.dev"
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
 		`);
 		});
 	});
@@ -88,6 +126,7 @@ describe("publish", () => {
 		it("drops a user into the login flow if they're unauthenticated", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
+			mockDomainUsesAccess({ usesAccess: false });
 			mockSubDomainRequest();
 			mockUploadWorkerRequest();
 			mockOAuthServerCallback();
@@ -101,18 +140,59 @@ describe("publish", () => {
 			);
 
 			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%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
-			        Successfully logged in.
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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
+			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: undefined"
+		`);
 			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();
+				mockOAuthServerCallback();
+				const accessTokenRequest = mockGrantAccessToken({
+					domain: "dash.staging.cloudflare.com",
+					respondWith: "ok",
+				});
+				mockGrantAuthorization({ respondWith: "success" });
+
+				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.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%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: undefined"
+		`);
+				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();
@@ -125,10 +205,11 @@ describe("publish", () => {
 			await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
 
 			expect(std.out).toMatchInlineSnapshot(`
-			"Total Upload: 0xx KiB / gzip: 0xx KiB
+			"Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
-			  test-name.test-sub-domain.workers.dev"
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
 		`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			"▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
@@ -165,11 +246,12 @@ describe("publish", () => {
 				await runWrangler("publish index.js");
 
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"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: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
@@ -189,11 +271,12 @@ describe("publish", () => {
 				await runWrangler("publish index.js");
 
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"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: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
 
@@ -291,11 +374,12 @@ describe("publish", () => {
 			});
 			await runWrangler("publish index.js --env some-env");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-some-env (TIMINGS)
-			        Published test-name-some-env (TIMINGS)
-			          test-name-some-env.test-sub-domain.workers.dev"
-		      `);
+			"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 ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -310,11 +394,12 @@ describe("publish", () => {
 				});
 				await runWrangler("publish index.js --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"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: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -329,11 +414,12 @@ describe("publish", () => {
 				});
 				await runWrangler("publish index.js --env some-env --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name-some-env (TIMINGS)
-			          Published test-name-some-env (TIMINGS)
-			            test-name-some-env.test-sub-domain.workers.dev"
-		        `);
+			"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 ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -348,11 +434,12 @@ describe("publish", () => {
 				});
 				await runWrangler("publish index.js --env some-env --legacy-env true");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name-some-env (TIMINGS)
-			          Published test-name-some-env (TIMINGS)
-			            test-name-some-env.test-sub-domain.workers.dev"
-		        `);
+			"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 ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -378,17 +465,17 @@ describe("publish", () => {
 				await expect(
 					runWrangler("publish index.js --env some-env --legacy-env true")
 				).rejects.toThrowErrorMatchingInlineSnapshot(`
-                "Processing wrangler.toml configuration:
-                  - No environment found in configuration with name \\"some-env\\".
-                    Before using \`--env=some-env\` there should be an equivalent environment section in the configuration.
-                    The available configured environment names are: [\\"other-env\\"]
+			                "Processing wrangler.toml configuration:
+			                  - No environment found in configuration with name \\"some-env\\".
+			                    Before using \`--env=some-env\` there should be an equivalent environment section in the configuration.
+			                    The available configured environment names are: [\\"other-env\\"]
 
-                    Consider adding an environment configuration section to the wrangler.toml file:
-                    \`\`\`
-                    [env.some-env]
-                    \`\`\`
-                "
-              `);
+			                    Consider adding an environment configuration section to the wrangler.toml file:
+			                    \`\`\`
+			                    [env.some-env]
+			                    \`\`\`
+			                "
+		              `);
 			});
 
 			it("should throw an error w/ helpful message when using --env --name", async () => {
@@ -418,11 +505,12 @@ describe("publish", () => {
 				});
 				await runWrangler("publish index.js --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"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: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -444,11 +532,12 @@ describe("publish", () => {
 				});
 				await runWrangler("publish index.js --env some-env --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (some-env) (TIMINGS)
-			          Published test-name (some-env) (TIMINGS)
-			            some-env.test-name.test-sub-domain.workers.dev"
-		        `);
+			"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 ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -487,14 +576,15 @@ describe("publish", () => {
 		mockSubDomainRequest();
 		await runWrangler("publish ./some-path/worker/index.js");
 		expect(std.out).toMatchInlineSnapshot(`
-		      "Your worker has access to the following bindings:
-		      - Vars:
-		        - xyz: \\"123\\"
-		      Total Upload: 0xx KiB / gzip: 0xx KiB
-		      Uploaded test-name (TIMINGS)
-		      Published test-name (TIMINGS)
-		        test-name.test-sub-domain.workers.dev"
-	    `);
+		"Total Upload: xx KiB / gzip: xx KiB
+		Your worker has access to the following bindings:
+		- Vars:
+		  - xyz: 123
+		Uploaded test-name (TIMINGS)
+		Published test-name (TIMINGS)
+		  https://test-name.test-sub-domain.workers.dev
+		Current Deployment ID: undefined"
+	`);
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
 
@@ -524,10 +614,11 @@ describe("publish", () => {
 			Object {
 			  "debug": "",
 			  "err": "",
-			  "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
-			  test-name.test-sub-domain.workers.dev",
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - The \\"route\\" field in your configuration is an empty string and will be ignored.
@@ -537,7 +628,6 @@ describe("publish", () => {
 			}
 		`);
 		});
-
 		it("should publish to a route with a pattern/{zone_id|zone_name} combo", async () => {
 			writeWranglerToml({
 				routes: [
@@ -568,20 +658,21 @@ describe("publish", () => {
 			});
 			await runWrangler("publish ./index");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          some-example.com/some-route/*
-			          *a-boring-website.com (zone id: 54sdf7fsda)
-			          *another-boring-website.com (zone name: some-zone.com)
-			          example.com/some-route/* (zone id: JGHFHG654gjcj)
-			          more-examples.com/*",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  some-example.com/some-route/*
+			  *a-boring-website.com (zone id: 54sdf7fsda)
+			  *another-boring-website.com (zone name: some-zone.com)
+			  example.com/some-route/* (zone id: JGHFHG654gjcj)
+			  more-examples.com/*
+			Current Deployment ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should publish to a route with a pattern/{zone_id|zone_name} combo (service environments)", async () => {
@@ -629,25 +720,26 @@ describe("publish", () => {
 			});
 			await runWrangler("publish ./index --legacy-env false --env staging");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (staging) (TIMINGS)
-			        Published test-name (staging) (TIMINGS)
-			          some-example.com/some-route/*
-			          *a-boring-website.com (zone id: 54sdf7fsda)
-			          *another-boring-website.com (zone name: some-zone.com)
-			          example.com/some-route/* (zone id: JGHFHG654gjcj)
-			          more-examples.com/*",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (staging) (TIMINGS)
+			Published test-name (staging) (TIMINGS)
+			  some-example.com/some-route/*
+			  *a-boring-website.com (zone id: 54sdf7fsda)
+			  *another-boring-website.com (zone name: some-zone.com)
+			  example.com/some-route/* (zone id: JGHFHG654gjcj)
+			  more-examples.com/*
+			Current Deployment ID: undefined",
+			  "warn": "▲ [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 to legacy environment specific routes", async () => {
@@ -738,11 +830,12 @@ describe("publish", () => {
 			        "
 		      `);
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          example.com/some-route/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  example.com/some-route/*
+			Current Deployment ID: undefined"
+		`);
 		});
 
 		it("should error if the bulk-routes API fails and trying to push to a non-production environment", async () => {
@@ -769,9 +862,9 @@ describe("publish", () => {
 			});
 			await expect(runWrangler("publish ./index --env=staging")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.
-              Either turn off service environments by setting \`legacy_env = true\`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
-            `);
+			              "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.
+			              Either turn off service environments by setting \`legacy_env = true\`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
+		            `);
 		});
 
 		describe("custom domains", () => {
@@ -782,6 +875,7 @@ describe("publish", () => {
 				writeWorkerSource();
 				mockUpdateWorkerRequest({ enabled: false });
 				mockUploadWorkerRequest({ expectedType: "esm" });
+				mockCustomDomainsChangesetRequest({});
 				mockPublishCustomDomainsRequest({
 					publishFlags: {
 						override_scope: true,
@@ -794,63 +888,145 @@ describe("publish", () => {
 				expect(std.out).toContain("api.example.com (custom domain)");
 			});
 
-			it("should allow retrying if publish fails with a conflicting custom domain error", async () => {
+			it("should confirm override if custom domain publish would override an existing domain", async () => {
 				writeWranglerToml({
 					routes: [{ pattern: "api.example.com", custom_domain: true }],
 				});
 				writeWorkerSource();
 				mockUpdateWorkerRequest({ enabled: false });
 				mockUploadWorkerRequest({ expectedType: "esm" });
-				mockPublishCustomDomainsRequestConflictWithoutOverride({
-					originConflicts: true,
+				mockCustomDomainsChangesetRequest({
+					originConflicts: [
+						{
+							id: "101",
+							zone_id: "",
+							zone_name: "",
+							hostname: "api.example.com",
+							service: "test-name",
+							environment: "",
+						},
+					],
+				});
+				mockCustomDomainLookup({
+					id: "101",
+					zone_id: "",
+					zone_name: "",
+					hostname: "api.example.com",
+					service: "other-script",
+					environment: "",
+				});
+				mockPublishCustomDomainsRequest({
+					publishFlags: {
+						override_scope: true,
+						override_existing_origin: true,
+						override_existing_dns_record: false,
+					},
 					domains: [{ hostname: "api.example.com" }],
 				});
 				mockConfirm({
-					text: `Custom Domains already exist for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+					text: `Custom Domains already exist for these domains:
+\t• api.example.com (used as a domain for "other-script")
+Update them to point to this script instead?`,
 					result: true,
 				});
 				await runWrangler("publish ./index");
 				expect(std.out).toContain("api.example.com (custom domain)");
 			});
 
-			it("should allow retrying if publish fails with a conflicting DNS record error", async () => {
+			it("should confirm override if custom domain publish contains a conflicting DNS record", async () => {
 				writeWranglerToml({
 					routes: [{ pattern: "api.example.com", custom_domain: true }],
 				});
 				writeWorkerSource();
 				mockUpdateWorkerRequest({ enabled: false });
 				mockUploadWorkerRequest({ expectedType: "esm" });
-				mockPublishCustomDomainsRequestConflictWithoutOverride({
-					dnsRecordConflicts: true,
+				mockCustomDomainsChangesetRequest({
+					dnsRecordConflicts: [
+						{
+							id: "",
+							zone_id: "",
+							zone_name: "",
+							hostname: "api.example.com",
+							service: "test-name",
+							environment: "",
+						},
+					],
+				});
+				mockPublishCustomDomainsRequest({
+					publishFlags: {
+						override_scope: true,
+						override_existing_origin: false,
+						override_existing_dns_record: true,
+					},
 					domains: [{ hostname: "api.example.com" }],
 				});
 				mockConfirm({
-					text: `You already have conflicting DNS records for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+					text: `You already have DNS records that conflict for these Custom Domains:
+\t• api.example.com
+Update them to point to this script instead?`,
 					result: true,
 				});
 				await runWrangler("publish ./index");
 				expect(std.out).toContain("api.example.com (custom domain)");
 			});
 
-			it("should allow retrying for conflicting custom domains and then again for conflicting dns", async () => {
+			it("should confirm for conflicting custom domains and then again for conflicting dns", async () => {
 				writeWranglerToml({
 					routes: [{ pattern: "api.example.com", custom_domain: true }],
 				});
 				writeWorkerSource();
 				mockUpdateWorkerRequest({ enabled: false });
 				mockUploadWorkerRequest({ expectedType: "esm" });
-				mockPublishCustomDomainsRequestConflictWithoutOverride({
-					originConflicts: true,
-					dnsRecordConflicts: true,
+				mockCustomDomainsChangesetRequest({
+					originConflicts: [
+						{
+							id: "101",
+							zone_id: "",
+							zone_name: "",
+							hostname: "api.example.com",
+							service: "test-name",
+							environment: "",
+						},
+					],
+					dnsRecordConflicts: [
+						{
+							id: "",
+							zone_id: "",
+							zone_name: "",
+							hostname: "api.example.com",
+							service: "test-name",
+							environment: "",
+						},
+					],
+				});
+				mockCustomDomainLookup({
+					id: "101",
+					zone_id: "",
+					zone_name: "",
+					hostname: "api.example.com",
+					service: "other-script",
+					environment: "",
+				});
+				mockPublishCustomDomainsRequest({
+					publishFlags: {
+						override_scope: true,
+						override_existing_origin: true,
+						override_existing_dns_record: true,
+					},
 					domains: [{ hostname: "api.example.com" }],
 				});
 				mockConfirm(
 					{
-						text: `Custom Domains already exist for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+						text: `Custom Domains already exist for these domains:
+\t• api.example.com (used as a domain for "other-script")
+Update them to point to this script instead?`,
 						result: true,
 					},
 					{
-						text: `You already have conflicting DNS records for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+						text: `You already have DNS records that conflict for these Custom Domains:
+\t• api.example.com
+Update them to point to this script instead?`,
+
 						result: true,
 					}
 				);
@@ -882,19 +1058,37 @@ describe("publish", () => {
 				);
 			});
 
-			it("should not retry publish on error if user does not confirm", async () => {
+			it("should not continue with publishing an override if user does not confirm", async () => {
 				writeWranglerToml({
 					routes: [{ pattern: "api.example.com", custom_domain: true }],
 				});
 				writeWorkerSource();
 				mockUpdateWorkerRequest({ enabled: false });
 				mockUploadWorkerRequest({ expectedType: "esm" });
-				mockPublishCustomDomainsRequestConflictWithoutOverride({
-					dnsRecordConflicts: true,
-					domains: [{ hostname: "api.example.com" }],
+				mockCustomDomainsChangesetRequest({
+					originConflicts: [
+						{
+							id: "101",
+							zone_id: "",
+							zone_name: "",
+							hostname: "api.example.com",
+							service: "test-name",
+							environment: "",
+						},
+					],
+				});
+				mockCustomDomainLookup({
+					id: "101",
+					zone_id: "",
+					zone_name: "",
+					hostname: "api.example.com",
+					service: "other-script",
+					environment: "",
 				});
 				mockConfirm({
-					text: `You already have conflicting DNS records for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+					text: `Custom Domains already exist for these domains:
+\t• api.example.com (used as a domain for "other-script")
+Update them to point to this script instead?`,
 					result: false,
 				});
 				await runWrangler("publish ./index");
@@ -917,11 +1111,12 @@ describe("publish", () => {
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -934,11 +1129,12 @@ describe("publish", () => {
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -951,11 +1147,12 @@ describe("publish", () => {
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -970,11 +1167,12 @@ describe("publish", () => {
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -987,11 +1185,12 @@ describe("publish", () => {
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			        "▲ [WARNING] Processing wrangler.toml configuration:
@@ -1023,11 +1222,12 @@ describe("publish", () => {
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			        "▲ [WARNING] Processing ../wrangler.toml configuration:
@@ -1058,11 +1258,11 @@ describe("publish", () => {
 			});
 			await expect(runWrangler("publish")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - Don't define both the \`main\` and \`build.upload.main\` fields in your configuration.
-                  They serve the same purpose: to point to the entry-point of your worker.
-                  Delete the \`build.upload.main\` and \`build.upload.dir\` field from your config."
-            `);
+			              "Processing wrangler.toml configuration:
+			                - Don't define both the \`main\` and \`build.upload.main\` fields in your configuration.
+			                  They serve the same purpose: to point to the entry-point of your worker.
+			                  Delete the \`build.upload.main\` and \`build.upload.dir\` field from your config."
+		            `);
 		});
 
 		it("should be able to transpile TypeScript (esm)", async () => {
@@ -1073,11 +1273,12 @@ describe("publish", () => {
 			await runWrangler("publish index.ts");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1092,11 +1293,12 @@ describe("publish", () => {
 			await runWrangler("publish index.ts");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1123,11 +1325,12 @@ export default{
 			mockSubDomainRequest();
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1140,11 +1343,12 @@ export default{
 			await runWrangler("publish ./src/index.js");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1177,14 +1381,14 @@ export default {};`
 		      `);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "--dry-run: exiting now.
-			        Total Upload: 0xx KiB / gzip: 0xx KiB",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			--dry-run: exiting now.",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should not preserve exports on a service-worker format worker", async () => {
@@ -1210,16 +1414,16 @@ addEventListener('fetch', event => {});`
 			).toMatchInlineSnapshot(`Array []`);
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "--dry-run: exiting now.
-			        Total Upload: 0xx KiB / gzip: 0xx KiB",
-			          "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...
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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...
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should be able to transpile entry-points in sub-directories (sw)", async () => {
@@ -1234,11 +1438,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./src/index.js");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1253,9 +1458,9 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish ./index.js")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - \\"site.bucket\\" is a required field."
-            `);
+			              "Processing wrangler.toml configuration:
+			                - \\"site.bucket\\" is a required field."
+		            `);
 
 			expect(std.out).toMatchInlineSnapshot(`
 			        "
@@ -1308,30 +1513,31 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index.js");
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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: undefined",
+			  "warn": "▲ [WARNING] Processing 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 = \\"index.js\\"
-			              \`\`\`
+			    - Deprecation: \\"site.entry-point\\":
+			      Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
+			  file:
+			      \`\`\`
+			      main = \\"index.js\\"
+			      \`\`\`
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should resolve site.entry-point relative to wrangler.toml", async () => {
@@ -1363,16 +1569,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --config ./my-site/wrangler.toml");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(normalizeSlashes(std.warn)).toMatchInlineSnapshot(`
 			        "▲ [WARNING] Processing my-site/wrangler.toml configuration:
@@ -1399,11 +1606,11 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - Don't define both the \`main\` and \`site.entry-point\` fields in your configuration.
-                  They serve the same purpose: to point to the entry-point of your worker.
-                  Delete the deprecated \`site.entry-point\` field from your config."
-            `);
+			              "Processing wrangler.toml configuration:
+			                - Don't define both the \`main\` and \`site.entry-point\` fields in your configuration.
+			                  They serve the same purpose: to point to the entry-point of your worker.
+			                  Delete the deprecated \`site.entry-point\` field from your config."
+		            `);
 		});
 
 		it("should error if there is no entry-point specified", async () => {
@@ -1438,7 +1645,9 @@ addEventListener('fetch', event => {});`
 				id: "__test-name-workers_sites_assets-id",
 			};
 			writeAssets(assets);
-			mockUploadWorkerRequest({ expectedMainModule: "stdin.js" });
+			mockUploadWorkerRequest({
+				expectedMainModule: "serve-static-assets.entry.js",
+			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
 			mockKeyListRequest(kvNamespace.id, []);
@@ -1447,28 +1656,29 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --assets assets --latest --name test-name");
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "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: 52xx KiB / gzip: 13xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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: undefined",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
 
-			        ▲ [WARNING] Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.
+			▲ [WARNING] Using the latest version of the Workers runtime. To silence this warning, please choose a specific version of the runtime with --compatibility-date, or add a compatibility_date to your wrangler.toml.
 
 
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 	});
 
@@ -1498,16 +1708,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1526,7 +1737,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1535,23 +1746,24 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --assets assets");
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "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: 52xx KiB / gzip: 13xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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: undefined",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should error when trying to use --assets with a service-worker Worker", async () => {
@@ -1634,6 +1846,7 @@ addEventListener('fetch', event => {});`
 		it("should error if config.assets and --site are used together", async () => {
 			writeWranglerToml({
 				main: "./index.js",
+				// @ts-expect-error we allow string inputs here
 				assets: "abc",
 			});
 			writeWorkerSource();
@@ -1663,6 +1876,7 @@ addEventListener('fetch', event => {});`
 		it("should error if config.assets and config.site are used together", async () => {
 			writeWranglerToml({
 				main: "./index.js",
+				// @ts-expect-error we allow string inputs here
 				assets: "abc",
 				site: {
 					bucket: "xyz",
@@ -1708,7 +1922,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1717,28 +1931,30 @@ addEventListener('fetch', event => {});`
 
 			await runWrangler("publish --assets ./assets");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Reading subdir/file-1.txt...
-			        Uploading as subdir/file-1.2ca234f380.txt...
-			        Reading subdir/file-2.txt...
-			        Uploading as subdir/file-2.5938485188.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 52xx KiB / gzip: 13xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Reading subdir/file-1.txt...
+			Uploading as subdir/file-1.2ca234f380.txt...
+			Reading subdir/file-2.txt...
+			Uploading as subdir/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: undefined",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 
 		it("should warn if config.assets is used", async () => {
 			writeWranglerToml({
 				main: "./index.js",
+				// @ts-expect-error we allow string inputs here
 				assets: "./assets",
 			});
 			const assets = [
@@ -1753,7 +1969,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1762,25 +1978,26 @@ addEventListener('fetch', event => {});`
 
 			await runWrangler("publish");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Reading subdir/file-1.txt...
-			        Uploading as subdir/file-1.2ca234f380.txt...
-			        Reading subdir/file-2.txt...
-			        Uploading as subdir/file-2.5938485188.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 52xx KiB / gzip: 13xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Reading subdir/file-1.txt...
+			Uploading as subdir/file-1.2ca234f380.txt...
+			Reading subdir/file-2.txt...
+			Uploading as subdir/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: undefined",
+			  "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 not contain backslash for assets with nested directories", async () => {
@@ -1821,16 +2038,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading subdir/file-1.txt...
-			        Uploading as subdir/file-1.2ca234f380.txt...
-			        Reading subdir/file-2.txt...
-			        Uploading as subdir/file-2.5938485188.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading subdir/file-1.txt...
+			Uploading as subdir/file-1.2ca234f380.txt...
+			Reading subdir/file-2.txt...
+			Uploading as subdir/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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1878,16 +2096,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1929,16 +2148,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -1978,16 +2198,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --env some-env --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (some-env) (TIMINGS)
-			        Published test-name (some-env) (TIMINGS)
-			          some-env.test-name.test-sub-domain.workers.dev"
-		      `);
+			"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 (some-env) (TIMINGS)
+			Published test-name (some-env) (TIMINGS)
+			  https://some-env.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2028,16 +2249,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --env some-env --legacy-env true");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-some-env (TIMINGS)
-			        Published test-name-some-env (TIMINGS)
-			          test-name-some-env.test-sub-domain.workers.dev"
-		      `);
+			"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-some-env (TIMINGS)
+			Published test-name-some-env (TIMINGS)
+			  https://test-name-some-env.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2071,16 +2293,17 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Skipping - already uploaded.
-			        Reading file-2.txt...
-			        Uploading as file-2.5938485188.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Skipping - already uploaded.
+			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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2113,14 +2336,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --site-include file-1.txt");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Uploading as file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Uploading as file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2153,14 +2377,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --site-exclude file-2.txt");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Uploading as file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Uploading as file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2194,14 +2419,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Uploading as file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Uploading as file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2235,14 +2461,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Uploading as file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Uploading as file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2276,14 +2503,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --site-include file-1.txt");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Uploading as file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Uploading as file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2317,14 +2545,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --site-exclude file-2.txt");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Uploading as file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Uploading as file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2360,14 +2589,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading directory-1/file-1.txt...
-			        Uploading as directory-1/file-1.2ca234f380.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading directory-1/file-1.txt...
+			Uploading as directory-1/file-1.2ca234f380.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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2407,14 +2637,15 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading .well-known/file-2.txt...
-			        Uploading as .well-known/file-2.5938485188.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading .well-known/file-2.txt...
+			Uploading as .well-known/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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2515,57 +2746,58 @@ addEventListener('fetch', event => {});`
 			}
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Reading file-00.txt...
-			        Uploading as file-00.be5be5dd26.txt...
-			        Reading file-01.txt...
-			        Uploading as file-01.4842d35994.txt...
-			        Reading file-02.txt...
-			        Uploading as file-02.990572ec63.txt...
-			        Reading file-03.txt...
-			        Uploading as file-03.9d7dda9045.txt...
-			        Reading file-04.txt...
-			        Uploading as file-04.2b6fac6382.txt...
-			        Reading file-05.txt...
-			        Uploading as file-05.55762dc758.txt...
-			        Reading file-06.txt...
-			        Uploading as file-06.f408a6b020.txt...
-			        Reading file-07.txt...
-			        Uploading as file-07.64c051715b.txt...
-			        Reading file-08.txt...
-			        Uploading as file-08.d286789adb.txt...
-			        Reading file-09.txt...
-			        Uploading as file-09.6838c183a8.txt...
-			        Reading file-10.txt...
-			        Uploading as file-10.6e03221d2a.txt...
-			        Reading file-11.txt...
-			        Uploading as file-11.37d3fb2eff.txt...
-			        Reading file-12.txt...
-			        Uploading as file-12.b3556942f8.txt...
-			        Reading file-13.txt...
-			        Uploading as file-13.680caf51b1.txt...
-			        Reading file-14.txt...
-			        Uploading as file-14.51e88468f0.txt...
-			        Reading file-15.txt...
-			        Uploading as file-15.8e3fedb394.txt...
-			        Reading file-16.txt...
-			        Uploading as file-16.c81c5e426f.txt...
-			        Reading file-17.txt...
-			        Uploading as file-17.4b2ae3c47b.txt...
-			        Reading file-18.txt...
-			        Uploading as file-18.07f245e02b.txt...
-			        Reading file-19.txt...
-			        Uploading as file-19.f0d69f705d.txt...
-			        ↗️  Done syncing assets
-			        Total Upload: 1xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Reading file-00.txt...
+			Uploading as file-00.be5be5dd26.txt...
+			Reading file-01.txt...
+			Uploading as file-01.4842d35994.txt...
+			Reading file-02.txt...
+			Uploading as file-02.990572ec63.txt...
+			Reading file-03.txt...
+			Uploading as file-03.9d7dda9045.txt...
+			Reading file-04.txt...
+			Uploading as file-04.2b6fac6382.txt...
+			Reading file-05.txt...
+			Uploading as file-05.55762dc758.txt...
+			Reading file-06.txt...
+			Uploading as file-06.f408a6b020.txt...
+			Reading file-07.txt...
+			Uploading as file-07.64c051715b.txt...
+			Reading file-08.txt...
+			Uploading as file-08.d286789adb.txt...
+			Reading file-09.txt...
+			Uploading as file-09.6838c183a8.txt...
+			Reading file-10.txt...
+			Uploading as file-10.6e03221d2a.txt...
+			Reading file-11.txt...
+			Uploading as file-11.37d3fb2eff.txt...
+			Reading file-12.txt...
+			Uploading as file-12.b3556942f8.txt...
+			Reading file-13.txt...
+			Uploading as file-13.680caf51b1.txt...
+			Reading file-14.txt...
+			Uploading as file-14.51e88468f0.txt...
+			Reading file-15.txt...
+			Uploading as file-15.8e3fedb394.txt...
+			Reading file-16.txt...
+			Uploading as file-16.c81c5e426f.txt...
+			Reading file-17.txt...
+			Uploading as file-17.4b2ae3c47b.txt...
+			Reading file-18.txt...
+			Uploading as file-18.07f245e02b.txt...
+			Reading file-19.txt...
+			Uploading as file-19.f0d69f705d.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: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should error if the asset key is over 512 characters", async () => {
@@ -2651,18 +2883,19 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Reading file-1.txt...
-			        Skipping - already uploaded.
-			        Reading file-2.txt...
-			        Uploading as file-2.5938485188.txt...
-			        Deleting file-3.somehash.txt from the asset store...
-			        Deleting file-4.anotherhash.txt from the asset store...
-			        ↗️  Done syncing assets
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Reading file-1.txt...
+			Skipping - already uploaded.
+			Reading file-2.txt...
+			Uploading as file-2.5938485188.txt...
+			Deleting file-3.somehash.txt from the asset store...
+			Deleting file-4.anotherhash.txt from the asset store...
+			↗️  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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2707,16 +2940,17 @@ addEventListener('fetch', event => {});`
 			process.chdir("../");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2745,21 +2979,22 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --site .");
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "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: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should use the relative path from current working directory to Worker directory when using `--assets`", async () => {
@@ -2777,7 +3012,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets, "my-assets");
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -2787,23 +3022,24 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish --assets .");
 
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "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: 52xx KiB / gzip: 13xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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: undefined",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 	});
 
@@ -2817,11 +3053,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2837,11 +3074,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2856,11 +3094,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2875,10 +3114,11 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        No publish targets for test-name (TIMINGS)"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			No publish targets for test-name (TIMINGS)
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2895,10 +3135,11 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        No publish targets for test-name (TIMINGS)"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			No publish targets for test-name (TIMINGS)
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2919,10 +3160,11 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index --env dev --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        No publish targets for test-name (dev) (TIMINGS)"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			No publish targets for test-name (dev) (TIMINGS)
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2944,10 +3186,11 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index --env dev --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        No publish targets for test-name (dev) (TIMINGS)"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			No publish targets for test-name (dev) (TIMINGS)
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2969,11 +3212,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index --env dev --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        Published test-name (dev) (TIMINGS)
-			          dev.test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			Published test-name (dev) (TIMINGS)
+			  https://dev.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -2996,11 +3240,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index --env dev --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        Published test-name (dev) (TIMINGS)
-			          dev.test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			Published test-name (dev) (TIMINGS)
+			  https://dev.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -3024,11 +3269,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index --env dev --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        Published test-name (dev) (TIMINGS)
-			          dev.test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			Published test-name (dev) (TIMINGS)
+			  https://dev.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -3055,11 +3301,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index --env dev --legacy-env false");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        Published test-name (dev) (TIMINGS)
-			          dev.test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			Published test-name (dev) (TIMINGS)
+			  https://dev.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -3088,11 +3335,12 @@ addEventListener('fetch', event => {});`
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (dev) (TIMINGS)
-			        Published test-name (dev) (TIMINGS)
-			          dev.test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (dev) (TIMINGS)
+			Published test-name (dev) (TIMINGS)
+			  https://dev.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -3115,6 +3363,29 @@ addEventListener('fetch', event => {});`
 		      `);
 		});
 
+		it("should error if a compatibility_date is missing and suggest the correct month", async () => {
+			jest.spyOn(Date.prototype, "getMonth").mockImplementation(() => 11);
+			jest.spyOn(Date.prototype, "getFullYear").mockImplementation(() => 2020);
+			jest.spyOn(Date.prototype, "getDate").mockImplementation(() => 1);
+
+			writeWorkerSource();
+			let err: undefined | Error;
+			try {
+				await runWrangler("publish ./index.js");
+			} catch (e) {
+				err = e as Error;
+			}
+
+			expect(err?.message).toMatchInlineSnapshot(`
+			"A compatibility_date is required when publishing. Add the following to your wrangler.toml file:.
+			    \`\`\`
+			    compatibility_date = \\"2020-12-01\\"
+			    \`\`\`
+			    Or you could pass it in your terminal as \`--compatibility-date 2020-12-01\`
+			See https://developers.cloudflare.com/workers/platform/compatibility-dates for more information."
+		`);
+		});
+
 		it("should enable the workers.dev domain if workers_dev is undefined and subdomain is not already available", async () => {
 			writeWranglerToml();
 			writeWorkerSource();
@@ -3125,11 +3396,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -3143,15 +3415,16 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish ./index");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
-		it("should error politely when publishing to workers_dev when there is no workers.dev subdomain", async () => {
+		it("should offer to create a new workers.dev subdomain when publishing to workers_dev without one", async () => {
 			writeWranglerToml({
 				workers_dev: true,
 			});
@@ -3159,12 +3432,16 @@ addEventListener('fetch', event => {});`
 			mockUploadWorkerRequest();
 			mockSubDomainRequest("does-not-exist", false);
 
+			mockConfirm({
+				text: `Would you like to register a workers.dev subdomain now?`,
+				result: false,
+			});
+
 			await expect(runWrangler("publish ./index")).rejects
 				.toThrowErrorMatchingInlineSnapshot(`
-              "Error: You need to register a workers.dev subdomain before publishing to workers.dev
-              You can either publish your worker to one or more routes by specifying them in wrangler.toml, or register a workers.dev subdomain here:
-              https://dash.cloudflare.com/some-account-id/workers/onboarding"
-            `);
+			"You can either publish your worker to one or more routes by specifying them in wrangler.toml, or register a workers.dev subdomain here:
+			https://dash.cloudflare.com/some-account-id/workers/onboarding"
+		`);
 		});
 
 		it("should not deploy to workers.dev if there are any routes defined", async () => {
@@ -3181,11 +3458,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          http://example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  http://example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3215,11 +3493,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js --env production");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-production (TIMINGS)
-			        Published test-name-production (TIMINGS)
-			          http://production.example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name-production (TIMINGS)
+			Published test-name-production (TIMINGS)
+			  http://production.example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3248,11 +3527,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js --env production");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-production (TIMINGS)
-			        Published test-name-production (TIMINGS)
-			          http://production.example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name-production (TIMINGS)
+			Published test-name-production (TIMINGS)
+			  http://production.example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3274,12 +3554,13 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev
-			          http://example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			  http://example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3309,12 +3590,13 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js --env production");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-production (TIMINGS)
-			        Published test-name-production (TIMINGS)
-			          test-name-production.test-sub-domain.workers.dev
-			          http://production.example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name-production (TIMINGS)
+			Published test-name-production (TIMINGS)
+			  https://test-name-production.test-sub-domain.workers.dev
+			  http://production.example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3344,12 +3626,13 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js --env production");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-production (TIMINGS)
-			        Published test-name-production (TIMINGS)
-			          test-name-production.test-sub-domain.workers.dev
-			          http://production.example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name-production (TIMINGS)
+			Published test-name-production (TIMINGS)
+			  https://test-name-production.test-sub-domain.workers.dev
+			  http://production.example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3379,11 +3662,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js --env production");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-production (TIMINGS)
-			        Published test-name-production (TIMINGS)
-			          http://production.example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name-production (TIMINGS)
+			Published test-name-production (TIMINGS)
+			  http://production.example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3413,11 +3697,12 @@ addEventListener('fetch', event => {});`
 			await runWrangler("publish index.js --env production");
 
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name-production (TIMINGS)
-			        Published test-name-production (TIMINGS)
-			          http://production.example.com/*"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name-production (TIMINGS)
+			Published test-name-production (TIMINGS)
+			  http://production.example.com/*
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3451,20 +3736,17 @@ addEventListener('fetch', event => {});`
 			mockSubDomainRequest();
 			mockUploadWorkerRequest();
 			await runWrangler("build");
-			expect(fs.readFileSync("dist/index.js", "utf-8")).toMatchInlineSnapshot(`
-			        "(() => {
-			          // index.js
-			          console.log(123);
-			          console.log(globalThis.abc);
-			          function foo() {
-			            const abc2 = \\"a string\\";
-			            console.log(abc2);
-			          }
-			          console.log(foo);
-			        })();
-			        //# sourceMappingURL=index.js.map
-			        "
-		      `);
+
+			const outFile = normalizeSlashes(
+				normalizeTempDirs(fs.readFileSync("dist/index.js", "utf-8"))
+			);
+
+			// We don't check against the whole file as there is middleware being injected
+			expect(outFile).toContain("console.log(123);");
+			expect(outFile).toContain("console.log(globalThis.abc);");
+			expect(outFile).toContain(`const abc2 = "a string";`);
+			expect(outFile).toContain("console.log(abc2);");
+			expect(outFile).toContain("console.log(foo);");
 		});
 
 		it("can be overriden in environments", async () => {
@@ -3490,17 +3772,62 @@ addEventListener('fetch', event => {});`
 			mockSubDomainRequest();
 			mockUploadWorkerRequest();
 			await runWrangler("build --env staging");
-			expect(fs.readFileSync("dist/index.js", "utf-8")).toMatchInlineSnapshot(`
-			        "(() => {
-			          // index.js
-			          console.log(456);
-			        })();
-			        //# sourceMappingURL=index.js.map
-			        "
-		      `);
+
+			const outFile = normalizeSlashes(
+				normalizeTempDirs(fs.readFileSync("dist/index.js", "utf-8"))
+			);
+
+			// We don't check against the whole file as there is middleware being injected
+			expect(outFile).toContain("console.log(456);");
 		});
-	});
 
+		it("can be overridden with cli args", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				define: {
+					abc: "123",
+				},
+			});
+			fs.writeFileSync(
+				"index.js",
+				`
+				console.log(abc);
+			`
+			);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			await runWrangler("publish --dry-run --outdir dist --define abc:789");
+
+			expect(fs.readFileSync("dist/index.js", "utf-8")).toContain(
+				`console.log(789);`
+			);
+		});
+
+		it("can be overridden with cli args containing colons", async () => {
+			writeWranglerToml({
+				main: "index.js",
+				define: {
+					abc: "123",
+				},
+			});
+			fs.writeFileSync(
+				"index.js",
+				`
+				console.log(abc);
+			`
+			);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			await runWrangler(
+				"publish --dry-run --outdir dist --define abc:'https://www.abc.net.au/news/'"
+			);
+
+			expect(fs.readFileSync("dist/index.js", "utf-8")).toContain(
+				// eslint-disable-next-line no-useless-escape
+				`console.log(\"https://www.abc.net.au/news/\");`
+			);
+		});
+	});
 	describe("custom builds", () => {
 		beforeEach(() => {
 			// @ts-expect-error disable the mock we'd setup earlier
@@ -3521,14 +3848,15 @@ 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) } }')\\"
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
-			expect(std.err).toMatchInlineSnapshot(`""`);
-			expect(std.warn).toMatchInlineSnapshot(`""`);
+			"Running custom build: node -e \\"console.log('custom build'); 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 ID: undefined"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
 
 		if (process.platform !== "win32") {
@@ -3546,12 +3874,13 @@ 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
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Running custom build: echo \\"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 ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -3567,9 +3896,9 @@ addEventListener('fetch', event => {});`
 
 			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 \`main\` property in wrangler.toml should point to the file generated by the custom build."
-            `);
+			              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			              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');\\"
 
@@ -3599,16 +3928,16 @@ 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 \`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.
-
-              Did you mean to set the main field to one of:
-              \`\`\`
-              main = \\"./worker.js\\"
-              main = \\"./dist/index.ts\\"
-              \`\`\`"
-            `);
+			              "The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+			              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.
+
+			              Did you mean to set the main field to one of:
+			              \`\`\`
+			              main = \\"./worker.js\\"
+			              main = \\"./dist/index.ts\\"
+			              \`\`\`"
+		            `);
 			expect(std.out).toMatchInlineSnapshot(`
 			        "Running custom build: node -e \\"console.log('custom build');\\"
 
@@ -3653,11 +3982,12 @@ addEventListener('fetch', event => {});`
 			mockSubDomainRequest();
 			await runWrangler("publish index.js --minify");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 
@@ -3692,11 +4022,12 @@ addEventListener('fetch', event => {});`
 			mockSubDomainRequest();
 			await runWrangler("publish -e testEnv index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (testEnv) (TIMINGS)
-			        Published test-name (testEnv) (TIMINGS)
-			          testEnv.test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Uploaded test-name (testEnv) (TIMINGS)
+			Published test-name (testEnv) (TIMINGS)
+			  https://testEnv.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
 	});
@@ -3716,14 +4047,15 @@ addEventListener('fetch', event => {});`
 			mockUploadWorkerRequest();
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Your worker has access to the following bindings:
-			        - Durable Objects:
-			          - SOMENAME: SomeClass
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			        "▲ [WARNING] Processing wrangler.toml configuration:
@@ -3766,14 +4098,15 @@ addEventListener('fetch', event => {});`
 			mockUploadWorkerRequest();
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Your worker has access to the following bindings:
-			        - Durable Objects:
-			          - SOMENAME: SomeClass (defined in some-script)
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass (defined in some-script)
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3809,15 +4142,16 @@ addEventListener('fetch', event => {});`
 
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Your worker has access to the following bindings:
-			        - Durable Objects:
-			          - SOMENAME: SomeClass
-			          - SOMEOTHERNAME: SomeOtherClass
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -3857,20 +4191,21 @@ addEventListener('fetch', event => {});`
 
 			await runWrangler("publish index.js");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Your worker has access to the following bindings:
-			        - Durable Objects:
-			          - SOMENAME: SomeClass
-			          - SOMEOTHERNAME: SomeOtherClass
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should not send migrations if they've all already been sent", async () => {
@@ -3901,20 +4236,21 @@ addEventListener('fetch', event => {});`
 
 			await runWrangler("publish index.js");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Your worker has access to the following bindings:
-			        - Durable Objects:
-			          - SOMENAME: SomeClass
-			          - SOMEOTHERNAME: SomeOtherClass
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		describe("service environments", () => {
@@ -3950,15 +4286,16 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js --legacy-env false");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - SOMENAME: SomeClass
-			            - SOMEOTHERNAME: SomeOtherClass
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -4013,15 +4350,16 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js --legacy-env false --env xyz");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - SOMENAME: SomeClass
-			            - SOMEOTHERNAME: SomeOtherClass
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (xyz) (TIMINGS)
-			          Published test-name (xyz) (TIMINGS)
-			            xyz.test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (xyz) (TIMINGS)
+			Published test-name (xyz) (TIMINGS)
+			  https://xyz.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -4034,6 +4372,7 @@ addEventListener('fetch', event => {});`
 			});
 
 			it("should use a script's current migration tag when publishing migrations", async () => {
+				unsetAllMocks();
 				writeWranglerToml({
 					durable_objects: {
 						bindings: [
@@ -4066,28 +4405,35 @@ addEventListener('fetch', event => {});`
 						],
 					},
 				});
+				setMockResponse(
+					"/accounts/:accountId/workers/deployments/by-script/:scriptTag",
+					() => ({
+						latest: { number: "2" },
+					})
+				);
 
 				await runWrangler("publish index.js --legacy-env false");
 				expect(std).toMatchInlineSnapshot(`
-			          Object {
-			            "debug": "",
-			            "err": "",
-			            "out": "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - SOMENAME: SomeClass
-			            - SOMEOTHERNAME: SomeOtherClass
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev",
-			            "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined",
+			  "warn": "▲ [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 an environment's current migration tag when publishing migrations", async () => {
@@ -4138,25 +4484,26 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js --legacy-env false --env xyz");
 				expect(std).toMatchInlineSnapshot(`
-			          Object {
-			            "debug": "",
-			            "err": "",
-			            "out": "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - SOMENAME: SomeClass
-			            - SOMEOTHERNAME: SomeOtherClass
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (xyz) (TIMINGS)
-			          Published test-name (xyz) (TIMINGS)
-			            xyz.test-name.test-sub-domain.workers.dev",
-			            "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - SOMENAME: SomeClass
+			  - SOMEOTHERNAME: SomeOtherClass
+			Uploaded test-name (xyz) (TIMINGS)
+			Published test-name (xyz) (TIMINGS)
+			  https://xyz.test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined",
+			  "warn": "▲ [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.
 
-			          ",
-			          }
-		        `);
+			",
+			}
+		`);
 			});
 		});
 	});
@@ -4193,6 +4540,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",
@@ -4223,6 +4574,19 @@ addEventListener('fetch', event => {});`
 					DATA_BLOB_ONE: "./some-data-blob.bin",
 					DATA_BLOB_TWO: "./more-data-blob.bin",
 				},
+				logfwdr: {
+					schema: "./message.capnp.compiled",
+					bindings: [
+						{
+							name: "httplogs",
+							destination: "httplogs",
+						},
+						{
+							name: "trace",
+							destination: "trace",
+						},
+					],
+				},
 			});
 
 			writeWorkerSource({ type: "sw" });
@@ -4237,6 +4601,8 @@ addEventListener('fetch', event => {});`
 			fs.writeFileSync("./some-data-blob.bin", "some data");
 			fs.writeFileSync("./more-data-blob.bin", "more data");
 
+			fs.writeFileSync("./message.capnp.compiled", "compiled capnp messages");
+
 			mockUploadWorkerRequest({
 				expectedType: "sw",
 				expectedBindings: [
@@ -4279,6 +4645,26 @@ 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",
+						destination: "httplogs",
+					},
+					{
+						name: "trace",
+						type: "logfwdr",
+						destination: "trace",
+					},
 					{
 						name: "WASM_MODULE_ONE",
 						part: "WASM_MODULE_ONE",
@@ -4310,36 +4696,43 @@ addEventListener('fetch', event => {});`
 
 			await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Your worker has access to the following bindings:
-			        - Data Blobs:
-			          - DATA_BLOB_ONE: some-data-blob.bin
-			          - DATA_BLOB_TWO: more-data-blob.bin
-			        - Durable Objects:
-			          - DURABLE_OBJECT_ONE: SomeDurableObject (defined in some-durable-object-worker)
-			          - DURABLE_OBJECT_TWO: AnotherDurableObject (defined in another-durable-object-worker) - staging
-			        - KV Namespaces:
-			          - KV_NAMESPACE_ONE: kv-ns-one-id
-			          - KV_NAMESPACE_TWO: kv-ns-two-id
-			        - R2 Buckets:
-			          - R2_BUCKET_ONE: r2-bucket-one-name
-			          - R2_BUCKET_TWO: r2-bucket-two-name
-			        - Text Blobs:
-			          - TEXT_BLOB_ONE: my-entire-app-depends-on-this.cfg
-			          - TEXT_BLOB_TWO: the-entirety-of-human-knowledge.txt
-			        - Unsafe:
-			          - some unsafe thing: UNSAFE_BINDING_ONE
-			          - another unsafe thing: UNSAFE_BINDING_TWO
-			        - Vars:
-			          - ENV_VAR_ONE: \\"123\\"
-			          - ENV_VAR_TWO: \\"Hello, I'm an environment variable\\"
-			        - Wasm Modules:
-			          - WASM_MODULE_ONE: some_wasm.wasm
-			          - WASM_MODULE_TWO: more_wasm.wasm
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Data Blobs:
+			  - DATA_BLOB_ONE: some-data-blob.bin
+			  - DATA_BLOB_TWO: more-data-blob.bin
+			- Durable Objects:
+			  - DURABLE_OBJECT_ONE: SomeDurableObject (defined in some-durable-object-worker)
+			  - DURABLE_OBJECT_TWO: AnotherDurableObject (defined in another-durable-object-worker) - staging
+			- KV Namespaces:
+			  - KV_NAMESPACE_ONE: kv-ns-one-id
+			  - KV_NAMESPACE_TWO: kv-ns-two-id
+			- R2 Buckets:
+			  - R2_BUCKET_ONE: r2-bucket-one-name
+			  - R2_BUCKET_TWO: r2-bucket-two-name
+			- 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
+			- Unsafe:
+			  - some unsafe thing: UNSAFE_BINDING_ONE
+			  - another unsafe thing: UNSAFE_BINDING_TWO
+			- Vars:
+			  - ENV_VAR_ONE: 123
+			  - ENV_VAR_TWO: \\"Hello, I'm an environment variable\\"
+			- Wasm Modules:
+			  - WASM_MODULE_ONE: some_wasm.wasm
+			  - WASM_MODULE_TWO: more_wasm.wasm
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			        "▲ [WARNING] Processing wrangler.toml configuration:
@@ -4380,6 +4773,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",
@@ -4427,7 +4826,7 @@ 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.]
 					            `);
@@ -4442,7 +4841,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.
 
@@ -4487,6 +4886,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: [
 						{
@@ -4526,6 +4935,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.]
@@ -4540,6 +4950,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.
@@ -4601,6 +5012,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",
@@ -4658,8 +5087,9 @@ 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.]
@@ -4674,9 +5104,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.
@@ -4712,14 +5144,15 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Wasm Modules:
-			            - TESTWASMNAME: path/to/test.wasm
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Wasm Modules:
+			  - TESTWASMNAME: path/to/test.wasm
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -4782,14 +5215,15 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js --config ./path/to/wrangler.toml");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Wasm Modules:
-			            - TESTWASMNAME: path/to/and/the/path/to/test.wasm
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Wasm Modules:
+			  - TESTWASMNAME: path/to/and/the/path/to/test.wasm
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -4818,11 +5252,12 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"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: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -4852,14 +5287,15 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Text Blobs:
-			            - TESTTEXTBLOBNAME: path/to/text.file
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Text Blobs:
+			  - TESTTEXTBLOBNAME: path/to/text.file
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -4926,14 +5362,15 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js --config ./path/to/wrangler.toml");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Text Blobs:
-			            - TESTTEXTBLOBNAME: path/to/and/the/path/to/text.file
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Text Blobs:
+			  - TESTTEXTBLOBNAME: path/to/and/the/path/to/text.file
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -4963,14 +5400,15 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Data Blobs:
-			            - TESTDATABLOBNAME: path/to/data.bin
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Data Blobs:
+			  - TESTDATABLOBNAME: path/to/data.bin
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5037,14 +5475,15 @@ addEventListener('fetch', event => {});`
 				mockSubDomainRequest();
 				await runWrangler("publish index.js --config ./path/to/wrangler.toml");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Data Blobs:
-			            - TESTDATABLOBNAME: path/to/and/the/path/to/data.bin
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Data Blobs:
+			  - TESTDATABLOBNAME: path/to/and/the/path/to/data.bin
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5075,19 +5514,47 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Vars:
-			            - text: \\"plain ol' string\\"
-			            - count: \\"1\\"
-			            - complex: \\"[object Object]\\"
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Vars:
+			  - text: \\"plain ol' string\\"
+			  - count: 1
+			  - complex: {
+			 \\"enabled\\": true,
+			 \\"id\\": 123
+			}
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
+
+			it("should read vars passed as cli arguments", async () => {
+				writeWranglerToml();
+				writeWorkerSource();
+				mockSubDomainRequest();
+				mockUploadWorkerRequest();
+				await runWrangler("publish index.js --var TEXT:sometext --var COUNT:1");
+				expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Vars:
+			  - TEXT: \\"(hidden)\\"
+			  - COUNT: \\"(hidden)\\"
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined",
+			  "warn": "",
+			}
+		`);
+			});
 		});
 
 		describe("[r2_buckets]", () => {
@@ -5105,14 +5572,68 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - R2 Buckets:
-			            - FOO: foo-bucket
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- R2 Buckets:
+			  - FOO: foo-bucket
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+			});
+		});
+
+		describe("[logfwdr]", () => {
+			it("should support logfwdr bindings", async () => {
+				fs.writeFileSync("./message.capnp.compiled", "compiled capnp messages");
+
+				writeWranglerToml({
+					logfwdr: {
+						schema: "./message.capnp.compiled",
+						bindings: [
+							{
+								name: "httplogs",
+								destination: "httplogs",
+							},
+							{
+								name: "trace",
+								destination: "trace",
+							},
+						],
+					},
+				});
+				writeWorkerSource();
+				mockSubDomainRequest();
+				mockUploadWorkerRequest({
+					expectedBindings: [
+						{
+							name: "httplogs",
+							type: "logfwdr",
+							destination: "httplogs",
+						},
+						{
+							name: "trace",
+							type: "logfwdr",
+							destination: "trace",
+						},
+					],
+				});
+
+				await runWrangler("publish index.js");
+				expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- logfwdr:
+			  - httplogs: httplogs
+			  - trace: trace
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5151,14 +5672,15 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - EXAMPLE_DO_BINDING: ExampleDurableObject
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - EXAMPLE_DO_BINDING: ExampleDurableObject
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5191,14 +5713,15 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - EXAMPLE_DO_BINDING: ExampleDurableObject (defined in example-do-binding-worker)
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - EXAMPLE_DO_BINDING: ExampleDurableObject (defined in example-do-binding-worker)
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5236,14 +5759,15 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Durable Objects:
-			            - EXAMPLE_DO_BINDING: ExampleDurableObject
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - EXAMPLE_DO_BINDING: ExampleDurableObject
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5264,12 +5788,12 @@ addEventListener('fetch', event => {});`
 
 				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/"
-                          `);
+			                              "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/"
+		                          `);
 			});
 		});
 
@@ -5299,14 +5823,15 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Services:
-			            - FOO: foo-service - production
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Services:
+			  - FOO: foo-service - production
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -5318,10 +5843,41 @@ addEventListener('fetch', event => {});`
 			});
 		});
 
-		describe("[worker_namespaces]", () => {
-			it("should support bindings to a worker namespace", async () => {
+		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: undefined"
+		`);
+				expect(std.err).toMatchInlineSnapshot(`""`);
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+			});
+		});
+
+		describe("[dispatch_namespaces]", () => {
+			it("should support bindings to a dispatch namespace", async () => {
 				writeWranglerToml({
-					worker_namespaces: [
+					dispatch_namespaces: [
 						{
 							binding: "foo",
 							namespace: "Foo",
@@ -5333,7 +5889,7 @@ addEventListener('fetch', event => {});`
 				mockUploadWorkerRequest({
 					expectedBindings: [
 						{
-							type: "namespace",
+							type: "dispatch_namespace",
 							name: "foo",
 							namespace: "Foo",
 						},
@@ -5341,24 +5897,19 @@ addEventListener('fetch', event => {});`
 				});
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Worker Namespaces:
-			            - foo: Foo
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- dispatch namespaces:
+			  - foo: Foo
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
-				expect(std.warn).toMatchInlineSnapshot(`
-			"▲ [WARNING] Processing wrangler.toml configuration:
-
-			    - \\"worker_namespaces\\" fields are experimental and may change or break at any time.
-
-			"
-		`);
-			});
-		});
+				expect(std.warn).toMatchInlineSnapshot(`""`);
+			});
+		});
 
 		describe("[unsafe]", () => {
 			it("should warn if using unsafe bindings", async () => {
@@ -5387,14 +5938,15 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Unsafe:
-			            - binding-type: my-binding
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Unsafe:
+			  - binding-type: my-binding
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -5430,14 +5982,15 @@ addEventListener('fetch', event => {});`
 
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Your worker has access to the following bindings:
-			          - Unsafe:
-			            - plain_text: my-binding
-			          Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Unsafe:
+			  - plain_text: my-binding
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
 			          "▲ [WARNING] Processing wrangler.toml configuration:
@@ -5479,11 +6032,12 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -5508,11 +6062,12 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -5541,11 +6096,12 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			        "▲ [WARNING] Processing wrangler.toml configuration:
@@ -5590,11 +6146,12 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -5687,11 +6244,12 @@ addEventListener('fetch', event => {});`
 				});
 				await runWrangler("publish index.js");
 				expect(std.out).toMatchInlineSnapshot(`
-			          "Total Upload: 0xx KiB / gzip: 0xx KiB
-			          Uploaded test-name (TIMINGS)
-			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
-		        `);
+			"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: undefined"
+		`);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
 			});
@@ -5717,11 +6275,12 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			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\\";
@@ -5746,11 +6305,12 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js");
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			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\\";
@@ -5759,6 +6319,38 @@ addEventListener('fetch', event => {});`
 		      `);
 		});
 
+		it("should work with legacy module specifiers, with a deprecation warning (3)", async () => {
+			writeWranglerToml({
+				rules: [{ type: "Text", globs: ["**/*.file"], fallthrough: false }],
+			});
+			fs.writeFileSync(
+				"./index.js",
+				`import TEXT from 'text+name.file'; export default {};`
+			);
+			fs.writeFileSync("./text+name.file", "SOME TEXT CONTENT");
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedModules: {
+					"./2d91d1c4dd6e57d4f5432187ab7c25f45a8973f0-text+name.file":
+						"SOME TEXT CONTENT",
+				},
+			});
+			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: undefined"
+		`);
+			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\\";
+
+			        "
+		      `);
+		});
+
 		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
 
@@ -5775,11 +6367,12 @@ addEventListener('fetch', event => {});`
 				"publish index.js --compatibility-date 2022-03-17 --name test-name"
 			);
 			expect(std.out).toMatchInlineSnapshot(`
-			        "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
-		      `);
+			"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: undefined"
+		`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 		});
@@ -5813,16 +6406,17 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.ts");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			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 ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should output to target es2020 even if tsconfig says otherwise", async () => {
@@ -5843,16 +6437,17 @@ addEventListener('fetch', event => {});`
 			});
 			await runWrangler("publish index.js"); // this would throw if we tried to compile with es5
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			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 ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 	});
 
@@ -5866,16 +6461,17 @@ addEventListener('fetch', event => {});`
 			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": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			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 ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 	});
 
@@ -5893,17 +6489,17 @@ addEventListener('fetch', event => {});`
 			process.env.CLOUDFLARE_ACCOUNT_ID = "";
 			await runWrangler("publish index.js --dry-run");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Your worker has access to the following bindings:
-			        - Durable Objects:
-			          - NAME: SomeClass
-			        Total Upload: 0xx KiB / gzip: 0xx KiB
-			        --dry-run: exiting now.",
-			          "warn": "",
-			        }
-		      `);
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Durable Objects:
+			  - NAME: SomeClass
+			--dry-run: exiting now.",
+			  "warn": "",
+			}
+		`);
 		});
 	});
 
@@ -5916,7 +6512,7 @@ addEventListener('fetch', event => {});`
 			        Object {
 			          "debug": "",
 			          "err": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
+			          "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.
 
@@ -5935,14 +6531,16 @@ addEventListener('fetch', event => {});`
       export default {}
       `
 			);
-			let err: Error | undefined;
+			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 Error;
+				err = e as esbuild.BuildFailure;
 			}
-			expect(err?.message).toMatch(
-				`Detected a Node builtin module import while Node compatibility is disabled.\nAdd node_compat = true to your wrangler.toml file to enable Node compatibility.`
+			expect(
+				esbuild.formatMessagesSync(err?.errors ?? [], { kind: "error" }).join()
+			).toMatch(
+				/The package "path" wasn't found on the file system but is built into node\.\s+Add "node_compat = true" to your wrangler\.toml file to enable Node compatibility\./
 			);
 		});
 
@@ -5961,7 +6559,7 @@ addEventListener('fetch', event => {});`
 			        Object {
 			          "debug": "",
 			          "err": "",
-			          "out": "Total Upload: 4xx KiB / gzip: 1xx KiB
+			          "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.
 
@@ -6008,16 +6606,17 @@ addEventListener('fetch', event => {});`
 			mockUploadWorkerRequest();
 			await runWrangler("publish");
 			expect(std).toMatchInlineSnapshot(`
-			        Object {
-			          "debug": "",
-			          "err": "",
-			          "out": "Total Upload: 4xx KiB / gzip: 0xx KiB
-			        Uploaded test-name (TIMINGS)
-			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
-			          "warn": "",
-			        }
-		      `);
+			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 ID: undefined",
+			  "warn": "",
+			}
+		`);
 		});
 
 		it("should print the bundle size, with API errors", async () => {
@@ -6066,7 +6665,7 @@ addEventListener('fetch', event => {});`
 			        Object {
 			          "debug": "",
 			          "err": "",
-			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
+			          "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.
 
@@ -6081,6 +6680,200 @@ addEventListener('fetch', event => {});`
 			        }
 		      `);
 		});
+
+		test("should check biggest dependencies when upload fails with script size error", async () => {
+			fs.writeFileSync("dependency.js", `export const thing = "a string dep";`);
+
+			fs.writeFileSync(
+				"index.js",
+				`import { thing } from "./dependency";
+
+        export default {
+          async fetch() {
+            return new Response('response plus ' + thing);
+          }
+        }`
+			);
+			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": "",
+			  "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.
+
+			  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
+
+			",
+			  "warn": "▲ [WARNING] Here are the 2 largest dependencies included in your script:
+
+			  - index.js - xx KiB
+			  - dependency.js - xx KiB
+			  If these are unnecessary, consider removing them
+
+			",
+			}
+		`);
+		});
+
+		test("should check biggest dependencies when upload fails with script startup error", async () => {
+			fs.writeFileSync("dependency.js", `export const thing = "a string dep";`);
+
+			fs.writeFileSync(
+				"index.js",
+				`import { thing } from "./dependency";
+
+        export default {
+          async fetch() {
+            return new Response('response plus ' + thing);
+          }
+        }`
+			);
+			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.]`
+			);
+			expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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.
+
+			  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
+
+			",
+			  "warn": "▲ [WARNING] Here are the 2 largest dependencies included in your script:
+
+			  - index.js - xx KiB
+			  - dependency.js - xx KiB
+			  If these are unnecessary, consider removing them
+
+			",
+			}
+		`);
+		});
+
+		describe("unit tests", () => {
+			// keeping these as unit tests to try and keep them snappy, as they often deal with
+			// big files that would take a while to deal with in a full wrangler test
+
+			test("should print the bundle size and warn about large scripts when > 1MiB", async () => {
+				const bigModule = Buffer.alloc(10_000_000);
+				randomFillSync(bigModule);
+				await printBundleSize({ name: "index.js", content: "" }, [
+					{ name: "index.js", content: bigModule, type: "buffer" },
+				]);
+
+				expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "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
+
+			",
+			}
+		`);
+			});
+
+			test("should not warn about bundle sizes when NO_SCRIPT_SIZE_WARNING is set", async () => {
+				const previousValue = process.env.NO_SCRIPT_SIZE_WARNING;
+				process.env.NO_SCRIPT_SIZE_WARNING = "true";
+
+				const bigModule = Buffer.alloc(10_000_000);
+				randomFillSync(bigModule);
+				await printBundleSize({ name: "index.js", content: "" }, [
+					{ name: "index.js", content: bigModule, type: "buffer" },
+				]);
+
+				expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "Total Upload: xx KiB / gzip: xx KiB",
+			  "warn": "",
+			}
+		`);
+
+				process.env.NO_SCRIPT_SIZE_WARNING = previousValue;
+			});
+
+			test("should print the top biggest dependencies in the bundle when upload fails", () => {
+				const deps = {
+					"node_modules/a-mod/module.js": { bytesInOutput: 450 },
+					"node_modules/b-mod/module.js": { bytesInOutput: 10 },
+					"node_modules/c-mod/module.js": { bytesInOutput: 200 },
+					"node_modules/d-mod/module.js": { bytesInOutput: 2111200 }, // 1
+					"node_modules/e-mod/module.js": { bytesInOutput: 8209 }, // 3
+					"node_modules/f-mod/module.js": { bytesInOutput: 770 },
+					"node_modules/g-mod/module.js": { bytesInOutput: 78902 }, // 2
+					"node_modules/h-mod/module.js": { bytesInOutput: 899 },
+					"node_modules/i-mod/module.js": { bytesInOutput: 2001 }, // 4
+					"node_modules/j-mod/module.js": { bytesInOutput: 900 }, // 5
+					"node_modules/k-mod/module.js": { bytesInOutput: 79 },
+				};
+
+				printOffendingDependencies(deps);
+				expect(std).toMatchInlineSnapshot(`
+			Object {
+			  "debug": "",
+			  "err": "",
+			  "out": "",
+			  "warn": "▲ [WARNING] Here are the 5 largest dependencies included in your script:
+
+			  - node_modules/d-mod/module.js - xx KiB
+			  - node_modules/g-mod/module.js - xx KiB
+			  - node_modules/e-mod/module.js - xx KiB
+			  - node_modules/i-mod/module.js - xx KiB
+			  - node_modules/j-mod/module.js - xx KiB
+			  If these are unnecessary, consider removing them
+
+			",
+			}
+		`);
+			});
+		});
 	});
 
 	describe("--no-bundle", () => {
@@ -6184,6 +6977,240 @@ addEventListener('fetch', event => {});`
 		`);
 		});
 	});
+
+	it("should publish if the last deployed source check fails", async () => {
+		unsetAllMocks();
+		writeWorkerSource();
+		writeWranglerToml();
+		mockSubDomainRequest();
+		mockUploadWorkerRequest();
+		setMockResponse(
+			"/accounts/:accountId/workers/deployments/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 ID: undefined",
+		  "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/deployments/by-script/:scriptTag",
+			() => ({
+				latest: { number: "2" },
+			})
+		);
+
+		await runWrangler("publish index.js");
+		expect(std.err).toContain(
+			`A request to the Cloudflare API (/accounts/some-account-id/workers/services/test-name) failed`
+		);
+	});
+
+	describe("queues", () => {
+		it("should upload producer bindings", async () => {
+			writeWranglerToml({
+				queues: {
+					producers: [{ binding: "QUEUE_ONE", queue: "queue1" }],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({
+				expectedBindings: [
+					{
+						type: "queue",
+						name: "QUEUE_ONE",
+						queue_name: "queue1",
+					},
+				],
+			});
+			mockGetQueue("queue1");
+
+			await runWrangler("publish index.js");
+			expect(std.out).toMatchInlineSnapshot(`
+			"Total Upload: xx KiB / gzip: xx KiB
+			Your worker has access to the following bindings:
+			- Queues:
+			  - QUEUE_ONE: queue1
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev
+			Current Deployment ID: undefined"
+		`);
+		});
+
+		it("should update queue consumers on publish", async () => {
+			writeWranglerToml({
+				queues: {
+					consumers: [
+						{
+							queue: "queue1",
+							dead_letter_queue: "myDLQ",
+							max_batch_size: 5,
+							max_batch_timeout: 3,
+							max_retries: 10,
+						},
+					],
+				},
+			});
+			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: undefined"
+		`);
+		});
+
+		it("consumer should error when a queue doesn't exist", async () => {
+			writeWranglerToml({
+				queues: {
+					producers: [],
+					consumers: [
+						{
+							queue: "queue1",
+							dead_letter_queue: "myDLQ",
+							max_batch_size: 5,
+							max_batch_timeout: 3,
+							max_retries: 10,
+						},
+					],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			mockGetQueueMissing("queue1");
+
+			await expect(
+				runWrangler("publish index.js")
+			).rejects.toMatchInlineSnapshot(
+				`[Error: Queue "queue1" does not exist. To create it, run: wrangler queues create queue1]`
+			);
+		});
+
+		it("producer should error when a queue doesn't exist", async () => {
+			writeWranglerToml({
+				queues: {
+					producers: [{ queue: "queue1", binding: "QUEUE_ONE" }],
+					consumers: [],
+				},
+			});
+			await fs.promises.writeFile("index.js", `export default {};`);
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			mockGetQueueMissing("queue1");
+
+			await expect(
+				runWrangler("publish index.js")
+			).rejects.toMatchInlineSnapshot(
+				`[Error: Queue "queue1" does not exist. To create it, run: wrangler queues create queue1]`
+			);
+		});
+	});
+
+	describe("--keep-vars", () => {
+		it("should send keepVars when keep-vars is passed in", async () => {
+			process.env = {
+				CLOUDFLARE_API_TOKEN: "hunter2",
+				CLOUDFLARE_ACCOUNT_ID: "some-account-id",
+			};
+			setIsTTY(false);
+			writeWranglerToml();
+			writeWorkerSource();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest({ keepVars: true });
+			mockOAuthServerCallback();
+			mockGetMemberships([]);
+
+			await runWrangler("publish index.js --keep-vars");
+
+			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: undefined"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+
+		it("should not send keepVars by default", async () => {
+			process.env = {
+				CLOUDFLARE_API_TOKEN: "hunter2",
+				CLOUDFLARE_ACCOUNT_ID: "some-account-id",
+			};
+			setIsTTY(false);
+			writeWranglerToml();
+			writeWorkerSource();
+			mockSubDomainRequest();
+			mockUploadWorkerRequest();
+			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: undefined"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+	});
 });
 
 /** Write mock assets to the file system so they can be uploaded. */
@@ -6215,6 +7242,8 @@ function mockUploadWorkerRequest(
 		env?: string;
 		legacyEnv?: boolean;
 		sendScriptIds?: boolean;
+		keepVars?: boolean;
+		tag?: string;
 	} = {}
 ) {
 	const {
@@ -6230,6 +7259,7 @@ function mockUploadWorkerRequest(
 		legacyEnv = false,
 		expectedMigrations,
 		sendScriptIds,
+		keepVars,
 	} = options;
 	setMockResponse(
 		env && !legacyEnv
@@ -6260,6 +7290,13 @@ function mockUploadWorkerRequest(
 			} else {
 				expect(metadata.body_part).toEqual("index.js");
 			}
+
+			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);
 			}
@@ -6285,6 +7322,7 @@ function mockUploadWorkerRequest(
 							id: "abc12345",
 							etag: "etag98765",
 							pipeline_hash: "hash9999",
+							tag: "sample-tag",
 					  }
 					: {}),
 			};
@@ -6395,19 +7433,6 @@ function mockUnauthorizedPublishRoutesRequest({
 	);
 }
 
-function mockCollectKnownRoutesRequest(
-	routes: { pattern: string; script: string }[]
-) {
-	setMockResponse(`/zones/:zoneId/workers/routes`, "GET", () => routes);
-}
-
-function mockGetZoneFromHostRequest(host: string, zone: string) {
-	setMockResponse("/zones", (_uri, _init, queryParams) => {
-		expect(queryParams.get("name")).toEqual(host);
-		return [{ id: zone }];
-	});
-}
-
 function mockPublishRoutesFallbackRequest(route: {
 	pattern: string;
 	script: string;
@@ -6418,20 +7443,27 @@ function mockPublishRoutesFallbackRequest(route: {
 	});
 }
 
-function mockPublishCustomDomainsRequest({
-	publishFlags,
-	domains = [],
+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;
+		}
+	);
+}
+
+function mockCustomDomainsChangesetRequest({
+	originConflicts = [],
+	dnsRecordConflicts = [],
 	env = undefined,
 	legacyEnv = false,
 }: {
-	publishFlags: {
-		override_scope: boolean;
-		override_existing_origin: boolean;
-		override_existing_dns_record: boolean;
-	};
-	domains: Array<
-		{ hostname: string } & ({ zone_id?: string } | { zone_name?: string })
-	>;
+	originConflicts?: Array<CustomDomain>;
+	dnsRecordConflicts?: Array<CustomDomain>;
 	env?: string | undefined;
 	legacyEnv?: boolean | undefined;
 }) {
@@ -6439,8 +7471,8 @@ function mockPublishCustomDomainsRequest({
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
 
 	setMockResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains`,
-		"PUT",
+		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains/changeset`,
+		"POST",
 		([_url, accountId, scriptName, envName], { body }) => {
 			expect(accountId).toEqual("some-account-id");
 			expect(scriptName).toEqual(
@@ -6450,25 +7482,48 @@ function mockPublishCustomDomainsRequest({
 				expect(envName).toEqual(env);
 			}
 
-			expect(JSON.parse(body as string)).toEqual({
-				...publishFlags,
-				origins: domains,
-			});
+			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) => {
+						return {
+							...domain,
+							modified: true,
+						};
+					}) ?? [],
+				conflicting: dnsRecordConflicts,
+			};
 
-			return null;
+			return changeset;
 		}
 	);
 }
 
-function mockPublishCustomDomainsRequestConflictWithoutOverride({
+function mockPublishCustomDomainsRequest({
+	publishFlags,
 	domains = [],
-	originConflicts = false,
-	dnsRecordConflicts = false,
 	env = undefined,
 	legacyEnv = false,
 }: {
-	originConflicts?: boolean;
-	dnsRecordConflicts?: boolean;
+	publishFlags: {
+		override_scope: boolean;
+		override_existing_origin: boolean;
+		override_existing_dns_record: boolean;
+	};
 	domains: Array<
 		{ hostname: string } & ({ zone_id?: string } | { zone_name?: string })
 	>;
@@ -6478,8 +7533,8 @@ function mockPublishCustomDomainsRequestConflictWithoutOverride({
 	const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
 	const environment = env && !legacyEnv ? "/environments/:envName" : "";
 
-	setMockRawResponse(
-		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains`,
+	setMockResponse(
+		`/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains/records`,
 		"PUT",
 		([_url, accountId, scriptName, envName], { body }) => {
 			expect(accountId).toEqual("some-account-id");
@@ -6490,26 +7545,12 @@ function mockPublishCustomDomainsRequestConflictWithoutOverride({
 				expect(envName).toEqual(env);
 			}
 
-			const parsed = JSON.parse(body as string);
-			expect(parsed.origins).toEqual(domains);
+			expect(JSON.parse(body as string)).toEqual({
+				...publishFlags,
+				origins: domains,
+			});
 
-			if (originConflicts && !parsed.override_existing_origin) {
-				return createFetchResult(null, false, [
-					{
-						code: 100116,
-						message: `Cannot create Custom Domain "${domains[0].hostname}": Custom Domain already exists and points to a different script; retry and use option "override_existing_origin" to override`,
-					},
-				]);
-			}
-			if (dnsRecordConflicts && !parsed.override_existing_dns_record) {
-				return createFetchResult(null, false, [
-					{
-						code: 100117,
-						message: `Cannot create Custom Domain "${domains[0].hostname}": a DNS record already exists for this origin; retry and use option "override_existing_dns_record" to override`,
-					},
-				]);
-			}
-			return createFetchResult(null, true);
+			return null;
 		}
 	);
 }
@@ -6669,3 +7710,48 @@ function mockServiceScriptData(options: {
 		);
 	}
 }
+
+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 };
+		}
+	);
+	return requests;
+}
+
+function mockGetQueueMissing(expectedQueueName: string) {
+	const requests = { count: 0 };
+	setMockResponse(
+		`/accounts/:accountId/workers/queues/${expectedQueueName}`,
+		"GET",
+		([_url, _accountId]) => {
+			throw { code: 11000 };
+		}
+	);
+	return requests;
+}
+
+function mockPutQueueConsumer(
+	expectedQueueName: string,
+	expectedConsumerName: string,
+	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 };
+		}
+	);
+	return requests;
+}