wrangler 0.0.0-e2b7352 → 0.0.0-e2f9bb2

package/src/__tests__/publish.test.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as TOML from "@iarna/toml";
+import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
   createFetchResult,
@@ -9,32 +10,264 @@ import {
   unsetAllMocks,
   unsetMockFetchKVGetValues,
 } from "./helpers/mock-cfetch";
-import { mockConsoleMethods } from "./helpers/mock-console";
+import { mockConsoleMethods, normalizeSlashes } from "./helpers/mock-console";
+import { useMockIsTTY } from "./helpers/mock-istty";
 import { mockKeyListRequest } from "./helpers/mock-kv";
+import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
+import { writeWorkerSource } from "./helpers/write-worker-source";
 import writeWranglerToml from "./helpers/write-wrangler-toml";
+import type { Config } from "../config";
 import type { WorkerMetadata } from "../create-worker-upload-form";
 import type { KVNamespaceInfo } from "../kv";
+import type { CfWorkerInit } from "../worker";
 import type { FormData, File } from "undici";
 
 describe("publish", () => {
+  mockAccountId();
+  mockApiToken();
+  runInTempDir({ homedir: "./home" });
+  const { setIsTTY } = useMockIsTTY();
+  const std = mockConsoleMethods();
+  const {
+    mockOAuthServerCallback,
+    mockGrantAccessToken,
+    mockGrantAuthorization,
+    mockGetMemberships,
+  } = mockOAuthFlow();
+
   beforeEach(() => {
     // @ts-expect-error we're using a very simple setTimeout mock here
     jest.spyOn(global, "setTimeout").mockImplementation((fn, _period) => {
-      fn();
+      setImmediate(fn);
     });
+    setIsTTY(true);
   });
-  mockAccountId();
-  mockApiToken();
-  runInTempDir();
-  const std = mockConsoleMethods();
 
   afterEach(() => {
     unsetAllMocks();
     unsetMockFetchKVGetValues();
   });
 
+  describe("authentication", () => {
+    mockApiToken({ apiToken: null });
+    beforeEach(() => {
+      // @ts-expect-error disable the mock we'd setup earlier
+      // or else our server won't bother listening for oauth requests
+      // and will timeout and fail
+      global.setTimeout.mockRestore();
+    });
+
+    it("drops a user into the login flow if they're unauthenticated", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest();
+
+      mockOAuthServerCallback();
+      const accessTokenRequest = mockGrantAccessToken({ 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...
+        Successfully logged in.
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      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();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest();
+      writeAuthConfigFile({
+        api_token: "some-api-token",
+      });
+
+      const accessTokenRequest = mockGrantAccessToken({ 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...
+        Successfully logged in.
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          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.
+
+          This is no longer supported in the current version of Wrangler.
+          If you wish to authenticate via an API token then please set the \`CLOUDFLARE_API_TOKEN\`
+          environment variable.
+
+        "
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    describe("non-TTY", () => {
+      const ENV_COPY = process.env;
+
+      afterEach(() => {
+        process.env = ENV_COPY;
+      });
+
+      it("should not throw an error in non-TTY if 'CLOUDFLARE_API_TOKEN' & 'account_id' are in scope", async () => {
+        process.env = {
+          CLOUDFLARE_API_TOKEN: "123456789",
+        };
+        setIsTTY(false);
+        writeWranglerToml({
+          account_id: "some-account-id",
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest();
+        mockOAuthServerCallback();
+
+        await runWrangler("publish index.js");
+
+        expect(std.out).toMatchInlineSnapshot(`
+          "Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should not throw an error if 'CLOUDFLARE_ACCOUNT_ID' & 'CLOUDFLARE_API_TOKEN' are in scope", async () => {
+        process.env = {
+          CLOUDFLARE_API_TOKEN: "hunter2",
+          CLOUDFLARE_ACCOUNT_ID: "some-account-id",
+        };
+        setIsTTY(false);
+        writeWranglerToml();
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest();
+        mockOAuthServerCallback();
+        mockGetMemberships({
+          success: true,
+          result: [],
+        });
+
+        await runWrangler("publish index.js");
+
+        expect(std.out).toMatchInlineSnapshot(`
+          "Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should throw an error in non-TTY & there is more than one account associated with API token", async () => {
+        setIsTTY(false);
+        process.env = {
+          CLOUDFLARE_API_TOKEN: "hunter2",
+          CLOUDFLARE_ACCOUNT_ID: undefined,
+        };
+        writeWranglerToml({
+          account_id: undefined,
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest();
+        mockOAuthServerCallback();
+        mockGetMemberships({
+          success: true,
+          result: [
+            { id: "IG-88", account: { id: "1701", name: "enterprise" } },
+            { id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+          ],
+        });
+
+        await expect(runWrangler("publish index.js")).rejects
+          .toMatchInlineSnapshot(`
+                [Error: More than one account available but unable to select one in non-interactive mode.
+                Please set the appropriate \`account_id\` in your \`wrangler.toml\` file.
+                Available accounts are ("<name>" - "<id>"):
+                  "enterprise" - "1701")
+                  "enterprise-nx" - "nx01")]
+              `);
+      });
+
+      it("should throw error in non-TTY if 'CLOUDFLARE_API_TOKEN' is missing", async () => {
+        setIsTTY(false);
+        writeWranglerToml({
+          account_id: undefined,
+        });
+        process.env = {
+          CLOUDFLARE_API_TOKEN: undefined,
+          CLOUDFLARE_ACCOUNT_ID: "badwolf",
+        };
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest();
+        mockOAuthServerCallback();
+        mockGetMemberships({
+          success: true,
+          result: [
+            { id: "IG-88", account: { id: "1701", name: "enterprise" } },
+            { id: "R2-D2", account: { id: "nx01", name: "enterprise-nx" } },
+          ],
+        });
+
+        await expect(runWrangler("publish index.js")).rejects.toThrowError();
+
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.
+
+          "
+        `);
+      });
+      it("should throw error with no account ID provided and no members retrieved", async () => {
+        setIsTTY(false);
+        writeWranglerToml({
+          account_id: undefined,
+        });
+        process.env = {
+          CLOUDFLARE_API_TOKEN: "picard",
+          CLOUDFLARE_ACCOUNT_ID: undefined,
+        };
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest();
+        mockOAuthServerCallback();
+        mockGetMemberships({
+          success: false,
+          result: [],
+        });
+
+        await expect(runWrangler("publish index.js")).rejects.toThrowError();
+
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] Failed to automatically retrieve account IDs for the logged in user. In a non-interactive environment, it is mandatory to specify an account ID, either by assigning its value to CLOUDFLARE_ACCOUNT_ID, or as \`account_id\` in your \`wrangler.toml\` file.
+
+          "
+        `);
+      });
+    });
+  });
+
   describe("environments", () => {
     it("should use legacy environments by default", async () => {
       writeWranglerToml({ env: { "some-env": {} } });
@@ -106,14 +339,18 @@ describe("publish", () => {
         `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`
-          "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.
+          "▲ [WARNING] 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.
+
+                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]
-              \`\`\`
           "
         `);
       });
@@ -163,14 +400,21 @@ describe("publish", () => {
         mockUploadWorkerRequest({
           legacyEnv: false,
         });
-        await runWrangler("publish index.js");
+        await runWrangler("publish index.js --legacy-env false");
         expect(std.out).toMatchInlineSnapshot(`
           "Uploaded test-name (TIMINGS)
           Published test-name (TIMINGS)
             test-name.test-sub-domain.workers.dev"
         `);
         expect(std.err).toMatchInlineSnapshot(`""`);
-        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`
+          "▲ [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.
+
+          "
+        `);
       });
 
       it("publishes as an environment when provided", async () => {
@@ -188,7 +432,14 @@ describe("publish", () => {
             some-env.test-name.test-sub-domain.workers.dev"
         `);
         expect(std.err).toMatchInlineSnapshot(`""`);
-        expect(std.warn).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`
+          "▲ [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.
+
+          "
+        `);
       });
     });
   });
@@ -237,6 +488,116 @@ describe("publish", () => {
       await runWrangler("publish ./index");
     });
 
+    it("should publish to a route with a pattern/{zone_id|zone_name} combo", async () => {
+      writeWranglerToml({
+        routes: [
+          "some-example.com/some-route/*",
+          { pattern: "*a-boring-website.com", zone_id: "54sdf7fsda" },
+          {
+            pattern: "*another-boring-website.com",
+            zone_name: "some-zone.com",
+          },
+          { pattern: "example.com/some-route/*", zone_id: "JGHFHG654gjcj" },
+          "more-examples.com/*",
+        ],
+      });
+      writeWorkerSource();
+      mockUpdateWorkerRequest({ enabled: false });
+      mockUploadWorkerRequest({ expectedType: "esm" });
+      mockPublishRoutesRequest({
+        routes: [
+          "some-example.com/some-route/*",
+          { pattern: "*a-boring-website.com", zone_id: "54sdf7fsda" },
+          {
+            pattern: "*another-boring-website.com",
+            zone_name: "some-zone.com",
+          },
+          { pattern: "example.com/some-route/*", zone_id: "JGHFHG654gjcj" },
+          "more-examples.com/*",
+        ],
+      });
+      await runWrangler("publish ./index");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "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": "",
+        }
+      `);
+    });
+
+    it("should publish to a route with a pattern/{zone_id|zone_name} combo (service environments)", async () => {
+      writeWranglerToml({
+        env: {
+          staging: {
+            routes: [
+              "some-example.com/some-route/*",
+              { pattern: "*a-boring-website.com", zone_id: "54sdf7fsda" },
+              {
+                pattern: "*another-boring-website.com",
+                zone_name: "some-zone.com",
+              },
+              { pattern: "example.com/some-route/*", zone_id: "JGHFHG654gjcj" },
+              "more-examples.com/*",
+            ],
+          },
+        },
+      });
+      mockSubDomainRequest();
+      writeWorkerSource();
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "staging",
+        legacyEnv: false,
+      });
+      mockUploadWorkerRequest({
+        expectedType: "esm",
+        env: "staging",
+        legacyEnv: false,
+      });
+      mockPublishRoutesRequest({
+        routes: [
+          "some-example.com/some-route/*",
+          { pattern: "*a-boring-website.com", zone_id: "54sdf7fsda" },
+          {
+            pattern: "*another-boring-website.com",
+            zone_name: "some-zone.com",
+          },
+          { pattern: "example.com/some-route/*", zone_id: "JGHFHG654gjcj" },
+          "more-examples.com/*",
+        ],
+        env: "staging",
+        legacyEnv: false,
+      });
+      await runWrangler("publish ./index --legacy-env false --env staging");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "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:
+
+            - 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 () => {
       writeWranglerToml({
         routes: ["example.com/some-route/*"],
@@ -368,13 +729,16 @@ describe("publish", () => {
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - DEPRECATION: \\"build.upload.main\\":
-            Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-            Then add the top level \`main\` field to your configuration file:
-            \`\`\`
-            main = \\"dist/index.js\\"
-            \`\`\`"
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - Deprecation: \\"build.upload.main\\":
+              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+              Then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"dist/index.js\\"
+              \`\`\`
+
+        "
       `);
     });
 
@@ -400,15 +764,19 @@ describe("publish", () => {
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing ../wrangler.toml configuration:
-          - DEPRECATION: \\"build.upload.main\\":
-            Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
-            Then add the top level \`main\` field to your configuration file:
-            \`\`\`
-            main = \\"foo/index.js\\"
-            \`\`\`
-          - DEPRECATION: \\"build.upload.dir\\":
-            Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the Worker."
+        "▲ [WARNING] Processing ../wrangler.toml configuration:
+
+            - Deprecation: \\"build.upload.main\\":
+              Delete the \`build.upload.main\` and \`build.upload.dir\` fields.
+              Then add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"foo/index.js\\"
+              \`\`\`
+            - Deprecation: \\"build.upload.dir\\":
+              Use the top level \\"main\\" field or a command-line argument to specify the entry-point for the
+          Worker.
+
+        "
       `);
     });
 
@@ -544,17 +912,32 @@ export default{
                 - \\"site.bucket\\" is a required field."
             `);
 
-      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.out).toMatchInlineSnapshot(`
+        "
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - \\"site.bucket\\" is a required field.
+        "X [ERROR] Processing wrangler.toml configuration:
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+            - \\"site.bucket\\" is a required field.
+
+        "
+      `);
+      expect(normalizeSlashes(std.warn)).toMatchInlineSnapshot(`
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - Because you've defined a [site] configuration, we're defaulting to \\"workers-site\\" for the
+          deprecated \`site.entry-point\`field.
+              Add the top level \`main\` field to your configuration file:
+              \`\`\`
+              main = \\"workers-site/index.js\\"
+              \`\`\`
+
+        "
       `);
-      expect(std.warn).toMatchInlineSnapshot(`""`);
     });
 
-    it("should error if there is a `site.entry-point` configuration", async () => {
+    it("should warn if there is a `site.entry-point` configuration", async () => {
       const assets = [
         { filePath: "assets/file-1.txt", content: "Content of file-1" },
         { filePath: "assets/file-2.txt", content: "Content of file-2" },
@@ -577,52 +960,35 @@ export default{
       mockListKVNamespacesRequest(kvNamespace);
       mockKeyListRequest(kvNamespace.id, []);
       mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+      await runWrangler("publish ./index.js");
+
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
 
-      await expect(runWrangler("publish ./index.js")).rejects
-        .toThrowErrorMatchingInlineSnapshot(`
-              "Processing wrangler.toml configuration:
-                - DEPRECATION: \\"site.entry-point\\":
-                  The \`site.entry-point\` config field is no longer used.
-                  The entry-point should be specified via the command line or the \`main\` config field."
-            `);
-
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - DEPRECATION: \\"site.entry-point\\":
-            The \`site.entry-point\` config field is no longer used.
-            The entry-point should be specified via the command line or the \`main\` config field.
-
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
-      `);
-      expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - Unexpected fields found in site field: \\"entry-point\\""
-      `);
-    });
-
-    it("should error if there is no entry-point specified", async () => {
-      writeWranglerToml();
-      writeWorkerSource();
-      mockUploadWorkerRequest();
-      mockSubDomainRequest();
-      await expect(
-        runWrangler("publish")
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field."`
-      );
-
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      expect(std.err).toMatchInlineSnapshot(`
-        "Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field.
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
+          file:
+              \`\`\`
+              main = \\"index.js\\"
+              \`\`\`
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        ",
+        }
       `);
     });
-  });
 
-  describe("asset upload", () => {
-    it("should upload all the files in the directory specified by `config.site.bucket`", async () => {
+    it("should resolve site.entry-point relative to wrangler.toml", async () => {
       const assets = [
         { filePath: "assets/file-1.txt", content: "Content of file-1" },
         { filePath: "assets/file-2.txt", content: "Content of file-2" },
@@ -631,47 +997,142 @@ export default{
         title: "__test-name-workers_sites_assets",
         id: "__test-name-workers_sites_assets-id",
       };
+      fs.mkdirSync("my-site");
+      process.chdir("my-site");
       writeWranglerToml({
-        main: "./index.js",
         site: {
           bucket: "assets",
+          "entry-point": "my-entry",
         },
       });
-      writeWorkerSource();
+      fs.mkdirSync("my-entry");
+      fs.writeFileSync("my-entry/index.js", "export default {}");
       writeAssets(assets);
+      process.chdir("..");
       mockUploadWorkerRequest();
       mockSubDomainRequest();
       mockListKVNamespacesRequest(kvNamespace);
       mockKeyListRequest(kvNamespace.id, []);
       mockUploadAssetsToKVRequest(kvNamespace.id, assets);
-      await runWrangler("publish");
+      await runWrangler("publish --config ./my-site/wrangler.toml");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(normalizeSlashes(std.warn)).toMatchInlineSnapshot(`
+        "▲ [WARNING] Processing my-site/wrangler.toml configuration:
+
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
+          file:
+              \`\`\`
+              main = \\"my-entry/index.js\\"
+              \`\`\`
+
+        "
+      `);
     });
 
-    it("when using a service worker type, it should add an asset manifest as a text_blob, and bind to a namespace", async () => {
-      const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
-      ];
-      const kvNamespace = {
-        title: "__test-name-workers_sites_assets",
-        id: "__test-name-workers_sites_assets-id",
-      };
+    it("should error if both main and site.entry-point are specified", async () => {
       writeWranglerToml({
-        main: "./index.js",
+        main: "some-entry",
         site: {
-          bucket: "assets",
+          bucket: "some-bucket",
+          "entry-point": "./index.js",
+        },
+      });
+
+      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."
+            `);
+    });
+
+    it("should error if there is no entry-point specified", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      mockUploadWorkerRequest();
+      mockSubDomainRequest();
+      await expect(
+        runWrangler("publish")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field."`
+      );
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
+      expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field.
+
+        "
+      `);
+    });
+  });
+
+  describe("asset upload", () => {
+    it("should upload all the files in the directory specified by `config.site.bucket`", async () => {
+      const assets = [
+        { filePath: "assets/file-1.txt", content: "Content of file-1" },
+        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+      ];
+      const kvNamespace = {
+        title: "__test-name-workers_sites_assets",
+        id: "__test-name-workers_sites_assets-id",
+      };
+      writeWranglerToml({
+        main: "./index.js",
+        site: {
+          bucket: "assets",
+        },
+      });
+      writeWorkerSource();
+      writeAssets(assets);
+      mockUploadWorkerRequest();
+      mockSubDomainRequest();
+      mockListKVNamespacesRequest(kvNamespace);
+      mockKeyListRequest(kvNamespace.id, []);
+      mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+      await runWrangler("publish");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("when using a service-worker type, it should add an asset manifest as a text_blob, and bind to a namespace", async () => {
+      const assets = [
+        { filePath: "assets/file-1.txt", content: "Content of file-1" },
+        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+      ];
+      const kvNamespace = {
+        title: "__test-name-workers_sites_assets",
+        id: "__test-name-workers_sites_assets-id",
+      };
+      writeWranglerToml({
+        main: "./index.js",
+        site: {
+          bucket: "assets",
         },
       });
       writeWorkerSource({ type: "sw" });
@@ -703,10 +1164,10 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -753,10 +1214,10 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -801,10 +1262,10 @@ export default{
       await runWrangler("publish --env some-env --legacy-env false");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (some-env) (TIMINGS)
         Published test-name (some-env) (TIMINGS)
@@ -850,10 +1311,10 @@ export default{
       await runWrangler("publish --env some-env --legacy-env true");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name-some-env (TIMINGS)
         Published test-name-some-env (TIMINGS)
@@ -894,10 +1355,10 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        skipping - already uploaded
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
+        "Reading assets/file-1.txt...
+        Skipping - already uploaded.
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -935,8 +1396,8 @@ export default{
       await runWrangler("publish --site-include file-1.txt");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -974,8 +1435,8 @@ export default{
       await runWrangler("publish --site-exclude file-2.txt");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1014,8 +1475,8 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1054,8 +1515,8 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1094,8 +1555,8 @@ export default{
       await runWrangler("publish --site-include file-1.txt");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1134,8 +1595,8 @@ export default{
       await runWrangler("publish --site-exclude file-2.txt");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        uploading as assets/file-1.2ca234f380.txt...
+        "Reading assets/file-1.txt...
+        Uploading as assets/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1176,8 +1637,8 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/directory-1/file-1.txt...
-        uploading as assets/directory-1/file-1.2ca234f380.txt...
+        "Reading assets/directory-1/file-1.txt...
+        Uploading as assets/directory-1/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1222,8 +1683,8 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/.well-known/file-2.txt...
-        uploading as assets/.well-known/file-2.5938485188.txt...
+        "Reading assets/.well-known/file-2.txt...
+        Uploading as assets/.well-known/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1269,13 +1730,15 @@ export default{
       );
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/large-file.txt...
-        uploading as assets/large-file.0ea0637a45.txt..."
+        "Reading assets/large-file.txt...
+        Uploading as assets/large-file.0ea0637a45.txt...
+
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
       `);
       expect(std.err).toMatchInlineSnapshot(`
-        "File assets/too-large-file.txt is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits
+        "X [ERROR] File assets/too-large-file.txt is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
       `);
     });
 
@@ -1307,13 +1770,15 @@ export default{
         `"The asset path key \\"assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\","`
       );
 
-      expect(std.out).toMatchInlineSnapshot(
-        `"reading assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.txt..."`
-      );
+      expect(std.out).toMatchInlineSnapshot(`
+        "Reading assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.txt...
+
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "The asset path key \\"assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\",
+        "X [ERROR] The asset path key \\"assets/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\",
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
       `);
     });
 
@@ -1359,12 +1824,12 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "reading assets/file-1.txt...
-        skipping - already uploaded
-        reading assets/file-2.txt...
-        uploading as assets/file-2.5938485188.txt...
-        deleting assets/file-3.somehash.txt from the asset store...
-        deleting assets/file-4.anotherhash.txt from the asset store...
+        "Reading assets/file-1.txt...
+        Skipping - already uploaded.
+        Reading assets/file-2.txt...
+        Uploading as assets/file-2.5938485188.txt...
+        Deleting assets/file-3.somehash.txt from the asset store...
+        Deleting assets/file-4.anotherhash.txt from the asset store...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1396,7 +1861,26 @@ export default{
         workers_dev: true,
       });
       writeWorkerSource();
-      mockUploadWorkerRequest();
+      mockUploadWorkerRequest({ available_on_subdomain: false });
+      mockSubDomainRequest();
+      mockUpdateWorkerRequest({ enabled: true });
+
+      await runWrangler("publish ./index");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should not try to enable the workers.dev domain if it has been enabled before", async () => {
+      writeWranglerToml({
+        workers_dev: true,
+      });
+      writeWorkerSource();
+      mockUploadWorkerRequest({ available_on_subdomain: true });
       mockSubDomainRequest();
 
       await runWrangler("publish ./index");
@@ -1426,6 +1910,25 @@ export default{
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
+    it("should not try to disable the workers.dev domain if it is not already available", async () => {
+      writeWranglerToml({
+        workers_dev: false,
+      });
+      writeWorkerSource();
+      mockSubDomainRequest("test-sub-domain", false);
+      mockUploadWorkerRequest({ available_on_subdomain: false });
+
+      // note the lack of a mock for the subdomain disable request
+
+      await runWrangler("publish ./index");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        No publish targets for test-name (TIMINGS)"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
     it("should disable the workers.dev domain if workers_dev is undefined but overwritten to `false` in environment", async () => {
       writeWranglerToml({
         env: {
@@ -1931,7 +2434,7 @@ export default{
 
       await runWrangler("publish index.js");
       expect(std.out).toMatchInlineSnapshot(`
-        "running: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\"
+        "Running custom build: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\"
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev"
@@ -1955,7 +2458,7 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-          "running: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js
+          "Running custom build: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js
           Uploaded test-name (TIMINGS)
           Published test-name (TIMINGS)
             test-name.test-sub-domain.workers.dev"
@@ -1978,21 +2481,499 @@ export default{
       ).rejects.toThrowErrorMatchingInlineSnapshot(
         `"Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\""`
       );
-      expect(std.out).toMatchInlineSnapshot(
-        `"running: node -e \\"console.log('custom build');\\""`
-      );
+      expect(std.out).toMatchInlineSnapshot(`
+        "Running custom build: node -e \\"console.log('custom build');\\"
+
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\"
+        "X [ERROR] Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\"
+
+        "
+      `);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should minify the script when `--minify` is true (sw)", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+      });
+      fs.writeFileSync(
+        "./index.js",
+        `export
+        default {
+          fetch() {
+            return new Response(     "hello Cpt Picard"     )
+                  }
+            }
+        `
+      );
+
+      mockUploadWorkerRequest({
+        expectedEntry: 'fetch(){return new Response("hello Cpt Picard")',
+      });
+
+      mockSubDomainRequest();
+      await runWrangler("publish index.js --minify");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should minify the script when `minify` in config is true (esm)", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+        legacy_env: false,
+        env: {
+          testEnv: {
+            minify: true,
+          },
+        },
+      });
+      fs.writeFileSync(
+        "./index.js",
+        `export
+        default {
+          fetch() {
+            return new Response(     "hello Cpt Picard"     )
+                  }
+            }
+        `
+      );
+
+      mockUploadWorkerRequest({
+        env: "testEnv",
+        expectedType: "esm",
+        legacyEnv: false,
+        expectedEntry: `fetch(){return new Response("hello Cpt Picard")`,
+      });
+
+      mockSubDomainRequest();
+      await runWrangler("publish -e testEnv index.js");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (testEnv) (TIMINGS)
+        Published test-name (testEnv) (TIMINGS)
+          testEnv.test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+  });
+
+  describe("durable object migrations", () => {
+    it("should warn when you try to publish durable objects without migrations", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [{ name: "SOMENAME", class_name: "SomeClass" }],
+        },
+      });
+      fs.writeFileSync(
+        "index.js",
+        `export class SomeClass{}; export default {};`
+      );
+      mockSubDomainRequest();
+      mockUploadWorkerRequest();
+      await runWrangler("publish index.js");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass), but no [migrations] for them. This may not work as expected until you add a [migrations] section to your wrangler.toml. Refer to https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml for more details.
+
+        "
+      `);
+    });
+
+    it("does not warn if all the durable object bindings are to external classes", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            {
+              name: "SOMENAME",
+              class_name: "SomeClass",
+              script_name: "some-script",
+            },
+          ],
+        },
+      });
+      fs.writeFileSync(
+        "index.js",
+        `export class SomeClass{}; export default {};`
+      );
+      mockSubDomainRequest();
+      mockUploadWorkerRequest();
+      await runWrangler("publish index.js");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should publish all migrations on first publish", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            { name: "SOMENAME", class_name: "SomeClass" },
+            { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+          ],
+        },
+        migrations: [
+          { tag: "v1", new_classes: ["SomeClass"] },
+          { tag: "v2", new_classes: ["SomeOtherClass"] },
+        ],
+      });
+      fs.writeFileSync(
+        "index.js",
+        `export class SomeClass{}; export class SomeOtherClass{}; export default {};`
+      );
+      mockSubDomainRequest();
+      mockLegacyScriptData({ scripts: [] }); // no previously uploaded scripts at all
+      mockUploadWorkerRequest({
+        expectedMigrations: {
+          new_tag: "v2",
+          steps: [
+            { new_classes: ["SomeClass"] },
+            { new_classes: ["SomeOtherClass"] },
+          ],
+        },
+      });
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      await runWrangler("publish index.js");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
       `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
     });
+
+    it("should upload migrations past a previously uploaded tag", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            { name: "SOMENAME", class_name: "SomeClass" },
+            { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+          ],
+        },
+        migrations: [
+          { tag: "v1", new_classes: ["SomeClass"] },
+          { tag: "v2", new_classes: ["SomeOtherClass"] },
+        ],
+      });
+      fs.writeFileSync(
+        "index.js",
+        `export class SomeClass{}; export class SomeOtherClass{}; export default {};`
+      );
+      mockSubDomainRequest();
+      mockLegacyScriptData({
+        scripts: [{ id: "test-name", migration_tag: "v1" }],
+      });
+      mockUploadWorkerRequest({
+        expectedMigrations: {
+          old_tag: "v1",
+          new_tag: "v2",
+          steps: [
+            {
+              new_classes: ["SomeOtherClass"],
+            },
+          ],
+        },
+      });
+
+      await runWrangler("publish index.js");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not send migrations if they've all already been sent", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            { name: "SOMENAME", class_name: "SomeClass" },
+            { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+          ],
+        },
+        migrations: [
+          { tag: "v1", new_classes: ["SomeClass"] },
+          { tag: "v2", new_classes: ["SomeOtherClass"] },
+          { tag: "v3", new_classes: ["YetAnotherClass"] },
+        ],
+      });
+      fs.writeFileSync(
+        "index.js",
+        `export class SomeClass{}; export class SomeOtherClass{}; export class YetAnotherClass{}; export default {};`
+      );
+      mockSubDomainRequest();
+      mockLegacyScriptData({
+        scripts: [{ id: "test-name", migration_tag: "v3" }],
+      });
+      mockUploadWorkerRequest({
+        expectedMigrations: undefined,
+      });
+
+      await runWrangler("publish index.js");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "",
+        }
+      `);
+    });
+
+    describe("service environments", () => {
+      it("should publish all migrations on first publish", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              { name: "SOMENAME", class_name: "SomeClass" },
+              { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+            ],
+          },
+          migrations: [
+            { tag: "v1", new_classes: ["SomeClass"] },
+            { tag: "v2", new_classes: ["SomeOtherClass"] },
+          ],
+        });
+        fs.writeFileSync(
+          "index.js",
+          `export class SomeClass{}; export class SomeOtherClass{}; export default {};`
+        );
+        mockSubDomainRequest();
+        mockServiceScriptData({}); // no scripts at all
+        mockUploadWorkerRequest({
+          legacyEnv: false,
+          expectedMigrations: {
+            new_tag: "v2",
+            steps: [
+              { new_classes: ["SomeClass"] },
+              { new_classes: ["SomeOtherClass"] },
+            ],
+          },
+        });
+
+        await runWrangler("publish index.js --legacy-env false");
+        expect(std.out).toMatchInlineSnapshot(`
+          "Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`
+          "▲ [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.
+
+          "
+        `);
+      });
+
+      it("should publish all migrations on first publish (--env)", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              { name: "SOMENAME", class_name: "SomeClass" },
+              { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+            ],
+          },
+          env: {
+            xyz: {
+              durable_objects: {
+                bindings: [
+                  { name: "SOMENAME", class_name: "SomeClass" },
+                  { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+                ],
+              },
+            },
+          },
+          migrations: [
+            { tag: "v1", new_classes: ["SomeClass"] },
+            { tag: "v2", new_classes: ["SomeOtherClass"] },
+          ],
+        });
+        fs.writeFileSync(
+          "index.js",
+          `export class SomeClass{}; export class SomeOtherClass{}; export default {};`
+        );
+        mockSubDomainRequest();
+        mockServiceScriptData({ env: "xyz" }); // no scripts at all
+        mockUploadWorkerRequest({
+          legacyEnv: false,
+          env: "xyz",
+          expectedMigrations: {
+            new_tag: "v2",
+            steps: [
+              { new_classes: ["SomeClass"] },
+              { new_classes: ["SomeOtherClass"] },
+            ],
+          },
+        });
+
+        await runWrangler("publish index.js --legacy-env false --env xyz");
+        expect(std.out).toMatchInlineSnapshot(`
+          "Uploaded test-name (xyz) (TIMINGS)
+          Published test-name (xyz) (TIMINGS)
+            xyz.test-name.test-sub-domain.workers.dev"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`
+          "▲ [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.
+
+          "
+        `);
+      });
+
+      it("should use a script's current migration tag when publishing migrations", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              { name: "SOMENAME", class_name: "SomeClass" },
+              { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+            ],
+          },
+          migrations: [
+            { tag: "v1", new_classes: ["SomeClass"] },
+            { tag: "v2", new_classes: ["SomeOtherClass"] },
+          ],
+        });
+        fs.writeFileSync(
+          "index.js",
+          `export class SomeClass{}; export class SomeOtherClass{}; export default {};`
+        );
+        mockSubDomainRequest();
+        mockServiceScriptData({
+          script: { id: "test-name", migration_tag: "v1" },
+        });
+        mockUploadWorkerRequest({
+          legacyEnv: false,
+          expectedMigrations: {
+            old_tag: "v1",
+            new_tag: "v2",
+            steps: [
+              {
+                new_classes: ["SomeOtherClass"],
+              },
+            ],
+          },
+        });
+
+        await runWrangler("publish index.js --legacy-env false");
+        expect(std).toMatchInlineSnapshot(`
+          Object {
+            "debug": "",
+            "err": "",
+            "out": "Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            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
+            the future. DO NOT USE IN PRODUCTION.
+
+          ",
+          }
+        `);
+      });
+
+      it("should use an environment's current migration tag when publishing migrations", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              { name: "SOMENAME", class_name: "SomeClass" },
+              { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+            ],
+          },
+          env: {
+            xyz: {
+              durable_objects: {
+                bindings: [
+                  { name: "SOMENAME", class_name: "SomeClass" },
+                  { name: "SOMEOTHERNAME", class_name: "SomeOtherClass" },
+                ],
+              },
+            },
+          },
+          migrations: [
+            { tag: "v1", new_classes: ["SomeClass"] },
+            { tag: "v2", new_classes: ["SomeOtherClass"] },
+          ],
+        });
+        fs.writeFileSync(
+          "index.js",
+          `export class SomeClass{}; export class SomeOtherClass{}; export default {};`
+        );
+        mockSubDomainRequest();
+        mockServiceScriptData({
+          script: { id: "test-name", migration_tag: "v1" },
+          env: "xyz",
+        });
+        mockUploadWorkerRequest({
+          legacyEnv: false,
+          env: "xyz",
+          expectedMigrations: {
+            old_tag: "v1",
+            new_tag: "v2",
+            steps: [
+              {
+                new_classes: ["SomeOtherClass"],
+              },
+            ],
+          },
+        });
+
+        await runWrangler("publish index.js --legacy-env false --env xyz");
+        expect(std).toMatchInlineSnapshot(`
+          Object {
+            "debug": "",
+            "err": "",
+            "out": "Uploaded test-name (xyz) (TIMINGS)
+          Published test-name (xyz) (TIMINGS)
+            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
+            the future. DO NOT USE IN PRODUCTION.
+
+          ",
+          }
+        `);
+      });
+    });
   });
 
   describe("bindings", () => {
     it("should allow bindings with different names", async () => {
       writeWranglerToml({
+        migrations: [
+          {
+            tag: "v1",
+            new_classes: ["SomeDurableObject", "AnotherDurableObject"],
+          },
+        ],
         durable_objects: {
           bindings: [
             {
@@ -2041,6 +3022,10 @@ export default{
           WASM_MODULE_ONE: "./some_wasm.wasm",
           WASM_MODULE_TWO: "./more_wasm.wasm",
         },
+        data_blobs: {
+          DATA_BLOB_ONE: "./some-data-blob.bin",
+          DATA_BLOB_TWO: "./more-data-blob.bin",
+        },
       });
 
       writeWorkerSource({ type: "sw" });
@@ -2052,6 +3037,9 @@ export default{
       fs.writeFileSync("./some_wasm.wasm", "some wasm");
       fs.writeFileSync("./more_wasm.wasm", "more wasm");
 
+      fs.writeFileSync("./some-data-blob.bin", "some data");
+      fs.writeFileSync("./more-data-blob.bin", "more data");
+
       mockUploadWorkerRequest({
         expectedType: "sw",
         expectedBindings: [
@@ -2105,6 +3093,8 @@ export default{
           },
           { name: "TEXT_BLOB_ONE", part: "TEXT_BLOB_ONE", type: "text_blob" },
           { name: "TEXT_BLOB_TWO", part: "TEXT_BLOB_TWO", type: "text_blob" },
+          { name: "DATA_BLOB_ONE", part: "DATA_BLOB_ONE", type: "data_blob" },
+          { name: "DATA_BLOB_TWO", part: "DATA_BLOB_TWO", type: "data_blob" },
           {
             data: { some: { unsafe: "thing" } },
             name: "UNSAFE_BINDING_ONE",
@@ -2118,6 +3108,7 @@ export default{
         ],
       });
       mockSubDomainRequest();
+      mockLegacyScriptData({ scripts: [] });
 
       await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
       expect(std.out).toMatchInlineSnapshot(`
@@ -2127,8 +3118,11 @@ export default{
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - \\"unsafe\\" fields are experimental and may change or break at any time."
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
       `);
     });
 
@@ -2188,6 +3182,10 @@ export default{
           WASM_MODULE_ONE: "./some_wasm.wasm",
           CONFLICTING_NAME_THREE: "./more_wasm.wasm",
         },
+        data_blobs: {
+          DATA_BLOB_ONE: "./some_data.bin",
+          CONFLICTING_NAME_THREE: "./more_data.bin",
+        },
       });
 
       writeWorkerSource({ type: "sw" });
@@ -2204,26 +3202,34 @@ export default{
               [Error: Processing wrangler.toml configuration:
                 - 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, and WASM Module 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.
                 - Bindings must have unique names, so that they can all be referenced in the worker.
                   Please change your bindings to have unique names.]
             `);
-      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.out).toMatchInlineSnapshot(`
+        "
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - 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, and WASM Module bindings.
-          - CONFLICTING_NAME_FOUR assigned to 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.
+        "X [ERROR] Processing wrangler.toml configuration:
+
+            - 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.
+            - Bindings must have unique names, so that they can all be referenced in the worker.
+              Please change your bindings to have unique names.
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
       `);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - \\"unsafe\\" fields are experimental and may change or break at any time."
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
       `);
     });
 
@@ -2271,7 +3277,7 @@ export default{
             },
           ],
         },
-        // text_blobs, vars, and wasm_modules are fine because they're object literals,
+        // text_blobs, vars, wasm_modules and data_blobs are fine because they're object literals,
         // and by definition cannot have two keys of the same name
         //
         // text_blobs: {
@@ -2300,21 +3306,28 @@ export default{
                 - Bindings must have unique names, so that they can all be referenced in the worker.
                   Please change your bindings to have unique names.]
             `);
-      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.out).toMatchInlineSnapshot(`
+        "
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - 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_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.
+        "X [ERROR] Processing wrangler.toml configuration:
+
+            - 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_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.
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
       `);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - \\"unsafe\\" fields are experimental and may change or break at any time."
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
       `);
     });
 
@@ -2400,6 +3413,10 @@ export default{
           WASM_MODULE_ONE: "./some_wasm.wasm",
           CONFLICTING_NAME_THREE: "./more_wasm.wasm",
         },
+        data_blobs: {
+          DATA_BLOB_ONE: "./some_data.bin",
+          CONFLICTING_NAME_THREE: "./more_data.bin",
+        },
       });
 
       writeWorkerSource({ type: "sw" });
@@ -2417,29 +3434,37 @@ export default{
                 - 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, and WASM Module 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_UNSAFE_NAME assigned to multiple Unsafe bindings.
                 - Bindings must have unique names, so that they can all be referenced in the worker.
                   Please change your bindings to have unique names.]
             `);
-      expect(std.out).toMatchInlineSnapshot(`""`);
+      expect(std.out).toMatchInlineSnapshot(`
+        "
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      `);
       expect(std.err).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - 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, and WASM Module bindings.
-          - CONFLICTING_NAME_FOUR assigned to R2 Bucket, Text Blob, and Unsafe 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.
-
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "X [ERROR] Processing wrangler.toml configuration:
+
+            - 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_UNSAFE_NAME assigned to multiple Unsafe bindings.
+            - Bindings must have unique names, so that they can all be referenced in the worker.
+              Please change your bindings to have unique names.
+
+        "
       `);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - \\"unsafe\\" fields are experimental and may change or break at any time."
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
       `);
     });
 
