wrangler 2.0.8 → 2.0.12

package/src/__tests__/publish.test.ts

@@ -649,8 +649,85 @@ 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 seperate custom domains", async () => {
+      it("should publish routes marked with 'custom_domain' as separate custom domains", async () => {
         writeWranglerToml({
           routes: [{ pattern: "api.example.com", custom_domain: true }],
         });
@@ -1146,8 +1223,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1173,10 +1250,10 @@ addEventListener('fetch', event => {});`
         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)
@@ -1197,8 +1274,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1224,10 +1301,10 @@ addEventListener('fetch', event => {});`
       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)
@@ -1292,8 +1369,8 @@ addEventListener('fetch', event => {});`
   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",
@@ -1315,10 +1392,46 @@ addEventListener('fetch', event => {});`
       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 upload all the files in the directory specified by `--experimental-public`", 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: "./index.js",
+      });
+      writeWorkerSource();
+      writeAssets(assets);
+      mockUploadWorkerRequest({
+        expectedMainModule: "stdin.js",
+      });
+      mockSubDomainRequest();
+      mockListKVNamespacesRequest(kvNamespace);
+      mockKeyListRequest(kvNamespace.id, []);
+      mockUploadAssetsToKVRequest(kvNamespace.id, assets);
+      await runWrangler("publish --experimental-public assets");
+
+      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)
@@ -1327,10 +1440,37 @@ addEventListener('fetch', event => {});`
       expect(std.err).toMatchInlineSnapshot(`""`);
     });
 
+    it("should error if --experimental-public and --site are used together", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+      });
+      writeWorkerSource();
+      await expect(
+        runWrangler("publish --experimental-public abc --site xyz")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot use --experimental-public and a Site configuration together."`
+      );
+    });
+
+    it("should error if --experimental-public and config.site are used together", async () => {
+      writeWranglerToml({
+        main: "./index.js",
+        site: {
+          bucket: "xyz",
+        },
+      });
+      writeWorkerSource();
+      await expect(
+        runWrangler("publish --experimental-public abc")
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Cannot use --experimental-public and a Site configuration together."`
+      );
+    });
+
     it("should not contain backslash for assets with nested directories", async () => {
       const assets = [
-        { filePath: "assets/subdir/file-1.txt", content: "Content of file-1" },
-        { filePath: "assets/subdir/file-2.txt", content: "Content of file-2" },
+        { 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",
@@ -1354,7 +1494,7 @@ addEventListener('fetch', event => {});`
         ],
         expectedModules: {
           __STATIC_CONTENT_MANIFEST:
-            '{"subdir/file-1.txt":"assets/subdir/file-1.2ca234f380.txt","subdir/file-2.txt":"assets/subdir/file-2.5938485188.txt"}',
+            '{"subdir/file-1.txt":"subdir/file-1.2ca234f380.txt","subdir/file-2.txt":"subdir/file-2.5938485188.txt"}',
         },
       });
       mockSubDomainRequest();
@@ -1365,10 +1505,10 @@ addEventListener('fetch', event => {});`
       await runWrangler("publish");
 
       expect(std.out).toMatchInlineSnapshot(`
-        "Reading assets/subdir/file-1.txt...
-        Uploading as assets/subdir/file-1.2ca234f380.txt...
-        Reading assets/subdir/file-2.txt...
-        Uploading as assets/subdir/file-2.5938485188.txt...
+        "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)
@@ -1379,8 +1519,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1398,7 +1538,7 @@ addEventListener('fetch', event => {});`
         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: [
           {
@@ -1421,10 +1561,10 @@ addEventListener('fetch', event => {});`
       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)
@@ -1435,8 +1575,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1460,7 +1600,7 @@ addEventListener('fetch', event => {});`
         ],
         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();
@@ -1471,10 +1611,10 @@ addEventListener('fetch', event => {});`
       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)
@@ -1486,8 +1626,8 @@ addEventListener('fetch', event => {});`
     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",
@@ -1519,10 +1659,10 @@ addEventListener('fetch', event => {});`
       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)
@@ -1534,8 +1674,8 @@ addEventListener('fetch', event => {});`
     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",
@@ -1568,10 +1708,10 @@ addEventListener('fetch', event => {});`
       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)
@@ -1582,8 +1722,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1601,21 +1741,19 @@ addEventListener('fetch', event => {});`
       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)
@@ -1626,8 +1764,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1648,13 +1786,13 @@ addEventListener('fetch', event => {});`
       // 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)
@@ -1665,8 +1803,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1687,13 +1825,13 @@ addEventListener('fetch', event => {});`
       // 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)
@@ -1704,8 +1842,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1727,13 +1865,13 @@ addEventListener('fetch', event => {});`
       // 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)
@@ -1744,8 +1882,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1767,13 +1905,13 @@ addEventListener('fetch', event => {});`
       // 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)
@@ -1784,8 +1922,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1807,13 +1945,13 @@ addEventListener('fetch', event => {});`
       // 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)
@@ -1824,8 +1962,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -1835,7 +1973,7 @@ addEventListener('fetch', event => {});`
         main: "./index.js",
         site: {
           bucket: "assets",
-          exclude: ["assets/file-1.txt"],
+          exclude: ["file-1.txt"],
         },
       });
       writeWorkerSource();
@@ -1847,13 +1985,13 @@ addEventListener('fetch', event => {});`
       // 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)
@@ -1865,11 +2003,11 @@ addEventListener('fetch', event => {});`
     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",
         },
       ];
@@ -1894,8 +2032,8 @@ addEventListener('fetch', event => {});`
       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)
@@ -1907,15 +2045,15 @@ addEventListener('fetch', event => {});`
     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",
         },
       ];
