wrangler 2.7.1 → 2.8.1

package/package.json

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

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

@@ -37,10 +37,12 @@ describe("d1", () => {
 		  -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"
+		--------------------
+		🚧 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
+		--------------------"
 	`);
 	});
 
@@ -74,10 +76,12 @@ describe("d1", () => {
 		  -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"
+		--------------------
+		🚧 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
+		--------------------"
 	`);
 	});
 

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__/helpers/mock-dialogs.ts

@@ -1,4 +1,5 @@
 import prompts from "prompts";
+
 /**
  * The expected values for a confirmation request.
  */
@@ -30,6 +31,7 @@ export function mockConfirm(...expectations: ConfirmExpectation[]) {
 				if (expectation.options) {
 					expect(initial).toStrictEqual(expectation.options?.defaultValue);
 				}
+
 				return Promise.resolve({ value: expectation.result });
 			}
 		);

package/src/__tests__/helpers/mock-get-zone-from-host.ts

@@ -1,8 +1,11 @@
-import { setMockResponse } from "./mock-cfetch";
+import { rest } from "msw";
+import { msw, createFetchResult } from "./msw";
 
 export function mockGetZoneFromHostRequest(host: string, zone?: string) {
-	setMockResponse("/zones", (_uri, _init, queryParams) => {
-		expect(queryParams.get("name")).toEqual(host);
-		return zone ? [{ id: zone }] : [];
-	});
+	msw.use(
+		rest.get("*/zones", (req, res, ctx) => {
+			expect(req.url.searchParams.get("name")).toEqual(host);
+			return res(ctx.json(createFetchResult(zone ? [{ id: zone }] : [])));
+		})
+	);
 }

package/src/__tests__/helpers/mock-known-routes.ts

@@ -1,7 +1,12 @@
-import { setMockResponse } from "./mock-cfetch";
+import { rest } from "msw";
+import { createFetchResult, msw } from "./msw";
 
 export function mockCollectKnownRoutesRequest(
 	routes: { pattern: string; script: string }[]
 ) {
-	setMockResponse(`/zones/:zoneId/workers/routes`, "GET", () => routes);
+	msw.use(
+		rest.get(`*/zones/:zoneId/workers/routes`, (_, res, ctx) =>
+			res.once(ctx.json(createFetchResult(routes)))
+		)
+	);
 }

package/src/__tests__/helpers/mock-kv.ts

