wrangler 2.0.23 → 2.0.26

package/src/__tests__/publish.test.ts

@@ -9,7 +9,7 @@ import {
 	setMockRawResponse,
 	setMockResponse,
 	unsetAllMocks,
-	unsetMockFetchKVGetValues,
+	unsetSpecialMockFns,
 } from "./helpers/mock-cfetch";
 import { mockConsoleMethods, normalizeSlashes } from "./helpers/mock-console";
 import { mockConfirm } from "./helpers/mock-dialogs";
@@ -23,6 +23,7 @@ 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 { CustomDomainChangeset, CustomDomain } from "../publish";
 import type { CfWorkerInit } from "../worker";
 import type { FormData, File } from "undici";
 
@@ -48,15 +49,24 @@ describe("publish", () => {
 
 	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 });
@@ -71,7 +81,7 @@ describe("publish", () => {
 			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"
 		`);
 		});
 	});
@@ -107,7 +117,7 @@ describe("publish", () => {
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -128,7 +138,7 @@ describe("publish", () => {
 			"Total Upload: 0xx KiB / gzip: 0xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
-			  test-name.test-sub-domain.workers.dev"
+			  https://test-name.test-sub-domain.workers.dev"
 		`);
 			expect(std.warn).toMatchInlineSnapshot(`
 			"▲ [WARNING] It looks like you have used Wrangler 1's \`config\` command to login with an API token.
@@ -168,7 +178,7 @@ describe("publish", () => {
 			          "Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
@@ -192,7 +202,7 @@ describe("publish", () => {
 			          "Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 			});
@@ -294,7 +304,7 @@ describe("publish", () => {
 			        "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"
+			          https://test-name-some-env.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -313,7 +323,7 @@ describe("publish", () => {
 			          "Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -332,7 +342,7 @@ describe("publish", () => {
 			          "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"
+			            https://test-name-some-env.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -351,7 +361,7 @@ describe("publish", () => {
 			          "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"
+			            https://test-name-some-env.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -421,7 +431,7 @@ describe("publish", () => {
 			          "Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -447,7 +457,7 @@ describe("publish", () => {
 			          "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"
+			            https://some-env.test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -493,7 +503,7 @@ describe("publish", () => {
 		      Total Upload: 0xx KiB / gzip: 0xx KiB
 		      Uploaded test-name (TIMINGS)
 		      Published test-name (TIMINGS)
-		        test-name.test-sub-domain.workers.dev"
+		        https://test-name.test-sub-domain.workers.dev"
 	    `);
 		expect(std.err).toMatchInlineSnapshot(`""`);
 	});
