wrangler 0.0.0-e178d6fb → 0.0.0-e1c2f5b9

package/src/__tests__/pages.test.ts

@@ -1,5 +1,8 @@
 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 {
 	createFetchResult,
@@ -57,23 +60,24 @@ describe("pages", () => {
 		await endEventLoop();
 
 		expect(std.out).toMatchInlineSnapshot(`
-      "wrangler pages
+		"wrangler pages
 
-      ⚡️ Configure Cloudflare 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
+		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]
+		Flags:
+		  -c, --config   Path to .toml configuration file  [string]
+		  -e, --env      Environment to use for operations and .env files  [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"
-    `);
+		🚧 '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", () => {
@@ -81,24 +85,38 @@ describe("pages", () => {
 			await expect(
 				runWrangler("pages dev")
 			).rejects.toThrowErrorMatchingInlineSnapshot(
-				`"Must specify a directory of static assets to serve or a command to run."`
+				`"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
+			        "🚧 '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"
-      `);
+			        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
+			        "🚧 '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"
-      `);
+			        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"
+		      `);
 		});
 	});
 
@@ -220,9 +238,9 @@ describe("pages", () => {
 				"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]'."
-      `);
+			        "✨ 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]'."
+		      `);
 		});
 	});
 
@@ -255,6 +273,7 @@ describe("pages", () => {
 					id: "87bbc8fe-16be-45cd-81e0-63d722e82cdf",
 					url: "https://87bbc8fe.images.pages.dev",
 					environment: "preview",
+					created_on: "2021-11-17T14:52:26.133835Z",
 					latest_stage: {
 						ended_on: "2021-11-17T14:52:26.133835Z",
 						status: "success",
@@ -298,26 +317,28 @@ describe("pages", () => {
 			await endEventLoop();
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "wrangler pages publish [directory]
+			"wrangler pages publish [directory]
 
-        🆙 Publish a directory of static assets as a Pages deployment
+			🆙 Publish a directory of static assets as a Pages deployment
 
-        Positionals:
-          directory  The directory of static files to upload  [string]
+			Positionals:
+			  directory  The directory of static files to upload  [string]
 
-        Flags:
-          -h, --help     Show help  [boolean]
-          -v, --version  Show version number  [boolean]
+			Flags:
+			  -e, --env      Environment to use for operations and .env files  [string]
+			  -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]
+			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]
+			      --skip-caching    Skip asset caching which speeds up builds  [boolean]
 
-        🚧 'wrangler pages <command>' is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose"
-      `);
+			🚧 '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 () => {
@@ -370,10 +391,10 @@ describe("pages", () => {
 						const body = init.body as FormData;
 						const manifest = JSON.parse(body.get("manifest") as string);
 						expect(manifest).toMatchInlineSnapshot(`
-                          Object {
-                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
-                          }
-                      `);
+				                          Object {
+				                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                          }
+			                      `);
 					});
 
 					return {
@@ -382,15 +403,24 @@ describe("pages", () => {
 				}
 			);
 
-			await runWrangler("pages publish . --project-name=foo");
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
 
-			// TODO: Unmounting somehow loses this output
+			await runWrangler("pages publish . --project-name=foo");
 
-			// expect(std.out).toMatchInlineSnapshot(`
-			//   "✨ Success! Uploaded 1 files (TIMINGS)
+			expect(std.out).toMatchInlineSnapshot(`
+			  "✨ Success! Uploaded 1 files (TIMINGS)
 
-			//   ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-			// `);
+			  ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+			`);
 		});
 
 		it("should retry uploads", async () => {
@@ -441,10 +471,10 @@ describe("pages", () => {
 						const body = init.body as FormData;
 						const manifest = JSON.parse(body.get("manifest") as string);
 						expect(manifest).toMatchInlineSnapshot(`
-                          Object {
-                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
-                          }
-                      `);
+				                          Object {
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
 					});
 
 					return {
@@ -453,6 +483,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			// Assert two identical requests
@@ -478,10 +519,10 @@ describe("pages", () => {
 			}
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "✨ Success! Uploaded 1 files (TIMINGS)
+			        "✨ Success! Uploaded 1 files (TIMINGS)
 
-        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-      `);
+			        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		      `);
 		});
 
 		it("should refetch a JWT if it expires while uploading", async () => {
@@ -535,10 +576,10 @@ describe("pages", () => {
 						const body = init.body as FormData;
 						const manifest = JSON.parse(body.get("manifest") as string);
 						expect(manifest).toMatchInlineSnapshot(`