@@ -1940,8 +2078,8 @@ addEventListener('fetch', event => {});`
       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)
@@ -1953,12 +2091,12 @@ addEventListener('fetch', event => {});`
     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),
         },
       ];
@@ -1970,7 +2108,7 @@ addEventListener('fetch', event => {});`
         main: "./index.js",
         site: {
           bucket: "assets",
-          exclude: ["assets/file-1.txt"],
+          exclude: ["file-1.txt"],
         },
       });
       writeWorkerSource();
@@ -1983,25 +2121,122 @@ addEventListener('fetch', event => {});`
       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/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, []);
+      const requests = mockUploadAssetsToKVRequest(kvNamespace.id);
+
+      await runWrangler("publish");
+
+      // We expect this to be uploaded in 3 batches
+      // The first batch has 11 files (88mb)
+      expect(requests[0].uploads.length).toEqual(11);
+      // The next batch has 5 files (93mb)
+      expect(requests[1].uploads.length).toEqual(5);
+      // And the last one has 4 files (98mb)
+      expect(requests[2].uploads.length).toEqual(4);
+
+      let assetIndex = 0;
+      for (const request of requests) {
+        for (const upload of request.uploads) {
+          checkAssetUpload(assets[assetIndex], upload);
+          assetIndex++;
+        }
+      }
+
+      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 = {
@@ -2024,16 +2259,16 @@ addEventListener('fetch', event => {});`
       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/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\\",
 
         "
       `);
@@ -2041,8 +2276,8 @@ addEventListener('fetch', event => {});`
 
     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",
@@ -2061,32 +2296,86 @@ addEventListener('fetch', event => {});`
       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)
@@ -5004,7 +5293,7 @@ addEventListener('fetch', event => {});`
           "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.
 
         ",
         }
@@ -5048,7 +5337,7 @@ addEventListener('fetch', event => {});`
           "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.
 
         ",
         }