@@ -527,7 +537,7 @@ describe("publish", () => {
 			  "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
 			Uploaded test-name (TIMINGS)
 			Published test-name (TIMINGS)
-			  test-name.test-sub-domain.workers.dev",
+			  https://test-name.test-sub-domain.workers.dev",
 			  "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			    - The \\"route\\" field in your configuration is an empty string and will be ignored.
@@ -782,6 +792,7 @@ describe("publish", () => {
 				writeWorkerSource();
 				mockUpdateWorkerRequest({ enabled: false });
 				mockUploadWorkerRequest({ expectedType: "esm" });
+				mockCustomDomainsChangesetRequest({});
 				mockPublishCustomDomainsRequest({
 					publishFlags: {
 						override_scope: true,
@@ -794,63 +805,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 +975,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");
@@ -920,7 +1031,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -937,7 +1048,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -954,7 +1065,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -973,7 +1084,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -990,7 +1101,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -1026,7 +1137,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -1076,7 +1187,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1095,7 +1206,7 @@ describe("publish", () => {
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1126,7 +1237,7 @@ export default{
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1143,7 +1254,7 @@ export default{
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1237,7 +1348,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1319,7 +1430,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			            - Deprecation: \\"site.entry-point\\":
@@ -1371,7 +1482,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(normalizeSlashes(std.warn)).toMatchInlineSnapshot(`
@@ -1438,7 +1549,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 +1560,28 @@ 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: 52xx KiB / gzip: 14xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev",
+			  "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.
 
 
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 	});
 
@@ -1506,7 +1619,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1526,7 +1639,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1535,23 +1648,23 @@ 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: 52xx KiB / gzip: 14xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev",
+			  "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 +1747,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 +1777,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 +1823,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1717,28 +1832,29 @@ 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: 52xx KiB / gzip: 14xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev",
+			  "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 +1869,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets);
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -1762,25 +1878,25 @@ 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: 52xx KiB / gzip: 14xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev",
+			  "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 () => {
@@ -1829,7 +1945,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1886,7 +2002,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1937,7 +2053,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -1986,7 +2102,7 @@ addEventListener('fetch', event => {});`
 			        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"
+			          https://some-env.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2036,7 +2152,7 @@ addEventListener('fetch', event => {});`
 			        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"
+			          https://test-name-some-env.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2079,7 +2195,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2119,7 +2235,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2159,7 +2275,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2200,7 +2316,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2241,7 +2357,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2282,7 +2398,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2323,7 +2439,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2366,7 +2482,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2413,7 +2529,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2562,7 +2678,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 1xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -2661,7 +2777,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2715,7 +2831,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2756,7 +2872,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -2777,7 +2893,7 @@ addEventListener('fetch', event => {});`
 			writeWorkerSource();
 			writeAssets(assets, "my-assets");
 			mockUploadWorkerRequest({
-				expectedMainModule: "stdin.js",
+				expectedMainModule: "serve-static-assets.entry.js",
 			});
 			mockSubDomainRequest();
 			mockListKVNamespacesRequest(kvNamespace);
@@ -2787,23 +2903,23 @@ 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: 52xx KiB / gzip: 14xx KiB
+			Uploaded test-name (TIMINGS)
+			Published test-name (TIMINGS)
+			  https://test-name.test-sub-domain.workers.dev",
+			  "warn": "▲ [WARNING] The --assets argument is experimental and may change or break at any time
 
-			        ",
-			        }
-		      `);
+			",
+			}
+		`);
 		});
 	});
 
@@ -2820,7 +2936,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2840,7 +2956,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2859,7 +2975,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2972,7 +3088,7 @@ addEventListener('fetch', event => {});`
 			        "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"
+			          https://dev.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -2999,7 +3115,7 @@ addEventListener('fetch', event => {});`
 			        "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"
+			          https://dev.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3027,7 +3143,7 @@ addEventListener('fetch', event => {});`
 			        "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"
+			          https://dev.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3058,7 +3174,7 @@ addEventListener('fetch', event => {});`
 			        "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"
+			          https://dev.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3091,7 +3207,7 @@ addEventListener('fetch', event => {});`
 			        "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"
+			          https://dev.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3128,7 +3244,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3146,7 +3262,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3277,7 +3393,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev
+			          https://test-name.test-sub-domain.workers.dev
 			          http://example.com/*"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -3312,7 +3428,7 @@ addEventListener('fetch', event => {});`
 			        "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
+			          https://test-name-production.test-sub-domain.workers.dev
 			          http://production.example.com/*"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -3347,7 +3463,7 @@ addEventListener('fetch', event => {});`
 			        "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
+			          https://test-name-production.test-sub-domain.workers.dev
 			          http://production.example.com/*"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -3525,7 +3641,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3550,7 +3666,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3656,7 +3772,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3695,7 +3811,7 @@ addEventListener('fetch', event => {});`
 			        "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"
+			          https://testEnv.test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 		});
@@ -3722,7 +3838,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -3772,7 +3888,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3816,7 +3932,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -3867,7 +3983,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -3911,7 +4027,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -3957,7 +4073,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -4020,7 +4136,7 @@ addEventListener('fetch', event => {});`
 			          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"
+			            https://xyz.test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -4079,7 +4195,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev",
+			            https://test-name.test-sub-domain.workers.dev",
 			            "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			              - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
@@ -4148,7 +4264,7 @@ addEventListener('fetch', event => {});`
 			          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",
+			            https://xyz.test-name.test-sub-domain.workers.dev",
 			            "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
 			              - Experimental: Service environments are in beta, and their behaviour is guaranteed to change in
@@ -4223,6 +4339,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 +4366,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 +4410,16 @@ addEventListener('fetch', event => {});`
 						name: "R2_BUCKET_TWO",
 						type: "r2_bucket",
 					},
+					{
+						name: "httplogs",
+						type: "logfwdr",
+						destination: "httplogs",
+					},
+					{
+						name: "trace",
+						type: "logfwdr",
+						destination: "trace",
+					},
 					{
 						name: "WASM_MODULE_ONE",
 						part: "WASM_MODULE_ONE",
@@ -4323,6 +4464,9 @@ addEventListener('fetch', event => {});`
 			        - R2 Buckets:
 			          - R2_BUCKET_ONE: r2-bucket-one-name
 			          - R2_BUCKET_TWO: r2-bucket-two-name
+			        - logfwdr:
+			          - httplogs: httplogs
+			          - trace: trace
 			        - Text Blobs:
 			          - TEXT_BLOB_ONE: my-entire-app-depends-on-this.cfg
 			          - TEXT_BLOB_TWO: the-entirety-of-human-knowledge.txt
@@ -4338,7 +4482,7 @@ addEventListener('fetch', event => {});`
 			        Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -4718,7 +4862,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4788,7 +4932,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4821,7 +4965,7 @@ addEventListener('fetch', event => {});`
 			          "Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4858,7 +5002,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4932,7 +5076,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -4969,7 +5113,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5043,7 +5187,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5083,7 +5227,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5111,7 +5255,59 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
+		        `);
+				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(`
+			          "Your worker has access to the following bindings:
+			          - logfwdr:
+			            - httplogs: httplogs
+			            - trace: trace
+			          Total Upload: 0xx KiB / gzip: 0xx KiB
+			          Uploaded test-name (TIMINGS)
+			          Published test-name (TIMINGS)
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5157,7 +5353,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5197,7 +5393,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5242,7 +5438,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5305,7 +5501,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -5347,7 +5543,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -5393,7 +5589,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -5436,7 +5632,7 @@ addEventListener('fetch', event => {});`
 			          Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`
@@ -5482,7 +5678,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5511,7 +5707,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5544,7 +5740,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -5593,7 +5789,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5690,7 +5886,7 @@ addEventListener('fetch', event => {});`
 			          "Total Upload: 0xx KiB / gzip: 0xx KiB
 			          Uploaded test-name (TIMINGS)
 			          Published test-name (TIMINGS)
-			            test-name.test-sub-domain.workers.dev"
+			            https://test-name.test-sub-domain.workers.dev"
 		        `);
 				expect(std.err).toMatchInlineSnapshot(`""`);
 				expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5720,7 +5916,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -5749,7 +5945,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`
@@ -5759,6 +5955,37 @@ 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: 0xx KiB / gzip: 0xx KiB
+			        Uploaded test-name (TIMINGS)
+			        Published test-name (TIMINGS)
+			          https://test-name.test-sub-domain.workers.dev"
+		      `);
+			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
 
@@ -5778,7 +6005,7 @@ addEventListener('fetch', event => {});`
 			        "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev"
+			          https://test-name.test-sub-domain.workers.dev"
 		      `);
 			expect(std.err).toMatchInlineSnapshot(`""`);
 			expect(std.warn).toMatchInlineSnapshot(`""`);
@@ -5819,7 +6046,7 @@ addEventListener('fetch', event => {});`
 			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -5849,7 +6076,7 @@ addEventListener('fetch', event => {});`
 			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -5872,7 +6099,7 @@ addEventListener('fetch', event => {});`
 			          "out": "Total Upload: 0xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -6014,7 +6241,7 @@ addEventListener('fetch', event => {});`
 			          "out": "Total Upload: 4xx KiB / gzip: 0xx KiB
 			        Uploaded test-name (TIMINGS)
 			        Published test-name (TIMINGS)
-			          test-name.test-sub-domain.workers.dev",
+			          https://test-name.test-sub-domain.workers.dev",
 			          "warn": "",
 			        }
 		      `);
@@ -6418,20 +6645,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 +6673,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 +6684,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 +6735,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 +6747,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;
 		}
 	);
 }