-                          Object {
-                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
-                          }
-                      `);
+				                          Object {
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
 					});
 
 					return {
@@ -547,6 +588,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			// Assert two requests
@@ -575,10 +627,10 @@ describe("pages", () => {
 			}
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "✨ Success! Uploaded 1 files (TIMINGS)
+			        "✨ Success! Uploaded 1 files (TIMINGS)
 
-        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-      `);
+			        ✨ 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 () => {
@@ -626,13 +678,13 @@ describe("pages", () => {
 						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",
-                          }
-                      `);
+				                          Object {
+				                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+				                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+				                            "/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
 					});
 
 					return {
@@ -641,6 +693,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			// We have 3 buckets, so expect 3 uploads
@@ -685,10 +748,10 @@ describe("pages", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "✨ Success! Uploaded 4 files (TIMINGS)
+			        "✨ Success! Uploaded 4 files (TIMINGS)
 
-        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-      `);
+			        ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		      `);
 		});
 
 		it("should resolve child directories correctly", async () => {
@@ -740,13 +803,13 @@ describe("pages", () => {
 						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",
-                          }
-                      `);
+				                          Object {
+				                            "/imgs/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+				                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
 					});
 
 					return {
@@ -755,6 +818,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler(`pages publish public --project-name=foo`);
 
 			// We have 3 buckets, so expect 3 uploads
@@ -799,10 +873,10 @@ describe("pages", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-          "✨ Success! Uploaded 4 files (TIMINGS)
+			          "✨ Success! Uploaded 4 files (TIMINGS)
 
-          ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-        `);
+			          ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
+		        `);
 		});
 
 		it("should resolve the current directory correctly", async () => {
@@ -854,13 +928,13 @@ describe("pages", () => {
 						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",
-                          }
-                      `);
+				                          Object {
+				                            "/imgs/logo.png": "2082190357cfd3617ccfe04f340c6247",
+				                            "/logo.html": "d96fef225537c9f5e44a3cb27fd0b492",
+				                            "/logo.js": "6be321bef99e758250dac034474ddbb8",
+				                            "/logo.txt": "1a98fb08af91aca4a7df1764a2c4ddb0",
+				                          }
+			                      `);
 					});
 
 					return {
@@ -869,6 +943,17 @@ describe("pages", () => {
 				}
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			chdir("public");
 			await runWrangler(`pages publish . --project-name=foo`);
 
@@ -914,10 +999,10 @@ describe("pages", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-          "✨ Success! Uploaded 4 files (TIMINGS)
+			          "✨ Success! Uploaded 4 files (TIMINGS)
 
-          ✨ Deployment complete! Take a peek over at https://abcxyz.foo.pages.dev/"
-        `);
+			          ✨ 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 () => {
@@ -971,6 +1056,17 @@ describe("pages", () => {
 				})
 			);
 
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
 			await runWrangler("pages publish . --project-name=foo");
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -988,27 +1084,336 @@ describe("pages", () => {
 				`"Pages does not support wrangler.toml"`
 			);
 		});
-	});
 
-	describe("project upload", () => {
-		const ENV_COPY = process.env;
+		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!");
+			}
+			`
+			);
 
-		mockAccountId();
-		mockApiToken();
-		runInTempDir();
+			mockGetToken("<<funfetti-auth-jwt>>");
 
-		beforeEach(() => {
-			process.env.CI = "true";
-			process.env.CF_PAGES_UPLOAD_JWT = "<<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`,
+						// `functions-filepath-routing-config.json`, 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();
+						const generatedFilepathRoutingConfig = await (
+							body.get("functions-filepath-routing-config.json") as Blob
+						).text();
+
+						// make sure this is all we uploaded
+						expect([...body.keys()]).toEqual([
+							"manifest",
+							"functions-filepath-routing-config.json",
+							"_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: [],
+						});
+
+						// Make sure the routing config is valid json
+						const parsedFilepathRoutingConfig = JSON.parse(
+							generatedFilepathRoutingConfig
+						);
+						// The actual shape doesn't matter that much since this
+						// is only used for display in Dash, but it's still useful for
+						// tracking unexpected changes to this config.
+						expect(parsedFilepathRoutingConfig).toStrictEqual({
+							routes: [
+								{
+									routePath: "/hello",
+									mountPath: "/",
+									method: "",
+									module: ["hello.js:onRequest"],
+								},
+							],
+							baseURL: "/",
+						});
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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('""');
 		});
 
-		afterEach(() => {
-			unsetAllMocks();
-			process.env = ENV_COPY;
+		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/",
+					};
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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 a directory of files with a provided JWT", async () => {
-			writeFileSync("logo.png", "foobar");
+		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",
@@ -1020,7 +1425,7 @@ describe("pages", () => {
 							Authorization: "Bearer <<funfetti-auth-jwt>>",
 						});
 						expect(body).toMatchObject({
-							hashes: ["2082190357cfd3617ccfe04f340c6247"],
+							hashes: ["13a03eaf24ae98378acd36ea00f77f2f"],
 						});
 					});
 					return body.hashes;
@@ -1035,10 +1440,10 @@ describe("pages", () => {
 					const body = JSON.parse(init.body as string) as UploadPayloadFile[];
 					expect(body).toMatchObject([
 						{
-							key: "2082190357cfd3617ccfe04f340c6247",
-							value: Buffer.from("foobar").toString("base64"),
+							key: "13a03eaf24ae98378acd36ea00f77f2f",
+							value: Buffer.from("This is a readme").toString("base64"),
 							metadata: {
-								contentType: "image/png",
+								contentType: "text/markdown",
 							},
 							base64: true,
 						},
@@ -1046,13 +1451,790 @@ describe("pages", () => {
 				});
 			});
 
+			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();
+						const generatedFilepathRoutingConfig = await (
+							body.get("functions-filepath-routing-config.json") as Blob
+						).text();
+
+						// make sure this is all we uploaded
+						expect([...body.keys()]).toEqual([
+							"manifest",
+							"functions-filepath-routing-config.json",
+							"_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: [],
+						});
+
+						// Make sure the routing config is valid json
+						const parsedFilepathRoutingConfig = JSON.parse(
+							generatedFilepathRoutingConfig
+						);
+						// The actual shape doesn't matter that much since this
+						// is only used for display in Dash, but it's still useful for
+						// tracking unexpected changes to this config.
+						console.log(generatedFilepathRoutingConfig);
+						expect(parsedFilepathRoutingConfig).toStrictEqual({
+							routes: [
+								{
+									routePath: "/goodbye",
+									mountPath: "/",
+									method: "",
+									module: ["goodbye.ts:onRequest"],
+								},
+								{
+									routePath: "/hello",
+									mountPath: "/",
+									method: "",
+									module: ["hello.js:onRequest"],
+								},
+							],
+							baseURL: "/",
+						});
+					});
+
+					return {
+						url: "https://abcxyz.foo.pages.dev/",
+					};
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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/",
+					};
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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,
+						},
+					]);
+				});
+			});
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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 ignore the entire /functions directory if _worker.js is 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!");
+				}
+				`
+			);
+
+			// 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/",
+					};
+				}
+			);
+
+			setMockResponse(
+				"/accounts/:accountId/pages/projects/foo",
+				"GET",
+				async ([_url, accountId]) => {
+					assertLater(() => {
+						expect(accountId).toEqual("some-account-id");
+					});
+					return { deployment_configs: { production: {}, preview: {} } };
+				}
+			);
+
+			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('""');
+		});
+	});
+
+	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 avoid uploading some files", async () => {
+			mkdirSync("some_dir/node_modules", { recursive: true });
+			mkdirSync("some_dir/functions", { recursive: true });
+
+			writeFileSync("logo.png", "foobar");
+			writeFileSync("some_dir/functions/foo.js", "func");
+			writeFileSync("some_dir/_headers", "headersfile");
+
+			writeFileSync("_headers", "headersfile");
+			writeFileSync("_redirects", "redirectsfile");
+			writeFileSync("_worker.js", "workerfile");
+			writeFileSync("_routes.json", "routesfile");
+			mkdirSync(".git");
+			writeFileSync(".git/foo", "gitfile");
+			writeFileSync("some_dir/node_modules/some_package", "nodefile");
+			mkdirSync("functions");
+			writeFileSync("functions/foo.js", "func");
+
+			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",
+								"95dedb64e6d4940fc2e0f11f711cc2f4",
+								"09a79777abda8ccc8bdd51dd3ff8e9e9",
+							],
+						});
+					});
+					return body.hashes;
+				}
+			);
+
+			// Accumulate multiple requests then assert afterwards
+			const requests: RequestInit[] = [];
+			setMockRawResponse("/pages/assets/upload", "POST", async (_, init) => {
+				requests.push(init);
+
+				return createFetchResult(null, true);
+			});
+
+			assertLater(() => {
+				expect(requests.length).toBe(3);
+
+				const sortedRequests = requests.sort((a, b) => {
+					return (JSON.parse(a.body as string)[0].key as string).localeCompare(
+						JSON.parse(b.body as string)[0].key as string
+					);
+				});
+
+				expect(sortedRequests[0].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				let body = JSON.parse(
+					sortedRequests[0].body as string
+				) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
+						value: Buffer.from("func").toString("base64"),
+						metadata: {
+							contentType: "application/javascript",
+						},
+						base64: true,
+					},
+				]);
+
+				expect(sortedRequests[1].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				body = JSON.parse(
+					sortedRequests[1].body as string
+				) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "2082190357cfd3617ccfe04f340c6247",
+						value: Buffer.from("foobar").toString("base64"),
+						metadata: {
+							contentType: "image/png",
+						},
+						base64: true,
+					},
+				]);
+
+				expect(sortedRequests[2].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				body = JSON.parse(
+					sortedRequests[2].body as string
+				) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "95dedb64e6d4940fc2e0f11f711cc2f4",
+						value: Buffer.from("headersfile").toString("base64"),
+						metadata: {
+							contentType: "application/octet-stream",
+						},
+						base64: true,
+					},
+				]);
+			});
+
 			await runWrangler("pages project upload .");
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "✨ Success! Uploaded 1 files (TIMINGS)
+			        "✨ Success! Uploaded 3 files (TIMINGS)
 
-        ✨ Upload complete!"
-      `);
+			        ✨ Upload complete!"
+		      `);
 		});
 
 		it("should retry uploads", async () => {
@@ -1117,10 +2299,10 @@ describe("pages", () => {
 			}
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "✨ Success! Uploaded 1 files (TIMINGS)
+			        "✨ Success! Uploaded 1 files (TIMINGS)
 
-        ✨ Upload complete!"
-      `);
+			        ✨ Upload complete!"
+		      `);
 		});
 
 		it("should try to use multiple buckets (up to the max concurrency)", async () => {
@@ -1203,10 +2385,10 @@ describe("pages", () => {
 			);
 
 			expect(std.out).toMatchInlineSnapshot(`
-        "✨ Success! Uploaded 4 files (TIMINGS)
+			        "✨ Success! Uploaded 4 files (TIMINGS)
 
-        ✨ Upload complete!"
-      `);
+			        ✨ Upload complete!"
+		      `);
 		});
 
 		it("should not error when directory names contain periods and houses a extensionless file", async () => {