wrangler 0.0.0-e2f9bb2 → 0.0.0-e3278fa

package/src/__tests__/publish.test.ts

@@ -1,6 +1,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import * as TOML from "@iarna/toml";
+import * as esbuild from "esbuild";
 import { writeAuthConfigFile } from "../user";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
 import {
@@ -11,6 +12,7 @@ import {
   unsetMockFetchKVGetValues,
 } from "./helpers/mock-cfetch";
 import { mockConsoleMethods, normalizeSlashes } from "./helpers/mock-console";
+import { mockConfirm } from "./helpers/mock-dialogs";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import { mockKeyListRequest } from "./helpers/mock-kv";
 import { mockOAuthFlow } from "./helpers/mock-oauth-flow";
@@ -469,7 +471,10 @@ describe("publish", () => {
     mockSubDomainRequest();
     await runWrangler("publish ./some-path/worker/index.js");
     expect(std.out).toMatchInlineSnapshot(`
-      "Uploaded test-name (TIMINGS)
+      "Your worker has access to the following bindings:
+      - Vars:
+        - xyz: \\"123\\"
+      Uploaded test-name (TIMINGS)
       Published test-name (TIMINGS)
         test-name.test-sub-domain.workers.dev"
     `);
@@ -644,6 +649,213 @@ describe("publish", () => {
       await runWrangler("publish ./index --env dev --legacy-env false");
     });
 
+    it("should fallback to the Wrangler 1 zone-based API if the bulk-routes API fails", async () => {
+      writeWranglerToml({
+        routes: ["example.com/some-route/*"],
+      });
+      writeWorkerSource();
+      mockUpdateWorkerRequest({ enabled: false });
+      mockUploadWorkerRequest({ expectedType: "esm" });
+      // Simulate the bulk-routes API failing with a not authorized error.
+      mockUnauthorizedPublishRoutesRequest();
+      // Simulate that the worker has already been deployed to another route in this zone.
+      mockCollectKnownRoutesRequest([
+        {
+          pattern: "foo.example.com/other-route",
+          script: "test-name",
+        },
+      ]);
+      mockGetZoneFromHostRequest("example.com", "some-zone-id");
+      mockPublishRoutesFallbackRequest({
+        pattern: "example.com/some-route/*",
+        script: "test-name",
+      });
+      await runWrangler("publish ./index");
+
+      expect(std.err).toMatchInlineSnapshot(`""`);
+      expect(std.warn).toMatchInlineSnapshot(`
+        "▲ [WARNING] The current authentication token does not have 'All Zones' permissions.
+
+          Falling back to using the zone-based API endpoint to update each route individually.
+          Note that there is no access to routes associated with zones that the API token does not have
+          permission for.
+          Existing routes for this Worker in such zones will not be deleted.
+
+
+        ▲ [WARNING] Previously deployed routes:
+
+          The following routes were already associated with this worker, and have not been deleted:
+           - \\"foo.example.com/other-route\\"
+          If these routes are not wanted then you can remove them in the dashboard.
+
+        "
+      `);
+      expect(std.out).toMatchInlineSnapshot(`
+        "Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          example.com/some-route/*"
+      `);
+    });
+
+    it("should error if the bulk-routes API fails and trying to push to a non-production environment", async () => {
+      writeWranglerToml({
+        routes: ["example.com/some-route/*"],
+        legacy_env: false,
+      });
+      writeWorkerSource();
+      mockUpdateWorkerRequest({ env: "staging", enabled: false });
+      mockUploadWorkerRequest({ env: "staging", expectedType: "esm" });
+      // Simulate the bulk-routes API failing with a not authorized error.
+      mockUnauthorizedPublishRoutesRequest({ env: "staging" });
+      // Simulate that the worker has already been deployed to another route in this zone.
+      mockCollectKnownRoutesRequest([
+        {
+          pattern: "foo.example.com/other-route",
+          script: "test-name",
+        },
+      ]);
+      mockGetZoneFromHostRequest("example.com", "some-zone-id");
+      mockPublishRoutesFallbackRequest({
+        pattern: "example.com/some-route/*",
+        script: "test-name",
+      });
+      await expect(runWrangler("publish ./index --env=staging")).rejects
+        .toThrowErrorMatchingInlineSnapshot(`
+              "Service environments combined with an API token that doesn't have 'All Zones' permissions is not supported.
+              Either turn off service environments by setting \`legacy_env = true\`, creating an API token with 'All Zones' permissions, or logging in via OAuth"
+            `);
+    });
+
+    describe("custom domains", () => {
+      it("should publish routes marked with 'custom_domain' as separate custom domains", async () => {
+        writeWranglerToml({
+          routes: [{ pattern: "api.example.com", custom_domain: true }],
+        });
+        writeWorkerSource();
+        mockUpdateWorkerRequest({ enabled: false });
+        mockUploadWorkerRequest({ expectedType: "esm" });
+        mockPublishCustomDomainsRequest({
+          publishFlags: {
+            override_scope: true,
+            override_existing_origin: false,
+            override_existing_dns_record: false,
+          },
+          domains: [{ hostname: "api.example.com" }],
+        });
+        await runWrangler("publish ./index");
+        expect(std.out).toContain("api.example.com (custom domain)");
+      });
+
+      it("should allow retrying if publish fails with a conflicting custom domain error", async () => {
+        writeWranglerToml({
+          routes: [{ pattern: "api.example.com", custom_domain: true }],
+        });
+        writeWorkerSource();
+        mockUpdateWorkerRequest({ enabled: false });
+        mockUploadWorkerRequest({ expectedType: "esm" });
+        mockPublishCustomDomainsRequestConflictWithoutOverride({
+          originConflicts: true,
+          domains: [{ hostname: "api.example.com" }],
+        });
+        mockConfirm({
+          text: `Custom Domains already exist for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+          result: true,
+        });
+        await runWrangler("publish ./index");
+        expect(std.out).toContain("api.example.com (custom domain)");
+      });
+
+      it("should allow retrying if publish fails with a conflicting DNS record error", async () => {
+        writeWranglerToml({
+          routes: [{ pattern: "api.example.com", custom_domain: true }],
+        });
+        writeWorkerSource();
+        mockUpdateWorkerRequest({ enabled: false });
+        mockUploadWorkerRequest({ expectedType: "esm" });
+        mockPublishCustomDomainsRequestConflictWithoutOverride({
+          dnsRecordConflicts: true,
+          domains: [{ hostname: "api.example.com" }],
+        });
+        mockConfirm({
+          text: `You already have conflicting DNS records for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+          result: true,
+        });
+        await runWrangler("publish ./index");
+        expect(std.out).toContain("api.example.com (custom domain)");
+      });
+
+      it("should allow retrying for conflicting custom domains and then again for conflicting dns", async () => {
+        writeWranglerToml({
+          routes: [{ pattern: "api.example.com", custom_domain: true }],
+        });
+        writeWorkerSource();
+        mockUpdateWorkerRequest({ enabled: false });
+        mockUploadWorkerRequest({ expectedType: "esm" });
+        mockPublishCustomDomainsRequestConflictWithoutOverride({
+          originConflicts: true,
+          dnsRecordConflicts: true,
+          domains: [{ hostname: "api.example.com" }],
+        });
+        mockConfirm(
+          {
+            text: `Custom Domains already exist for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+            result: true,
+          },
+          {
+            text: `You already have conflicting DNS records for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+            result: true,
+          }
+        );
+        await runWrangler("publish ./index");
+        expect(std.out).toContain("api.example.com (custom domain)");
+      });
+
+      it("should throw if an invalid custom domain is requested", async () => {
+        writeWranglerToml({
+          routes: [{ pattern: "*.example.com", custom_domain: true }],
+        });
+        writeWorkerSource();
+        await expect(
+          runWrangler("publish ./index")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Cannot use \\"*.example.com\\" as a Custom Domain; wildcard operators (*) are not allowed"`
+        );
+
+        writeWranglerToml({
+          routes: [
+            { pattern: "api.example.com/at/a/path", custom_domain: true },
+          ],
+        });
+        writeWorkerSource();
+        await expect(
+          runWrangler("publish ./index")
+        ).rejects.toThrowErrorMatchingInlineSnapshot(
+          `"Cannot use \\"api.example.com/at/a/path\\" as a Custom Domain; paths are not allowed"`
+        );
+      });
+
+      it("should not retry publish on error if user does not confirm", async () => {
+        writeWranglerToml({
+          routes: [{ pattern: "api.example.com", custom_domain: true }],
+        });
+        writeWorkerSource();
+        mockUpdateWorkerRequest({ enabled: false });
+        mockUploadWorkerRequest({ expectedType: "esm" });
+        mockPublishCustomDomainsRequestConflictWithoutOverride({
+          dnsRecordConflicts: true,
+          domains: [{ hostname: "api.example.com" }],
+        });
+        mockConfirm({
+          text: `You already have conflicting DNS records for these domains: "api.example.com"\nUpdate them to point to this script instead?`,
+          result: false,
+        });
+        await runWrangler("publish ./index");
+        expect(std.out).toContain(
+          'Publishing to Custom Domain "api.example.com" was skipped, fix conflict and try again'
+        );
+      });
+    });
+
     it.todo("should error if it's a workers.dev route");
   });
 
@@ -878,6 +1090,78 @@ 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");
+
+      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" });
@@ -914,7 +1198,7 @@ export default{
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -939,8 +1223,8 @@ export default{
 
     it("should warn if there is a `site.entry-point` configuration", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -966,10 +1250,10 @@ export default{
         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...
+          "out": "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -990,8 +1274,8 @@ export default{
 
     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" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1017,10 +1301,10 @@ export default{
       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 file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1072,7 +1356,7 @@ export default{
 
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Missing entry-point: The entry-point should be specified via the command line (e.g. \`wrangler publish path/to/script\`) or the \`main\` config field.
@@ -1085,8 +1369,8 @@ export default{
   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" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1108,10 +1392,60 @@ 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 file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as 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("should not contain backslash for assets with nested directories", async () => {
+      const assets = [
+        { filePath: "subdir/file-1.txt", content: "Content of file-1" },
+        { filePath: "subdir/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({
+        expectedBindings: [
+          {
+            name: "__STATIC_CONTENT",
+            namespace_id: "__test-name-workers_sites_assets-id",
+            type: "kv_namespace",
+          },
+        ],
+        expectedModules: {
+          __STATIC_CONTENT_MANIFEST:
+            '{"subdir/file-1.txt":"subdir/file-1.2ca234f380.txt","subdir/file-2.txt":"subdir/file-2.5938485188.txt"}',
+        },
+      });
+      mockSubDomainRequest();
+      mockListKVNamespacesRequest(kvNamespace);
+      mockKeyListRequest(kvNamespace.id, []);
+      mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+
+      await runWrangler("publish");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Reading subdir/file-1.txt...
+        Uploading as subdir/file-1.2ca234f380.txt...
+        Reading subdir/file-2.txt...
+        Uploading as subdir/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1122,8 +1456,8 @@ export default{
 
     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" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1141,7 +1475,7 @@ export default{
         expectedType: "sw",
         expectedModules: {
           __STATIC_CONTENT_MANIFEST:
-            '{"file-1.txt":"assets/file-1.2ca234f380.txt","file-2.txt":"assets/file-2.5938485188.txt"}',
+            '{"file-1.txt":"file-1.2ca234f380.txt","file-2.txt":"file-2.5938485188.txt"}',
         },
         expectedBindings: [
           {
@@ -1164,10 +1498,10 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
-        Uploading as assets/file-1.2ca234f380.txt...
-        Reading assets/file-2.txt...
-        Uploading as assets/file-2.5938485188.txt...
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1178,8 +1512,8 @@ export default{
 
     it("when using a module worker type, it should add an asset manifest module, 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" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1203,7 +1537,7 @@ export default{
         ],
         expectedModules: {
           __STATIC_CONTENT_MANIFEST:
-            '{"file-1.txt":"assets/file-1.2ca234f380.txt","file-2.txt":"assets/file-2.5938485188.txt"}',
+            '{"file-1.txt":"file-1.2ca234f380.txt","file-2.txt":"file-2.5938485188.txt"}',
         },
       });
       mockSubDomainRequest();
@@ -1214,10 +1548,10 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
-        Uploading as assets/file-1.2ca234f380.txt...
-        Reading assets/file-2.txt...
-        Uploading as assets/file-2.5938485188.txt...
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1229,8 +1563,8 @@ export default{
     it("should make environment specific kv namespace for assets, even for service envs", async () => {
       // This is the same test as the one before this, but with an env arg
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-some-env-workers_sites_assets",
@@ -1262,10 +1596,10 @@ export default{
       await runWrangler("publish --env some-env --legacy-env false");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
-        Uploading as assets/file-1.2ca234f380.txt...
-        Reading assets/file-2.txt...
-        Uploading as assets/file-2.5938485188.txt...
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (some-env) (TIMINGS)
         Published test-name (some-env) (TIMINGS)
@@ -1277,8 +1611,8 @@ export default{
     it("should make environment specific kv namespace for assets, even for legacy envs", async () => {
       // And this is the same test as the one before this, but with legacyEnv:true
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-some-env-workers_sites_assets",
@@ -1311,10 +1645,10 @@ export default{
       await runWrangler("publish --env some-env --legacy-env true");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
-        Uploading as assets/file-1.2ca234f380.txt...
-        Reading assets/file-2.txt...
-        Uploading as assets/file-2.5938485188.txt...
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name-some-env (TIMINGS)
         Published test-name-some-env (TIMINGS)
@@ -1325,8 +1659,8 @@ export default{
 
     it("should only upload files that are not already in the KV namespace", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1344,21 +1678,19 @@ export default{
       mockSubDomainRequest();
       mockListKVNamespacesRequest(kvNamespace);
       // Put file-1 in the KV namespace
-      mockKeyListRequest(kvNamespace.id, [
-        { name: "assets/file-1.2ca234f380.txt" },
-      ]);
+      mockKeyListRequest(kvNamespace.id, [{ name: "file-1.2ca234f380.txt" }]);
       // Check we do not upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath !== "assets/file-1.txt")
+        assets.filter((a) => a.filePath !== "file-1.txt")
       );
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
+        "Reading file-1.txt...
         Skipping - already uploaded.
-        Reading assets/file-2.txt...
-        Uploading as assets/file-2.5938485188.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1369,8 +1701,8 @@ export default{
 
     it("should only upload files that match the `site-include` arg", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1391,13 +1723,13 @@ export default{
       // Check we only upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath === "assets/file-1.txt")
+        assets.filter((a) => a.filePath === "file-1.txt")
       );
       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 file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1408,8 +1740,8 @@ export default{
 
     it("should not upload files that match the `site-exclude` arg", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1430,13 +1762,13 @@ export default{
       // Check we only upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath === "assets/file-1.txt")
+        assets.filter((a) => a.filePath === "file-1.txt")
       );
       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 file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1447,8 +1779,8 @@ export default{
 
     it("should only upload files that match the `site.include` config", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1470,13 +1802,13 @@ export default{
       // Check we only upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath === "assets/file-1.txt")
+        assets.filter((a) => a.filePath === "file-1.txt")
       );
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
-        Uploading as assets/file-1.2ca234f380.txt...
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1487,8 +1819,8 @@ export default{
 
     it("should not upload files that match the `site.exclude` config", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1510,13 +1842,13 @@ export default{
       // Check we only upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath === "assets/file-1.txt")
+        assets.filter((a) => a.filePath === "file-1.txt")
       );
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
-        Uploading as assets/file-1.2ca234f380.txt...
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1527,8 +1859,8 @@ export default{
 
     it("should use `site-include` arg over `site.include` config", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1550,13 +1882,13 @@ export default{
       // Check we only upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath === "assets/file-1.txt")
+        assets.filter((a) => a.filePath === "file-1.txt")
       );
       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 file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1567,8 +1899,8 @@ export default{
 
     it("should use `site-exclude` arg over `site.exclude` config", async () => {
       const assets = [
-        { filePath: "assets/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/file-2.txt", content: "Content of file-2" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1578,7 +1910,7 @@ export default{
         main: "./index.js",
         site: {
           bucket: "assets",
-          exclude: ["assets/file-1.txt"],
+          exclude: ["file-1.txt"],
         },
       });
       writeWorkerSource();
@@ -1590,13 +1922,13 @@ export default{
       // Check we only upload file-1
       mockUploadAssetsToKVRequest(
         kvNamespace.id,
-        assets.filter((a) => a.filePath.endsWith("assets/file-1.txt"))
+        assets.filter((a) => a.filePath.endsWith("file-1.txt"))
       );
       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 file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1608,11 +1940,11 @@ export default{
     it("should walk directories except node_modules", async () => {
       const assets = [
         {
-          filePath: "assets/directory-1/file-1.txt",
+          filePath: "directory-1/file-1.txt",
           content: "Content of file-1",
         },
         {
-          filePath: "assets/node_modules/file-2.txt",
+          filePath: "node_modules/file-2.txt",
           content: "Content of file-2",
         },
       ];
@@ -1637,8 +1969,8 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/directory-1/file-1.txt...
-        Uploading as assets/directory-1/file-1.2ca234f380.txt...
+        "Reading directory-1/file-1.txt...
+        Uploading as directory-1/file-1.2ca234f380.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1650,15 +1982,15 @@ export default{
     it("should skip hidden files and directories except `.well-known`", async () => {
       const assets = [
         {
-          filePath: "assets/.hidden-file.txt",
+          filePath: ".hidden-file.txt",
           content: "Content of hidden-file",
         },
         {
-          filePath: "assets/.hidden/file-1.txt",
+          filePath: ".hidden/file-1.txt",
           content: "Content of file-1",
         },
         {
-          filePath: "assets/.well-known/file-2.txt",
+          filePath: ".well-known/file-2.txt",
           content: "Content of file-2",
         },
       ];
@@ -1683,8 +2015,8 @@ export default{
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/.well-known/file-2.txt...
-        Uploading as assets/.well-known/file-2.5938485188.txt...
+        "Reading .well-known/file-2.txt...
+        Uploading as .well-known/file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1696,12 +2028,12 @@ export default{
     it("should error if the asset is over 25Mb", async () => {
       const assets = [
         {
-          filePath: "assets/large-file.txt",
+          filePath: "large-file.txt",
           // This file is greater than 25MiB when base64 encoded but small enough to be uploaded.
           content: "X".repeat(25 * 1024 * 1024 * 0.8 + 1),
         },
         {
-          filePath: "assets/too-large-file.txt",
+          filePath: "too-large-file.txt",
           content: "X".repeat(25 * 1024 * 1024 + 1),
         },
       ];
@@ -1713,7 +2045,7 @@ export default{
         main: "./index.js",
         site: {
           bucket: "assets",
-          exclude: ["assets/file-1.txt"],
+          exclude: ["file-1.txt"],
         },
       });
       writeWorkerSource();
@@ -1726,25 +2058,131 @@ export default{
       await expect(
         runWrangler("publish")
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"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"`
+        `"File too-large-file.txt is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits"`
       );
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/large-file.txt...
-        Uploading as assets/large-file.0ea0637a45.txt...
+        "Reading large-file.txt...
+        Uploading as large-file.0ea0637a45.txt...
+        Reading too-large-file.txt...
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
-        "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
+        "X [ERROR] File too-large-file.txt is too big, it should be under 25 MiB. See https://developers.cloudflare.com/workers/platform/limits#kv-limits
 
         "
       `);
     });
 
+    it("should batch assets in groups <100 mb", async () => {
+      // Let's have 20 files, from size 1 - 20 mb
+      const assets = Array.from({ length: 20 }, (_, index) => ({
+        filePath: `file-${`${index}`.padStart(2, "0")}.txt`,
+        content: "X".repeat(1024 * 1024 * (index + 1)),
+      }));
+
+      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, []);
+
+      // We expect this to be uploaded in 3 batches
+      // The first batch has 11 files (88mb)
+      // The next batch has 5 files (93mb)
+      // And the last one has 4 files (98mb)
+
+      // Since the bulk upload api endpoint stays the same
+      // We're going to have to clear the mock as soon as it's resolved
+      // And immediately add a mock for another one
+      // Welcome to a callback pyramid in 2022
+
+      const removeFirstBulkUploadMockFn = mockUploadAssetsToKVRequest(
+        kvNamespace.id,
+        assets.slice(0, 11),
+        () => {
+          removeFirstBulkUploadMockFn();
+          const removeSecondBulkUploadMockFn = mockUploadAssetsToKVRequest(
+            kvNamespace.id,
+            assets.slice(11, 16),
+            () => {
+              removeSecondBulkUploadMockFn();
+              mockUploadAssetsToKVRequest(kvNamespace.id, assets.slice(16, 20));
+            }
+          );
+        }
+      );
+
+      await runWrangler("publish");
+
+      expect(std).toMatchInlineSnapshot(`
+        Object {
+          "debug": "",
+          "err": "",
+          "out": "Reading file-00.txt...
+        Uploading as file-00.be5be5dd26.txt...
+        Reading file-01.txt...
+        Uploading as file-01.4842d35994.txt...
+        Reading file-02.txt...
+        Uploading as file-02.990572ec63.txt...
+        Reading file-03.txt...
+        Uploading as file-03.9d7dda9045.txt...
+        Reading file-04.txt...
+        Uploading as file-04.2b6fac6382.txt...
+        Reading file-05.txt...
+        Uploading as file-05.55762dc758.txt...
+        Reading file-06.txt...
+        Uploading as file-06.f408a6b020.txt...
+        Reading file-07.txt...
+        Uploading as file-07.64c051715b.txt...
+        Reading file-08.txt...
+        Uploading as file-08.d286789adb.txt...
+        Reading file-09.txt...
+        Uploading as file-09.6838c183a8.txt...
+        Reading file-10.txt...
+        Uploading as file-10.6e03221d2a.txt...
+        Reading file-11.txt...
+        Uploading as file-11.37d3fb2eff.txt...
+        Reading file-12.txt...
+        Uploading as file-12.b3556942f8.txt...
+        Reading file-13.txt...
+        Uploading as file-13.680caf51b1.txt...
+        Reading file-14.txt...
+        Uploading as file-14.51e88468f0.txt...
+        Reading file-15.txt...
+        Uploading as file-15.8e3fedb394.txt...
+        Reading file-16.txt...
+        Uploading as file-16.c81c5e426f.txt...
+        Reading file-17.txt...
+        Uploading as file-17.4b2ae3c47b.txt...
+        Reading file-18.txt...
+        Uploading as file-18.07f245e02b.txt...
+        Reading file-19.txt...
+        Uploading as file-19.f0d69f705d.txt...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev",
+          "warn": "",
+        }
+      `);
+    });
+
     it("should error if the asset key is over 512 characters", async () => {
       const longFilePathAsset = {
-        filePath: "assets/" + "folder/".repeat(100) + "file.txt",
+        filePath: "folder/".repeat(100) + "file.txt",
         content: "content of file",
       };
       const kvNamespace = {
@@ -1767,16 +2205,16 @@ export default{
       await expect(
         runWrangler("publish")
       ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"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\\","`
+        `"The asset path key \\"folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\","`
       );
 
       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...
+        "Reading folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.txt...
 
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
-        "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\\",
+        "X [ERROR] The asset path key \\"folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/folder/file.3da0d0cd12.txt\\" exceeds the maximum key size limit of 512. See https://developers.cloudflare.com/workers/platform/limits#kv-limits\\",
 
         "
       `);
@@ -1784,8 +2222,8 @@ export default{
 
     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" },
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
       ];
       const kvNamespace = {
         title: "__test-name-workers_sites_assets",
@@ -1804,32 +2242,86 @@ export default{
       mockListKVNamespacesRequest(kvNamespace);
       mockKeyListRequest(kvNamespace.id, [
         // Put file-1 in the KV namespace
-        { name: "assets/file-1.2ca234f380.txt" },
+        { name: "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" },
+        { name: "file-3.somehash.txt" },
+        { name: "file-4.anotherhash.txt" },
       ]);
 
       // we upload only file-1.txt
-      mockUploadAssetsToKVRequest(kvNamespace.id, [
-        ...assets.filter((a) => a.filePath !== "assets/file-1.txt"),
-      ]);
+      mockUploadAssetsToKVRequest(
+        kvNamespace.id,
+        assets.filter((a) => a.filePath !== "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",
+        "file-3.somehash.txt",
+        "file-4.anotherhash.txt",
       ]);
 
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/file-1.txt...
+        "Reading file-1.txt...
         Skipping - already uploaded.
-        Reading assets/file-2.txt...
-        Uploading as assets/file-2.5938485188.txt...
-        Deleting assets/file-3.somehash.txt from the asset store...
-        Deleting assets/file-4.anotherhash.txt from the asset store...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
+        Deleting file-3.somehash.txt from the asset store...
+        Deleting file-4.anotherhash.txt from the asset store...
+        ↗️  Done syncing assets
+        Uploaded test-name (TIMINGS)
+        Published test-name (TIMINGS)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should generate an asset manifest with keys relative to site.bucket", async () => {
+      const assets = [
+        { filePath: "file-1.txt", content: "Content of file-1" },
+        { filePath: "file-2.txt", content: "Content of file-2" },
+      ];
+      const kvNamespace = {
+        title: "__test-name-workers_sites_assets",
+        id: "__test-name-workers_sites_assets-id",
+      };
+
+      writeWranglerToml({
+        main: "./src/index.js",
+        site: {
+          bucket: "assets",
+        },
+      });
+      writeWorkerSource({ basePath: "src", type: "esm" });
+      writeAssets(assets);
+      mockUploadWorkerRequest({
+        expectedBindings: [
+          {
+            name: "__STATIC_CONTENT",
+            namespace_id: "__test-name-workers_sites_assets-id",
+            type: "kv_namespace",
+          },
+        ],
+        expectedModules: {
+          __STATIC_CONTENT_MANIFEST:
+            '{"file-1.txt":"file-1.2ca234f380.txt","file-2.txt":"file-2.5938485188.txt"}',
+        },
+      });
+      mockSubDomainRequest();
+      mockListKVNamespacesRequest(kvNamespace);
+      mockKeyListRequest(kvNamespace.id, []);
+      mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+
+      process.chdir("./src");
+      await runWrangler("publish");
+      process.chdir("../");
+
+      expect(std.out).toMatchInlineSnapshot(`
+        "Reading file-1.txt...
+        Uploading as file-1.2ca234f380.txt...
+        Reading file-2.txt...
+        Uploading as file-2.5938485188.txt...
         ↗️  Done syncing assets
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -2476,18 +2968,66 @@ export default{
         },
       });
 
-      await expect(
-        runWrangler("publish index.js")
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\""`
-      );
+      await expect(runWrangler("publish index.js")).rejects
+        .toThrowErrorMatchingInlineSnapshot(`
+              "The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+              The \`main\` property in wrangler.toml should point to the file generated by the custom build."
+            `);
+      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/choose"
+      `);
+      expect(std.err).toMatchInlineSnapshot(`
+        "X [ERROR] The expected output file at \\"index.js\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+
+          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
+
+        "
+      `);
+      expect(std.warn).toMatchInlineSnapshot(`""`);
+    });
+
+    it("should throw an error if the entry is a directory after the build finishes", async () => {
+      writeWranglerToml({
+        main: "./",
+        build: {
+          command: `node -e "console.log('custom build');"`,
+        },
+      });
+
+      fs.writeFileSync("./worker.js", "some content", "utf-8");
+      fs.mkdirSync("./dist");
+      fs.writeFileSync("./dist/index.ts", "some content", "utf-8");
+
+      await expect(runWrangler("publish")).rejects
+        .toThrowErrorMatchingInlineSnapshot(`
+              "The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+              The \`main\` property in wrangler.toml should point to the file generated by the custom build.
+              The provided entry-point path, \\".\\", points to a directory, rather than a file.
+
+              Did you mean to set the main field to one of:
+              \`\`\`
+              main = \\"./worker.js\\"
+              main = \\"./dist/index.ts\\"
+              \`\`\`"
+            `);
       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."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
-        "X [ERROR] Could not resolve \\"index.js\\" after running custom build: node -e \\"console.log('custom build');\\"
+        "X [ERROR] The expected output file at \\".\\" was not found after running custom build: node -e \\"console.log('custom build');\\".
+
+          The \`main\` property in wrangler.toml should point to the file generated by the custom build.
+          The provided entry-point path, \\".\\", points to a directory, rather than a file.
+
+          Did you mean to set the main field to one of:
+          \`\`\`
+          main = \\"./worker.js\\"
+          main = \\"./dist/index.ts\\"
+          \`\`\`
 
         "
       `);
@@ -2577,13 +3117,30 @@ export default{
       mockUploadWorkerRequest();
       await runWrangler("publish index.js");
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
+        "Your worker has access to the following bindings:
+        - Durable Objects:
+          - SOMENAME: SomeClass
+        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.
+        "▲ [WARNING] Processing wrangler.toml configuration:
+
+            - In wrangler.toml, you have configured [durable_objects] exported by this Worker (SomeClass),
+          but no [migrations] for them. This may not work as expected until you add a [migrations] section
+          to your wrangler.toml. Add this configuration to your wrangler.toml:
+
+                \`\`\`
+                [[migrations]]
+                tag = \\"v1\\" # Should be unique for each entry
+                new_classes = [\\"SomeClass\\"]
+                \`\`\`
+
+              Refer to
+          https://developers.cloudflare.com/workers/learning/using-durable-objects/#durable-object-migrations-in-wranglertoml
+          for more details.
 
         "
       `);
@@ -2609,7 +3166,10 @@ export default{
       mockUploadWorkerRequest();
       await runWrangler("publish index.js");
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
+        "Your worker has access to the following bindings:
+        - Durable Objects:
+          - SOMENAME: SomeClass (defined in some-script)
+        Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev"
       `);
@@ -2648,7 +3208,11 @@ export default{
 
       await runWrangler("publish index.js");
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
+        "Your worker has access to the following bindings:
+        - Durable Objects:
+          - SOMENAME: SomeClass
+          - SOMEOTHERNAME: SomeOtherClass
+        Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev"
       `);
@@ -2694,7 +3258,11 @@ export default{
         Object {
           "debug": "",
           "err": "",
-          "out": "Uploaded test-name (TIMINGS)
+          "out": "Your worker has access to the following bindings:
+        - Durable Objects:
+          - SOMENAME: SomeClass
+          - SOMEOTHERNAME: SomeOtherClass
+        Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev",
           "warn": "",
@@ -2733,7 +3301,11 @@ export default{
         Object {
           "debug": "",
           "err": "",
-          "out": "Uploaded test-name (TIMINGS)
+          "out": "Your worker has access to the following bindings:
+        - Durable Objects:
+          - SOMENAME: SomeClass
+          - SOMEOTHERNAME: SomeOtherClass
+        Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev",
           "warn": "",
@@ -2774,7 +3346,11 @@ export default{
 
         await runWrangler("publish index.js --legacy-env false");
         expect(std.out).toMatchInlineSnapshot(`
-          "Uploaded test-name (TIMINGS)
+          "Your worker has access to the following bindings:
+          - Durable Objects:
+            - SOMENAME: SomeClass
+            - SOMEOTHERNAME: SomeOtherClass
+          Uploaded test-name (TIMINGS)
           Published test-name (TIMINGS)
             test-name.test-sub-domain.workers.dev"
         `);
@@ -2832,7 +3408,11 @@ export default{
 
         await runWrangler("publish index.js --legacy-env false --env xyz");
         expect(std.out).toMatchInlineSnapshot(`
-          "Uploaded test-name (xyz) (TIMINGS)
+          "Your worker has access to the following bindings:
+          - Durable Objects:
+            - SOMENAME: SomeClass
+            - SOMEOTHERNAME: SomeOtherClass
+          Uploaded test-name (xyz) (TIMINGS)
           Published test-name (xyz) (TIMINGS)
             xyz.test-name.test-sub-domain.workers.dev"
         `);
@@ -2886,7 +3466,11 @@ export default{
           Object {
             "debug": "",
             "err": "",
-            "out": "Uploaded test-name (TIMINGS)
+            "out": "Your worker has access to the following bindings:
+          - Durable Objects:
+            - SOMENAME: SomeClass
+            - SOMEOTHERNAME: SomeOtherClass
+          Uploaded test-name (TIMINGS)
           Published test-name (TIMINGS)
             test-name.test-sub-domain.workers.dev",
             "warn": "▲ [WARNING] Processing wrangler.toml configuration:
@@ -2950,7 +3534,11 @@ export default{
           Object {
             "debug": "",
             "err": "",
-            "out": "Uploaded test-name (xyz) (TIMINGS)
+            "out": "Your worker has access to the following bindings:
+          - Durable Objects:
+            - SOMENAME: SomeClass
+            - SOMEOTHERNAME: SomeOtherClass
+          Uploaded test-name (xyz) (TIMINGS)
           Published test-name (xyz) (TIMINGS)
             xyz.test-name.test-sub-domain.workers.dev",
             "warn": "▲ [WARNING] Processing wrangler.toml configuration:
@@ -2985,6 +3573,7 @@ export default{
               name: "DURABLE_OBJECT_TWO",
               class_name: "AnotherDurableObject",
               script_name: "another-durable-object-worker",
+              environment: "staging",
             },
           ],
         },
@@ -3043,6 +3632,12 @@ export default{
       mockUploadWorkerRequest({
         expectedType: "sw",
         expectedBindings: [
+          { json: 123, name: "ENV_VAR_ONE", type: "json" },
+          {
+            name: "ENV_VAR_TWO",
+            text: "Hello, I'm an environment variable",
+            type: "plain_text",
+          },
           {
             name: "KV_NAMESPACE_ONE",
             namespace_id: "kv-ns-one-id",
@@ -3061,6 +3656,7 @@ export default{
           },
           {
             class_name: "AnotherDurableObject",
+            environment: "staging",
             name: "DURABLE_OBJECT_TWO",
             script_name: "another-durable-object-worker",
             type: "durable_object_namespace",
@@ -3075,12 +3671,6 @@ export default{
             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",
@@ -3112,7 +3702,32 @@ export default{
 
       await expect(runWrangler("publish index.js")).resolves.toBeUndefined();
       expect(std.out).toMatchInlineSnapshot(`
-        "Uploaded test-name (TIMINGS)
+        "Your worker has access to the following bindings:
+        - Data Blobs:
+          - DATA_BLOB_ONE: some-data-blob.bin
+          - DATA_BLOB_TWO: more-data-blob.bin
+        - Durable Objects:
+          - DURABLE_OBJECT_ONE: SomeDurableObject (defined in some-durable-object-worker)
+          - DURABLE_OBJECT_TWO: AnotherDurableObject (defined in another-durable-object-worker) - staging
+        - KV Namespaces:
+          - KV_NAMESPACE_ONE: kv-ns-one-id
+          - KV_NAMESPACE_TWO: kv-ns-two-id
+        - R2 Buckets:
+          - R2_BUCKET_ONE: r2-bucket-one-name
+          - R2_BUCKET_TWO: r2-bucket-two-name
+        - Text Blobs:
+          - TEXT_BLOB_ONE: my-entire-app-depends-on-this.cfg
+          - TEXT_BLOB_TWO: the-entirety-of-human-knowledge.txt
+        - Unsafe:
+          - some unsafe thing: UNSAFE_BINDING_ONE
+          - another unsafe thing: UNSAFE_BINDING_TWO
+        - Vars:
+          - ENV_VAR_ONE: \\"123\\"
+          - ENV_VAR_TWO: \\"Hello, I'm an environment variable\\"
+        - Wasm Modules:
+          - WASM_MODULE_ONE: some_wasm.wasm
+          - WASM_MODULE_TWO: more_wasm.wasm
+        Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
           test-name.test-sub-domain.workers.dev"
       `);
@@ -3209,7 +3824,7 @@ export default{
             `);
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -3308,7 +3923,7 @@ export default{
             `);
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -3442,7 +4057,7 @@ export default{
             `);
       expect(std.out).toMatchInlineSnapshot(`
         "
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
       `);
       expect(std.err).toMatchInlineSnapshot(`
         "X [ERROR] Processing wrangler.toml configuration:
@@ -3488,10 +4103,13 @@ export default{
         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"
-              `);
+          "Your worker has access to the following bindings:
+          - Wasm Modules:
+            - TESTWASMNAME: path/to/test.wasm
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3513,7 +4131,7 @@ export default{
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] You cannot configure [wasm_modules] with an ES module worker. Instead, import the .wasm module directly in your code
@@ -3554,10 +4172,13 @@ export default{
         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"
-              `);
+          "Your worker has access to the following bindings:
+          - Wasm Modules:
+            - TESTWASMNAME: path/to/and/the/path/to/test.wasm
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3619,10 +4240,13 @@ export default{
         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"
-              `);
+          "Your worker has access to the following bindings:
+          - Text Blobs:
+            - TESTTEXTBLOBNAME: path/to/text.file
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3644,7 +4268,7 @@ export default{
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] You cannot configure [text_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
@@ -3689,10 +4313,13 @@ export default{
         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"
-              `);
+          "Your worker has access to the following bindings:
+          - Text Blobs:
+            - TESTTEXTBLOBNAME: path/to/and/the/path/to/text.file
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3722,10 +4349,13 @@ export default{
         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"
-              `);
+          "Your worker has access to the following bindings:
+          - Data Blobs:
+            - TESTDATABLOBNAME: path/to/data.bin
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3747,7 +4377,7 @@ export default{
         );
         expect(std.out).toMatchInlineSnapshot(`
           "
-          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
+          If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
         `);
         expect(std.err).toMatchInlineSnapshot(`
           "X [ERROR] You cannot configure [data_blobs] with an ES module worker. Instead, import the file directly in your code, and optionally configure \`[rules]\` in your wrangler.toml
@@ -3792,10 +4422,13 @@ export default{
         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"
-              `);
+          "Your worker has access to the following bindings:
+          - Data Blobs:
+            - TESTDATABLOBNAME: path/to/and/the/path/to/data.bin
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3826,10 +4459,15 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - Vars:
+            - text: \\"plain ol' string\\"
+            - count: \\"1\\"
+            - complex: \\"[object Object]\\"
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3850,10 +4488,13 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - R2 Buckets:
+            - FOO: foo-bucket
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3892,10 +4533,13 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - Durable Objects:
+            - EXAMPLE_DO_BINDING: ExampleDurableObject
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3928,10 +4572,13 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - Durable Objects:
+            - EXAMPLE_DO_BINDING: ExampleDurableObject (defined in example-do-binding-worker)
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -3969,10 +4616,13 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - Durable Objects:
+            - EXAMPLE_DO_BINDING: ExampleDurableObject
+          Uploaded test-name (TIMINGS)
+          Published test-name (TIMINGS)
+            test-name.test-sub-domain.workers.dev"
+        `);
         expect(std.err).toMatchInlineSnapshot(`""`);
         expect(std.warn).toMatchInlineSnapshot(`""`);
       });
@@ -4002,6 +4652,50 @@ export default{
       });
     });
 
+    describe("[services]", () => {
+      it("should support service bindings", async () => {
+        writeWranglerToml({
+          services: [
+            {
+              binding: "FOO",
+              service: "foo-service",
+              environment: "production",
+            },
+          ],
+        });
+        writeWorkerSource();
+        mockSubDomainRequest();
+        mockUploadWorkerRequest({
+          expectedBindings: [
+            {
+              type: "service",
+              name: "FOO",
+              service: "foo-service",
+              environment: "production",
+            },
+          ],
+        });
+
+        await runWrangler("publish index.js");
+        expect(std.out).toMatchInlineSnapshot(`
+          "Your worker has access to the following bindings:
+          - Services:
+            - FOO: foo-service - production
+          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:
+
+              - \\"services\\" fields are experimental and may change or break at any time.
+
+          "
+        `);
+      });
+    });
+
     describe("[unsafe]", () => {
       it("should warn if using unsafe bindings", async () => {
         writeWranglerToml({
@@ -4029,10 +4723,13 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - Unsafe:
+            - binding-type: my-binding
+          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:
@@ -4068,10 +4765,13 @@ export default{
 
         await runWrangler("publish index.js");
         expect(std.out).toMatchInlineSnapshot(`
-                  "Uploaded test-name (TIMINGS)
-                  Published test-name (TIMINGS)
-                    test-name.test-sub-domain.workers.dev"
-              `);
+          "Your worker has access to the following bindings:
+          - Unsafe:
+            - plain_text: my-binding
+          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:
@@ -4504,14 +5204,25 @@ export default{
 
   describe("--dry-run", () => {
     it("should not publish the worker if --dry-run is specified", async () => {
-      writeWranglerToml();
+      writeWranglerToml({
+        // add a durable object with migrations
+        // to make sure we _don't_ fetch migration status
+        durable_objects: {
+          bindings: [{ name: "NAME", class_name: "SomeClass" }],
+        },
+        migrations: [{ tag: "v1", new_classes: ["SomeClass"] }],
+      });
       writeWorkerSource();
+      process.env.CLOUDFLARE_ACCOUNT_ID = "";
       await runWrangler("publish index.js --dry-run");
       expect(std).toMatchInlineSnapshot(`
         Object {
           "debug": "",
           "err": "",
-          "out": "--dry-run: exiting now.",
+          "out": "Your worker has access to the following bindings:
+        - Durable Objects:
+          - NAME: SomeClass
+        --dry-run: exiting now.",
           "warn": "",
         }
       `);
@@ -4528,13 +5239,34 @@ export default{
           "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.
+          "warn": "▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
 
         ",
         }
       `);
     });
 
+    it("should recommend node compatibility mode when using node builtins and node-compat isn't enabled", async () => {
+      writeWranglerToml();
+      fs.writeFileSync(
+        "index.js",
+        `
+      import path from 'path';
+      console.log(path.join("some/path/to", "a/file.txt"));
+      export default {}
+      `
+      );
+      let err: Error | undefined;
+      try {
+        await runWrangler("publish index.js --dry-run"); // expecting this to throw, as node compatibility isn't enabled
+      } catch (e) {
+        err = e as Error;
+      }
+      expect(err?.message).toMatch(
+        `Detected a Node builtin module import while Node compatibility is disabled.\nAdd node_compat = true to your wrangler.toml file to enable Node compatibility.`
+      );
+    });
+
     it("should polyfill node builtins when enabled", async () => {
       writeWranglerToml();
       fs.writeFileSync(
@@ -4551,7 +5283,7 @@ export default{
           "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.
+          "warn": "▲ [WARNING] Enabling node.js compatibility mode for built-ins and globals. This is experimental and has serious tradeoffs. Please see https://github.com/ionic-team/rollup-plugin-node-polyfills/ for more details.
 
         ",
         }
@@ -4561,10 +5293,16 @@ export default{
 });
 
 /** Write mock assets to the file system so they can be uploaded. */
-function writeAssets(assets: { filePath: string; content: string }[]) {
+function writeAssets(
+  assets: { filePath: string; content: string }[],
+  destination = "assets"
+) {
   for (const asset of assets) {
-    fs.mkdirSync(path.dirname(asset.filePath), { recursive: true });
-    fs.writeFileSync(asset.filePath, asset.content);
+    const filePathDestination = path.join(destination, asset.filePath);
+    fs.mkdirSync(path.dirname(filePathDestination), {
+      recursive: true,
+    });
+    fs.writeFileSync(filePathDestination, asset.content);
   }
 }
 
@@ -4729,6 +5467,145 @@ function mockPublishRoutesRequest({
   );
 }
 
+function mockUnauthorizedPublishRoutesRequest({
+  env = undefined,
+  legacyEnv = false,
+}: {
+  env?: string | undefined;
+  legacyEnv?: boolean | undefined;
+} = {}) {
+  const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
+  const environment = env && !legacyEnv ? "/environments/:envName" : "";
+
+  setMockRawResponse(
+    `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/routes`,
+    "PUT",
+    () =>
+      createFetchResult(null, false, [
+        { message: "Authentication error", code: 10000 },
+      ])
+  );
+}
+
+function mockCollectKnownRoutesRequest(
+  routes: { pattern: string; script: string }[]
+) {
+  setMockResponse(`/zones/:zoneId/workers/routes`, "GET", () => routes);
+}
+
+function mockGetZoneFromHostRequest(host: string, zone: string) {
+  setMockResponse("/zones", (_uri, _init, queryParams) => {
+    expect(queryParams.get("name")).toEqual(host);
+    return [{ id: zone }];
+  });
+}
+
+function mockPublishRoutesFallbackRequest(route: {
+  pattern: string;
+  script: string;
+}) {
+  setMockResponse(`/zones/:zoneId/workers/routes`, "POST", (_url, { body }) => {
+    expect(JSON.parse(body as string)).toEqual(route);
+    return route.pattern;
+  });
+}
+
+function mockPublishCustomDomainsRequest({
+  publishFlags,
+  domains = [],
+  env = undefined,
+  legacyEnv = false,
+}: {
+  publishFlags: {
+    override_scope: boolean;
+    override_existing_origin: boolean;
+    override_existing_dns_record: boolean;
+  };
+  domains: Array<
+    { hostname: string } & ({ zone_id?: string } | { zone_name?: string })
+  >;
+  env?: string | undefined;
+  legacyEnv?: boolean | undefined;
+}) {
+  const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
+  const environment = env && !legacyEnv ? "/environments/:envName" : "";
+
+  setMockResponse(
+    `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains`,
+    "PUT",
+    ([_url, accountId, scriptName, envName], { body }) => {
+      expect(accountId).toEqual("some-account-id");
+      expect(scriptName).toEqual(
+        legacyEnv && env ? `test-name-${env}` : "test-name"
+      );
+      if (!legacyEnv) {
+        expect(envName).toEqual(env);
+      }
+
+      expect(JSON.parse(body as string)).toEqual({
+        ...publishFlags,
+        origins: domains,
+      });
+
+      return null;
+    }
+  );
+}
+
+function mockPublishCustomDomainsRequestConflictWithoutOverride({
+  domains = [],
+  originConflicts = false,
+  dnsRecordConflicts = false,
+  env = undefined,
+  legacyEnv = false,
+}: {
+  originConflicts?: boolean;
+  dnsRecordConflicts?: boolean;
+  domains: Array<
+    { hostname: string } & ({ zone_id?: string } | { zone_name?: string })
+  >;
+  env?: string | undefined;
+  legacyEnv?: boolean | undefined;
+}) {
+  const servicesOrScripts = env && !legacyEnv ? "services" : "scripts";
+  const environment = env && !legacyEnv ? "/environments/:envName" : "";
+
+  setMockRawResponse(
+    `/accounts/:accountId/workers/${servicesOrScripts}/:scriptName${environment}/domains`,
+    "PUT",
+    ([_url, accountId, scriptName, envName], { body }) => {
+      expect(accountId).toEqual("some-account-id");
+      expect(scriptName).toEqual(
+        legacyEnv && env ? `test-name-${env}` : "test-name"
+      );
+      if (!legacyEnv) {
+        expect(envName).toEqual(env);
+      }
+
+      const parsed = JSON.parse(body as string);
+      expect(parsed.origins).toEqual(domains);
+
+      if (originConflicts && !parsed.override_existing_origin) {
+        return createFetchResult(null, false, [
+          {
+            code: 100116,
+            message: `Cannot create Custom Domain "${domains[0].hostname}": Custom Domain already exists and points to a different script; retry and use option "override_existing_origin" to override`,
+          },
+        ]);
+      }
+      if (dnsRecordConflicts && !parsed.override_existing_dns_record) {
+        return createFetchResult(null, false, [
+          {
+            code: 100117,
+            message: `Cannot create Custom Domain "${domains[0].hostname}": a DNS record already exists for this origin; retry and use option "override_existing_dns_record" to override`,
+          },
+        ]);
+      }
+      return createFetchResult(null, true);
+    }
+  );
+}
+
 /** Create a mock handler for the request to get a list of all KV namespaces. */
 function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
   setMockResponse(
@@ -4749,9 +5626,10 @@ function mockUploadAssetsToKVRequest(
     content: string;
     expiration?: number;
     expiration_ttl?: number;
-  }[]
+  }[],
+  onUpload?: () => void
 ) {
-  setMockResponse(
+  return setMockResponse(
     "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
     "PUT",
     ([_url, accountId, namespaceId], { body }) => {
@@ -4781,6 +5659,7 @@ function mockUploadAssetsToKVRequest(
         expect(upload.expiration).toEqual(asset.expiration);
         expect(upload.expiration_ttl).toEqual(asset.expiration_ttl);
       }
+      onUpload?.();
       return null;
     }
   );