wrangler 0.0.0-e043479 → 0.0.0-e0a0509

package/src/__tests__/publish.test.ts

@@ -1,37 +1,277 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as TOML from "@iarna/toml";
+import * as esbuild from "esbuild";
+import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
-import { mockConsoleMethods } from "./helpers/mock-console";
+import {
+  createFetchResult,
+  setMockRawResponse,
+  setMockResponse,
+  unsetAllMocks,
+  unsetMockFetchKVGetValues,
+} from "./helpers/mock-cfetch";
+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 { WorkerMetadata } from "../api/form_data";
 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();
+      writeWranglerToml({ env: { "some-env": {} } });
       writeWorkerSource();
       mockSubDomainRequest();
       mockUploadWorkerRequest({
@@ -66,8 +306,8 @@ describe("publish", () => {
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
 
-      it("appends the environment name when provided", async () => {
-        writeWranglerToml();
+      it("appends the environment name when provided, and there is associated config", async () => {
+        writeWranglerToml({ env: { "some-env": {} } });
         writeWorkerSource();
         mockSubDomainRequest();
         mockUploadWorkerRequest({
@@ -83,6 +323,74 @@ describe("publish", () => {
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
+
+      it("appends the environment name when provided (with a warning), if there are no configured environments", async () => {
+        writeWranglerToml({});
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          env: "some-env",
+          legacyEnv: true,
+        });
+        await runWrangler("publish index.js --env some-env --legacy-env true");
+        expect(std.out).toMatchInlineSnapshot(`
+          "Uploaded test-name-some-env (TIMINGS)
+          Published test-name-some-env (TIMINGS)
+            test-name-some-env.test-sub-domain.workers.dev"
+        `);
+        expect(std.err).toMatchInlineSnapshot(`""`);
+        expect(std.warn).toMatchInlineSnapshot(`
+          "▲ [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]
+                \`\`\`
+
+
+          "
+        `);
+      });
+
+      it("should throw an error when an environment name when provided, which doesn't match those in the config", async () => {
+        writeWranglerToml({ env: { "other-env": {} } });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        await expect(
+          runWrangler("publish index.js --env some-env --legacy-env true")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(`
+                "Processing wrangler.toml configuration:
+                  - No environment found in configuration with name \\"some-env\\".
+                    Before using \`--env=some-env\` there should be an equivalent environment section in the configuration.
+                    The available configured environment names are: [\\"other-env\\"]
+
+                    Consider adding an environment configuration section to the wrangler.toml file:
+                    \`\`\`
+                    [env.some-env]
+                    \`\`\`
+                "
+              `);
+      });
+
+      it("should throw an error w/ helpful message when using --env --name", async () => {
+        writeWranglerToml({ env: { "some-env": {} } });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        await runWrangler(
+          "publish index.js --name voyager --env some-env --legacy-env true"
+        ).catch((err) =>
+          expect(err).toMatchInlineSnapshot(`
+            [Error: In legacy environment mode you cannot use --name and --env together. If you want to specify a Worker name for a specific environment you can add the following to your wrangler.toml config:
+                [env.some-env]
+                name = "voyager"
+                ]
+          `)
+        );
+      });
     });
 
     describe("services", () => {
@@ -93,18 +401,25 @@ 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 () => {
-        writeWranglerToml();
+        writeWranglerToml({ env: { "some-env": {} } });
         writeWorkerSource();
         mockSubDomainRequest();
         mockUploadWorkerRequest({
@@ -118,7 +433,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.
+
+          "
+        `);
       });
     });
   });
@@ -143,6 +465,7 @@ describe("publish", () => {
           type: "json",
         },
       ],
+      expectedCompatibilityDate: "2022-01-12",
     });
     mockSubDomainRequest();
     await runWrangler("publish ./some-path/worker/index.js");
@@ -166,6 +489,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/*"],
@@ -297,13 +730,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\\"
+              \`\`\`
+
+        "
       `);
     });
 
@@ -329,15 +765,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.
+
+        "
       `);
     });
 
@@ -439,6 +879,77 @@ export default{
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
+    it("should preserve exports on a module format worker", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "index.js",
+        `
+export const abc = 123;
+export const def = "show me the money";
+export default {};`
+      );
+
+      await runWrangler("publish index.js --dry-run --outdir out");
+
+      expect(
+        (
+          await esbuild.build({
+            entryPoints: [path.resolve("./out/index.js")],
+            metafile: true,
+            write: false,
+          })
+        ).metafile?.outputs["index.js"].exports
+      ).toMatchInlineSnapshot(`
+        Array [
+          "abc",
+          "def",
+          "default",
+        ]
+      `);
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "",
+        }
+      `);
+    });
+
+    it("should not preserve exports on a service-worker format worker", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "index.js",
+        `
+export const abc = 123;
+export const def = "show me the money";
+addEventListener('fetch', event => {});`
+      );
+
+      await runWrangler("publish index.js --dry-run --outdir out --minify");
+
+      expect(
+        (
+          await esbuild.build({
+            entryPoints: [path.resolve("./out/index.js")],
+            metafile: true,
+            write: false,
+          })
+        ).metafile?.outputs["index.js"].exports
+      ).toMatchInlineSnapshot(`Array []`);
+
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "--dry-run: exiting now.",
+          "warn": "▲ [WARNING] The entrypoint index.js has exports like an ES Module, but hasn't defined a default export like a module worker normally would. Building the worker using \\"service-worker\\" format...
+
+        ",
+        }
+      `);
+    });
+
     it("should be able to transpile entry-points in sub-directories (sw)", async () => {
       writeWranglerToml();
       writeWorkerSource({ basePath: "./src", type: "sw" });
@@ -460,9 +971,8 @@ export default{
 
     it('should error if a site definition doesn\'t have a "bucket" field', async () => {
       writeWranglerToml({
-        site: {
-          "entry-point": "./index.js",
-        } as Config["site"],
+        // @ts-expect-error we're intentionally setting an invalid config
+        site: {},
       });
       writeWorkerSource();
       mockUploadWorkerRequest();
@@ -471,17 +981,32 @@ export default{
       await expect(runWrangler("publish ./index.js")).rejects
         .toThrowErrorMatchingInlineSnapshot(`
               "Processing wrangler.toml configuration:
-                - ERROR: \\"site.bucket\\" is a required field."
+                - \\"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:
-          - ERROR: \\"site.bucket\\" is a required field.
+        "X [ERROR] Processing wrangler.toml configuration:
+
+            - \\"site.bucket\\" is a required field.
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        "
+      `);
+      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 warn if there is a `site.entry-point` configuration", async () => {
@@ -507,48 +1032,35 @@ export default{
       mockListKVNamespacesRequest(kvNamespace);
       mockKeyListRequest(kvNamespace.id, []);
       mockUploadAssetsToKVRequest(kvNamespace.id, assets);
-
       await runWrangler("publish ./index.js");
 
-      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...
+      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"
-      `);
-      expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(`
-        "Deprecation notice: The \`site.entry-point\` config field is no longer used.
-        The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field.
-        Please remove the \`site.entry-point\` field from the \`wrangler.toml\` file."
-      `);
-    });
-
-    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.
-
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          test-name.test-sub-domain.workers.dev",
+          "warn": "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - Deprecation: \\"site.entry-point\\":
+              Delete the \`site.entry-point\` field, then add the top level \`main\` field to your configuration
+          file:
+              \`\`\`
+              main = \\"index.js\\"
+              \`\`\`
+
+        ",
+        }
       `);
     });
-  });
 
