wrangler 2.8.0 → 2.9.0

package/src/__tests__/index.test.ts

@@ -56,10 +56,11 @@ describe("wrangler", () => {
 			  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 
 			expect(std.err).toMatchInlineSnapshot(`""`);
@@ -104,10 +105,11 @@ describe("wrangler", () => {
 			  wrangler deployments                 🚢 Displays the 10 most recent deployments for a worker
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 			expect(std.err).toMatchInlineSnapshot(`
 			        "X [ERROR] Unknown argument: invalid-command
@@ -151,10 +153,11 @@ describe("wrangler", () => {
 			  wrangler secret list          List all secrets for a Worker
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 		});
 
@@ -172,10 +175,11 @@ describe("wrangler", () => {
 			  wrangler kv:namespace delete              Deletes a given namespace.
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 		});
 
@@ -194,10 +198,11 @@ describe("wrangler", () => {
 			  wrangler kv:key delete <key>       Removes a single key value pair from the given namespace.
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 		});
 
@@ -214,10 +219,11 @@ describe("wrangler", () => {
 			  wrangler kv:bulk delete <filename>  Delete multiple key-value pairs from a namespace
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 		});
 
@@ -234,10 +240,11 @@ describe("wrangler", () => {
 			  wrangler r2 bucket  Manage R2 buckets
 
 			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]"
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]"
 		`);
 		});
 	});

package/src/__tests__/kv.test.ts