@@ -2486,12 +3511,15 @@ export default{
         ).rejects.toThrowErrorMatchingInlineSnapshot(
           `"You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code"`
         );
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.err).toMatchInlineSnapshot(`
-                  "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
+          "X [ERROR] You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
 
-                  %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
-              `);
+          "
+        `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
 
@@ -2612,14 +3640,17 @@ export default{
         await expect(
           runWrangler("publish index.js")
         ).rejects.toThrowErrorMatchingInlineSnapshot(
-          `"You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[build.upload.rules]\` in your wrangler.toml"`
+          `"You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml"`
         );
-        expect(std.out).toMatchInlineSnapshot(`""`);
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
         expect(std.err).toMatchInlineSnapshot(`
-                  "You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[build.upload.rules]\` in your wrangler.toml
+          "X [ERROR] You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
 
-                  %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
-              `);
+          "
+        `);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
 
@@ -2667,6 +3698,109 @@ export default{
       });
     });
 
+    describe("[data_blobs]", () => {
+      it("should be able to define data blobs for service-worker format workers", async () => {
+        writeWranglerToml({
+          data_blobs: {
+            TESTDATABLOBNAME: "./path/to/data.bin",
+          },
+        });
+        writeWorkerSource({ type: "sw" });
+        fs.mkdirSync("./path/to", { recursive: true });
+        fs.writeFileSync("./path/to/data.bin", "SOME DATA CONTENT");
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: { TESTDATABLOBNAME: "SOME DATA CONTENT" },
+          expectedBindings: [
+            {
+              name: "TESTDATABLOBNAME",
+              part: "TESTDATABLOBNAME",
+              type: "data_blob",
+            },
+          ],
+        });
+        mockSubDomainRequest();
+        await runWrangler("publish index.js");
+        expect(std.out).toMatchInlineSnapshot(`
+                  "Uploaded test-name (TIMINGS)
+                  Published test-name (TIMINGS)
+                    test-name.test-sub-domain.workers.dev"
+              `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should error when defining data blobs for modules format workers", async () => {
+        writeWranglerToml({
+          data_blobs: {
+            TESTDATABLOBNAME: "./path/to/data.bin",
+          },
+        });
+        writeWorkerSource({ type: "esm" });
+        fs.mkdirSync("./path/to", { recursive: true });
+        fs.writeFileSync("./path/to/data.bin", "SOME DATA CONTENT");
+
+        await expect(
+          runWrangler("publish index.js")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml"`
+        );
+        expect(std.out).toMatchInlineSnapshot(`
+          "
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        `);
+        expect(std.err).toMatchInlineSnapshot(`
+          "X [ERROR] You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
+
+          "
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should resolve data blobs relative to the wrangler.toml file", async () => {
+        fs.mkdirSync("./path/to/and/the/path/to/", { recursive: true });
+        fs.writeFileSync(
+          "./path/to/wrangler.toml",
+          TOML.stringify({
+            compatibility_date: "2022-01-12",
+            name: "test-name",
+            data_blobs: {
+              TESTDATABLOBNAME: "./and/the/path/to/data.bin",
+            },
+          }),
+
+          "utf-8"
+        );
+
+        writeWorkerSource({ type: "sw" });
+        fs.writeFileSync(
+          "./path/to/and/the/path/to/data.bin",
+          "SOME DATA CONTENT"
+        );
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: { TESTDATABLOBNAME: "SOME DATA CONTENT" },
+          expectedBindings: [
+            {
+              name: "TESTDATABLOBNAME",
+              part: "TESTDATABLOBNAME",
+              type: "data_blob",
+            },
+          ],
+          expectedCompatibilityDate: "2022-01-12",
+        });
+        mockSubDomainRequest();
+        await runWrangler("publish index.js --config ./path/to/wrangler.toml");
+        expect(std.out).toMatchInlineSnapshot(`
+                  "Uploaded test-name (TIMINGS)
+                  Published test-name (TIMINGS)
+                    test-name.test-sub-domain.workers.dev"
+              `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+    });
+
     describe("[vars]", () => {
       it("should support json bindings", async () => {
         writeWranglerToml({
@@ -2736,9 +3870,16 @@ export default{
               },
             ],
           },
+          migrations: [{ tag: "v1", new_classes: ["ExampleDurableObject"] }],
         });
-        writeWorkerSource({ type: "esm" });
+        fs.writeFileSync(
+          "index.js",
+          `export class ExampleDurableObject {}; export default{};`
+        );
         mockSubDomainRequest();
+        mockLegacyScriptData({
+          scripts: [{ id: "test-name", migration_tag: "v1" }],
+        });
         mockUploadWorkerRequest({
           expectedBindings: [
             {
@@ -2805,9 +3946,16 @@ export default{
               },
             ],
           },
+          migrations: [{ tag: "v1", new_classes: ["ExampleDurableObject"] }],
         });
-        writeWorkerSource({ type: "esm" });
+        fs.writeFileSync(
+          "index.js",
+          `export class ExampleDurableObject {}; export default{};`
+        );
         mockSubDomainRequest();
+        mockLegacyScriptData({
+          scripts: [{ id: "test-name", migration_tag: "v1" }],
+        });
         mockUploadWorkerRequest({
           expectedType: "esm",
           expectedBindings: [
@@ -2829,7 +3977,7 @@ export default{
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
 
-      it("should error when detecting service workers implementing  durable objects", async () => {
+      it("should error when detecting a service-worker worker implementing durable objects", async () => {
         writeWranglerToml({
           durable_objects: {
             bindings: [
@@ -2845,7 +3993,7 @@ export default{
 
         await expect(runWrangler("publish index.js")).rejects
           .toThrowErrorMatchingInlineSnapshot(`
-                              "You seem to be trying to use Durable Objects in a Worker written with Service Worker syntax.
+                              "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:
@@ -2887,9 +4035,12 @@ export default{
               `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`
-                  "Processing wrangler.toml configuration:
-                    - \\"unsafe\\" fields are experimental and may change or break at any time."
-              `);
+          "▲ [WARNING] Processing wrangler.toml configuration:
+
+              - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+          "
+        `);
       });
       it("should warn if using unsafe bindings already handled by wrangler", async () => {
         writeWranglerToml({
@@ -2923,13 +4074,17 @@ export default{
               `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`
-                  "Processing wrangler.toml configuration:
-                    - \\"unsafe\\" fields are experimental and may change or break at any time.
-                    - \\"unsafe.bindings[0]\\": {\\"name\\":\\"my-binding\\",\\"type\\":\\"plain_text\\",\\"text\\":\\"text\\"}
-                      - The binding type \\"plain_text\\" is directly supported by wrangler.
-                        Consider migrating this unsafe binding to a format for 'plain_text' bindings that is supported by wrangler for optimal support.
-                        For more details, see https://developers.cloudflare.com/workers/cli-wrangler/configuration"
-              `);
+          "▲ [WARNING] Processing wrangler.toml configuration:
+
+              - \\"unsafe\\" fields are experimental and may change or break at any time.
+              - \\"unsafe.bindings[0]\\": {\\"name\\":\\"my-binding\\",\\"type\\":\\"plain_text\\",\\"text\\":\\"text\\"}
+                - The binding type \\"plain_text\\" is directly supported by wrangler.
+                  Consider migrating this unsafe binding to a format for 'plain_text' bindings that is
+            supported by wrangler for optimal support.
+                  For more details, see https://developers.cloudflare.com/workers/cli-wrangler/configuration
+
+          "
+        `);
       });
     });
   });