@@ -5058,10 +5347,16 @@ addEventListener('fetch', event => {});`
 });
 
 /** 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);
   }
 }
 
@@ -5070,6 +5365,7 @@ function mockUploadWorkerRequest(
   options: {
     available_on_subdomain?: boolean;
     expectedEntry?: string;
+    expectedMainModule?: string;
     expectedType?: "esm" | "sw";
     expectedBindings?: unknown;
     expectedModules?: Record<string, string>;
@@ -5083,6 +5379,7 @@ function mockUploadWorkerRequest(
   const {
     available_on_subdomain = true,
     expectedEntry,
+    expectedMainModule = "index.js",
     expectedType = "esm",
     expectedBindings,
     expectedModules = {},
@@ -5106,6 +5403,7 @@ function mockUploadWorkerRequest(
         expect(envName).toEqual(env);
       }
       expect(queryParams.get("include_subdomain_availability")).toEqual("true");
+      expect(queryParams.get("excludeScript")).toEqual("true");
       const formBody = body as FormData;
       if (expectedEntry !== undefined) {
         expect(await (formBody.get("index.js") as File).text()).toMatch(
@@ -5116,7 +5414,7 @@ function mockUploadWorkerRequest(
         formBody.get("metadata") as string
       ) as WorkerMetadata;
       if (expectedType === "esm") {
-        expect(metadata.main_module).toEqual("index.js");
+        expect(metadata.main_module).toEqual(expectedMainModule);
       } else {
         expect(metadata.body_part).toEqual("index.js");
       }
@@ -5226,6 +5524,49 @@ 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 = [],
@@ -5334,16 +5675,28 @@ function mockListKVNamespacesRequest(...namespaces: KVNamespaceInfo[]) {
   );
 }
 
+interface ExpectedAsset {
+  filePath: string;
+  content: string;
+  expiration?: number;
+  expiration_ttl?: number;
+}
+interface StaticAssetUpload {
+  key: string;
+  base64: boolean;
+  value: string;
+  expiration: number | undefined;
+  expiration_ttl: number | undefined;
+}
+
 /** 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;
-    expiration?: number;
-    expiration_ttl?: number;
-  }[]
+  assets?: ExpectedAsset[]
 ) {
+  const requests: {
+    uploads: StaticAssetUpload[];
+  }[] = [];
   setMockResponse(
     "/accounts/:accountId/storage/kv/namespaces/:namespaceId/bulk",
     "PUT",
@@ -5351,32 +5704,31 @@ function mockUploadAssetsToKVRequest(
       expect(accountId).toEqual("some-account-id");
       expect(namespaceId).toEqual(expectedNamespaceId);
       const uploads = JSON.parse(body as string);
-      expect(assets.length).toEqual(uploads.length);
-      for (let i = 0; i < uploads.length; i++) {
-        const asset = assets[i];
-        const upload = uploads[i];
-        // The asset key consists of:
-        // - the basename of the filepath
-        // - some hash value
-        // - the extension
-        const keyMatcher = new RegExp(
-          "^" +
-            asset.filePath
-              .replace(/(\.[^.]+)$/, ".[a-z0-9]+$1")
-              .replace(/\./g, "\\.")
-        );
-        expect(upload.key).toMatch(keyMatcher);
-        // The asset value is base64 encoded.
-        expect(upload.base64).toBe(true);
-        expect(Buffer.from(upload.value, "base64").toString()).toEqual(
-          asset.content
-        );
-        expect(upload.expiration).toEqual(asset.expiration);
-        expect(upload.expiration_ttl).toEqual(asset.expiration_ttl);
+      if (assets) {
+        expect(assets.length).toEqual(uploads.length);
+        for (let i = 0; i < uploads.length; i++) {
+          checkAssetUpload(assets[i], uploads[i]);
+        }
+      } else {
+        requests.push({ uploads });
       }
-      return null;
     }
   );
+  return requests;
+}
+
+function checkAssetUpload(asset: ExpectedAsset, upload: StaticAssetUpload) {
+  // The asset key consists of: `<basename>.<hash>.<extension>`
+  const keyMatcher = new RegExp(
+    "^" +
+      asset.filePath.replace(/(\.[^.]+)$/, ".[a-z0-9]+$1").replace(/\./g, "\\.")
+  );
+  expect(upload.key).toMatch(keyMatcher);
+  // The asset value is base64 encoded.
+  expect(upload.base64).toBe(true);
+  expect(Buffer.from(upload.value, "base64").toString()).toEqual(asset.content);
+  expect(upload.expiration).toEqual(asset.expiration);
+  expect(upload.expiration_ttl).toEqual(asset.expiration_ttl);
 }
 
 /** Create a mock handler for thr request that does a bulk delete of unused assets */