-  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" },
@@ -557,35 +1069,131 @@ 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 = [
+    it("should error if both main and site.entry-point are specified", async () => {
+      writeWranglerToml({
+        main: "some-entry",
+        site: {
+          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" },
       ];
@@ -628,10 +1236,11 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -677,10 +1286,11 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -703,6 +1313,7 @@ export default{
         site: {
           bucket: "assets",
         },
+        env: { "some-env": {} },
       });
       writeWorkerSource();
       writeAssets(assets);
@@ -723,10 +1334,11 @@ 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)
           some-env.test-name.test-sub-domain.workers.dev"
@@ -749,6 +1361,7 @@ export default{
         site: {
           bucket: "assets",
         },
+        env: { "some-env": {} },
       });
       writeWorkerSource();
       writeAssets(assets);
@@ -770,10 +1383,11 @@ 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)
           test-name-some-env.test-sub-domain.workers.dev"
@@ -802,7 +1416,9 @@ export default{
       mockSubDomainRequest();
       mockListKVNamespacesRequest(kvNamespace);
       // Put file-1 in the KV namespace
-      mockKeyListRequest(kvNamespace.id, ["assets/file-1.2ca234f380.txt"]);
+      mockKeyListRequest(kvNamespace.id, [
+        { name: "assets/file-1.2ca234f380.txt" },
+      ]);
       // Check we do not upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
@@ -811,10 +1427,11 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -851,8 +1468,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -889,8 +1507,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -928,8 +1547,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -967,8 +1587,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -1006,8 +1627,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -1045,8 +1667,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -1086,8 +1709,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -1131,8 +1755,9 @@ 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)
           test-name.test-sub-domain.workers.dev"
@@ -1177,13 +1802,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."
+        "
       `);
     });
 
@@ -1215,14 +1842,72 @@ 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\\",
+
+        "
+      `);
+    });
+
+    it("should delete uploaded assets that aren't included anymore", 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, [
+        // Put file-1 in the KV namespace
+        { name: "assets/file-1.2ca234f380.txt" },
+        // As well as a couple from a previous upload
+        { name: "assets/file-3.somehash.txt" },
+        { name: "assets/file-4.anotherhash.txt" },
+      ]);
+
+      // we upload only file-1.txt
+      mockUploadAssetsToKVRequest(kvNamespace.id, [
+        ...assets.filter((a) => a.filePath !== "assets/file-1.txt"),
+      ]);
+
+      // and mark file-3 and file-4 for deletion
+      mockDeleteUnusedAssetsRequest(kvNamespace.id, [
+        "assets/file-3.somehash.txt",
+        "assets/file-4.anotherhash.txt",
+      ]);
+
+      await runWrangler("publish");
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      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...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
       `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
     });
   });
 
@@ -1248,8 +1933,9 @@ export default{
         workers_dev: true,
       });
       writeWorkerSource();
-      mockUploadWorkerRequest();
+      mockUploadWorkerRequest({ available_on_subdomain: false });
       mockSubDomainRequest();
+      mockUpdateWorkerRequest({ enabled: true });
 
       await runWrangler("publish ./index");
 
@@ -1261,467 +1947,2217 @@ export default{
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
-    it("should disable the workers.dev domain if workers_dev is `false`", async () => {
+    it("should not try to enable the workers.dev domain if it has been enabled before", async () => {
       writeWranglerToml({
-        workers_dev: false,
+        workers_dev: true,
       });
       writeWorkerSource();
-      mockUploadWorkerRequest();
+      mockUploadWorkerRequest({ available_on_subdomain: true });
       mockSubDomainRequest();
-      mockUpdateWorkerRequest({ enabled: false });
 
       await runWrangler("publish ./index");
 
       expect(std.out).toMatchInlineSnapshot(`
         "Uploaded test-name (TIMINGS)
