wrangler 2.1.14 → 2.2.0

package/src/__tests__/pages.test.ts

@@ -60,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", () => {
@@ -315,26 +316,27 @@ 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]
 
-			        🚧 '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 () => {
@@ -1905,6 +1907,116 @@ and that at least one include rule is provided.
 		      `);
 		});
 
+		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);
+
+				expect(requests[0].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				let body = JSON.parse(
+					requests[0].body as string
+				) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "95dedb64e6d4940fc2e0f11f711cc2f4",
+						value: Buffer.from("headersfile").toString("base64"),
+						metadata: {
+							contentType: "application/octet-stream",
+						},
+						base64: true,
+					},
+				]);
+
+				expect(requests[1].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				body = JSON.parse(requests[1].body as string) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "2082190357cfd3617ccfe04f340c6247",
+						value: Buffer.from("foobar").toString("base64"),
+						metadata: {
+							contentType: "image/png",
+						},
+						base64: true,
+					},
+				]);
+
+				expect(requests[2].headers).toMatchObject({
+					Authorization: "Bearer <<funfetti-auth-jwt>>",
+				});
+
+				body = JSON.parse(requests[2].body as string) as UploadPayloadFile[];
+				expect(body).toMatchObject([
+					{
+						key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
+						value: Buffer.from("func").toString("base64"),
+						metadata: {
+							contentType: "application/javascript",
+						},
+						base64: true,
+					},
+				]);
+			});
+
+			await runWrangler("pages project upload .");
+
+			expect(std.out).toMatchInlineSnapshot(`
+			        "✨ Success! Uploaded 3 files (TIMINGS)
+
+			        ✨ Upload complete!"
+		      `);
+		});
+
 		it("should retry uploads", async () => {
 			writeFileSync("logo.txt", "foobar");