@@ -3024,14 +4179,19 @@ export default{
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`
-        "Processing wrangler.toml configuration:
-          - DEPRECATION: The \`build.upload.rules\` config field is no longer used, the rules should be specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration file, and add this:
-            \`\`\`
-            [[rules]]
-            type = \\"Text\\"
-            globs = [ \\"**/*.file\\" ]
-            fallthrough = true
-            \`\`\`"
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - Deprecation: The \`build.upload.rules\` config field is no longer used, the rules should be
+          specified via the \`rules\` config field. Delete the \`build.upload\` field from the configuration
+          file, and add this:
+              \`\`\`
+              [[rules]]
+              type = \\"Text\\"
+              globs = [ \\"**/*.file\\" ]
+              fallthrough = true
+              \`\`\`
+
+        "
       `);
     });
 
@@ -3123,8 +4283,12 @@ export default{
       );
       // and the warnings because fallthrough was not explicitly set
       expect(std.warn).toMatchInlineSnapshot(`
-        "The module rule at position 1 ({\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.other\\"]}) has the same type as a previous rule (at position 0, {\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.file\\"]}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow this one to also be used, or \`fallthrough = false\` to silence this warning.
-        The default module rule {\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.txt\\",\\"**/*.html\\"]} has the same type as a previous rule (at position 0, {\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.file\\"]}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow the default one to also be used, or \`fallthrough = false\` to silence this warning."
+        "▲ [WARNING] The module rule at position 1 ({\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.other\\"]}) has the same type as a previous rule (at position 0, {\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.file\\"]}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow this one to also be used, or \`fallthrough = false\` to silence this warning.
+
+
+        ▲ [WARNING] The default module rule {\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.txt\\",\\"**/*.html\\"]} has the same type as a previous rule (at position 0, {\\"type\\":\\"Text\\",\\"globs\\":[\\"**/*.file\\"]}). This rule will be ignored. To the previous rule, add \`fallthrough = true\` to allow the default one to also be used, or \`fallthrough = false\` to silence this warning.
+
+        "
       `);
     });
 
