wrangler 2.0.9 → 2.0.14

package/src/__tests__/publish.test.ts

@@ -66,7 +66,6 @@ describe("publish", () => {
       writeWorkerSource();
       mockSubDomainRequest();
       mockUploadWorkerRequest();
-
       mockOAuthServerCallback();
       const accessTokenRequest = mockGrantAccessToken({ respondWith: "ok" });
       mockGrantAuthorization({ respondWith: "success" });
@@ -79,6 +78,7 @@ describe("publish", () => {
 
       expect(std.out).toMatchInlineSnapshot(`
         "Attempting to login via OAuth...
+        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
         Successfully logged in.
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -108,6 +108,7 @@ describe("publish", () => {
 
       expect(std.out).toMatchInlineSnapshot(`
         "Attempting to login via OAuth...
+        Opening a link in your default browser: https://dash.cloudflare.com/oauth2/auth?response_type=code&client_id=54d11594-84e4-41aa-b438-e81b8fa78ee7&redirect_uri=http%3A%2F%2Flocalhost%3A8976%2Foauth%2Fcallback&scope=account%3Aread%20user%3Aread%20workers%3Awrite%20workers_kv%3Awrite%20workers_routes%3Awrite%20workers_scripts%3Awrite%20workers_tail%3Aread%20pages%3Awrite%20zone%3Aread%20offline_access&state=MOCK_STATE_PARAM&code_challenge=MOCK_CODE_CHALLENGE&code_challenge_method=S256
         Successfully logged in.
         Uploaded test-name (TIMINGS)
         Published test-name (TIMINGS)
@@ -1223,8 +1224,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",
@@ -1250,10 +1251,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)
@@ -1274,8 +1275,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",
@@ -1301,10 +1302,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)
@@ -1369,8 +1370,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",
@@ -1392,10 +1393,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)
@@ -1404,10 +1405,73 @@ addEventListener('fetch', event => {});`
       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)
+          test-name.test-sub-domain.workers.dev"
+      `);
+      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",
@@ -1431,7 +1495,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();
@@ -1442,10 +1506,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)
@@ -1456,8 +1520,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",
@@ -1475,7 +1539,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: [
           {
@@ -1498,10 +1562,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)
@@ -1512,8 +1576,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",
@@ -1537,7 +1601,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();
@@ -1548,10 +1612,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)
@@ -1563,8 +1627,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",
@@ -1596,10 +1660,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)
@@ -1611,8 +1675,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",
@@ -1645,10 +1709,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)
@@ -1659,8 +1723,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",
@@ -1678,21 +1742,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)
@@ -1703,8 +1765,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",
@@ -1725,13 +1787,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)
@@ -1742,8 +1804,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",
@@ -1764,13 +1826,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)
@@ -1781,8 +1843,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",
@@ -1804,13 +1866,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)
@@ -1821,8 +1883,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",
@@ -1844,13 +1906,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)
@@ -1861,8 +1923,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",
@@ -1884,13 +1946,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)
@@ -1901,8 +1963,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",
@@ -1912,7 +1974,7 @@ addEventListener('fetch', event => {});`
         main: "./index.js",
         site: {
           bucket: "assets",
-          exclude: ["assets/file-1.txt"],
+          exclude: ["file-1.txt"],
         },
       });
       writeWorkerSource();
@@ -1924,13 +1986,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)
@@ -1942,11 +2004,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",
         },
       ];
@@ -1971,8 +2033,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)
@@ -1984,15 +2046,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",
         },
       ];
@@ -2017,8 +2079,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)
@@ -2030,12 +2092,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),
         },
       ];
@@ -2047,7 +2109,7 @@ addEventListener('fetch', event => {});`
         main: "./index.js",
         site: {
           bucket: "assets",
-          exclude: ["assets/file-1.txt"],
+          exclude: ["file-1.txt"],
         },
       });
       writeWorkerSource();
@@ -2060,25 +2122,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 = {
@@ -2101,16 +2260,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\\",
 
         "
       `);
@@ -2118,8 +2277,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",
@@ -2138,32 +2297,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)
@@ -5135,10 +5348,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);
   }
 }
 
@@ -5147,6 +5366,7 @@ function mockUploadWorkerRequest(
   options: {
     available_on_subdomain?: boolean;
     expectedEntry?: string;
+    expectedMainModule?: string;
     expectedType?: "esm" | "sw";
     expectedBindings?: unknown;
     expectedModules?: Record<string, string>;
@@ -5160,6 +5380,7 @@ function mockUploadWorkerRequest(
   const {
     available_on_subdomain = true,
     expectedEntry,
+    expectedMainModule = "index.js",
     expectedType = "esm",
     expectedBindings,
     expectedModules = {},
@@ -5183,6 +5404,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(
@@ -5193,7 +5415,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");
       }
@@ -5454,16 +5676,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",
@@ -5471,32 +5705,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 */