@@ -1,4 +1,5 @@
-import { createFetchResult, setMockRawResponse } from "./mock-cfetch";
+import { rest } from "msw";
+import { createFetchResult, msw } from "./msw";
 import type { NamespaceKeyInfo } from "../../kv/helpers";
 
 export function mockKeyListRequest(
@@ -9,25 +10,37 @@ export function mockKeyListRequest(
 ) {
 	const requests = { count: 0 };
 	// See https://api.cloudflare.com/#workers-kv-namespace-list-a-namespace-s-keys
+	msw.use(
+		rest.get(
+			"*/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
+			(req, res, ctx) => {
+				requests.count++;
+				expect(req.params.accountId).toEqual("some-account-id");
+				expect(req.params.namespaceId).toEqual(expectedNamespaceId);
+				let response: undefined | NamespaceKeyInfo[];
+				if (expectedKeys.length <= keysPerRequest) {
+					response = expectedKeys;
+				}
 
-	setMockRawResponse(
-		"/accounts/:accountId/storage/kv/namespaces/:namespaceId/keys",
-		"GET",
-		([_url, accountId, namespaceId], _init, query) => {
-			requests.count++;
-			expect(accountId).toEqual("some-account-id");
-			expect(namespaceId).toEqual(expectedNamespaceId);
-			if (expectedKeys.length <= keysPerRequest) {
-				return createFetchResult(expectedKeys);
-			} else {
-				const start = parseInt(query.get("cursor") ?? "0") || 0;
+				const start = parseInt(req.url.searchParams.get("cursor") ?? "0") || 0;
 				const end = start + keysPerRequest;
 				const cursor = end < expectedKeys.length ? end : blankCursorValue;
-				return createFetchResult(expectedKeys.slice(start, end), true, [], [], {
-					cursor,
-				});
+
+				return res(
+					ctx.json(
+						createFetchResult(
+							response ? response : expectedKeys.slice(start, end),
+							true,
+							[],
+							[],
+							{
+								cursor,
+							}
+						)
+					)
+				);
 			}
-		}
+		)
 	);
 	return requests;
 }

package/src/__tests__/helpers/mock-oauth-flow.ts

@@ -1,30 +1,34 @@
-import fetchMock from "jest-fetch-mock";
+import { rest } from "msw";
 import { Request } from "undici";
 import openInBrowser from "../../open-in-browser";
-import { setMockResponse } from "./mock-cfetch";
 import { mockHttpServer } from "./mock-http-server";
+import { createFetchResult, msw } from "./msw";
 
 export function mockGetMemberships(
 	accounts: { id: string; account: { id: string; name: string } }[]
 ) {
-	setMockResponse("/memberships", "GET", () => {
-		return accounts;
-	});
+	msw.use(
+		rest.get("*/memberships", (_, res, ctx) => {
+			return res.once(ctx.json(createFetchResult(accounts)));
+		})
+	);
+}
+export function mockGetMembershipsFail() {
+	msw.use(
+		rest.get("*/memberships", (_, res, ctx) => {
+			return res.once(ctx.json(createFetchResult([], false)));
+		})
+	);
 }
-
-// the response to send when wrangler wants an oauth grant
-let oauthGrantResponse: GrantResponseOptions | "timeout" = {};
 
 /**
  * Functions to help with mocking various parts of the OAuth Flow
  */
 export const mockOAuthFlow = () => {
+	// the response to send when wrangler wants an oauth grant
+	let oauthGrantResponse: GrantResponseOptions | "timeout" = {};
 	const fetchHttp = mockHttpServer();
 
-	afterEach(() => {
-		fetchMock.resetMocks();
-	});
-
 	/**
 	 * Mock out the callback from a browser to our HttpServer.
 	 *
@@ -61,7 +65,7 @@ export const mockOAuthFlow = () => {
 		});
 	};
 
-	//TODO: this can just handled in `mockOAuthServerCallback`
+	// Handled in `mockOAuthServerCallback`
 	const mockGrantAuthorization = ({
 		respondWith,
 	}: {
@@ -82,25 +86,6 @@ export const mockOAuthFlow = () => {
 		}
 	};
 
-	const mockRevokeAuthorization = ({
-		domain = "dash.cloudflare.com",
-	}: { domain?: string } = {}) => {
-		const outcome = {
-			actual: new Request("https://example.org"),
-			expected: new Request(`https://${domain}/oauth2/revoke`, {
-				method: "POST",
-			}),
-		};
-
-		fetchMock.mockIf(outcome.expected.url, async (req) => {
-			// TODO: update Miniflare typings to match full undici Request
-			outcome.actual = req as unknown as Request;
-			return "";
-		});
-
-		return outcome;
-	};
-
 	const mockGrantAccessToken = ({
 		respondWith,
 		domain = "dash.cloudflare.com",
@@ -109,94 +94,101 @@ export const mockOAuthFlow = () => {
 		domain?: string;
 	}) => {
 		const outcome = {
-			actual: new Request("https://example.org"),
-			expected: new Request(`https://${domain}/oauth2/token`, {
-				method: "POST",
-			}),
+			actual: "https://example.org",
+			expected: `https://${domain}/oauth2/token`,
 		};
-
-		fetchMock.mockOnceIf(outcome.expected.url, async (req) => {
-			// TODO: update Miniflare typings to match full undici Request
-			outcome.actual = req as unknown as Request;
-			return makeTokenResponse(respondWith);
-		});
+		msw.use(
+			rest.post(outcome.expected, async (req, res, ctx) => {
+				// TODO: update Miniflare typings to match full undici Request
+				outcome.actual = req.url.toString();
+				return res.once(ctx.json(makeTokenResponse(respondWith)));
+			})
+		);
 
 		return outcome;
 	};
 
-	const mockExchangeRefreshTokenForAccessToken = ({
-		respondWith,
-		domain = "dash.cloudlfare.com",
+	function mockDomainUsesAccess({
+		usesAccess,
+		domain = "dash.cloudflare.com",
 	}: {
-		respondWith: "refreshSuccess" | "refreshError" | "badResponse";
+		usesAccess: boolean;
 		domain?: string;
-	}) => {
-		fetchMock.mockOnceIf(`https://${domain}/oauth2/token`, async () => {
+	}) {
+		// If the domain relies upon Cloudflare Access, then a request to the domain
+		// will result in a redirect to the `cloudflareaccess.com` domain.
+		msw.use(
+			rest.get(`https://${domain}/`, (_, res, ctx) => {
+				let status = 200;
+				let headers: Record<string, string> = {
+					"Content-Type": "application/json",
+				};
+				if (usesAccess) {
+					status = 302;
+					headers = { location: "cloudflareaccess.com" };
+				}
+				return res.once(ctx.status(status), ctx.set(headers));
+			})
+		);
+	}
+
+	return {
+		mockHttpServer,
+		mockDomainUsesAccess,
+		mockGrantAccessToken,
+		mockOAuthServerCallback,
+		mockExchangeRefreshTokenForAccessToken,
+	};
+};
+
+export function mockExchangeRefreshTokenForAccessToken({
+	respondWith,
+	domain = "dash.cloudflare.com",
+}: {
+	respondWith: "refreshSuccess" | "refreshError" | "badResponse";
+	domain?: string;
+}) {
+	msw.use(
+		rest.post(`https://${domain}/oauth2/token`, async (_, res, ctx) => {
 			switch (respondWith) {
 				case "refreshSuccess":
-					return {
-						status: 200,
-						body: JSON.stringify({
+					return res.once(
+						ctx.status(200),
+						ctx.json({
 							access_token: "access_token_success_mock",
 							expires_in: 1701,
 							refresh_token: "refresh_token_success_mock",
 							scope: "scope_success_mock",
 							token_type: "bearer",
-						}),
-					};
+						})
+					);
 				case "refreshError":
-					return {
-						status: 400,
-						body: JSON.stringify({
+					return res.once(
+						ctx.status(400),
+						ctx.json({
 							error: "invalid_request",
 							error_description: "error_description_mock",
 							error_hint: "error_hint_mock",
 							error_verbose: "error_verbose_mock",
 							status_code: 400,
-						}),
-					};
+						})
+					);
 				case "badResponse":
-					return {
-						status: 400,
-						body: `<html> <body> This shouldn't be sent, but should be handled </body> </html>`,
-					};
+					return res.once(
+						ctx.status(400),
+						ctx.text(
+							`<html> <body> This shouldn't be sent, but should be handled </body> </html>`
+						)
+					);
 
 				default:
-					return "Not a respondWith option for `mockExchangeRefreshTokenForAccessToken`";
-			}
-		});
-	};
-
-	const mockDomainUsesAccess = ({
-		usesAccess,
-		domain = "dash.cloudflare.com",
-	}: {
-		usesAccess: boolean;
-		domain?: string;
-	}) => {
-		// If the domain relies upon Cloudflare Access, then a request to the domain
-		// will result in a redirect to the `cloudflareaccess.com` domain.
-		fetchMock.mockOnceIf(`https://${domain}/`, async () => {
-			if (usesAccess) {
-				return {
-					status: 302,
-					headers: { location: "cloudflareaccess.com" },
-				};
-			} else {
-				return { status: 200 };
+					throw new Error(
+						"Not a respondWith option for `mockExchangeRefreshTokenForAccessToken`"
+					);
 			}
-		});
-	};
-
-	return {
-		mockDomainUsesAccess,
-		mockGrantAccessToken,
-		mockGrantAuthorization,
-		mockOAuthServerCallback,
-		mockRevokeAuthorization,
-		mockExchangeRefreshTokenForAccessToken,
-	};
-};
+		})
+	);
+}
 
 type GrantResponseOptions = {
 	code?: string;
@@ -249,7 +241,7 @@ type MockTokenResponse =
 			error: ErrorType;
 	  };
 
-const makeTokenResponse = (partialResponse: MockTokenResponse): string => {
+const makeTokenResponse = (partialResponse: MockTokenResponse) => {
 	let fullResponse: MockTokenResponse;
 
 	if (partialResponse === "ok") {
@@ -267,5 +259,5 @@ const makeTokenResponse = (partialResponse: MockTokenResponse): string => {
 		fullResponse = partialResponse;
 	}
 
-	return JSON.stringify(fullResponse);
+	return fullResponse;
 };

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,23 @@ export const mswSuccessDeployments = [
 								},
 							},
 						],
-					} as DeploymentListRes,
-				})
+					})
+				)
 			)
 	),
 ];
+
+export const mswSuccessLastDeployment = [
+	rest.get(
+		"*/accounts/:accountId/workers/services/:scriptName",
+		(_, res, ctx) => {
+			return res.once(
+				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",
 						},
-					],
-				})
+					])
+				)
 			);
 		}
 	),