@@ -3187,93 +4351,215 @@ export default{
           test-name.test-sub-domain.workers.dev"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(
-        `"Deprecation warning: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"text.file\\" with \\"./text.file\\";"`
+      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\\";
+
+        "
+      `);
+    });
+
+    it("should work with legacy module specifiers, with a deprecation warning (2)", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "./index.js",
+        `import WASM from 'index.wasm'; export default {};`
+      );
+      fs.writeFileSync("./index.wasm", "SOME WASM CONTENT");
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({
+        expectedModules: {
+          "./94b240d0d692281e6467aa42043986e5c7eea034-index.wasm":
+            "SOME WASM CONTENT",
+        },
+      });
+      await runWrangler("publish index.js");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          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 \\"index.wasm\\" with \\"./index.wasm\\";
+
+        "
+      `);
+    });
+
+    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
+
+      fs.writeFileSync(
+        "./index.js",
+        `import inner from './inner/index.js'; export default {};`
+      );
+      fs.mkdirSync("./inner", { recursive: true });
+      fs.writeFileSync("./inner/index.js", `export default 123`);
+      mockSubDomainRequest();
+      mockUploadWorkerRequest();
+
+      await runWrangler(
+        "publish index.js --compatibility-date 2022-03-17 --name test-name"
       );
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
     });
   });
 