-        No publish targets for test-name (TIMINGS)"
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
-    it("should enable the workers.dev domain if workers_dev is undefined and subdomain is not already available", async () => {
-      writeWranglerToml();
+    it("should disable the workers.dev domain if workers_dev is `false`", async () => {
+      writeWranglerToml({
+        workers_dev: false,
+      });
       writeWorkerSource();
-      mockUploadWorkerRequest({ available_on_subdomain: false });
-      mockSubDomainRequest();
-      mockUpdateWorkerRequest({ enabled: true });
+      mockUploadWorkerRequest();
+      mockUpdateWorkerRequest({ enabled: false });
 
       await runWrangler("publish ./index");
 
       expect(std.out).toMatchInlineSnapshot(`
         "Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        No publish targets for test-name (TIMINGS)"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
-    it("should enable the workers.dev domain if workers_dev is true and subdomain is not already available", async () => {
-      writeWranglerToml({ workers_dev: true });
+    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 });
-      mockSubDomainRequest();
-      mockUpdateWorkerRequest({ enabled: true });
+
+      // note the lack of a mock for the subdomain disable request
 
       await runWrangler("publish ./index");
 
       expect(std.out).toMatchInlineSnapshot(`
         "Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        No publish targets for test-name (TIMINGS)"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
-  });
 
-  describe("custom builds", () => {
-    beforeEach(() => {
-      // @ts-expect-error disable the mock we'd setup earlier
-      // or else custom builds will timeout immediately
-      global.setTimeout.mockRestore();
-    });
-    it("should run a custom build before publishing", async () => {
+    it("should disable the workers.dev domain if workers_dev is undefined but overwritten to `false` in environment", async () => {
       writeWranglerToml({
-        build: {
-          command: `node -e "console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
+        env: {
+          dev: {
+            workers_dev: false,
+          },
         },
       });
-
+      writeWorkerSource();
       mockUploadWorkerRequest({
-        expectedEntry: "return new Response(123)",
+        env: "dev",
       });
-      mockSubDomainRequest();
+      mockUpdateWorkerRequest({ enabled: false, env: "dev" });
+
+      await runWrangler("publish ./index --env dev --legacy-env false");
 
-      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) } }')\\"
-        Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        "Uploaded test-name (dev) (TIMINGS)
+        No publish targets for test-name (dev) (TIMINGS)"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(`""`);
     });
 
-    if (process.platform !== "win32") {
-      it("should run a custom build of multiple steps combined by && before publishing", async () => {
-        writeWranglerToml({
-          build: {
-            command: `echo "custom build" && echo "export default { fetch(){ return new Response(123) } }" > index.js`,
-          },
-        });
-
-        mockUploadWorkerRequest({
-          expectedEntry: "return new Response(123)",
-        });
-        mockSubDomainRequest();
-
-        await runWrangler("publish index.js");
-        expect(std.out).toMatchInlineSnapshot(`
-          "running: 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"
-        `);
-        expect(std.err).toMatchInlineSnapshot(`""`);
-        expect(std.warn).toMatchInlineSnapshot(`""`);
-      });
-    }
-  });
-
-  describe("[wasm_modules]", () => {
-    it("should be able to define wasm modules for service-worker format workers", async () => {
+    it("should disable the workers.dev domain if workers_dev is `true` but overwritten to `false` in environment", async () => {
       writeWranglerToml({
-        wasm_modules: {
-          TESTWASMNAME: "./path/to/test.wasm",
+        workers_dev: true,
+        env: {
+          dev: {
+            workers_dev: false,
+          },
         },
       });
-      writeWorkerSource({ type: "sw" });
-      fs.mkdirSync("./path/to", { recursive: true });
-      fs.writeFileSync("./path/to/test.wasm", "SOME WASM CONTENT");
+      writeWorkerSource();
       mockUploadWorkerRequest({
-        expectedType: "sw",
-        expectedModules: { TESTWASMNAME: "SOME WASM CONTENT" },
-        expectedBindings: [
-          { name: "TESTWASMNAME", part: "TESTWASMNAME", type: "wasm_module" },
-        ],
+        env: "dev",
       });
-      mockSubDomainRequest();
-      await runWrangler("publish index.js");
+      mockUpdateWorkerRequest({ enabled: false, env: "dev" });
+
+      await runWrangler("publish ./index --env dev --legacy-env false");
+
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        "Uploaded test-name (dev) (TIMINGS)
+        No publish targets for test-name (dev) (TIMINGS)"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(`""`);
     });
 
-    it("should error when defining wasm modules for modules format workers", async () => {
+    it("should publish to a workers.dev domain if workers_dev is undefined but overwritten to `true` in environment", async () => {
       writeWranglerToml({
-        wasm_modules: {
-          TESTWASMNAME: "./path/to/test.wasm",
+        env: {
+          dev: {
+            workers_dev: true,
+          },
         },
       });
-      writeWorkerSource({ type: "esm" });
-      fs.mkdirSync("./path/to", { recursive: true });
-      fs.writeFileSync("./path/to/test.wasm", "SOME WASM CONTENT");
+      writeWorkerSource();
+      mockUploadWorkerRequest({
+        env: "dev",
+      });
+      mockSubDomainRequest();
+      mockUpdateWorkerRequest({ enabled: true, env: "dev" });
 
-      await expect(
-        runWrangler("publish index.js")
-      ).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.err).toMatchInlineSnapshot(`
-        "You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
+      await runWrangler("publish ./index --env dev --legacy-env false");
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (dev) (TIMINGS)
+        Published test-name (dev) (TIMINGS)
+          dev.test-name.test-sub-domain.workers.dev"
       `);
-      expect(std.warn).toMatchInlineSnapshot(`""`);
+      expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
-    it("should resolve wasm modules 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",
-          wasm_modules: {
-            TESTWASMNAME: "./and/the/path/to/test.wasm",
+    it("should publish to a workers.dev domain if workers_dev is `false` but overwritten to `true` in environment", async () => {
+      writeWranglerToml({
+        workers_dev: false,
+        env: {
+          dev: {
+            workers_dev: true,
           },
-        }),
-
-        "utf-8"
-      );
-
-      writeWorkerSource({ type: "sw" });
-      fs.writeFileSync(
-        "./path/to/and/the/path/to/test.wasm",
-        "SOME WASM CONTENT"
-      );
+        },
+      });
+      writeWorkerSource();
       mockUploadWorkerRequest({
-        expectedType: "sw",
-        expectedModules: { TESTWASMNAME: "SOME WASM CONTENT" },
-        expectedBindings: [
-          { name: "TESTWASMNAME", part: "TESTWASMNAME", type: "wasm_module" },
-        ],
+        env: "dev",
       });
       mockSubDomainRequest();
-      await runWrangler("publish index.js --config ./path/to/wrangler.toml");
+      mockUpdateWorkerRequest({ enabled: true, env: "dev" });
+
+      await runWrangler("publish ./index --env dev --legacy-env false");
+
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        "Uploaded test-name (dev) (TIMINGS)
+        Published test-name (dev) (TIMINGS)
+          dev.test-name.test-sub-domain.workers.dev"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
-      expect(std.warn).toMatchInlineSnapshot(`""`);
     });
 
-    it("should be able to import .wasm modules from service-worker format workers", async () => {
-      writeWranglerToml();
-      fs.writeFileSync("./index.js", "import TESTWASMNAME from './test.wasm';");
-      fs.writeFileSync("./test.wasm", "SOME WASM CONTENT");
-      mockUploadWorkerRequest({
-        expectedType: "sw",
-        expectedModules: {
-          __94b240d0d692281e6467aa42043986e5c7eea034_test_wasm:
-            "SOME WASM CONTENT",
+    it("should use the global compatibility_date and compatibility_flags if they are not overwritten by the environment", async () => {
+      writeWranglerToml({
+        compatibility_date: "2022-01-12",
+        compatibility_flags: ["no_global_navigator"],
+        env: {
+          dev: {},
         },
-        expectedBindings: [
-          {
-            name: "__94b240d0d692281e6467aa42043986e5c7eea034_test_wasm",
-            part: "__94b240d0d692281e6467aa42043986e5c7eea034_test_wasm",
-            type: "wasm_module",
+      });
+      writeWorkerSource();
+      mockUploadWorkerRequest({
+        env: "dev",
+        expectedCompatibilityDate: "2022-01-12",
+        expectedCompatibilityFlags: ["no_global_navigator"],
+      });
+      mockSubDomainRequest();
+      mockUpdateWorkerRequest({ enabled: true, env: "dev" });
+
+      await runWrangler("publish ./index --env dev --legacy-env false");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (dev) (TIMINGS)
+        Published test-name (dev) (TIMINGS)
+          dev.test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should use the environment specific compatibility_date and compatibility_flags", async () => {
+      writeWranglerToml({
+        compatibility_date: "2022-01-12",
+        compatibility_flags: ["no_global_navigator"],
+        env: {
+          dev: {
+            compatibility_date: "2022-01-13",
+            compatibility_flags: ["global_navigator"],
           },
-        ],
+        },
+      });
+      writeWorkerSource();
+      mockUploadWorkerRequest({
+        env: "dev",
+        expectedCompatibilityDate: "2022-01-13",
+        expectedCompatibilityFlags: ["global_navigator"],
       });
       mockSubDomainRequest();
-      await runWrangler("publish index.js");
+      mockUpdateWorkerRequest({ enabled: true, env: "dev" });
+
+      await runWrangler("publish ./index --env dev --legacy-env false");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (dev) (TIMINGS)
+        Published test-name (dev) (TIMINGS)
+          dev.test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should use the command line --compatibility-date and --compatibility-flags if they are specified", async () => {
+      writeWranglerToml({
+        compatibility_date: "2022-01-12",
+        compatibility_flags: ["no_global_navigator"],
+        env: {
+          dev: {
+            compatibility_date: "2022-01-13",
+            compatibility_flags: ["global_navigator"],
+          },
+        },
+      });
+      writeWorkerSource();
+      mockUploadWorkerRequest({
+        env: "dev",
+        expectedCompatibilityDate: "2022-01-14",
+        expectedCompatibilityFlags: ["url_standard"],
+      });
+      mockSubDomainRequest();
+      mockUpdateWorkerRequest({ enabled: true, env: "dev" });
+
+      await runWrangler(
+        "publish ./index --env dev --legacy-env false --compatibility-date 2022-01-14 --compatibility-flags url_standard"
+      );
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (dev) (TIMINGS)
+        Published test-name (dev) (TIMINGS)
+          dev.test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should enable the workers.dev domain if workers_dev is undefined and subdomain is not already available", async () => {
+      writeWranglerToml();
+      writeWorkerSource();
+      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(`""`);
-      expect(std.warn).toMatchInlineSnapshot(`""`);
     });
-  });
 
-  describe("[text_blobs]", () => {
-    it("should be able to define text blobs for service-worker format workers", async () => {
+    it("should enable the workers.dev domain if workers_dev is true and subdomain is not already available", async () => {
+      writeWranglerToml({ workers_dev: true });
+      writeWorkerSource();
+      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 error politely when publishing to workers_dev when there is no workers.dev subdomain", async () => {
       writeWranglerToml({
-        text_blobs: {
-          TESTTEXTBLOBNAME: "./path/to/text.file",
-        },
+        workers_dev: true,
       });
-      writeWorkerSource({ type: "sw" });
-      fs.mkdirSync("./path/to", { recursive: true });
-      fs.writeFileSync("./path/to/text.file", "SOME TEXT CONTENT");
-      mockUploadWorkerRequest({
-        expectedType: "sw",
-        expectedModules: { TESTTEXTBLOBNAME: "SOME TEXT CONTENT" },
-        expectedBindings: [
-          {
-            name: "TESTTEXTBLOBNAME",
-            part: "TESTTEXTBLOBNAME",
-            type: "text_blob",
-          },
-        ],
+      writeWorkerSource();
+      mockUploadWorkerRequest();
+      mockSubDomainRequest("does-not-exist", false);
+
+      await expect(runWrangler("publish ./index")).rejects
+        .toThrowErrorMatchingInlineSnapshot(`
+              "Error: You need to register a workers.dev subdomain before publishing to workers.dev
+              You can either publish your worker to one or more routes by specifying them in wrangler.toml, or register a workers.dev subdomain here:
+              https://dash.cloudflare.com/some-account-id/workers/onboarding"
+            `);
+    });
+
+    it("should not deploy to workers.dev if there are any routes defined", async () => {
+      writeWranglerToml({
+        routes: ["http://example.com/*"],
       });
+      writeWorkerSource();
       mockSubDomainRequest();
+      mockUploadWorkerRequest();
+      mockUpdateWorkerRequest({
+        enabled: false,
+      });
+      mockPublishRoutesRequest({ routes: ["http://example.com/*"] });
       await runWrangler("publish index.js");
+
       expect(std.out).toMatchInlineSnapshot(`
         "Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+          http://example.com/*"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
     });
 
-    it("should error when defining text blobs for modules format workers", async () => {
+    it("should not deploy to workers.dev if there are any routes defined (environments)", async () => {
       writeWranglerToml({
-        text_blobs: {
-          TESTTEXTBLOBNAME: "./path/to/text.file",
+        routes: ["http://example.com/*"],
+        env: {
+          production: {
+            routes: ["http://production.example.com/*"],
+          },
         },
       });
-      writeWorkerSource({ type: "esm" });
-      fs.mkdirSync("./path/to", { recursive: true });
-      fs.writeFileSync("./path/to/text.file", "SOME TEXT CONTENT");
-
-      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"`
-      );
-      expect(std.out).toMatchInlineSnapshot(`""`);
-      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
+      writeWorkerSource();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({ env: "production", legacyEnv: true });
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "production",
+        legacyEnv: true,
+      });
+      mockPublishRoutesRequest({
+        routes: ["http://production.example.com/*"],
+        env: "production",
+        legacyEnv: true,
+      });
+      await runWrangler("publish index.js --env production");
 
-        %s If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name-production (TIMINGS)
+        Published test-name-production (TIMINGS)
+          http://production.example.com/*"
       `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
     });
 
-    it("should resolve text 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",
-          text_blobs: {
-            TESTTEXTBLOBNAME: "./and/the/path/to/text.file",
+    it("should not deploy to workers.dev if there are any routes defined (only in environments)", async () => {
+      writeWranglerToml({
+        env: {
+          production: {
+            routes: ["http://production.example.com/*"],
           },
-        }),
+        },
+      });
+      writeWorkerSource();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({ env: "production", legacyEnv: true });
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "production",
+        legacyEnv: true,
+      });
+      mockPublishRoutesRequest({
+        routes: ["http://production.example.com/*"],
+        env: "production",
+        legacyEnv: true,
+      });
+      await runWrangler("publish index.js --env production");
 
-        "utf-8"
-      );
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name-production (TIMINGS)
+        Published test-name-production (TIMINGS)
+          http://production.example.com/*"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
 
-      writeWorkerSource({ type: "sw" });
-      fs.writeFileSync(
-        "./path/to/and/the/path/to/text.file",
-        "SOME TEXT CONTENT"
-      );
-      mockUploadWorkerRequest({
-        expectedType: "sw",
-        expectedModules: { TESTTEXTBLOBNAME: "SOME TEXT CONTENT" },
-        expectedBindings: [
-          {
-            name: "TESTTEXTBLOBNAME",
-            part: "TESTTEXTBLOBNAME",
-            type: "text_blob",
-          },
-        ],
+    it("can deploy to both workers.dev and routes if both defined ", async () => {
+      writeWranglerToml({
+        workers_dev: true,
+        routes: ["http://example.com/*"],
       });
+      writeWorkerSource();
       mockSubDomainRequest();
-      await runWrangler("publish index.js --config ./path/to/wrangler.toml");
+      mockUploadWorkerRequest();
+      mockUpdateWorkerRequest({
+        enabled: false,
+      });
+      mockPublishRoutesRequest({
+        routes: ["http://example.com/*"],
+      });
+      await runWrangler("publish index.js");
+
       expect(std.out).toMatchInlineSnapshot(`
         "Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+          test-name.test-sub-domain.workers.dev
+          http://example.com/*"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
     });
-  });
 
-  describe("vars bindings", () => {
-    it("should support json bindings", async () => {
+    it("can deploy to both workers.dev and routes if both defined (environments: 1)", async () => {
       writeWranglerToml({
-        vars: {
-          text: "plain ol' string",
-          count: 1,
-          complex: { enabled: true, id: 123 },
+        workers_dev: true,
+        env: {
+          production: {
+            routes: ["http://production.example.com/*"],
+          },
         },
       });
       writeWorkerSource();
       mockSubDomainRequest();
-      mockUploadWorkerRequest({
-        expectedBindings: [
-          { name: "text", type: "plain_text", text: "plain ol' string" },
-          { name: "count", type: "json", json: 1 },
-          {
-            name: "complex",
-            type: "json",
-            json: { enabled: true, id: 123 },
+      mockUploadWorkerRequest({ env: "production", legacyEnv: true });
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "production",
+        legacyEnv: true,
+      });
+      mockPublishRoutesRequest({
+        routes: ["http://production.example.com/*"],
+        env: "production",
+        legacyEnv: true,
+      });
+      await runWrangler("publish index.js --env production");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name-production (TIMINGS)
+        Published test-name-production (TIMINGS)
+          test-name-production.test-sub-domain.workers.dev
+          http://production.example.com/*"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
+
+    it("can deploy to both workers.dev and routes if both defined (environments: 2)", async () => {
+      writeWranglerToml({
+        env: {
+          production: {
+            workers_dev: true,
+            routes: ["http://production.example.com/*"],
           },
-        ],
+        },
+      });
+      writeWorkerSource();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({ env: "production", legacyEnv: true });
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "production",
+        legacyEnv: true,
       });
+      mockPublishRoutesRequest({
+        routes: ["http://production.example.com/*"],
+        env: "production",
+        legacyEnv: true,
+      });
+      await runWrangler("publish index.js --env production");
 
-      await runWrangler("publish index.js");
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        "Uploaded test-name-production (TIMINGS)
+        Published test-name-production (TIMINGS)
+          test-name-production.test-sub-domain.workers.dev
+          http://production.example.com/*"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
     });
-  });
 
-  describe("r2 bucket bindings", () => {
-    it("should support r2 bucket bindings", async () => {
+    it("will deploy only to routes when workers_dev is false (environments 1) ", async () => {
       writeWranglerToml({
-        r2_buckets: [{ binding: "FOO", bucket_name: "foo-bucket" }],
+        workers_dev: false,
+        env: {
+          production: {
+            routes: ["http://production.example.com/*"],
+          },
+        },
       });
       writeWorkerSource();
       mockSubDomainRequest();
-      mockUploadWorkerRequest({
-        expectedBindings: [
-          { bucket_name: "foo-bucket", name: "FOO", type: "r2_bucket" },
-        ],
+      mockUploadWorkerRequest({ env: "production", legacyEnv: true });
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "production",
+        legacyEnv: true,
       });
+      mockPublishRoutesRequest({
+        routes: ["http://production.example.com/*"],
+        env: "production",
+        legacyEnv: true,
+      });
+      await runWrangler("publish index.js --env production");
 
-      await runWrangler("publish index.js");
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
-        Published test-name (TIMINGS)
-          test-name.test-sub-domain.workers.dev"
+        "Uploaded test-name-production (TIMINGS)
+        Published test-name-production (TIMINGS)
+          http://production.example.com/*"
       `);
       expect(std.err).toMatchInlineSnapshot(`""`);
       expect(std.warn).toMatchInlineSnapshot(`""`);
     });
-  });
 
-  describe("unsafe bindings", () => {
-    it("should warn if using unsafe bindings", async () => {
+    it("will deploy only to routes when workers_dev is false (environments 2) ", async () => {
       writeWranglerToml({
-        unsafe: {
-          bindings: [
-            {
-              name: "my-binding",
-              type: "binding-type",
-              param: "binding-param",
-            },
-          ],
+        env: {
+          production: {
+            workers_dev: false,
+            routes: ["http://production.example.com/*"],
+          },
         },
       });
-      writeWorkerSource();
-      mockSubDomainRequest();
-      mockUploadWorkerRequest({
-        expectedBindings: [
-          {
-            name: "my-binding",
-            type: "binding-type",
-            param: "binding-param",
+      writeWorkerSource();
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({ env: "production", legacyEnv: true });
+      mockUpdateWorkerRequest({
+        enabled: false,
+        env: "production",
+        legacyEnv: true,
+      });
+      mockPublishRoutesRequest({
+        routes: ["http://production.example.com/*"],
+        env: "production",
+        legacyEnv: true,
+      });
+      await runWrangler("publish index.js --env production");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name-production (TIMINGS)
+        Published test-name-production (TIMINGS)
+          http://production.example.com/*"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
+  });
+
+  describe("custom builds", () => {
+    beforeEach(() => {
+      // @ts-expect-error disable the mock we'd setup earlier
+      // or else custom builds will timeout immediately
+      global.setTimeout.mockRestore();
+    });
+    it("should run a custom build before publishing", async () => {
+      writeWranglerToml({
+        build: {
+          command: `node -e "console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')"`,
+        },
+      });
+
+      mockUploadWorkerRequest({
+        expectedEntry: "return new Response(123)",
+      });
+      mockSubDomainRequest();
+
+      await runWrangler("publish index.js");
+      expect(std.out).toMatchInlineSnapshot(`
+        "Running custom build: node -e \\"console.log('custom build'); require('fs').writeFileSync('index.js', 'export default { fetch(){ return new Response(123) } }')\\"
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
+
+    if (process.platform !== "win32") {
+      it("should run a custom build of multiple steps combined by && before publishing", async () => {
+        writeWranglerToml({
+          build: {
+            command: `echo "custom build" && echo "export default { fetch(){ return new Response(123) } }" > index.js`,
+          },
+        });
+
+        mockUploadWorkerRequest({
+          expectedEntry: "return new Response(123)",
+        });
+        mockSubDomainRequest();
+
+        await runWrangler("publish index.js");
+        expect(std.out).toMatchInlineSnapshot(`
+          "Running custom build: echo \\"custom build\\" && echo \\"export default { fetch(){ return new Response(123) } }\\" > index.js
+          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 throw an error if the entry doesn't exist after the build finishes", async () => {
+      writeWranglerToml({
+        main: "index.js",
+        build: {
+          command: `node -e "console.log('custom build');"`,
+        },
+      });
+
+      await expect(
+        runWrangler("publish index.js")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Could not resolve \\"index.js\\" after running custom build: 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(`
+        "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"] },
+          ],
+        },
+      });
+
+      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: [
+            {
+              name: "DURABLE_OBJECT_ONE",
+              class_name: "SomeDurableObject",
+              script_name: "some-durable-object-worker",
+            },
+            {
+              name: "DURABLE_OBJECT_TWO",
+              class_name: "AnotherDurableObject",
+              script_name: "another-durable-object-worker",
+            },
+          ],
+        },
+        kv_namespaces: [
+          { binding: "KV_NAMESPACE_ONE", id: "kv-ns-one-id" },
+          { binding: "KV_NAMESPACE_TWO", id: "kv-ns-two-id" },
+        ],
+        r2_buckets: [
+          { binding: "R2_BUCKET_ONE", bucket_name: "r2-bucket-one-name" },
+          { binding: "R2_BUCKET_TWO", bucket_name: "r2-bucket-two-name" },
+        ],
+        text_blobs: {
+          TEXT_BLOB_ONE: "./my-entire-app-depends-on-this.cfg",
+          TEXT_BLOB_TWO: "./the-entirety-of-human-knowledge.txt",
+        },
+        unsafe: {
+          bindings: [
+            {
+              name: "UNSAFE_BINDING_ONE",
+              type: "some unsafe thing",
+              data: { some: { unsafe: "thing" } },
+            },
+            {
+              name: "UNSAFE_BINDING_TWO",
+              type: "another unsafe thing",
+              data: 1337,
+            },
+          ],
+        },
+        vars: {
+          ENV_VAR_ONE: 123,
+          ENV_VAR_TWO: "Hello, I'm an environment variable",
+        },
+        wasm_modules: {
+          WASM_MODULE_ONE: "./some_wasm.wasm",
+          WASM_MODULE_TWO: "./more_wasm.wasm",
+        },
+        data_blobs: {
+          DATA_BLOB_ONE: "./some-data-blob.bin",
+          DATA_BLOB_TWO: "./more-data-blob.bin",
+        },
+      });
+
+      writeWorkerSource({ type: "sw" });
+      fs.writeFileSync("./my-entire-app-depends-on-this.cfg", "config = value");
+      fs.writeFileSync(
+        "./the-entirety-of-human-knowledge.txt",
+        "Everything's bigger in Texas"
+      );
+      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: [
+          {
+            name: "KV_NAMESPACE_ONE",
+            namespace_id: "kv-ns-one-id",
+            type: "kv_namespace",
+          },
+          {
+            name: "KV_NAMESPACE_TWO",
+            namespace_id: "kv-ns-two-id",
+            type: "kv_namespace",
+          },
+          {
+            class_name: "SomeDurableObject",
+            name: "DURABLE_OBJECT_ONE",
+            script_name: "some-durable-object-worker",
+            type: "durable_object_namespace",
+          },
+          {
+            class_name: "AnotherDurableObject",
+            name: "DURABLE_OBJECT_TWO",
+            script_name: "another-durable-object-worker",
+            type: "durable_object_namespace",
+          },
+          {
+            bucket_name: "r2-bucket-one-name",
+            name: "R2_BUCKET_ONE",
+            type: "r2_bucket",
+          },
+          {
+            bucket_name: "r2-bucket-two-name",
+            name: "R2_BUCKET_TWO",
+            type: "r2_bucket",
+          },
+          { json: 123, name: "ENV_VAR_ONE", type: "json" },
+          {
+            name: "ENV_VAR_TWO",
+            text: "Hello, I'm an environment variable",
+            type: "plain_text",
+          },
+          {
+            name: "WASM_MODULE_ONE",
+            part: "WASM_MODULE_ONE",
+            type: "wasm_module",
+          },
+          {
+            name: "WASM_MODULE_TWO",
+            part: "WASM_MODULE_TWO",
+            type: "wasm_module",
+          },
+          { 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",
+            type: "some unsafe thing",
+          },
+          {
+            data: 1337,
+            name: "UNSAFE_BINDING_TWO",
+            type: "another unsafe thing",
+          },
+        ],
+      });
+      mockSubDomainRequest();
+      mockLegacyScriptData({ scripts: [] });
+
+      await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
+      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:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
+      `);
+    });
+
+    it("should error when bindings of different types have the same name", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            {
+              name: "CONFLICTING_NAME_ONE",
+              class_name: "SomeDurableObject",
+              script_name: "some-durable-object-worker",
+            },
+            {
+              name: "CONFLICTING_NAME_TWO",
+              class_name: "AnotherDurableObject",
+              script_name: "another-durable-object-worker",
+            },
+          ],
+        },
+        kv_namespaces: [
+          { binding: "CONFLICTING_NAME_ONE", id: "kv-ns-one-id" },
+          { binding: "CONFLICTING_NAME_TWO", id: "kv-ns-two-id" },
+        ],
+        r2_buckets: [
+          {
+            binding: "CONFLICTING_NAME_ONE",
+            bucket_name: "r2-bucket-one-name",
+          },
+          {
+            binding: "CONFLICTING_NAME_THREE",
+            bucket_name: "r2-bucket-two-name",
+          },
+        ],
+        text_blobs: {
+          CONFLICTING_NAME_THREE: "./my-entire-app-depends-on-this.cfg",
+          CONFLICTING_NAME_FOUR: "./the-entirety-of-human-knowledge.txt",
+        },
+        unsafe: {
+          bindings: [
+            {
+              name: "CONFLICTING_NAME_THREE",
+              type: "some unsafe thing",
+              data: { some: { unsafe: "thing" } },
+            },
+            {
+              name: "CONFLICTING_NAME_FOUR",
+              type: "another unsafe thing",
+              data: 1337,
+            },
+          ],
+        },
+        vars: {
+          ENV_VAR_ONE: 123,
+          CONFLICTING_NAME_THREE: "Hello, I'm an environment variable",
+        },
+        wasm_modules: {
+          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" });
+      fs.writeFileSync("./my-entire-app-depends-on-this.cfg", "config = value");
+      fs.writeFileSync(
+        "./the-entirety-of-human-knowledge.txt",
+        "Everything's bigger in Texas"
+      );
+      fs.writeFileSync("./some_wasm.wasm", "some wasm");
+      fs.writeFileSync("./more_wasm.wasm", "more wasm");
+
+      await expect(runWrangler("publish index.js")).rejects
+        .toMatchInlineSnapshot(`
+              [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.]
+            `);
+      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] 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.
+
+        "
+      `);
+      expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
+      `);
+    });
+
+    it("should error when bindings of the same type have the same name", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            {
+              name: "CONFLICTING_DURABLE_OBJECT_NAME",
+              class_name: "SomeDurableObject",
+              script_name: "some-durable-object-worker",
+            },
+            {
+              name: "CONFLICTING_DURABLE_OBJECT_NAME",
+              class_name: "AnotherDurableObject",
+              script_name: "another-durable-object-worker",
+            },
+          ],
+        },
+        kv_namespaces: [
+          { binding: "CONFLICTING_KV_NAMESPACE_NAME", id: "kv-ns-one-id" },
+          { binding: "CONFLICTING_KV_NAMESPACE_NAME", id: "kv-ns-two-id" },
+        ],
+        r2_buckets: [
+          {
+            binding: "CONFLICTING_R2_BUCKET_NAME",
+            bucket_name: "r2-bucket-one-name",
+          },
+          {
+            binding: "CONFLICTING_R2_BUCKET_NAME",
+            bucket_name: "r2-bucket-two-name",
+          },
+        ],
+        unsafe: {
+          bindings: [
+            {
+              name: "CONFLICTING_UNSAFE_NAME",
+              type: "some unsafe thing",
+              data: { some: { unsafe: "thing" } },
+            },
+            {
+              name: "CONFLICTING_UNSAFE_NAME",
+              type: "another unsafe thing",
+              data: 1337,
+            },
+          ],
+        },
+        // 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: {
+        //   CONFLICTING_TEXT_BLOB_NAME: "./my-entire-app-depends-on-this.cfg",
+        //   CONFLICTING_TEXT_BLOB_NAME: "./the-entirety-of-human-knowledge.txt",
+        // },
+        // vars: {
+        //   CONFLICTING_VARS_NAME: 123,
+        //   CONFLICTING_VARS_NAME: "Hello, I'm an environment variable",
+        // },
+        // wasm_modules: {
+        //   CONFLICTING_WASM_MODULE_NAME: "./some_wasm.wasm",
+        //   CONFLICTING_WASM_MODULE_NAME: "./more_wasm.wasm",
+        // },
+      });
+
+      writeWorkerSource({ type: "sw" });
+
+      await expect(runWrangler("publish index.js")).rejects
+        .toMatchInlineSnapshot(`
+              [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.]
+            `);
+      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] 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.
+
+        "
+      `);
+      expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
+      `);
+    });
+
+    it("should error correctly when bindings of the same and different types use the same name", async () => {
+      writeWranglerToml({
+        durable_objects: {
+          bindings: [
+            {
+              name: "CONFLICTING_DURABLE_OBJECT_NAME",
+              class_name: "SomeDurableObject",
+              script_name: "some-durable-object-worker",
+            },
+            {
+              name: "CONFLICTING_DURABLE_OBJECT_NAME",
+              class_name: "AnotherDurableObject",
+              script_name: "another-durable-object-worker",
+            },
+          ],
+        },
+        kv_namespaces: [
+          {
+            binding: "CONFLICTING_KV_NAMESPACE_NAME",
+            id: "kv-ns-one-id",
+          },
+          {
+            binding: "CONFLICTING_KV_NAMESPACE_NAME",
+            id: "kv-ns-two-id",
+          },
+          { binding: "CONFLICTING_NAME_ONE", id: "kv-ns-three-id" },
+          { binding: "CONFLICTING_NAME_TWO", id: "kv-ns-four-id" },
+        ],
+        r2_buckets: [
+          {
+            binding: "CONFLICTING_R2_BUCKET_NAME",
+            bucket_name: "r2-bucket-one-name",
+          },
+          {
+            binding: "CONFLICTING_R2_BUCKET_NAME",
+            bucket_name: "r2-bucket-two-name",
+          },
+          {
+            binding: "CONFLICTING_NAME_THREE",
+            bucket_name: "r2-bucket-three-name",
+          },
+          {
+            binding: "CONFLICTING_NAME_FOUR",
+            bucket_name: "r2-bucket-four-name",
+          },
+        ],
+        text_blobs: {
+          CONFLICTING_NAME_THREE: "./my-entire-app-depends-on-this.cfg",
+          CONFLICTING_NAME_FOUR: "./the-entirety-of-human-knowledge.txt",
+        },
+        unsafe: {
+          bindings: [
+            {
+              name: "CONFLICTING_UNSAFE_NAME",
+              type: "some unsafe thing",
+              data: { some: { unsafe: "thing" } },
+            },
+            {
+              name: "CONFLICTING_UNSAFE_NAME",
+              type: "another unsafe thing",
+              data: 1337,
+            },
+            {
+              name: "CONFLICTING_NAME_THREE",
+              type: "yet another unsafe thing",
+              data: "how is a string unsafe?",
+            },
+            {
+              name: "CONFLICTING_NAME_FOUR",
+              type: "a fourth unsafe thing",
+              data: null,
+            },
+          ],
+        },
+        vars: {
+          ENV_VAR_ONE: 123,
+          CONFLICTING_NAME_THREE: "Hello, I'm an environment variable",
+        },
+        wasm_modules: {
+          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" });
+      fs.writeFileSync("./my-entire-app-depends-on-this.cfg", "config = value");
+      fs.writeFileSync(
+        "./the-entirety-of-human-knowledge.txt",
+        "Everything's bigger in Texas"
+      );
+      fs.writeFileSync("./some_wasm.wasm", "some wasm");
+      fs.writeFileSync("./more_wasm.wasm", "more wasm");
+
+      await expect(runWrangler("publish index.js")).rejects
+        .toMatchInlineSnapshot(`
+              [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.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] 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(`
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - \\"unsafe\\" fields are experimental and may change or break at any time.
+
+        "
+      `);
+    });
+
+    describe("[wasm_modules]", () => {
+      it("should be able to define wasm modules for service-worker format workers", async () => {
+        writeWranglerToml({
+          wasm_modules: {
+            TESTWASMNAME: "./path/to/test.wasm",
+          },
+        });
+        writeWorkerSource({ type: "sw" });
+        fs.mkdirSync("./path/to", { recursive: true });
+        fs.writeFileSync("./path/to/test.wasm", "SOME WASM CONTENT");
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: { TESTWASMNAME: "SOME WASM CONTENT" },
+          expectedBindings: [
+            { name: "TESTWASMNAME", part: "TESTWASMNAME", type: "wasm_module" },
+          ],
+        });
+        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 wasm modules for modules format workers", async () => {
+        writeWranglerToml({
+          wasm_modules: {
+            TESTWASMNAME: "./path/to/test.wasm",
+          },
+        });
+        writeWorkerSource({ type: "esm" });
+        fs.mkdirSync("./path/to", { recursive: true });
+        fs.writeFileSync("./path/to/test.wasm", "SOME WASM CONTENT");
+
+        await expect(
+          runWrangler("publish index.js")
+        ).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(`
+          "
+          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 [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
+
+          "
+        `);
+        expect(std.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should resolve wasm modules 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",
+            wasm_modules: {
+              TESTWASMNAME: "./and/the/path/to/test.wasm",
+            },
+          }),
+
+          "utf-8"
+        );
+
+        writeWorkerSource({ type: "sw" });
+        fs.writeFileSync(
+          "./path/to/and/the/path/to/test.wasm",
+          "SOME WASM CONTENT"
+        );
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: { TESTWASMNAME: "SOME WASM CONTENT" },
+          expectedBindings: [
+            { name: "TESTWASMNAME", part: "TESTWASMNAME", type: "wasm_module" },
+          ],
+          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(`""`);
+      });
+
+      it("should be able to import .wasm modules from service-worker format workers", async () => {
+        writeWranglerToml();
+        fs.writeFileSync(
+          "./index.js",
+          "import TESTWASMNAME from './test.wasm';"
+        );
+        fs.writeFileSync("./test.wasm", "SOME WASM CONTENT");
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: {
+            __94b240d0d692281e6467aa42043986e5c7eea034_test_wasm:
+              "SOME WASM CONTENT",
+          },
+          expectedBindings: [
+            {
+              name: "__94b240d0d692281e6467aa42043986e5c7eea034_test_wasm",
+              part: "__94b240d0d692281e6467aa42043986e5c7eea034_test_wasm",
+              type: "wasm_module",
+            },
+          ],
+        });
+        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(`""`);
+      });
+    });
+
+    describe("[text_blobs]", () => {
+      it("should be able to define text blobs for service-worker format workers", async () => {
+        writeWranglerToml({
+          text_blobs: {
+            TESTTEXTBLOBNAME: "./path/to/text.file",
+          },
+        });
+        writeWorkerSource({ type: "sw" });
+        fs.mkdirSync("./path/to", { recursive: true });
+        fs.writeFileSync("./path/to/text.file", "SOME TEXT CONTENT");
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: { TESTTEXTBLOBNAME: "SOME TEXT CONTENT" },
+          expectedBindings: [
+            {
+              name: "TESTTEXTBLOBNAME",
+              part: "TESTTEXTBLOBNAME",
+              type: "text_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 text blobs for modules format workers", async () => {
+        writeWranglerToml({
+          text_blobs: {
+            TESTTEXTBLOBNAME: "./path/to/text.file",
+          },
+        });
+        writeWorkerSource({ type: "esm" });
+        fs.mkdirSync("./path/to", { recursive: true });
+        fs.writeFileSync("./path/to/text.file", "SOME TEXT CONTENT");
+
+        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 \`[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 [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.warn).toMatchInlineSnapshot(`""`);
+      });
+
+      it("should resolve text 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",
+            text_blobs: {
+              TESTTEXTBLOBNAME: "./and/the/path/to/text.file",
+            },
+          }),
+
+          "utf-8"
+        );
+
+        writeWorkerSource({ type: "sw" });
+        fs.writeFileSync(
+          "./path/to/and/the/path/to/text.file",
+          "SOME TEXT CONTENT"
+        );
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedModules: { TESTTEXTBLOBNAME: "SOME TEXT CONTENT" },
+          expectedBindings: [
+            {
+              name: "TESTTEXTBLOBNAME",
+              part: "TESTTEXTBLOBNAME",
+              type: "text_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("[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({
+          vars: {
+            text: "plain ol' string",
+            count: 1,
+            complex: { enabled: true, id: 123 },
+          },
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedBindings: [
+            { name: "text", type: "plain_text", text: "plain ol' string" },
+            { name: "count", type: "json", json: 1 },
+            {
+              name: "complex",
+              type: "json",
+              json: { enabled: true, id: 123 },
+            },
+          ],
+        });
+
+        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(`""`);
+      });
+    });
+
+    describe("[r2_buckets]", () => {
+      it("should support r2 bucket bindings", async () => {
+        writeWranglerToml({
+          r2_buckets: [{ binding: "FOO", bucket_name: "foo-bucket" }],
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedBindings: [
+            { bucket_name: "foo-bucket", name: "FOO", type: "r2_bucket" },
+          ],
+        });
+
+        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(`""`);
+      });
+    });
+
+    describe("[durable_objects]", () => {
+      it("should support durable object bindings", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              {
+                name: "EXAMPLE_DO_BINDING",
+                class_name: "ExampleDurableObject",
+              },
+            ],
+          },
+          migrations: [{ tag: "v1", new_classes: ["ExampleDurableObject"] }],
+        });
+        fs.writeFileSync(
+          "index.js",
+          `export class ExampleDurableObject {}; export default{};`
+        );
+        mockSubDomainRequest();
+        mockLegacyScriptData({
+          scripts: [{ id: "test-name", migration_tag: "v1" }],
+        });
+        mockUploadWorkerRequest({
+          expectedBindings: [
+            {
+              class_name: "ExampleDurableObject",
+              name: "EXAMPLE_DO_BINDING",
+              type: "durable_object_namespace",
+            },
+          ],
+        });
+
+        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 support service-workers binding to external durable objects", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              {
+                name: "EXAMPLE_DO_BINDING",
+                class_name: "ExampleDurableObject",
+                script_name: "example-do-binding-worker",
+              },
+            ],
+          },
+        });
+        writeWorkerSource({ type: "sw" });
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedType: "sw",
+          expectedBindings: [
+            {
+              name: "EXAMPLE_DO_BINDING",
+              class_name: "ExampleDurableObject",
+              script_name: "example-do-binding-worker",
+              type: "durable_object_namespace",
+            },
+          ],
+        });
+
+        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 support module workers implementing durable objects", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              {
+                name: "EXAMPLE_DO_BINDING",
+                class_name: "ExampleDurableObject",
+              },
+            ],
+          },
+          migrations: [{ tag: "v1", new_classes: ["ExampleDurableObject"] }],
+        });
+        fs.writeFileSync(
+          "index.js",
+          `export class ExampleDurableObject {}; export default{};`
+        );
+        mockSubDomainRequest();
+        mockLegacyScriptData({
+          scripts: [{ id: "test-name", migration_tag: "v1" }],
+        });
+        mockUploadWorkerRequest({
+          expectedType: "esm",
+          expectedBindings: [
+            {
+              name: "EXAMPLE_DO_BINDING",
+              class_name: "ExampleDurableObject",
+              type: "durable_object_namespace",
+            },
+          ],
+        });
+
+        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 detecting a service-worker worker implementing durable objects", async () => {
+        writeWranglerToml({
+          durable_objects: {
+            bindings: [
+              {
+                name: "EXAMPLE_DO_BINDING",
+                class_name: "ExampleDurableObject",
+              },
+            ],
+          },
+        });
+        writeWorkerSource({ type: "sw" });
+        mockSubDomainRequest();
+
+        await expect(runWrangler("publish index.js")).rejects
+          .toThrowErrorMatchingInlineSnapshot(`
+                              "You seem to be trying to use Durable Objects in a Worker written as a service-worker.
+                              You can use Durable Objects defined in other Workers by specifying a \`script_name\` in your wrangler.toml, where \`script_name\` is the name of the Worker that implements that Durable Object. For example:
+                              { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject } ==> { name = EXAMPLE_DO_BINDING, class_name = ExampleDurableObject, script_name = example-do-binding-worker }
+                              Alternatively, migrate your worker to ES Module syntax to implement a Durable Object in this Worker:
+                              https://developers.cloudflare.com/workers/learning/migrating-to-module-workers/"
+                          `);
+      });
+    });
+
+    describe("[unsafe]", () => {
+      it("should warn if using unsafe bindings", async () => {
+        writeWranglerToml({
+          unsafe: {
+            bindings: [
+              {
+                name: "my-binding",
+                type: "binding-type",
+                param: "binding-param",
+              },
+            ],
+          },
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedBindings: [
+            {
+              name: "my-binding",
+              type: "binding-type",
+              param: "binding-param",
+            },
+          ],
+        });
+
+        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] 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({
+          unsafe: {
+            bindings: [
+              {
+                name: "my-binding",
+                type: "plain_text",
+                text: "text",
+              },
+            ],
           },
-        ],
-      });
-
-      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(`
-        "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({
-        unsafe: {
-          bindings: [
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedBindings: [
             {
               name: "my-binding",
               type: "plain_text",
               text: "text",
             },
           ],
-        },
-      });
-      writeWorkerSource();
-      mockSubDomainRequest();
-      mockUploadWorkerRequest({
-        expectedBindings: [
-          {
-            name: "my-binding",
-            type: "plain_text",
-            text: "text",
-          },
-        ],
-      });
+        });
 
-      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(`
-        "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"
-      `);
+        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] 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
+
+          "
+        `);
+      });
     });
   });
 
