wrangler 0.0.0-e6c9c5c0 → 0.0.0-e6e1daba

package/README.md

@@ -1,12 +1,12 @@
 <h1 align="center"> ⛅️ wrangler </h1>
 <section align="center" id="shieldio-badges">
 <a href="https://www.npmjs.com/package/wrangler"><img alt="npm"  src="https://img.shields.io/npm/dw/wrangler?style=flat-square"></a>
-<img alt="GitHub contributors" src="https://img.shields.io/github/contributors/cloudflare/wrangler2?style=flat-square">
-<img alt="GitHub commit activity (branch)" src="https://img.shields.io/github/commit-activity/w/cloudflare/wrangler2/main?style=flat-square">
+<img alt="GitHub contributors" src="https://img.shields.io/github/contributors/cloudflare/workers-sdk?style=flat-square">
+<img alt="GitHub commit activity (branch)" src="https://img.shields.io/github/commit-activity/w/cloudflare/workers-sdk/main?style=flat-square">
 <a href="https://discord.gg/CloudflareDev"><img alt="Discord" src="https://img.shields.io/discord/595317990191398933?color=%23F48120&style=flat-square"></a>
 </section>
 
-> This package is for wrangler v2.x, released first in May 2022. If you're looking for v1.x of the `@cloudflare/wrangler` package, visit https://www.npmjs.com/package/@cloudflare/wrangler / https://github.com/cloudflare/wrangler.
+> This package is for wrangler v2.x, released first in May 2022. If you're looking for v1.x of the `@cloudflare/wrangler` package, visit https://www.npmjs.com/package/@cloudflare/wrangler / https://github.com/cloudflare/wrangler-legacy.
 
 `wrangler` is a command line tool for building [Cloudflare Workers](https://workers.cloudflare.com/).
 

package/miniflare-dist/index.mjs

@@ -441,7 +441,11 @@ async function generateHandler({
   async function generateResponse() {
     const match = staticRedirectsMatcher() || generateRedirectsMatcher()({ request })[0];
     if (match) {
-      return getResponseFromMatch(match, url);
+      if (match.status === 200) {
+        pathname = new URL(match.to, request.url).pathname;
+      } else {
+        return getResponseFromMatch(match, url);
+      }
     }
     if (!request.method.match(/^(get|head)$/i)) {
       return new MethodNotAllowedResponse();
@@ -669,7 +673,7 @@ async function generateHandler({
         return new HTMLRewriter().on("body", {
           element(e) {
             e.append(
-              `<!-- Cloudflare Pages Analytics --><script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "${metadata.analytics?.token}"}'><\/script><!-- Cloudflare Pages Analytics -->`,
+              `<!-- Cloudflare Pages Analytics --><script defer src='https://static.cloudflareinsights.com/beacon.min.js' data-cf-beacon='{"token": "${metadata.analytics?.token}"}'></script><!-- Cloudflare Pages Analytics -->`,
               { html: true }
             );
           }
@@ -5615,7 +5619,7 @@ import { join } from "node:path";
 var REDIRECTS_VERSION = 1;
 var HEADERS_VERSION = 2;
 var ANALYTICS_VERSION = 1;
-var PERMITTED_STATUS_CODES = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
+var PERMITTED_STATUS_CODES = /* @__PURE__ */ new Set([200, 301, 302, 303, 307, 308]);
 var HEADER_SEPARATOR = ":";
 var MAX_LINE_LENGTH = 2e3;
 var MAX_HEADER_RULES = 100;
@@ -5994,7 +5998,7 @@ function parseRedirects(input) {
       invalid.push({
         line,
         lineNumber: i + 1,
-        message: `Valid status codes are 301, 302 (default), 303, 307, or 308. Got ${str_status}.`
+        message: `Valid status codes are 200, 301, 302 (default), 303, 307, or 308. Got ${str_status}.`
       });
       continue;
     }
@@ -6007,6 +6011,19 @@ function parseRedirects(input) {
       continue;
     }
     seen_paths.add(from);
+    if (status === 200) {
+      const [proxyTo, error] = validateUrl(to, true, true, true);
+      if (error) {
+        invalid.push({
+          line,
+          lineNumber: i + 1,
+          message: `Proxy (200) redirects can only point to relative paths. Got ${to}`
+        });
+        continue;
+      }
+      rules.push({ from, to: proxyTo, status, lineNumber: i + 1 });
+      continue;
+    }
     rules.push({ from, to, status, lineNumber: i + 1 });
   }
   return {
@@ -6152,7 +6169,7 @@ async function generateAssetsFetch(directory, log, tre) {
         const filepath = assetKeyEntryMap.get(assetKey);
         if (!filepath) {
           throw new Error(
-            "Could not fetch asset. Please file an issue on GitHub (https://github.com/cloudflare/wrangler2/issues/new/choose) with reproduction steps."
+            "Could not fetch asset. Please file an issue on GitHub (https://github.com/cloudflare/workers-sdk/issues/new/choose) with reproduction steps."
           );
         }
         const body = readFileSync5(filepath);
@@ -6349,16 +6366,3 @@ async function main() {
   }
 }
 await main();
-/**
- * @fileoverview Main entrypoint for libraries using yargs-parser in Node.js
- * CJS and ESM environments.
- *
- * @license
- * Copyright (c) 2016, Contributors
- * SPDX-License-Identifier: ISC
- */
-/**
- * @license
- * Copyright (c) 2016, Contributors
- * SPDX-License-Identifier: ISC
- */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "0.0.0-e6c9c5c0",
+	"version": "0.0.0-e6e1daba",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -24,13 +24,13 @@
 		"http",
 		"cli"
 	],
-	"homepage": "https://github.com/cloudflare/wrangler2#readme",
+	"homepage": "https://github.com/cloudflare/workers-sdk#readme",
 	"bugs": {
-		"url": "https://github.com/cloudflare/wrangler2/issues"
+		"url": "https://github.com/cloudflare/workers-sdk/issues"
 	},
 	"repository": {
 		"type": "git",
-		"url": "https://github.com/cloudflare/wrangler2.git",
+		"url": "https://github.com/cloudflare/workers-sdk.git",
 		"directory": "packages/wrangler"
 	},
 	"license": "MIT OR Apache-2.0",
@@ -63,7 +63,7 @@
 		"emit-types": "tsc -p tsconfig.emit.json && node -r esbuild-register scripts/emit-types.ts",
 		"prepublishOnly": "SOURCEMAPS=false npm run build",
 		"start": "npm run bundle && cross-env NODE_OPTIONS=--enable-source-maps ./bin/wrangler.js",
-		"test": "npm run assert-git-version && jest --silent=false --verbose=true",
+		"test": "npm run assert-git-version && jest --silent=false --verbose=true --forceExit",
 		"test-watch": "npm run test -- --runInBand --testTimeout=50000 --watch",
 		"test:ci": "npm run test -- --verbose=true --coverage"
 	},
@@ -100,13 +100,13 @@
 		"@cloudflare/kv-asset-handler": "^0.2.0",
 		"@esbuild-plugins/node-globals-polyfill": "^0.1.1",
 		"@esbuild-plugins/node-modules-polyfill": "^0.1.4",
-		"@miniflare/core": "2.11.0",
-		"@miniflare/d1": "2.11.0",
-		"@miniflare/durable-objects": "2.11.0",
+		"@miniflare/core": "2.12.1",
+		"@miniflare/d1": "2.12.1",
+		"@miniflare/durable-objects": "2.12.1",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
-		"esbuild": "0.14.51",
-		"miniflare": "2.11.0",
+		"esbuild": "0.16.3",
+		"miniflare": "2.12.1",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",
 		"selfsigned": "^2.0.1",
@@ -118,7 +118,7 @@
 		"@cloudflare/workers-types": "^4.20221111.1",
 		"@iarna/toml": "^3.0.0",
 		"@microsoft/api-extractor": "^7.28.3",
-		"@miniflare/tre": "^3.0.0-next.8",
+		"@miniflare/tre": "^3.0.0-next.10",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",
@@ -179,7 +179,7 @@
 		"timeago.js": "^4.0.2",
 		"tmp-promise": "^3.0.3",
 		"ts-dedent": "^2.2.0",
-		"undici": "5.11.0",
+		"undici": "5.20.0",
 		"update-check": "^1.5.4",
 		"ws": "^8.5.0",
 		"xdg-app-paths": "^7.3.0",

package/src/__tests__/configuration.test.ts

@@ -68,6 +68,7 @@ describe("normalizeAndValidateConfig()", () => {
 				bindings: [],
 			},
 			dispatch_namespaces: [],
+			mtls_certificates: [],
 			usage_model: undefined,
 			vars: {},
 			define: {},
@@ -2190,6 +2191,75 @@ describe("normalizeAndValidateConfig()", () => {
 			});
 		});
 
+		describe("[mtls_certificates]", () => {
+			it("should error if mtls_certificates is not an array", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						mtls_certificates: "just a string",
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.hasErrors()).toBe(true);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"mtls_certificates\\" should be an array but got \\"just a string\\"."
+		`);
+			});
+
+			it("should error on non valid mtls_certificates", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						mtls_certificates: [
+							"a string",
+							123,
+							false,
+							{
+								binding: 123,
+								namespace: 123,
+							},
+							{
+								binding: "CERT_ONE",
+								id: "1234",
+							},
+							{
+								binding: "CERT_TWO",
+								certificate_id: 1234,
+							},
+							// this one is valid
+							{
+								binding: "CERT_THREE",
+								certificate_id: "1234",
+							},
+							{
+								binding: true,
+								service: "1234",
+							},
+						],
+					} as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.hasWarnings()).toBe(false);
+				expect(diagnostics.hasErrors()).toBe(true);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - \\"mtls_certificates\\" bindings should be objects, but got \\"a string\\"
+			  - \\"mtls_certificates\\" bindings should be objects, but got 123
+			  - \\"mtls_certificates\\" bindings should be objects, but got false
+			  - \\"mtls_certificates[3]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":123,\\"namespace\\":123}.
+			  - \\"mtls_certificates[3]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":123,\\"namespace\\":123}.
+			  - \\"mtls_certificates[4]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":\\"CERT_ONE\\",\\"id\\":\\"1234\\"}.
+			  - \\"mtls_certificates[5]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":\\"CERT_TWO\\",\\"certificate_id\\":1234}.
+			  - \\"mtls_certificates[7]\\" bindings should have a string \\"binding\\" field but got {\\"binding\\":true,\\"service\\":\\"1234\\"}.
+			  - \\"mtls_certificates[7]\\" bindings should have a string \\"certificate_id\\" field but got {\\"binding\\":true,\\"service\\":\\"1234\\"}."
+		`);
+			});
+		});
+
 		describe("[unsafe.bindings]", () => {
 			it("should error if unsafe is an array", () => {
 				const { diagnostics } = normalizeAndValidateConfig(

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

@@ -1,18 +1,11 @@
-import { cwd } from "process";
+import { endEventLoop } from "../helpers/end-event-loop";
 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));
-}
 
 describe("d1", () => {
 	const std = mockConsoleMethods();
 	runInTempDir();
-	const { setIsTTY } = useMockIsTTY();
 
 	it("should show help when no argument is passed", async () => {
 		await runWrangler("d1");
@@ -32,14 +25,15 @@ 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]
+		  -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
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/issues/new/choose
 		🚧 To request features, visit https://community.cloudflare.com/c/developers/d1
 		🚧 To give feedback, visit https://discord.gg/cloudflaredev
 		--------------------"
@@ -71,57 +65,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]
+		  -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
+		🚧 Please report any bugs to https://github.com/cloudflare/workers-sdk/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/execute.test.ts

@@ -0,0 +1,64 @@
+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("execute", () => {
+	runInTempDir();
+	const { setIsTTY } = useMockIsTTY();
+
+	it("should require login when running against prod", async () => {
+		setIsTTY(false);
+		writeWranglerToml({
+			d1_databases: [
+				{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+			],
+		});
+
+		await expect(
+			runWrangler("d1 execute --command 'select 1;'")
+		).rejects.toThrowError(
+			`In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work. Please go to https://developers.cloudflare.com/api/tokens/create/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.`
+		);
+	});
+
+	it("should expect either --command or --file", async () => {
+		setIsTTY(false);
+		writeWranglerToml({
+			d1_databases: [
+				{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+			],
+		});
+
+		await expect(runWrangler("d1 execute db")).rejects.toThrowError(
+			`Error: must provide --command or --file`
+		);
+	});
+
+	it("should reject the use of --preview with --local", async () => {
+		setIsTTY(false);
+		writeWranglerToml({
+			d1_databases: [
+				{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+			],
+		});
+
+		await expect(
+			runWrangler(`d1 execute db --command "select;" --local --preview`)
+		).rejects.toThrowError(`Error: can't use --preview with --local`);
+	});
+
+	it("should expect --local when using --persist-to", async () => {
+		setIsTTY(false);
+		writeWranglerToml({
+			d1_databases: [
+				{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+			],
+		});
+		await runWrangler("d1 migrations create db test");
+
+		await expect(
+			runWrangler("d1 migrations apply --local db --preview")
+		).rejects.toThrowError(`Error: can't use --preview with --local`);
+	});
+});

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

@@ -0,0 +1,155 @@
+import { cwd } from "process";
+import { reinitialiseAuthTokens } from "../../user";
+import { mockAccountId, mockApiToken } from "../helpers/mock-account-id";
+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("create", () => {
+		it("should reject the --local flag for create", async () => {
+			setIsTTY(false);
+			writeWranglerToml({
+				d1_databases: [
+					{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+				],
+			});
+
+			await expect(
+				runWrangler("d1 migrations create test some-message --local DATABASE")
+			).rejects.toThrowError(`Unknown argument: local`);
+		});
+	});
+
+	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.`
+			);
+		});
+
+		it("should reject the use of --preview with --local", async () => {
+			setIsTTY(false);
+			writeWranglerToml({
+				d1_databases: [
+					{ binding: "DATABASE", database_name: "db", database_id: "xxxx" },
+				],
+			});
+			await runWrangler("d1 migrations create db test");
+
+			await expect(
+				runWrangler("d1 migrations apply --local db --preview")
+			).rejects.toThrowError(`Error: can't use --preview with --local`);
+		});
+	});
+
+	describe("list", () => {
+		mockAccountId();
+		mockApiToken({ apiToken: null });
+
+		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 list --local DATABASE")
+			).rejects.toThrowError(
+				`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
+			);
+		});
+
+		it("should use the custom migrations folder when provided", async () => {
+			setIsTTY(false);
+			writeWranglerToml({
+				d1_databases: [
+					{
+						binding: "DATABASE",
+						database_name: "db",
+						database_id: "xxxx",
+						migrations_dir: "my-migrations-go-here",
+					},
+				],
+			});
+			await expect(
+				runWrangler("d1 migrations list --local DATABASE")
+			).rejects.toThrowError(
+				`No migrations present at ${cwd().replaceAll(
+					"\\",
+					"/"
+				)}/my-migrations-go-here.`
+			);
+		});
+
+		it("should try to read D1 config from wrangler.toml when logged in", async () => {
+			// no need to clear this env var as it's implicitly cleared by mockApiToken in afterEach
+			process.env.CLOUDFLARE_API_TOKEN = "api-token";
+			reinitialiseAuthTokens();
+			setIsTTY(false);
+			writeWranglerToml();
+			await expect(
+				runWrangler("d1 migrations list DATABASE")
+			).rejects.toThrowError(
+				"Can't find a DB with name/binding 'DATABASE' in local config. Check info in wrangler.toml..."
+			);
+		});
+
+		it("should throw if user is not authenticated and not using --local", async () => {
+			setIsTTY(false);
+
+			await expect(
+				runWrangler("d1 migrations list DATABASE")
+			).rejects.toThrowError(
+				"In a non-interactive environment, it's necessary to set a CLOUDFLARE_API_TOKEN environment variable for wrangler to work"
+			);
+		});
+
+		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 list --local DATABASE")
+			).rejects.toThrowError(
+				`No migrations present at ${cwd().replaceAll("\\", "/")}/migrations.`
+			);
+		});
+	});
+});

package/src/__tests__/deployments.test.ts

@@ -62,18 +62,30 @@ describe("deployments", () => {
 
 		await runWrangler("deployments");
 		expect(std.out).toMatchInlineSnapshot(`
-		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
 
 
-		Deployment ID: Galaxy-Class
-		Created on: 2021-01-01T00:00:00.000000Z
-		Author: Jean-Luc-Picard@federation.org
-		Source: 🤠 Wrangler
+		Deployment ID: Constitution-Class
+		Created on:    2021-01-01T00:00:00.000000Z
+		Author:        Jean-Luc-Picard@federation.org
+		Trigger:       Upload from Wrangler 🤠
+
+		Deployment ID: Intrepid-Class
+		Created on:    2021-02-02T00:00:00.000000Z
+		Author:        Kathryn-Janeway@federation.org
+		Trigger:       Rollback from Wrangler 🤠
+		Rollback from: MOCK-DEPLOYMENT-ID-1111
 
 		Deployment ID: Intrepid-Class
-		Created on: 2021-02-02T00:00:00.000000Z
-		Author: Kathryn-Janeway@federation.org
-		Source: 🤠 Wrangler
+		Created on:    2021-02-03T00:00:00.000000Z
+		Author:        Kathryn-Janeway@federation.org
+		Trigger:       Wrangler 🤠
+
+		Deployment ID: Galaxy-Class
+		Created on:    2021-01-04T00:00:00.000000Z
+		Author:        Jean-Luc-Picard@federation.org
+		Trigger:       Rollback from Wrangler 🤠
+		Rollback from: MOCK-DEPLOYMENT-ID-2222
 		🟩 Active"
 	`);
 	});
@@ -81,18 +93,30 @@ describe("deployments", () => {
 	it("should log deployments for script with passed in name option", async () => {
 		await runWrangler("deployments --name something-else");
 		expect(std.out).toMatchInlineSnapshot(`
-		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose
+		"🚧\`wrangler deployments\` is a beta command. Please report any issues to https://github.com/cloudflare/workers-sdk/issues/new/choose
 
 
-		Deployment ID: Galaxy-Class
-		Created on: 2021-01-01T00:00:00.000000Z
-		Author: Jean-Luc-Picard@federation.org
-		Source: 🤠 Wrangler
+		Deployment ID: Constitution-Class
+		Created on:    2021-01-01T00:00:00.000000Z
+		Author:        Jean-Luc-Picard@federation.org
+		Trigger:       Upload from Wrangler 🤠
+
+		Deployment ID: Intrepid-Class
+		Created on:    2021-02-02T00:00:00.000000Z
+		Author:        Kathryn-Janeway@federation.org
+		Trigger:       Rollback from Wrangler 🤠
+		Rollback from: MOCK-DEPLOYMENT-ID-1111
 
 		Deployment ID: Intrepid-Class
-		Created on: 2021-02-02T00:00:00.000000Z
-		Author: Kathryn-Janeway@federation.org
-		Source: 🤠 Wrangler
+		Created on:    2021-02-03T00:00:00.000000Z
+		Author:        Kathryn-Janeway@federation.org
+		Trigger:       Wrangler 🤠
+
+		Deployment ID: Galaxy-Class
+		Created on:    2021-01-04T00:00:00.000000Z
+		Author:        Jean-Luc-Picard@federation.org
+		Trigger:       Rollback from Wrangler 🤠
+		Rollback from: MOCK-DEPLOYMENT-ID-2222
 		🟩 Active"
 	`);
 	});