-  it("should work with legacy module specifiers, with a deprecation warning (2)", async () => {
-    writeWranglerToml();
-    fs.writeFileSync(
-      "./index.js",
-      `import WASM from 'index.wasm'; export default {};`
-    );
-    fs.writeFileSync("./index.wasm", "SOME WASM CONTENT");
-    mockSubDomainRequest();
-    mockUploadWorkerRequest({
-      expectedModules: {
-        "./94b240d0d692281e6467aa42043986e5c7eea034-index.wasm":
-          "SOME WASM CONTENT",
-      },
+  describe("tsconfig", () => {
+    it("should use compilerOptions.paths to resolve modules", async () => {
+      writeWranglerToml({
+        main: "index.ts",
+      });
+      fs.writeFileSync(
+        "index.ts",
+        `import { foo } from '~lib/foo'; export default { fetch() { return new Response(foo)} }`
+      );
+      fs.mkdirSync("lib", { recursive: true });
+      fs.writeFileSync("lib/foo.ts", `export const foo = 123;`);
+      fs.writeFileSync(
+        "tsconfig.json",
+        JSON.stringify({
+          compilerOptions: {
+            baseUrl: ".",
+            paths: {
+              "~lib/*": ["lib/*"],
+            },
+          },
+        })
+      );
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({
+        expectedEntry: "var foo = 123;", // make sure it imported the module correctly
+      });
+      await runWrangler("publish index.ts");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should output to target es2020 even if tsconfig says otherwise", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      fs.writeFileSync(
+        "tsconfig.json",
+        JSON.stringify({
+          compilerOptions: {
+            target: "es5",
+            module: "commonjs",
+          },
+        })
+      );
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({
+        expectedEntry: "export {", // just check that the export is preserved
+      });
+      await runWrangler("publish index.js"); // this would throw if we tried to compile with es5
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "",
+        }
+      `);
+    });
+  });
+
+  describe("--outdir", () => {
+    it("should generate built assets at --outdir if specified", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest();
+      await runWrangler("publish index.js --outdir some-dir");
+      expect(fs.existsSync("some-dir/index.js")).toBe(true);
+      expect(fs.existsSync("some-dir/index.js.map")).toBe(true);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "",
+        }
+      `);
     });
-    await runWrangler("publish index.js");
-    expect(std.out).toMatchInlineSnapshot(`
-      "Uploaded test-name (TIMINGS)
-      Published test-name (TIMINGS)
-        test-name.test-sub-domain.workers.dev"
-    `);
-    expect(std.err).toMatchInlineSnapshot(`""`);
-    expect(std.warn).toMatchInlineSnapshot(
-      `"Deprecation warning: detected a legacy module import in \\"./index.js\\". This will stop working in the future. Replace references to \\"index.wasm\\" with \\"./index.wasm\\";"`
-    );
   });
 
-  it("should 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
+  describe("--dry-run", () => {
+    it("should not publish the worker if --dry-run is specified", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      await runWrangler("publish index.js --dry-run");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "",
+        }
+      `);
+    });
+  });
 
-    fs.writeFileSync(
-      "./index.js",
-      `import inner from './inner/index.js'; export default {};`
-    );
-    fs.mkdirSync("./inner", { recursive: true });
-    fs.writeFileSync("./inner/index.js", `export default 123`);
-    mockSubDomainRequest();
-    mockUploadWorkerRequest();
+  describe("--node-compat", () => {
+    it("should warn when using node compatibility mode", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      await runWrangler("publish index.js --node-compat --dry-run");
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "▲ [WARNING] Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+
+        ",
+        }
+      `);
+    });
 
-    await runWrangler(
-      "publish index.js --compatibility-date 2022-03-17 --name test-name"
-    );
-    expect(std.out).toMatchInlineSnapshot(`
-      "Uploaded test-name (TIMINGS)
-      Published test-name (TIMINGS)
-        test-name.test-sub-domain.workers.dev"
-    `);
-    expect(std.err).toMatchInlineSnapshot(`""`);
-    expect(std.warn).toMatchInlineSnapshot(`""`);
+    it("should polyfill node builtins when enabled", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "index.js",
+        `
+      import path from 'path';
+      console.log(path.join("some/path/to", "a/file.txt"));
+      export default {}
+      `
+      );
+      await runWrangler("publish index.js --node-compat --dry-run"); // this would throw if node compatibility didn't exist
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "▲ [WARNING] Enabling node.js compatibility mode for builtins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
+
+        ",
+        }
+      `);
+    });
   });
 });
 
-/** Write a mock Worker script to disk. */
-function writeWorkerSource({
-  basePath = ".",
-  format = "js",
-  type = "esm",
-}: {
-  basePath?: string;
-  format?: "js" | "ts" | "jsx" | "tsx" | "mjs";
-  type?: "esm" | "sw";
-} = {}) {
-  if (basePath !== ".") {
-    fs.mkdirSync(basePath, { recursive: true });
-  }
-  fs.writeFileSync(
-    `${basePath}/index.${format}`,
-    type === "esm"
-      ? `import { foo } from "./another";
-      export default {
-        async fetch(request) {
-          return new Response('Hello' + foo);
-        },
-      };`
-      : `import { foo } from "./another";
-      addEventListener('fetch', event => {
-        event.respondWith(new Response('Hello' + foo));
-      })`
-  );
-  fs.writeFileSync(`${basePath}/another.${format}`, `export const foo = 100;`);
-}
-
 /** Write mock assets to the file system so they can be uploaded. */
 function writeAssets(assets: { filePath: string; content: string }[]) {
   for (const asset of assets) {
@@ -3283,27 +4569,32 @@ function writeAssets(assets: { filePath: string; content: string }[]) {
 }
 
 /** Create a mock handler for the request to upload a worker script. */
-function mockUploadWorkerRequest({
-  available_on_subdomain = true,
-  expectedEntry,
-  expectedType = "esm",
-  expectedBindings,
-  expectedModules = {},
-  expectedCompatibilityDate,
-  expectedCompatibilityFlags,
-  env = undefined,
-  legacyEnv = false,
-}: {
-  available_on_subdomain?: boolean;
-  expectedEntry?: string;
-  expectedType?: "esm" | "sw";
-  expectedBindings?: unknown;
-  expectedModules?: Record<string, string>;
-  expectedCompatibilityDate?: string;
-  expectedCompatibilityFlags?: string[];
-  env?: string;
-  legacyEnv?: boolean;
-} = {}) {
+function mockUploadWorkerRequest(
+  options: {
+    available_on_subdomain?: boolean;
+    expectedEntry?: string;
+    expectedType?: "esm" | "sw";
+    expectedBindings?: unknown;
+    expectedModules?: Record<string, string>;
+    expectedCompatibilityDate?: string;
+    expectedCompatibilityFlags?: string[];
+    expectedMigrations?: CfWorkerInit["migrations"];
+    env?: string;
+    legacyEnv?: boolean;
+  } = {}
+) {
+  const {
+    available_on_subdomain = true,
+    expectedEntry,
+    expectedType = "esm",
+    expectedBindings,
+    expectedModules = {},
+    expectedCompatibilityDate,
+    expectedCompatibilityFlags,
+    env = undefined,
+    legacyEnv = false,
+    expectedMigrations,
+  } = options;
   setMockResponse(
     env && !legacyEnv
       ? "/accounts/:accountId/workers/services/:scriptName/environments/:envName"
@@ -3317,7 +4608,7 @@ function mockUploadWorkerRequest({
       if (!legacyEnv) {
         expect(envName).toEqual(env);
       }
-      expect(queryParams.get("available_on_subdomain")).toEqual("true");
+      expect(queryParams.get("include_subdomain_availability")).toEqual("true");
       const formBody = body as FormData;
       if (expectedEntry !== undefined) {
         expect(await (formBody.get("index.js") as File).text()).toMatch(
@@ -3332,17 +4623,20 @@ function mockUploadWorkerRequest({
       } else {
         expect(metadata.body_part).toEqual("index.js");
       }
-      if (expectedBindings !== undefined) {
+      if ("expectedBindings" in options) {
         expect(metadata.bindings).toEqual(expectedBindings);
       }
-      if (expectedCompatibilityDate !== undefined) {
+      if ("expectedCompatibilityDate" in options) {
         expect(metadata.compatibility_date).toEqual(expectedCompatibilityDate);
       }
-      if (expectedCompatibilityFlags !== undefined) {
+      if ("expectedCompatibilityFlags" in options) {
         expect(metadata.compatibility_flags).toEqual(
           expectedCompatibilityFlags
         );
       }
+      if ("expectedMigrations" in options) {
+        expect(metadata.migrations).toEqual(expectedMigrations);
+      }
       for (const [name, content] of Object.entries(expectedModules)) {
         expect(await (formBody.get(name) as File).text()).toEqual(content);
       }
@@ -3402,11 +4696,11 @@ function mockUpdateWorkerRequest({
 }
 
 function mockPublishRoutesRequest({
-  routes,
+  routes = [],
   env = undefined,
   legacyEnv = false,
 }: {
-  routes: string[];
+  routes: Config["routes"];
   env?: string | undefined;
   legacyEnv?: boolean | undefined;
 }) {
@@ -3426,7 +4720,9 @@ function mockPublishRoutesRequest({
       }
 
       expect(JSON.parse(body as string)).toEqual(
-        routes.map((pattern) => ({ pattern }))
+        routes.map((route) =>
+          typeof route !== "object" ? { pattern: route } : route
+        )
       );
       return null;
     }
@@ -3507,3 +4803,73 @@ function mockDeleteUnusedAssetsRequest(
     }
   );
 }
+
+type LegacyScriptInfo = { id: string; migration_tag?: string };
+
+function mockLegacyScriptData(options: { scripts: LegacyScriptInfo[] }) {
+  const { scripts } = options;
+  setMockResponse(
+    "/accounts/:accountId/workers/scripts",
+    "GET",
+    ([_url, accountId]) => {
+      expect(accountId).toEqual("some-account-id");
+      return scripts;
+    }
+  );
+}
+
+type DurableScriptInfo = { id: string; migration_tag?: string };
+
+function mockServiceScriptData(options: {
+  script?: DurableScriptInfo;
+  scriptName?: string;
+  env?: string;
+}) {
+  const { script } = options;
+  if (options.env) {
+    if (!script) {
+      setMockRawResponse(
+        "/accounts/:accountId/workers/services/:scriptName/environments/:envName",
+        "GET",
+        () => {
+          return createFetchResult(null, false, [
+            { code: 10092, message: "workers.api.error.environment_not_found" },
+          ]);
+        }
+      );
+      return;
+    }
+    setMockResponse(
+      "/accounts/:accountId/workers/services/:scriptName/environments/:envName",
+      "GET",
+      ([_url, accountId, scriptName, envName]) => {
+        expect(accountId).toEqual("some-account-id");
+        expect(scriptName).toEqual(options.scriptName || "test-name");
+        expect(envName).toEqual(options.env);
+        return { script };
+      }
+    );
+  } else {
+    if (!script) {
+      setMockRawResponse(
+        "/accounts/:accountId/workers/services/:scriptName",
+        "GET",
+        () => {
+          return createFetchResult(null, false, [
+            { code: 10090, message: "workers.api.error.service_not_found" },
+          ]);
+        }
+      );
+      return;
+    }
+    setMockResponse(
+      "/accounts/:accountId/workers/services/:scriptName",
+      "GET",
+      ([_url, accountId, scriptName]) => {
+        expect(accountId).toEqual("some-account-id");
+        expect(scriptName).toEqual(options.scriptName || "test-name");
+        return { default_environment: { script } };
+      }
+    );
+  }
+}