wrangler 2.8.0 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.8.0",
+	"version": "2.9.0",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",

package/src/__tests__/d1/d1.test.ts

@@ -1,9 +1,6 @@
-import { cwd } from "process";
 import { mockConsoleMethods } from "../helpers/mock-console";
-import { useMockIsTTY } from "../helpers/mock-istty";
 import { runInTempDir } from "../helpers/run-in-tmp";
 import { runWrangler } from "../helpers/run-wrangler";
-import writeWranglerToml from "../helpers/write-wrangler-toml";
 
 function endEventLoop() {
 	return new Promise((resolve) => setImmediate(resolve));
@@ -12,7 +9,6 @@ function endEventLoop() {
 describe("d1", () => {
 	const std = mockConsoleMethods();
 	runInTempDir();
-	const { setIsTTY } = useMockIsTTY();
 
 	it("should show help when no argument is passed", async () => {
 		await runWrangler("d1");
@@ -32,15 +28,18 @@ describe("d1", () => {
 		  wrangler d1 migrations          Interact with D1 Migrations
 
 		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]
-
-		🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
-		Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
-		To request features, visit https://community.cloudflare.com/c/developers/d1.
-		To give feedback, visit https://discord.gg/cloudflaredev"
+		  -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]
+
+		--------------------
+		🚧 D1 is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose
+		🚧 To request features, visit https://community.cloudflare.com/c/developers/d1
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------"
 	`);
 	});
 
@@ -69,55 +68,18 @@ describe("d1", () => {
 		  wrangler d1 migrations          Interact with D1 Migrations
 
 		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]
-
-		🚧 D1 is currently in open alpha and is not recommended for production data and traffic.
-		Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose.
-		To request features, visit https://community.cloudflare.com/c/developers/d1.
-		To give feedback, visit https://discord.gg/cloudflaredev"
+		  -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]
+
+		--------------------
+		🚧 D1 is currently in open alpha and is not recommended for production data and traffic
+		🚧 Please report any bugs to https://github.com/cloudflare/wrangler2/issues/new/choose
+		🚧 To request features, visit https://community.cloudflare.com/c/developers/d1
+		🚧 To give feedback, visit https://discord.gg/cloudflaredev
+		--------------------"
 	`);
 	});
-
-	describe("migrate", () => {
-		describe("apply", () => {
-			it("should not attempt to login in local mode", async () => {
-				setIsTTY(false);
-				writeWranglerToml({
-					d1_databases: [
-						{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
-					],
-				});
-				// If we get to the point where we are checking for migrations then we have not been asked to log in.
-				await expect(
-					runWrangler("d1 migrations apply --local DATABASE")
-				).rejects.toThrowError(
-					`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
-				);
-			});
-
-			it("should try to read D1 config from wrangler.toml", async () => {
-				setIsTTY(false);
-				writeWranglerToml();
-				await expect(
-					runWrangler("d1 migrations apply DATABASE")
-				).rejects.toThrowError(
-					"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
-				);
-			});
-
-			it("should not try to read wrangler.toml in local mode", async () => {
-				setIsTTY(false);
-				writeWranglerToml();
-				// If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
-				await expect(
-					runWrangler("d1 migrations apply --local DATABASE")
-				).rejects.toThrowError(
-					`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
-				);
-			});
-		});
-	});
 });

package/src/__tests__/d1/migrate.test.ts

@@ -0,0 +1,48 @@
+import { cwd } from "process";
+import { useMockIsTTY } from "../helpers/mock-istty";
+import { runInTempDir } from "../helpers/run-in-tmp";
+import { runWrangler } from "../helpers/run-wrangler";
+import writeWranglerToml from "../helpers/write-wrangler-toml";
+
+describe("migrate", () => {
+	runInTempDir();
+	const { setIsTTY } = useMockIsTTY();
+
+	describe("apply", () => {
+		it("should not attempt to login in local mode", async () => {
+			setIsTTY(false);
+			writeWranglerToml({
+				d1_databases: [
+					{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+				],
+			});
+			// If we get to the point where we are checking for migrations then we have not been asked to log in.
+			await expect(
+				runWrangler("d1 migrations apply --local DATABASE")
+			).rejects.toThrowError(
+				`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
+			);
+		});
+
+		it("should try to read D1 config from wrangler.toml", async () => {
+			setIsTTY(false);
+			writeWranglerToml();
+			await expect(
+				runWrangler("d1 migrations apply DATABASE")
+			).rejects.toThrowError(
+				"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
+			);
+		});
+
+		it("should not try to read wrangler.toml in local mode", async () => {
+			setIsTTY(false);
+			writeWranglerToml();
+			// If we get to the point where we are checking for migrations then we have not checked wrangler.toml.
+			await expect(
+				runWrangler("d1 migrations apply --local DATABASE")
+			).rejects.toThrowError(
+				`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
+			);
+		});
+	});
+});

package/src/__tests__/deployments.test.ts

@@ -68,12 +68,12 @@ describe("deployments", () => {
 		Deployment ID: Galaxy-Class
 		Created on: 2021-01-01T00:00:00.000000Z
 		Author: Jean-Luc-Picard@federation.org
-		Source: Wrangler
+		Source: 🤠 Wrangler
 
 		Deployment ID: Intrepid-Class
 		Created on: 2021-02-02T00:00:00.000000Z
 		Author: Kathryn-Janeway@federation.org
-		Source: Wrangler
+		Source: 🤠 Wrangler
 		🟩 Active"
 	`);
 	});
@@ -87,12 +87,12 @@ describe("deployments", () => {
 		Deployment ID: Galaxy-Class
 		Created on: 2021-01-01T00:00:00.000000Z
 		Author: Jean-Luc-Picard@federation.org
-		Source: Wrangler
+		Source: 🤠 Wrangler
 
 		Deployment ID: Intrepid-Class
 		Created on: 2021-02-02T00:00:00.000000Z
 		Author: Kathryn-Janeway@federation.org
-		Source: Wrangler
+		Source: 🤠 Wrangler
 		🟩 Active"
 	`);
 	});

package/src/__tests__/dev.test.tsx

@@ -1218,10 +1218,11 @@ describe("wrangler dev", () => {
 			  script  The path to an entry point for your worker  [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:
 			      --name                                       Name of the worker  [string]

package/src/__tests__/helpers/msw/handlers/deployments.ts

@@ -1,18 +1,13 @@
 import { rest } from "msw";
-
-import type { DeploymentListRes } from "../../../../deployments";
+import { createFetchResult } from "../index";
 
 export const mswSuccessDeployments = [
 	rest.get(
 		"*/accounts/:accountId/workers/deployments/by-script/:scriptTag",
 		(_, response, context) =>
 			response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						latest: {
 							id: "Galaxy-Class",
 							number: "1701-E",
@@ -52,8 +47,8 @@ export const mswSuccessDeployments = [
 								},
 							},
 						],
-					} as DeploymentListRes,
-				})
+					})
+				)
 			)
 	),
 ];