@@ -63,10 +63,11 @@ describe("wrangler", () => {
 			  namespace  The name of the new namespace  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --preview  Interact with a preview namespace  [boolean]"
@@ -94,10 +95,11 @@ describe("wrangler", () => {
 			  namespace  The name of the new namespace  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --preview  Interact with a preview namespace  [boolean]"
@@ -126,10 +128,11 @@ describe("wrangler", () => {
 			  namespace  The name of the new namespace  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --preview  Interact with a preview namespace  [boolean]"
@@ -552,10 +555,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -591,10 +595,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -630,10 +635,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -669,10 +675,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -708,10 +715,11 @@ describe("wrangler", () => {
 			  value  The value to write  [string]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The binding of the namespace to write to  [string]
@@ -1083,10 +1091,11 @@ describe("wrangler", () => {
 			  key  The key value to get.  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The name of the namespace to get from  [string]
@@ -1117,10 +1126,11 @@ describe("wrangler", () => {
 			  key  The key value to get.  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The name of the namespace to get from  [string]
@@ -1152,10 +1162,11 @@ describe("wrangler", () => {
 			  key  The key value to get.  [string] [required]
 
 			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]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
 
 			Options:
 			      --binding       The name of the namespace to get from  [string]

package/src/__tests__/pages.test.ts

@@ -69,10 +69,11 @@ describe("pages", () => {
 		  wrangler pages publish [directory]             🆙 Publish a directory of static assets as a Pages deployment
 
 		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]
+		  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+		  -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"
 	`);
@@ -340,9 +341,10 @@ describe("pages", () => {
 			  directory  The directory of static files to upload  [string]
 
 			Flags:
-			  -e, --env      Environment to use for operations and .env files  [string]
-			  -h, --help     Show help  [boolean]
-			  -v, --version  Show version number  [boolean]
+			  -j, --experimental-json-config  Experimental: Support wrangler.json  [boolean]
+			  -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]
@@ -1468,6 +1470,8 @@ describe("pages", () => {
 			expect(std.err).toMatchInlineSnapshot('""');
 		});
 
+		const workerHasD1Shim = (contents: string) => contents.includes("D1_ERROR");
+
 		it("should upload an Advanced Mode project", async () => {
 			// set up the directory of static files to upload.
 			mkdirSync("public");
@@ -1480,6 +1484,7 @@ describe("pages", () => {
 				export default {
 					async fetch(request, env) {
 						const url = new URL(request.url);
+						console.log("SOMETHING FROM WITHIN THE WORKER");
 						return url.pathname.startsWith('/api/') ? new Response('Ok') : env.ASSETS.fetch(request);
 					}
 				};
@@ -1555,16 +1560,11 @@ describe("pages", () => {
 							                          }
 						                      `);
 
-						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);
-												}
-											};
-										"
-						`);
+						expect(workerHasD1Shim(customWorkerJS as string)).toBeTruthy();
+						expect(customWorkerJS).toContain(
+							`console.log("SOMETHING FROM WITHIN THE WORKER");`
+						);
+
 						return res.once(
 							ctx.status(200),
 							ctx.json({
@@ -1590,15 +1590,22 @@ describe("pages", () => {
 								errors: [],
 								messages: [],
 								result: {
-									deployment_configs: { production: {}, preview: {} },
-								},
+									deployment_configs: {
+										production: {
+											d1_databases: { MY_D1_DB: { id: "fake-db" } },
+										},
+										preview: {
+											d1_databases: { MY_D1_DB: { id: "fake-db" } },
+										},
+									},
+								} as Partial<Project>,
 							})
 						);
 					}
 				)
 			);
 
-			await runWrangler("pages publish public --project-name=foo");
+			await runWrangler("pages publish public --project-name=foo --bundle");
 
 			expect(std.out).toMatchInlineSnapshot(`
 			"✨ Success! Uploaded 1 files (TIMINGS)
@@ -2543,19 +2550,20 @@ and that at least one include rule is provided.
 			);
 
 			await runWrangler("pages project upload .");
-
 			expect(requests.length).toBe(3);
 
-			const resolvedRequests = await Promise.all(
-				requests.map(async (req) => await req.json<UploadPayloadFile>())
-			);
-
-			const sortedRequests = resolvedRequests.sort((a, b) => {
-				const aKey = a.key as string;
-				const bKey = b.key as string;
+			const resolvedRequests = (
+				await Promise.all(
+					requests.map(async (req) => await req.json<UploadPayloadFile[]>())
+				)
+			).flat();
 
-				return aKey?.localeCompare(bKey);
-			});
+			const requestMap = resolvedRequests.reduce<{
+				[key: string]: UploadPayloadFile;
+			}>(
+				(requestMap, req) => Object.assign(requestMap, { [req.key]: req }),
+				{}
+			);
 
 			for (const req of requests) {
 				expect(req.headers.get("Authorization")).toBe(
@@ -2563,38 +2571,34 @@ and that at least one include rule is provided.
 				);
 			}
 
-			expect(sortedRequests[0]).toMatchObject([
-				{
-					base64: true,
-					key: "95dedb64e6d4940fc2e0f11f711cc2f4",
-					metadata: {
-						contentType: "application/octet-stream",
-					},
-					value: "aGVhZGVyc2ZpbGU=",
+			expect(Object.keys(requestMap).length).toBe(3);
+
+			expect(requestMap["95dedb64e6d4940fc2e0f11f711cc2f4"]).toMatchObject({
+				base64: true,
+				key: "95dedb64e6d4940fc2e0f11f711cc2f4",
+				metadata: {
+					contentType: "application/octet-stream",
 				},
-			]);
+				value: "aGVhZGVyc2ZpbGU=",
+			});
 
-			expect(sortedRequests[1]).toMatchObject([
-				{
-					base64: true,
-					key: "2082190357cfd3617ccfe04f340c6247",
-					metadata: {
-						contentType: "image/png",
-					},
-					value: "Zm9vYmFy",
+			expect(requestMap["2082190357cfd3617ccfe04f340c6247"]).toMatchObject({
+				base64: true,
+				key: "2082190357cfd3617ccfe04f340c6247",
+				metadata: {
+					contentType: "image/png",
 				},
-			]);
+				value: "Zm9vYmFy",
+			});
 
-			expect(sortedRequests[2]).toMatchObject([
-				{
-					base64: true,
-					key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
-					metadata: {
-						contentType: "application/javascript",
-					},
-					value: "ZnVuYw==",
+			expect(requestMap["09a79777abda8ccc8bdd51dd3ff8e9e9"]).toMatchObject({
+				base64: true,
+				key: "09a79777abda8ccc8bdd51dd3ff8e9e9",
+				metadata: {
+					contentType: "application/javascript",
 				},
-			]);
+				value: "ZnVuYw==",
+			});
 
 			expect(std.out).toMatchInlineSnapshot(`
 			        "✨ Success! Uploaded 3 files (TIMINGS)

package/src/__tests__/parse.test.ts

@@ -4,6 +4,7 @@ import {
 	indexLocation,
 	parseJSON,
 	parseTOML,
+	parseJSONC,
 } from "../parse";
 import type { Message } from "../parse";
 
@@ -257,7 +258,112 @@ describe("parseJSON", () => {
 		}
 	});
 });
+describe("parseJSONC", () => {
+	it("should parse jsonc that is empty", () => {
+		expect(parseJSONC("{}")).toStrictEqual({});
+	});
+
+	it("should parse jsonc with basic values", () => {
+		expect(
+			parseJSONC(`
+      {
+        "name" : "basic",
+        "version": 1
+      }`)
+		).toStrictEqual({
+			name: "basic",
+			version: 1,
+		});
+	});
+
+	it("should parse jsonc with complex values", () => {
+		expect(
+			parseJSONC(
+				`{
+          "name":"complex",
+          "spec":{
+            "uptime":[1,2.5,3],
+            "ok":true
+          }
+        }`
+			)
+		).toStrictEqual({
+			name: "complex",
+			spec: {
+				uptime: [1, 2.5, 3],
+				ok: true,
+			},
+		});
+	});
 
+	it("should parse jsonc with comments", () => {
+		expect(
+			parseJSONC(
+				`{
+					// Comment A
+          "name":"complex",
+          "spec":{
+						// Nested comment
+            "uptime":[1,2.5,3],
+            "ok":true
+          }
+        }`
+			)
+		).toStrictEqual({
+			name: "complex",
+			spec: {
+				uptime: [1, 2.5, 3],
+				ok: true,
+			},
+		});
+	});
+
+	it("should fail to parse jsonc with invalid string", () => {
+		try {
+			parseJSONC(`\n{\n"version" "1\n}\n`);
+			fail("parseJSONC did not throw");
+		} catch (err) {
+			expect({ ...(err as Error) }).toStrictEqual({
+				name: "ParseError",
+				text: "UnexpectedEndOfString",
+				kind: "error",
+				location: {
+					length: 2,
+					line: 3,
+					column: 10,
+					lineText: '"version" "1',
+					file: undefined,
+					fileText: `\n{\n"version" "1\n}\n`,
+				},
+				notes: [],
+			});
+		}
+	});
+
+	it("should fail to parse jsonc with invalid number", () => {
+		const file = "config.json",
+			fileText = `{\n\t"a":{\n\t\t"b":{\n\t\t\t"c":[012345]\n}\n}\n}`;
+		try {
+			parseJSONC(fileText, file);
+			fail("parseJSONC did not throw");
+		} catch (err) {
+			expect({ ...(err as Error) }).toStrictEqual({
+				name: "ParseError",
+				text: "CommaExpected",
+				kind: "error",
+				location: {
+					file,
+					fileText,
+					length: 5,
+					line: 4,
+					column: 9,
+					lineText: `\t\t\t"c":[012345]`,
+				},
+				notes: [],
+			});
+		}
+	});
+});
 describe("indexLocation", () => {
 	it("should calculate location from one-line input", () => {
 		const fileText = "";