@@ -1815,14 +4251,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
+              \`\`\`
+
+        "
       `);
     });
 
@@ -1914,42 +4355,282 @@ 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.
+
+        "
       `);
     });
+
+    describe("inject process.env.NODE_ENV", () => {
+      let actualProcessEnvNodeEnv: string | undefined;
+      beforeEach(() => {
+        actualProcessEnvNodeEnv = process.env.NODE_ENV;
+        process.env.NODE_ENV = "some-node-env";
+      });
+      afterEach(() => {
+        process.env.NODE_ENV = actualProcessEnvNodeEnv;
+      });
+      it("should replace `process.env.NODE_ENV` in scripts", async () => {
+        writeWranglerToml();
+        fs.writeFileSync(
+          "./index.js",
+          `export default {
+            fetch(){
+              return new Response(process.env.NODE_ENV);
+            }
+          }`
+        );
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedEntry: `return new Response("some-node-env");`,
+        });
+        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(`""`);
+      });
+    });
   });
-});
 
-/** 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;`);
-}
+  describe("legacy module specifiers", () => {
+    it("should work with legacy module specifiers, with a deprecation warning (1)", async () => {
+      writeWranglerToml({
+        rules: [{ type: "Text", globs: ["**/*.file"], fallthrough: false }],
+      });
+      fs.writeFileSync(
+        "./index.js",
+        `import TEXT from 'text.file'; export default {};`
+      );
+      fs.writeFileSync("./text.file", "SOME TEXT CONTENT");
+      mockSubDomainRequest();
+      mockUploadWorkerRequest({
+        expectedModules: {
+          "./2d91d1c4dd6e57d4f5432187ab7c25f45a8973f0-text.file":
+            "SOME TEXT 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 \\"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(`""`);
+    });
+  });
+
+  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": "",
+        }
+      `);
+    });
+  });
+
+  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": "",
+        }
+      `);
+    });
+  });
+
+  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.
+
+        ",
+        }
+      `);
+    });
+
+    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 mock assets to the file system so they can be uploaded. */
 function writeAssets(assets: { filePath: string; content: string }[]) {
@@ -1960,23 +4641,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 = {},
-  env = undefined,
-  legacyEnv = false,
-}: {
-  available_on_subdomain?: boolean;
-  expectedEntry?: string;
-  expectedType?: "esm" | "sw";
-  expectedBindings?: unknown;
-  expectedModules?: Record<string, string>;
-  env?: string | undefined;
-  legacyEnv?: boolean | undefined;
-} = {}) {
+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"
@@ -1990,14 +4680,13 @@ 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(
           expectedEntry
         );
       }
-
       const metadata = JSON.parse(
         formBody.get("metadata") as string
       ) as WorkerMetadata;
@@ -2006,9 +4695,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" in options) {
+        expect(metadata.compatibility_date).toEqual(expectedCompatibilityDate);
+      }
+      if ("expectedCompatibilityFlags" in options) {
+        expect(metadata.compatibility_flags).toEqual(
+          expectedCompatibilityFlags
+        );
+      }
+      if ("expectedMigrations" in options) {
+        expect(metadata.migrations).toEqual(expectedMigrations);
+      }
       for (const [name, content] of Object.entries(expectedModules)) {
         expect(await (formBody.get(name) as File).text()).toEqual(content);
       }
@@ -2019,10 +4719,21 @@ function mockUploadWorkerRequest({
 }
 
 /** Create a mock handler for the request to get the account's subdomain. */
-function mockSubDomainRequest(subdomain = "test-sub-domain") {
-  setMockResponse("/accounts/:accountId/workers/subdomain", "GET", () => {
-    return { subdomain };
-  });
+function mockSubDomainRequest(
+  subdomain = "test-sub-domain",
+  registeredWorkersDev = true
+) {
+  if (registeredWorkersDev) {
+    setMockResponse("/accounts/:accountId/workers/subdomain", "GET", () => {
+      return { subdomain };
+    });
+  } else {
+    setMockRawResponse("/accounts/:accountId/workers/subdomain", "GET", () => {
+      return createFetchResult(null, false, [
+        { code: 10007, message: "haven't registered workers.dev" },
+      ]);
+    });
+  }
 }
 
 /** Create a mock handler to toggle a <script>.<user>.workers.dev subdomain */
@@ -2057,11 +4768,11 @@ function mockUpdateWorkerRequest({
 }
 
 function mockPublishRoutesRequest({
-  routes,
+  routes = [],
   env = undefined,
   legacyEnv = false,
 }: {
-  routes: string[];
+  routes: Config["routes"];
   env?: string | undefined;
   legacyEnv?: boolean | undefined;
 }) {
@@ -2081,7 +4792,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;
     }
@@ -2103,7 +4816,12 @@ function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
 /** Create a mock handler for the request that tries to do a bulk upload of assets to a KV namespace. */
 function mockUploadAssetsToKVRequest(
   expectedNamespaceId: string,
-  assets: { filePath: string; content: string }[]
+  assets: {
+    filePath: string;
+    content: string;
+    expiration?: number;
+    expiration_ttl?: number;
+  }[]
 ) {
   setMockResponse(
     "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
@@ -2132,8 +4850,98 @@ function mockUploadAssetsToKVRequest(
         expect(Buffer.from(upload.value, "base64").toString()).toEqual(
           asset.content
         );
+        expect(upload.expiration).toEqual(asset.expiration);
+        expect(upload.expiration_ttl).toEqual(asset.expiration_ttl);
       }
       return null;
     }
   );
 }
+
+/** Create a mock handler for thr request that does a bulk delete of unused assets */
+function mockDeleteUnusedAssetsRequest(
+  expectedNamespaceId: string,
+  assets: string[]
+) {
+  setMockResponse(
+    "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
+    "DELETE",
+    ([_url, accountId, namespaceId], { body }) => {
+      expect(accountId).toEqual("some-account-id");
+      expect(namespaceId).toEqual(expectedNamespaceId);
+      const deletes = JSON.parse(body as string);
+      expect(assets).toEqual(deletes);
+      return null;
+    }
+  );
+}
+
+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 } };
+      }
+    );
+  }
+}