@@ -61,16 +56,13 @@ export const mswSuccessDeployments = [
 export const mswSuccessLastDeployment = [
 	rest.get(
 		"*/accounts/:accountId/workers/services/:scriptName",
-		(req, res, ctx) => {
+		(_, res, ctx) => {
 			return res.once(
-				ctx.json({
-					success: true,
-					messages: [],
-					errors: [],
-					result: {
+				ctx.json(
+					createFetchResult({
 						default_environment: { script: { last_deployed_from: "wrangler" } },
-					},
-				})
+					})
+				)
 			);
 		}
 	),

package/src/__tests__/helpers/msw/handlers/namespaces.ts

@@ -1,59 +1,44 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export const mswSuccessNamespacesHandlers = [
 	rest.post(
 		"*/accounts/:accountId/workers/dispatch/namespaces",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						namespace_id: "some-namespace-id",
 						namespace_name: "namespace-name",
 						created_on: "2022-06-29T14:30:08.16152Z",
 						created_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						modified_on: "2022-06-29T14:30:08.16152Z",
 						modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-					},
-				})
+					})
+				)
 			);
 		}
 	),
 	rest.delete(
 		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
 		(_, response, context) => {
-			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: null,
-				})
-			);
+			return response.once(context.json(createFetchResult(null)));
 		}
 	),
 	rest.put(
 		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						namespace_id: "some-namespace-id",
 						namespace_name: "namespace-name",
 						created_on: "2022-06-29T14:30:08.16152Z",
 						created_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						modified_on: "2022-06-29T14:30:08.16152Z",
 						modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-					},
