wrangler 0.0.0-e2f9bb2 → 0.0.0-e305903a

package/src/__tests__/pages.test.ts

@@ -1,329 +1,1995 @@
-import { writeFileSync } from "node:fs";
+import { mkdirSync, writeFileSync } from "node:fs";
+import { chdir } from "node:process";
+import { ROUTES_SPEC_VERSION } from "../pages/constants";
+import { isRoutesJSONSpec } from "../pages/functions/routes-validation";
+import { version } from "./../../package.json";
 import { mockAccountId, mockApiToken } from "./helpers/mock-account-id";
-import { setMockResponse, unsetAllMocks } from "./helpers/mock-cfetch";
+import {
+	createFetchResult,
+	setMockRawResponse,
+	setMockResponse,
+	unsetAllMocks,
+} from "./helpers/mock-cfetch";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
-import type { Project, Deployment } from "../pages";
-import type { File, FormData } from "undici";
+import type { Deployment, Project, UploadPayloadFile } from "../pages/types";
+import type { FormData, RequestInit } from "undici";
+
+// Asserting within mock responses get swallowed, so run them out-of-band
+const outOfBandTests: (() => void)[] = [];
+function assertLater(fn: () => void) {
+	outOfBandTests.push(fn);
+}
+
+function mockGetToken(jwt: string) {
+	return setMockResponse(
+		"/accounts/:accountId/pages/projects/foo/upload-token",
+		async ([_url, accountId]) => {
+			assertLater(() => {
+				expect(accountId).toEqual("some-account-id");
+			});
+
+			return { jwt };
+		}
+	);
+}
 
 describe("pages", () => {
-  runInTempDir();
-  const std = mockConsoleMethods();
-  function endEventLoop() {
-    return new Promise((resolve) => setImmediate(resolve));
-  }
-
-  it("should should display a list of available subcommands, for pages with no subcommand", async () => {
-    await runWrangler("pages");
-    await endEventLoop();
-
-    expect(std.out).toMatchInlineSnapshot(`
-      "wrangler pages
-
-      ⚡️ Configure Cloudflare Pages
-
-      Commands:
-        wrangler pages dev [directory] [-- command]  🧑‍💻 Develop your full-stack Pages application locally
-        wrangler pages project                       ⚡️ Interact with your Pages projects
-        wrangler pages deployment                    🚀 Interact with the deployments of a project
-        wrangler pages publish [directory]           🆙 Publish a directory of static assets as a Pages deployment
-
-      Flags:
-        -c, --config      Path to .toml configuration file  [string]
-        -h, --help        Show help  [boolean]
-        -v, --version     Show version number  [boolean]
-            --legacy-env  Use legacy environments  [boolean]
-
-      🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-    `);
-  });
-
-  describe("beta message for subcommands", () => {
-    it("should display for pages:dev", async () => {
-      await expect(
-        runWrangler("pages dev")
-      ).rejects.toThrowErrorMatchingInlineSnapshot(
-        `"Must specify a directory of static assets to serve or a command to run."`
-      );
-
-      expect(std.out).toMatchInlineSnapshot(`
-        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
-
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
-      `);
-    });
-
-    it("should display for pages:functions:build", async () => {
-      await expect(runWrangler("pages functions build")).rejects.toThrowError();
-
-      expect(std.out).toMatchInlineSnapshot(`
-        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
-
-        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new."
-      `);
-    });
-  });
-
-  describe("project list", () => {
-    mockAccountId();
-    mockApiToken();
-
-    afterEach(() => {
-      unsetAllMocks();
-    });
-
-    function mockListRequest(projects: unknown[]) {
-      const requests = { count: 0 };
-      setMockResponse(
-        "/accounts/:accountId/pages/projects",
-        ([_url, accountId], init, query) => {
-          requests.count++;
-          expect(accountId).toEqual("some-account-id");
-          expect(query.get("per_page")).toEqual("10");
-          expect(query.get("page")).toEqual(`${requests.count}`);
-          expect(init).toEqual({});
-          const pageSize = Number(query.get("per_page"));
-          const page = Number(query.get("page"));
-          return projects.slice((page - 1) * pageSize, page * pageSize);
-        }
-      );
-      return requests;
-    }
-
-    it("should make request to list projects", async () => {
-      const projects: Project[] = [
-        {
-          name: "dogs",
-          subdomain: "docs.pages.dev",
-          domains: ["dogs.pages.dev"],
-          source: {
-            type: "github",
-          },
-          latest_deployment: {
-            modified_on: "2021-11-17T14:52:26.133835Z",
-          },
-          created_on: "2021-11-17T14:52:26.133835Z",
-          production_branch: "main",
-        },
-        {
-          name: "cats",
-          subdomain: "cats.pages.dev",
-          domains: ["cats.pages.dev", "kitten.com"],
-          latest_deployment: {
-            modified_on: "2021-11-17T14:52:26.133835Z",
-          },
-          created_on: "2021-11-17T14:52:26.133835Z",
-          production_branch: "main",
-        },
-      ];
-
-      const requests = mockListRequest(projects);
-      await runWrangler("pages project list");
-
-      expect(requests.count).toBe(1);
-    });
-
-    it("should make multiple requests for paginated results", async () => {
-      const projects: Project[] = [];
-      for (let i = 0; i < 15; i++) {
-        projects.push({
-          name: "dogs" + i,
-          subdomain: i + "dogs.pages.dev",
-          domains: [i + "dogs.pages.dev"],
-          source: {
-            type: "github",
-          },
-          latest_deployment: {
-            modified_on: "2021-11-17T14:52:26.133835Z",
-          },
-          created_on: "2021-11-17T14:52:26.133835Z",
-          production_branch: "main",
-        });
-      }
-      const requests = mockListRequest(projects);
-      await runWrangler("pages project list");
-      expect(requests.count).toEqual(2);
-    });
-  });
-
-  describe("project create", () => {
-    mockAccountId();
-    mockApiToken();
-
-    afterEach(() => {
-      unsetAllMocks();
-    });
-
-    it("should create a project with a production branch", async () => {
-      setMockResponse(
-        "/accounts/:accountId/pages/projects",
-        ([_url, accountId], init) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(init.method).toEqual("POST");
-          const body = JSON.parse(init.body as string);
-          expect(body).toEqual({
-            name: "a-new-project",
-            production_branch: "main",
-          });
-          return {
-            name: "a-new-project",
-            subdomain: "a-new-project.pages.dev",
-            production_branch: "main",
-          };
-        }
-      );
-      await runWrangler(
-        "pages project create a-new-project --production-branch=main"
-      );
-      expect(std.out).toMatchInlineSnapshot(`
-        "✨ Successfully created the 'a-new-project' project. It will be available at https://a-new-project.pages.dev/ once you create your first deployment.
-        To deploy a folder of assets, run 'wrangler pages publish [directory]'."
-      `);
-    });
-  });
-
-  describe("deployment list", () => {
-    mockAccountId();
-    mockApiToken();
-
-    afterEach(() => {
-      unsetAllMocks();
-    });
-    function mockListRequest(deployments: unknown[]) {
-      const requests = { count: 0 };
-      setMockResponse(
-        "/accounts/:accountId/pages/projects/:project/deployments",
-        ([_url, accountId, project]) => {
-          requests.count++;
-          expect(project).toEqual("images");
-          expect(accountId).toEqual("some-account-id");
-          return deployments;
-        }
-      );
-      return requests;
-    }
-
-    it("should make request to list deployments", async () => {
-      const deployments: Deployment[] = [
-        {
-          id: "87bbc8fe-16be-45cd-81e0-63d722e82cdf",
-          url: "https://87bbc8fe.images.pages.dev",
-          environment: "preview",
-          latest_stage: {
-            ended_on: "2021-11-17T14:52:26.133835Z",
-            status: "success",
-          },
-          deployment_trigger: {
-            metadata: {
-              branch: "main",
-              commit_hash: "c7649364c4cb32ad4f65b530b9424e8be5bec9d6",
-            },
-          },
-          project_name: "images",
-        },
-      ];
-
-      const requests = mockListRequest(deployments);
-      await runWrangler("pages deployment list --project-name=images");
-
-      expect(requests.count).toBe(1);
-    });
-  });
-
-  describe("deployment create", () => {
-    let actualProcessEnvCI: string | undefined;
-
-    mockAccountId();
-    mockApiToken();
-    runInTempDir();
-
-    beforeEach(() => {
-      actualProcessEnvCI = process.env.CI;
-      process.env.CI = "true";
-    });
-
-    afterEach(() => {
-      unsetAllMocks();
-      process.env.CI = actualProcessEnvCI;
-    });
-
-    it("should be aliased with 'wrangler pages publish'", async () => {
-      await runWrangler("pages publish --help");
-      await endEventLoop();
-
-      expect(std.out).toMatchInlineSnapshot(`
-        "wrangler pages publish [directory]
-
-        🆙 Publish a directory of static assets as a Pages deployment
-
-        Positionals:
-          directory  The directory of Pages Functions  [string] [default: \\"functions\\"]
-
-        Flags:
-          -c, --config      Path to .toml configuration file  [string]
-          -h, --help        Show help  [boolean]
-          -v, --version     Show version number  [boolean]
-              --legacy-env  Use legacy environments  [boolean]
-
-        Options:
-              --project-name    The name of the project you want to list deployments for  [string]
-              --branch          The branch of the project you want to list deployments for  [string]
-              --commit-hash     The branch of the project you want to list deployments for  [string]
-              --commit-message  The branch of the project you want to list deployments for  [string]
-              --commit-dirty    The branch of the project you want to list deployments for  [boolean]
-
-        🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-      `);
-    });
-
-    it("should upload a directory of files", async () => {
-      writeFileSync("logo.png", "foobar");
-
-      setMockResponse(
-        "/accounts/:accountId/pages/projects/foo/file",
-        async ([_url, accountId], init) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(init.method).toEqual("POST");
-          const body = init.body as FormData;
-          const logoPNGFile = body.get("file") as File;
-          expect(await logoPNGFile.text()).toEqual("foobar");
-          expect(logoPNGFile.name).toEqual("logo.png");
-
-          return {
-            id: "2082190357cfd3617ccfe04f340c6247",
-          };
-        }
-      );
-
-      setMockResponse(
-        "/accounts/:accountId/pages/projects/foo/deployments",
-        async ([_url, accountId], init) => {
-          expect(accountId).toEqual("some-account-id");
-          expect(init.method).toEqual("POST");
-          const body = init.body as FormData;
-          const manifest = JSON.parse(body.get("manifest") as string);
-          expect(manifest).toMatchInlineSnapshot(`
-            Object {
-              "/logo.png": "2082190357cfd3617ccfe04f340c6247",
-            }
-          `);
-
-          return {
-            url: "https://abcxyz.foo.pages.dev/",
-          };
-        }
-      );
-
-      await runWrangler("pages publish . --project-name=foo");
-
-      // TODO: Unmounting somehow loses this output
-
-      // expect(std.out).toMatchInlineSnapshot(`
-      //   "✨ Success! Uploaded 1 files (TIMINGS)
-
-      //   ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-      // `);
-    });
-  });
+	runInTempDir();
+	const std = mockConsoleMethods();
+	function endEventLoop() {
+		return new Promise((resolve) => setImmediate(resolve));
+	}
+	beforeEach(() => {
+		outOfBandTests.length = 0;
+	});
+	afterEach(() => {
+		outOfBandTests.forEach((fn) => fn());
+	});
+
+	beforeEach(() => {
+		// @ts-expect-error we're using a very simple setTimeout mock here
+		jest.spyOn(global, "setTimeout").mockImplementation((fn, _period) => {
+			setImmediate(fn);
+		});
+	});
+
+	it("should should display a list of available subcommands, for pages with no subcommand", async () => {
+		await runWrangler("pages");
+		await endEventLoop();
+
+		expect(std.out).toMatchInlineSnapshot(`
+		      "wrangler pages
+
+		      ⚡️ Configure Cloudflare Pages
+
+		      Commands:
+		        wrangler pages dev [directory] [-- command..]  🧑‍💻 Develop your full-stack Pages application locally
+		        wrangler pages project                         ⚡️ Interact with your Pages projects
+		        wrangler pages deployment                      🚀 Interact with the deployments of a project
+		        wrangler pages publish [directory]             🆙 Publish a directory of static assets as a Pages deployment
+
+		      Flags:
+		        -c, --config   Path to .toml configuration file  [string]
+		        -h, --help     Show help  [boolean]
+		        -v, --version  Show version number  [boolean]
+
+		      🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+	    `);
+	});
+
+	describe("beta message for subcommands", () => {
+		it("should display for pages:dev", async () => {
+			await expect(
+				runWrangler("pages dev")
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"Must specify a directory of static assets to serve or a command to run or a proxy port."`
+			);
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+
+			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		      `);
+		});
+
+		it("should display for pages:functions:build", async () => {
+			await expect(runWrangler("pages functions build")).rejects.toThrowError();
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+
+			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		      `);
+		});
+
+		it("should display for pages:functions:optimize-routes", async () => {
+			await expect(
+				runWrangler(
+					'pages functions optimize-routes --routes-path="/build/_routes.json" --output-routes-path="/build/_optimized-routes.json"'
+				)
+			).rejects.toThrowError();
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+
+			        If you think this is a bug then please create an issue at https://github.com/cloudflare/wrangler2/issues/new/choose"
+		      `);
+		});
+	});
+
+	describe("project list", () => {
+		mockAccountId();
+		mockApiToken();
+
+		afterEach(() => {
+			unsetAllMocks();
+		});
+
+		function mockListRequest(projects: unknown[]) {
+			const requests = { count: 0 };
+			setMockResponse(
+				"/accounts/:accountId/pages/projects",
+				([_url, accountId], init, query) => {
+					requests.count++;
+					const pageSize = Number(query.get("per_page"));
+					const page = Number(query.get("page"));
+					const expectedPageSize = 10;
+					const expectedPage = requests.count;
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(pageSize).toEqual(expectedPageSize);
+						expect(page).toEqual(expectedPage);
+						expect(init).toEqual({});
+					});
+					return projects.slice((page - 1) * pageSize, page * pageSize);
+				}
+			);
+			return requests;
+		}
+
+		it("should make request to list projects", async () => {
+			const projects: Project[] = [
+				{
+					name: "dogs",
+					subdomain: "docs.pages.dev",
+					domains: ["dogs.pages.dev"],
+					source: {
+						type: "github",
+					},
+					latest_deployment: {
+						modified_on: "2021-11-17T14:52:26.133835Z",
+					},
+					created_on: "2021-11-17T14:52:26.133835Z",
+					production_branch: "main",
+				},
+				{
+					name: "cats",
+					subdomain: "cats.pages.dev",
+					domains: ["cats.pages.dev", "kitten.com"],
+					latest_deployment: {
+						modified_on: "2021-11-17T14:52:26.133835Z",
+					},
+					created_on: "2021-11-17T14:52:26.133835Z",
+					production_branch: "main",
+				},
+			];
+
+			const requests = mockListRequest(projects);
+			await runWrangler("pages project list");
+
+			expect(requests.count).toBe(1);
+		});
+
+		it("should make multiple requests for paginated results", async () => {
+			const projects: Project[] = [];
+			for (let i = 0; i < 15; i++) {
+				projects.push({
+					name: "dogs" + i,
+					subdomain: i + "dogs.pages.dev",
+					domains: [i + "dogs.pages.dev"],
+					source: {
+						type: "github",
+					},
+					latest_deployment: {
+						modified_on: "2021-11-17T14:52:26.133835Z",
+					},
+					created_on: "2021-11-17T14:52:26.133835Z",
+					production_branch: "main",
+				});
+			}
+			const requests = mockListRequest(projects);
+			await runWrangler("pages project list");
+			expect(requests.count).toEqual(2);
+		});
+	});
+
+	describe("project create", () => {
+		mockAccountId();
+		mockApiToken();
+
+		afterEach(() => {
+			unsetAllMocks();
+		});
+
+		it("should create a project with a production branch", async () => {
+			setMockResponse(
+				"/accounts/:accountId/pages/projects",
+				([_url, accountId], init) => {
+					const body = JSON.parse(init.body as string);
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						expect(body).toEqual({
+							name: "a-new-project",
+							production_branch: "main",
+						});
+					});
+					return {
+						name: "a-new-project",
+						subdomain: "a-new-project.pages.dev",
+						production_branch: "main",
+					};
+				}
+			);
+			await runWrangler(
+				"pages project create a-new-project --production-branch=main"
+			);
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Successfully created the 'a-new-project' project. It will be available at https://a-new-project.pages.dev/ once you create your first deployment.
+			        To deploy a folder of assets, run 'wrangler pages publish [directory]'."
+		      `);
+		});
+	});
+
+	describe("deployment list", () => {
+		mockAccountId();
+		mockApiToken();
+
+		afterEach(() => {
+			unsetAllMocks();
+		});
+		function mockListRequest(deployments: unknown[]) {
+			const requests = { count: 0 };
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/:project/deployments",
+				([_url, accountId, project]) => {
+					requests.count++;
+					assertLater(() => {
+						expect(project).toEqual("images");
+						expect(accountId).toEqual("some-account-id");
+					});
+					return deployments;
+				}
+			);
+			return requests;
+		}
+
+		it("should make request to list deployments", async () => {
+			const deployments: Deployment[] = [
+				{
+					id: "87bbc8fe-16be-45cd-81e0-63d722e82cdf",
+					url: "https://87bbc8fe.images.pages.dev",
+					environment: "preview",
+					latest_stage: {
+						ended_on: "2021-11-17T14:52:26.133835Z",
+						status: "success",
+					},
+					deployment_trigger: {
+						metadata: {
+							branch: "main",
+							commit_hash: "c7649364c4cb32ad4f65b530b9424e8be5bec9d6",
+						},
+					},
+					project_name: "images",
+				},
+			];
+
+			const requests = mockListRequest(deployments);
+			await runWrangler("pages deployment list --project-name=images");
+
+			expect(requests.count).toBe(1);
+		});
+	});
+
+	describe("deployment create", () => {
+		let actualProcessEnvCI: string | undefined;
+
+		mockAccountId();
+		mockApiToken();
+		runInTempDir();
+
+		beforeEach(() => {
+			actualProcessEnvCI = process.env.CI;
+			process.env.CI = "true";
+		});
+
+		afterEach(() => {
+			unsetAllMocks();
+			process.env.CI = actualProcessEnvCI;
+		});
+
+		it("should be aliased with 'wrangler pages publish'", async () => {
+			await runWrangler("pages publish --help");
+			await endEventLoop();
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "wrangler pages publish [directory]
+
+			        🆙 Publish a directory of static assets as a Pages deployment
+
+			        Positionals:
+			          directory  The directory of static files to upload  [string]
+
+			        Flags:
+			          -h, --help     Show help  [boolean]
+			          -v, --version  Show version number  [boolean]
+
+			        Options:
+			              --project-name    The name of the project you want to deploy to  [string]
+			              --branch          The name of the branch you want to deploy to  [string]
+			              --commit-hash     The SHA to attach to this deployment  [string]
+			              --commit-message  The commit message to attach to this deployment  [string]
+			              --commit-dirty    Whether or not the workspace should be considered dirty for this deployment  [boolean]
+
+			        🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
+		      `);
+		});
+
+		it("should upload a directory of files", async () => {
+			writeFileSync("logo.png", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["2082190357cfd3617ccfe04f340c6247"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "2082190357cfd3617ccfe04f340c6247",
+							value: Buffer.from("foobar").toString("base64"),
+							metadata: {
+								contentType: "image/png",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                          }
+			                      `);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish . --project-name=foo");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			  "✨ Success! Uploaded 1 files (TIMINGS)
+
+			  ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+			`);
+		});
+
+		it("should retry uploads", async () => {
+			writeFileSync("logo.txt", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["1a98fb08af91aca4a7df1764a2c4ddb0"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+
+				if (requests.length < 2) {
+					return createFetchResult(null, false, [
+						{
+							code: 800000,
+							message: "Something exploded, please retry",
+						},
+					]);
+				} else {
+					return createFetchResult(null, true);
+				}
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish . --project-name=foo");
+
+			// Assert two identical requests
+			expect(requests.length).toBe(2);
+			for (const init of requests) {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+							value: Buffer.from("foobar").toString("base64"),
+							metadata: {
+								contentType: "text/plain",
+							},
+							base64: true,
+						},
+					]);
+				});
+			}
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 1 files (TIMINGS)
+
+			        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		      `);
+		});
+
+		it("should refetch a JWT if it expires while uploading", async () => {
+			writeFileSync("logo.txt", "foobar");
+
+			const cancelMockGetToken = mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["1a98fb08af91aca4a7df1764a2c4ddb0"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+
+				// Fail just the first request
+				if (requests.length < 2) {
+					cancelMockGetToken();
+					mockGetToken("<<funfetti-auth-jwt2>>");
+					return createFetchResult(null, false, [
+						{
+							code: 8000013,
+							message: "Authorization failed",
+						},
+					]);
+				} else {
+					return createFetchResult(null, true);
+				}
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish . --project-name=foo");
+
+			// Assert two requests
+			expect(requests.length).toBe(2);
+
+			expect(requests[0].headers).toMatchObject({
+				Authorization: "Bearer <<funfetti-auth-jwt>>",
+			});
+
+			expect(requests[1].headers).toMatchObject({
+				Authorization: "Bearer <<funfetti-auth-jwt2>>",
+			});
+
+			for (const init of requests) {
+				const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+						value: Buffer.from("foobar").toString("base64"),
+						metadata: {
+							contentType: "text/plain",
+						},
+						base64: true,
+					},
+				]);
+			}
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 1 files (TIMINGS)
+
+			        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		      `);
+		});
+
+		it("should try to use multiple buckets (up to the max concurrency)", async () => {
+			writeFileSync("logo.txt", "foobar");
+			writeFileSync("logo.png", "foobar");
+			writeFileSync("logo.html", "foobar");
+			writeFileSync("logo.js", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: expect.arrayContaining([
+								"d96fef225537c9f5e44a3cb27fd0b492",
+								"2082190357cfd3617ccfe04f340c6247",
+								"6be321bef99e758250dac034474ddbb8",
+								"1a98fb08af91aca4a7df1764a2c4ddb0",
+							]),
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+				                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+				                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish . --project-name=foo");
+
+			// We have 3 buckets, so expect 3 uploads
+			expect(requests.length).toBe(3);
+			const bodies: UploadPayloadFile[][] = [];
+			for (const init of requests) {
+				expect(init.headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+				bodies.push(JSON.parse(init.body as string) as UploadPayloadFile[]);
+			}
+			// One bucket should end up with 2 files
+			expect(bodies.map((b) => b.length).sort()).toEqual([1, 1, 2]);
+			// But we don't know the order, so flatten and test without ordering
+			expect(bodies.flatMap((b) => b)).toEqual(
+				expect.arrayContaining([
+					{
+						base64: true,
+						key: "d96fef225537c9f5e44a3cb27fd0b492",
+						metadata: { contentType: "text/html" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+						metadata: { contentType: "text/plain" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "6be321bef99e758250dac034474ddbb8",
+						metadata: { contentType: "application/javascript" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "2082190357cfd3617ccfe04f340c6247",
+						metadata: { contentType: "image/png" },
+						value: "Zm9vYmFy",
+					},
+				])
+			);
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 4 files (TIMINGS)
+
+			        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		      `);
+		});
+
+		it("should resolve child directories correctly", async () => {
+			mkdirSync("public");
+			mkdirSync("public/imgs");
+			writeFileSync("public/logo.txt", "foobar");
+			writeFileSync("public/imgs/logo.png", "foobar");
+			writeFileSync("public/logo.html", "foobar");
+			writeFileSync("public/logo.js", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as {
+						hashes: string[];
+					};
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: expect.arrayContaining([
+								"d96fef225537c9f5e44a3cb27fd0b492",
+								"2082190357cfd3617ccfe04f340c6247",
+								"6be321bef99e758250dac034474ddbb8",
+								"1a98fb08af91aca4a7df1764a2c4ddb0",
+							]),
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/imgs/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+				                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler(`pages publish public --project-name=foo`);
+
+			// We have 3 buckets, so expect 3 uploads
+			expect(requests.length).toBe(3);
+			const bodies: UploadPayloadFile[][] = [];
+			for (const init of requests) {
+				expect(init.headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+				bodies.push(JSON.parse(init.body as string) as UploadPayloadFile[]);
+			}
+			// One bucket should end up with 2 files
+			expect(bodies.map((b) => b.length).sort()).toEqual([1, 1, 2]);
+			// But we don't know the order, so flatten and test without ordering
+			expect(bodies.flatMap((b) => b)).toEqual(
+				expect.arrayContaining([
+					{
+						base64: true,
+						key: "d96fef225537c9f5e44a3cb27fd0b492",
+						metadata: { contentType: "text/html" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+						metadata: { contentType: "text/plain" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "6be321bef99e758250dac034474ddbb8",
+						metadata: { contentType: "application/javascript" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "2082190357cfd3617ccfe04f340c6247",
+						metadata: { contentType: "image/png" },
+						value: "Zm9vYmFy",
+					},
+				])
+			);
+
+			expect(std.out).toMatchInlineSnapshot(`
+			          "✨ Success! Uploaded 4 files (TIMINGS)
+
+			          ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		        `);
+		});
+
+		it("should resolve the current directory correctly", async () => {
+			mkdirSync("public");
+			mkdirSync("public/imgs");
+			writeFileSync("public/logo.txt", "foobar");
+			writeFileSync("public/imgs/logo.png", "foobar");
+			writeFileSync("public/logo.html", "foobar");
+			writeFileSync("public/logo.js", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as {
+						hashes: string[];
+					};
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: expect.arrayContaining([
+								"d96fef225537c9f5e44a3cb27fd0b492",
+								"2082190357cfd3617ccfe04f340c6247",
+								"6be321bef99e758250dac034474ddbb8",
+								"1a98fb08af91aca4a7df1764a2c4ddb0",
+							]),
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/imgs/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+				                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			chdir("public");
+			await runWrangler(`pages publish . --project-name=foo`);
+
+			// We have 3 buckets, so expect 3 uploads
+			expect(requests.length).toBe(3);
+			const bodies: UploadPayloadFile[][] = [];
+			for (const init of requests) {
+				expect(init.headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+				bodies.push(JSON.parse(init.body as string) as UploadPayloadFile[]);
+			}
+			// One bucket should end up with 2 files
+			expect(bodies.map((b) => b.length).sort()).toEqual([1, 1, 2]);
+			// But we don't know the order, so flatten and test without ordering
+			expect(bodies.flatMap((b) => b)).toEqual(
+				expect.arrayContaining([
+					{
+						base64: true,
+						key: "d96fef225537c9f5e44a3cb27fd0b492",
+						metadata: { contentType: "text/html" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+						metadata: { contentType: "text/plain" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "6be321bef99e758250dac034474ddbb8",
+						metadata: { contentType: "application/javascript" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "2082190357cfd3617ccfe04f340c6247",
+						metadata: { contentType: "image/png" },
+						value: "Zm9vYmFy",
+					},
+				])
+			);
+
+			expect(std.out).toMatchInlineSnapshot(`
+			          "✨ Success! Uploaded 4 files (TIMINGS)
+
+			          ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		        `);
+		});
+
+		it("should not error when directory names contain periods and houses a extensionless file", async () => {
+			mkdirSync(".well-known");
+			// Note: same content as previous test, but since it's a different extension,
+			// it hashes to a different value
+			writeFileSync(".well-known/foobar", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["7b764dacfd211bebd8077828a7ddefd7"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "7b764dacfd211bebd8077828a7ddefd7",
+							value: Buffer.from("foobar").toString("base64"),
+							metadata: {
+								contentType: "application/octet-stream",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async () => ({
+					url: "https://abcxyz.foo.pages.dev/",
+				})
+			);
+
+			await runWrangler("pages publish . --project-name=foo");
+
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+
+		it("should throw an error if user attempts to use config with pages", async () => {
+			await expect(
+				runWrangler("pages dev --config foo.toml")
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"Pages does not support wrangler.toml"`
+			);
+			await expect(
+				runWrangler("pages publish --config foo.toml")
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"Pages does not support wrangler.toml"`
+			);
+		});
+
+		it("should upload a Functions project", async () => {
+			// set up the directory of static files to upload.
+			mkdirSync("public");
+			writeFileSync("public/README.md", "This is a readme");
+
+			// set up /functions
+			mkdirSync("functions");
+			writeFileSync(
+				"functions/hello.js",
+				`
+			export async function onRequest() {
+				return new Response("Hello, world!");
+			}
+			`
+			);
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
+							metadata: {
+								contentType: "text/markdown",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				`/pages/assets/upsert-hashes`,
+				"POST",
+				async (_, init) => {
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+
+					return Promise.resolve(true);
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(async () => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+
+						// for Functions projects, we auto-generate a `_worker.js` and `_routes.json`
+						// file, based on the contents of `/functions`
+						const generatedWorkerJS = body.get("_worker.js") as Blob;
+						const generatedRoutesJSON = await (
+							body.get("_routes.json") as Blob
+						).text();
+
+						// make sure this is all we uploaded
+						expect([...body.keys()]).toEqual([
+							"manifest",
+							"_worker.js",
+							"_routes.json",
+						]);
+
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/README.md": "13a03eaf24ae98378acd36ea00f77f2f",
+				                          }
+			                      `);
+
+						// the contents of the generated `_worker.js` file is pretty massive, so I don't
+						// think snapshot testing makes much sense here. Plus, calling
+						// `.toMatchInlineSnapshot()` without any arguments, in order to generate that
+						// snapshot value, doesn't generate anything in this case (probably because the
+						// file contents is too big). So for now, let's test that _worker.js was indeed
+						// generated and that the file size is greater than zero
+						expect(generatedWorkerJS).not.toBeNull();
+						expect(generatedWorkerJS.size).toBeGreaterThan(0);
+
+						const maybeRoutesJSONSpec = JSON.parse(generatedRoutesJSON);
+						expect(isRoutesJSONSpec(maybeRoutesJSONSpec)).toBe(true);
+						expect(maybeRoutesJSONSpec).toMatchObject({
+							version: ROUTES_SPEC_VERSION,
+							description: `Generated by wrangler@${version}`,
+							include: ["/hello"],
+							exclude: [],
+						});
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish public --project-name=foo");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			"Compiled Worker successfully.
+			✨ Success! Uploaded 1 files (TIMINGS)
+
+			✨ Uploading Functions
+			✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+			`);
+
+			expect(std.err).toMatchInlineSnapshot('""');
+		});
+
+		it("should upload an Advanced Mode project", async () => {
+			// set up the directory of static files to upload.
+			mkdirSync("public");
+			writeFileSync("public/README.md", "This is a readme");
+
+			// set up _worker.js
+			writeFileSync(
+				"public/_worker.js",
+				`
+				export default {
+					async fetch(request, env) {
+						const url = new URL(request.url);
+						return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
+				};
+			`
+			);
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
+							metadata: {
+								contentType: "text/markdown",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(async () => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						const customWorkerJS = await (
+							body.get("_worker.js") as Blob
+						).text();
+
+						// make sure this is all we uploaded
+						expect([...body.keys()]).toEqual(["manifest", "_worker.js"]);
+
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/README.md": "13a03eaf24ae98378acd36ea00f77f2f",
+				                          }
+			                      `);
+
+						expect(customWorkerJS).toMatchInlineSnapshot(`
+				"
+								export default {
+									async fetch(request, env) {
+										const url = new URL(request.url);
+										return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
+								};
+							"
+			`);
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish public --project-name=foo");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			"✨ Success! Uploaded 1 files (TIMINGS)
+
+			✨ Uploading _worker.js
+			✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+			`);
+
+			expect(std.err).toMatchInlineSnapshot('""');
+		});
+
+		it("should upload _routes.json for Functions projects, if provided", async () => {
+			// set up the directory of static files to upload.
+			mkdirSync("public");
+			writeFileSync("public/README.md", "This is a readme");
+
+			// set up /functions
+			mkdirSync("functions");
+			writeFileSync(
+				"functions/hello.js",
+				`
+			export async function onRequest() {
+				return new Response("Hello, world!");
+			}
+			`
+			);
+
+			writeFileSync(
+				"functions/goodbye.ts",
+				`
+			export async function onRequest() {
+				return new Response("Bye bye!");
+			}
+						`
+			);
+
+			// set up _routes.json
+			writeFileSync(
+				"public/_routes.json",
+				`
+			{
+				"version": ${ROUTES_SPEC_VERSION},
+				"description": "Custom _routes.json file",
+				"include": ["/hello"],
+				"exclude": []
+			}
+						`
+			);
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
+							metadata: {
+								contentType: "text/markdown",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				`/pages/assets/upsert-hashes`,
+				"POST",
+				async (_, init) => {
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+
+					return Promise.resolve(true);
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(async () => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						const generatedWorkerJS = body.get("_worker.js") as Blob;
+						const customRoutesJSON = await (
+							body.get("_routes.json") as Blob
+						).text();
+
+						// make sure this is all we uploaded
+						expect([...body.keys()]).toEqual([
+							"manifest",
+							"_worker.js",
+							"_routes.json",
+						]);
+
+						expect(manifest).toMatchInlineSnapshot(`
+				                          Object {
+				                            "/README.md": "13a03eaf24ae98378acd36ea00f77f2f",
+				                          }
+			                      `);
+
+						// file content of generated `_worker.js` is too massive to snapshot test
+						expect(generatedWorkerJS).not.toBeNull();
+						expect(generatedWorkerJS.size).toBeGreaterThan(0);
+
+						const customRoutes = JSON.parse(customRoutesJSON);
+						expect(customRoutes).toMatchObject({
+							version: ROUTES_SPEC_VERSION,
+							description: "Custom _routes.json file",
+							include: ["/hello"],
+							exclude: [],
+						});
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish public --project-name=foo");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			"Compiled Worker successfully.
+			✨ Success! Uploaded 1 files (TIMINGS)
+
+			✨ Uploading Functions
+			✨ Uploading _routes.json
+			✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+			`);
+
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] _routes.json is an experimental feature and is subject to change. Please use with care.
+
+			"
+			`);
+
+			expect(std.err).toMatchInlineSnapshot('""');
+		});
+
+		it("should not deploy Functions projects that provide an invalid custom _routes.json file", async () => {
+			// set up the directory of static files to upload.
+			mkdirSync("public");
+			writeFileSync("public/README.md", "This is a readme");
+
+			// set up _routes.json
+			writeFileSync(
+				"public/_routes.json",
+				`
+				{
+					"description": "Custom _routes.json file",
+					"include": [],
+					"exclude": []
+				}
+				`
+			);
+
+			// set up /functions
+			mkdirSync("functions");
+			writeFileSync(
+				"functions/hello.js",
+				`
+				export async function onRequest() {
+					return new Response("Hello, world!");
+				}
+				`
+			);
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
+							metadata: {
+								contentType: "text/markdown",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			await expect(runWrangler("pages publish public --project-name=foo"))
+				.rejects
+				.toThrow(`Invalid _routes.json file found at: public/_routes.json
+Please make sure the JSON object has the following format:
+{
+	version: ${ROUTES_SPEC_VERSION};
+	include: string[];
+	exclude: string[];
+}
+and that at least one include rule is provided.
+		`);
+		});
+
+		it("should upload _routes.json for Advanced Mode projects, if provided", async () => {
+			// set up the directory of static files to upload.
+			mkdirSync("public");
+			writeFileSync("public/README.md", "This is a readme");
+
+			// set up _routes.json
+			writeFileSync(
+				"public/_routes.json",
+				`
+				{
+					"version": ${ROUTES_SPEC_VERSION},
+					"description": "Custom _routes.json file",
+					"include": ["/api/*"],
+					"exclude": []
+				}
+				`
+			);
+
+			// set up _worker.js
+			writeFileSync(
+				"public/_worker.js",
+				`
+				export default {
+					async fetch(request, env) {
+						const url = new URL(request.url);
+						return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
+				};
+			`
+			);
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
+							metadata: {
+								contentType: "text/markdown",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				`/pages/assets/upsert-hashes`,
+				"POST",
+				async (_, init) => {
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+
+					return Promise.resolve(true);
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo/deployments",
+				async ([_url, accountId], init) => {
+					assertLater(async () => {
+						expect(accountId).toEqual("some-account-id");
+						expect(init.method).toEqual("POST");
+						const body = init.body as FormData;
+						const manifest = JSON.parse(body.get("manifest") as string);
+						const customWorkerJS = await (
+							body.get("_worker.js") as Blob
+						).text();
+						const customRoutesJSON = await (
+							body.get("_routes.json") as Blob
+						).text();
+
+						// make sure this is all we uploaded
+						expect([...body.keys()]).toEqual([
+							"manifest",
+							"_worker.js",
+							"_routes.json",
+						]);
+
+						expect(manifest).toMatchInlineSnapshot(`
+				Object {
+				  "/README.md": "13a03eaf24ae98378acd36ea00f77f2f",
+				}
+			`);
+
+						expect(customWorkerJS).toMatchInlineSnapshot(`
+				"
+								export default {
+									async fetch(request, env) {
+										const url = new URL(request.url);
+										return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
+								};
+							"
+			`);
+
+						const customRoutes = JSON.parse(customRoutesJSON);
+						expect(customRoutes).toMatchObject({
+							version: ROUTES_SPEC_VERSION,
+							description: "Custom _routes.json file",
+							include: ["/api/*"],
+							exclude: [],
+						});
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			await runWrangler("pages publish public --project-name=foo");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			"✨ Success! Uploaded 1 files (TIMINGS)
+
+			✨ Uploading _worker.js
+			✨ Uploading _routes.json
+			✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+			`);
+
+			expect(std.warn).toMatchInlineSnapshot(`
+			"▲ [WARNING] _routes.json is an experimental feature and is subject to change. Please use with care.
+
+			"
+		`);
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+
+		it("should not deploy Advanced Mode projects that provide an invalid _routes.json file", async () => {
+			// set up the directory of static files to upload.
+			mkdirSync("public");
+			writeFileSync("public/README.md", "This is a readme");
+
+			// set up _routes.json
+			writeFileSync(
+				"public/_routes.json",
+				`
+				{
+					"description": "Custom _routes.json file",
+					"include": [],
+					"exclude": []
+				}
+				`
+			);
+
+			// set up _worker.js
+			writeFileSync(
+				"public/_worker.js",
+				`
+				export default {
+					async fetch(request, env) {
+						const url = new URL(request.url);
+						return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
+				};
+			`
+			);
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
+							metadata: {
+								contentType: "text/markdown",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			await expect(runWrangler("pages publish public --project-name=foo"))
+				.rejects
+				.toThrow(`Invalid _routes.json file found at: public/_routes.json
+Please make sure the JSON object has the following format:
+{
+	version: ${ROUTES_SPEC_VERSION};
+	include: string[];
+	exclude: string[];
+}
+and that at least one include rule is provided.
+		`);
+		});
+	});
+
+	describe("project upload", () => {
+		const ENV_COPY = process.env;
+
+		mockAccountId();
+		mockApiToken();
+		runInTempDir();
+
+		beforeEach(() => {
+			process.env.CI = "true";
+			process.env.CF_PAGES_UPLOAD_JWT = "<<funfetti-auth-jwt>>";
+		});
+
+		afterEach(() => {
+			unsetAllMocks();
+			process.env = ENV_COPY;
+		});
+
+		it("should upload a directory of files with a provided JWT", async () => {
+			writeFileSync("logo.png", "foobar");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["2082190357cfd3617ccfe04f340c6247"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "2082190357cfd3617ccfe04f340c6247",
+							value: Buffer.from("foobar").toString("base64"),
+							metadata: {
+								contentType: "image/png",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			await runWrangler("pages project upload .");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 1 files (TIMINGS)
+
+			        ✨ Upload complete!"
+		      `);
+		});
+
+		it("should retry uploads", async () => {
+			writeFileSync("logo.txt", "foobar");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["1a98fb08af91aca4a7df1764a2c4ddb0"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+
+				if (requests.length < 2) {
+					return createFetchResult(null, false, [
+						{
+							code: 800000,
+							message: "Something exploded, please retry",
+						},
+					]);
+				} else {
+					return createFetchResult(null, true);
+				}
+			});
+
+			await runWrangler("pages project upload .");
+
+			// Assert two identical requests
+			expect(requests.length).toBe(2);
+			for (const init of requests) {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+							value: Buffer.from("foobar").toString("base64"),
+							metadata: {
+								contentType: "text/plain",
+							},
+							base64: true,
+						},
+					]);
+				});
+			}
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 1 files (TIMINGS)
+
+			        ✨ Upload complete!"
+		      `);
+		});
+
+		it("should try to use multiple buckets (up to the max concurrency)", async () => {
+			writeFileSync("logo.txt", "foobar");
+			writeFileSync("logo.png", "foobar");
+			writeFileSync("logo.html", "foobar");
+			writeFileSync("logo.js", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: expect.arrayContaining([
+								"d96fef225537c9f5e44a3cb27fd0b492",
+								"2082190357cfd3617ccfe04f340c6247",
+								"6be321bef99e758250dac034474ddbb8",
+								"1a98fb08af91aca4a7df1764a2c4ddb0",
+							]),
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+			});
+
+			await runWrangler("pages project upload .");
+
+			// We have 3 buckets, so expect 3 uploads
+			expect(requests.length).toBe(3);
+			const bodies: UploadPayloadFile[][] = [];
+			for (const init of requests) {
+				expect(init.headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+				bodies.push(JSON.parse(init.body as string) as UploadPayloadFile[]);
+			}
+			// One bucket should end up with 2 files
+			expect(bodies.map((b) => b.length).sort()).toEqual([1, 1, 2]);
+			// But we don't know the order, so flatten and test without ordering
+			expect(bodies.flatMap((b) => b)).toEqual(
+				expect.arrayContaining([
+					{
+						base64: true,
+						key: "d96fef225537c9f5e44a3cb27fd0b492",
+						metadata: { contentType: "text/html" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "1a98fb08af91aca4a7df1764a2c4ddb0",
+						metadata: { contentType: "text/plain" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "6be321bef99e758250dac034474ddbb8",
+						metadata: { contentType: "application/javascript" },
+						value: "Zm9vYmFy",
+					},
+					{
+						base64: true,
+						key: "2082190357cfd3617ccfe04f340c6247",
+						metadata: { contentType: "image/png" },
+						value: "Zm9vYmFy",
+					},
+				])
+			);
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 4 files (TIMINGS)
+
+			        ✨ Upload complete!"
+		      `);
+		});
+
+		it("should not error when directory names contain periods and houses a extensionless file", async () => {
+			mkdirSync(".well-known");
+			// Note: same content as previous test, but since it's a different extension,
+			// it hashes to a different value
+			writeFileSync(".well-known/foobar", "foobar");
+
+			mockGetToken("<<funfetti-auth-jwt>>");
+
+			setMockResponse(
+				"/pages/assets/check-missing",
+				"POST",
+				async (_, init) => {
+					const body = JSON.parse(init.body as string) as { hashes: string[] };
+					assertLater(() => {
+						expect(init.headers).toMatchObject({
+							Authorization: "Bearer <<funfetti-auth-jwt>>",
+						});
+						expect(body).toMatchObject({
+							hashes: ["7b764dacfd211bebd8077828a7ddefd7"],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			setMockResponse("/pages/assets/upload", "POST", async (_, init) => {
+				assertLater(() => {
+					expect(init.headers).toMatchObject({
+						Authorization: "Bearer <<funfetti-auth-jwt>>",
+					});
+					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
+					expect(body).toMatchObject([
+						{
+							key: "7b764dacfd211bebd8077828a7ddefd7",
+							value: Buffer.from("foobar").toString("base64"),
+							metadata: {
+								contentType: "application/octet-stream",
+							},
+							base64: true,
+						},
+					]);
+				});
+			});
+
+			await runWrangler("pages project upload .");
+
+			expect(std.err).toMatchInlineSnapshot(`""`);
+		});
+	});
 });