-				})
+					})
+				)
 			);
 		}
 	),
@@ -61,20 +46,16 @@ export const mswSuccessNamespacesHandlers = [
 		"*/accounts/:accountId/workers/dispatch/namespaces/:namespaceName",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						namespace_id: "some-namespace-id",
 						namespace_name: "namespace-name",
 						created_on: "2022-06-29T14:30:08.16152Z",
 						created_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						modified_on: "2022-06-29T14:30:08.16152Z",
 						modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
-					},
-				})
+					})
+				)
 			);
 		}
 	),
@@ -82,12 +63,8 @@ export const mswSuccessNamespacesHandlers = [
 		"*/accounts/:accountId/workers/dispatch/namespaces",
 		(_, response, context) => {
 			return response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: [
+				context.json(
+					createFetchResult([
 						{
 							namespace_id: "some-namespace-id",
 							namespace_name: "namespace-name",
@@ -96,8 +73,8 @@ export const mswSuccessNamespacesHandlers = [
 							modified_on: "2022-06-29T14:30:08.16152Z",
 							modified_by: "1fc1df98cc4420fe00367c3ab68c1639",
 						},
-					],
-				})
+					])
+				)
 			);
 		}
 	),

package/src/__tests__/helpers/msw/handlers/r2.ts

@@ -1,44 +1,31 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export const mswSuccessR2handlers = [
 	// List endpoint r2Buckets
 	rest.get("*/accounts/:accountId/r2/buckets", (_, response, context) =>
 		response.once(
-			context.status(200),
-			context.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: {
+			context.json(
+				createFetchResult({
 					buckets: [
 						{ name: "bucket-1", creation_date: "01-01-2001" },
 						{ name: "bucket-2", creation_date: "01-01-2001" },
 					],
-				},
-			})
+				})
+			)
 		)
 	),
 	rest.post("*/accounts/:accountId/r2/buckets", (_, response, context) =>
-		response.once(
-			context.status(200),
-			context.json({ success: true, errors: [], messages: [], result: {} })
-		)
+		response.once(context.json(createFetchResult({})))
 	),
 	rest.put(
 		"*/accounts/:accountId/r2/buckets/:bucketName",
-		(_, response, context) =>
-			response.once(
-				context.status(200),
-				context.json({ success: true, errors: [], messages: [], result: {} })
-			)
+		(_, response, context) => response.once(context.json(createFetchResult({})))
 	),
 	rest.delete(
 		"*/accounts/:accountId/r2/buckets/:bucketName",
 		(_, response, context) =>
-			response.once(
-				context.status(200),
-				context.json({ success: true, errors: [], messages: [], result: null })
-			)
+			response.once(context.json(createFetchResult(null)))
 	),
 	rest.get(
 		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
@@ -47,7 +34,7 @@ export const mswSuccessR2handlers = [
 			return response.once(
 				context.set("Content-Length", imageBuffer.byteLength.toString()),
 				context.set("Content-Type", "image/png"),
-				context.status(200),
+
 				context.body(imageBuffer)
 			);
 		}
@@ -56,25 +43,18 @@ export const mswSuccessR2handlers = [
 		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
 		(_, response, context) =>
 			response.once(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: {
+				context.json(
+					createFetchResult({
 						accountId: "some-account-id",
 						bucketName: "bucketName-object-test",
 						objectName: "wormhole-img.png",
-					},
-				})
+					})
+				)
 			)
 	),
 	rest.delete(
 		"*/accounts/:accountId/r2/buckets/:bucketName/objects/:objectName",
 		(_, response, context) =>
-			response.once(
-				context.status(200),
-				context.json({ success: true, errors: [], messages: [], result: null })
-			)
+			response.once(context.json(createFetchResult(null)))
 	),
 ];

package/src/__tests__/helpers/msw/handlers/script.ts

@@ -1,4 +1,5 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 import type { WorkerMetadata } from "../../../../create-worker-upload-form";
 
 const bindings: Record<string, WorkerMetadata["bindings"]> = {
@@ -14,10 +15,12 @@ const scripts: Record<string, string> = {
 	websocket: `new WebSocket("ws://dummy")`,
 	response: `return new Response("ok")`,
 };
-function getBindings(scriptName: string) {
+function getBindings(scriptName: string | readonly string[]) {
+	if (typeof scriptName !== "string") return "";
 	return scriptName.split("--").flatMap((part) => bindings[part] ?? []);
 }
-function getScript(scriptName: string) {
+function getScript(scriptName: string | readonly string[]): string {
+	if (typeof scriptName !== "string") return "";
 	return `export default {fetch(request){
     ${scriptName
 			.split("--")
@@ -29,47 +32,25 @@ export default [
 	rest.get(
 		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/content",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.text(getScript(scriptName as string))
-			);
+			return res(context.text(getScript(scriptName)));
 		}
 	),
 	rest.get(
 		"*/accounts/:accountId/workers/scripts/:scriptName",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.text(getScript(scriptName as string))
-			);
+			return res(context.text(getScript(scriptName)));
 		}
 	),
 	rest.get(
 		"*/accounts/:accountId/workers/services/:scriptName/environments/:env/bindings",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: getBindings(scriptName as string),
-				})
-			);
+			return res(context.json(createFetchResult(getBindings(scriptName))));
 		}
 	),
 	rest.get(
 		"*/accounts/:accountId/workers/scripts/:scriptName/bindings",
 		({ params: { scriptName } }, res, context) => {
-			return res(
-				context.status(200),
-				context.json({
-					success: true,
-					errors: [],
-					messages: [],
-					result: getBindings(scriptName as string),
-				})
-			);
+			return res(context.json(createFetchResult(getBindings(scriptName))));
 		}
 	),
 ];

package/src/__tests__/helpers/msw/handlers/user.ts

@@ -1,14 +1,11 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export const mswSuccessUserHandlers = [
 	rest.get("*/user", (_, response, cxt) => {
 		return response.once(
-			cxt.status(200),
-			cxt.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: {
+			cxt.json(
+				createFetchResult({
 					id: "7c5dae5552338874e5053f2534d2767a",
 					email: "user@example.com",
 					first_name: "John",
@@ -21,33 +18,25 @@ export const mswSuccessUserHandlers = [
 					modified_on: "2014-01-01T05:20:00Z",
 					two_factor_authentication_enabled: false,
 					suspended: false,
-				},
-			})
+				})
+			)
 		);
 	}),
 	rest.get("*/accounts", (_, response, cxt) => {
 		return response.once(
-			cxt.status(200),
-			cxt.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: [
+			cxt.json(
+				createFetchResult([
 					{ name: "Account One", id: "account-1" },
 					{ name: "Account Two", id: "account-2" },
 					{ name: "Account Three", id: "account-3" },
-				],
-			})
+				])
+			)
 		);
 	}),
 	rest.get("*/memberships", (_, response, context) => {
 		return response.once(
-			context.status(200),
-			context.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result: [
+			context.json(
+				createFetchResult([
 					{
 						id: "membership-id-1",
 						account: { id: "account-id-1", name: "My Personal Account" },
@@ -56,8 +45,8 @@ export const mswSuccessUserHandlers = [
 						id: "membership-id-2",
 						account: { id: "account-id-2", name: "Enterprise Account" },
 					},
-				],
-			})
+				])
+			)
 		);
 	}),
 ];

package/src/__tests__/helpers/msw/handlers/zones.ts

@@ -1,22 +1,20 @@
 import { rest } from "msw";
+import { createFetchResult } from "../index";
 
 export default [
 	rest.get("*/zones", ({ url: { searchParams } }, res, context) => {
 		return res(
-			context.status(200),
-			context.json({
-				success: true,
-				errors: [],
-				messages: [],
-				result:
+			context.json(
+				createFetchResult(
 					searchParams.get("name") === "exists.com"
 						? [
 								{
 									id: "exists-com",
 								},
 						  ]
-						: [],
-			})
+						: []
+				)
+			)
 		);
 	}),
 ];