wrangler 2.8.1 → 2.9.1

package/miniflare-dist/index.mjs

@@ -669,7 +669,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 }
             );
           }
@@ -6349,16 +6349,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": "2.8.1",
+	"version": "2.9.1",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -105,7 +105,7 @@
 		"@miniflare/durable-objects": "2.11.0",
 		"blake3-wasm": "^2.1.5",
 		"chokidar": "^3.5.3",
-		"esbuild": "0.14.51",
+		"esbuild": "0.16.3",
 		"miniflare": "2.11.0",
 		"nanoid": "^3.3.3",
 		"path-to-regexp": "^6.2.0",

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,10 +25,11 @@ 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
@@ -71,10 +65,11 @@ 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
@@ -84,44 +79,4 @@ describe("d1", () => {
 		--------------------"
 	`);
 	});
-
-	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,141 @@
+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.`
+			);
+		});
+	});
+
+	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__/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__/generate.test.ts

@@ -131,7 +131,7 @@ describe("generate", () => {
 		// was harder than i thought, leaving this for now.
 		it.todo("clones a cloudflare template with full checkouts");
 
-		it("clones a user/repo template", async () => {
+		it.skip("clones a user/repo template", async () => {
 			await expect(
 				runWrangler("generate my-worker caass/wrangler-generate-test-template")
 			).resolves.toBeUndefined();

package/src/__tests__/helpers/end-event-loop.ts

@@ -0,0 +1,6 @@
+/**
+ * Forces a tick and ensures that all pending promises resolve
+ */
+export function endEventLoop() {
+	return new Promise((resolve) => setImmediate(resolve));
+}

package/src/__tests__/helpers/mock-get-pages-upload-token.ts

@@ -0,0 +1,25 @@
+import { rest } from "msw";
+import { msw } from "./msw";
+
+/**
+ * Mocks the `/accounts/:accountId/pages/projects/:projectName/upload-token` GET request
+ */
+export function mockGetUploadTokenRequest(
+	jwt: string,
+	accountId: string,
+	projectName: string
+) {
+	msw.use(
+		rest.get(
+			`*/accounts/:accountId/pages/projects/${projectName}/upload-token`,
+			(req, res, ctx) => {
+				expect(req.params.accountId).toEqual(accountId);
+
+				return res(
+					ctx.status(200),
+					ctx.json({ success: true, errors: [], messages: [], result: { jwt } })
+				);
+			}
+		)
+	);
+}

package/src/__tests__/helpers/mock-set-timeout.ts

@@ -0,0 +1,16 @@
+let setTimeoutSpy: jest.SpyInstance;
+
+export function mockSetTimeout() {
+	beforeEach(() => {
+		setTimeoutSpy = jest
+			.spyOn(global, "setTimeout")
+			// @ts-expect-error we're using a very simple setTimeout mock here
+			.mockImplementation((fn, _period) => {
+				setImmediate(fn);
+			});
+	});
+
+	afterEach(() => {
+		setTimeoutSpy.mockRestore();
+	});
+}

package/src/__tests__/index.test.ts

@@ -1,4 +1,5 @@
 import { getPackageManager } from "../package-manager";
+import { endEventLoop } from "./helpers/end-event-loop";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { runInTempDir } from "./helpers/run-in-tmp";
 import { runWrangler } from "./helpers/run-wrangler";
@@ -56,10 +57,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 +106,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 +154,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 +176,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 +199,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 +220,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 +241,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]"
 		`);
 		});
 	});
@@ -262,7 +270,3 @@ describe("wrangler", () => {
 	`);
 	});
 });
-
-function endEventLoop() {
-	return new Promise((resolve) => setImmediate(resolve));
-}

package/src/__tests__/init.test.ts

@@ -1392,7 +1392,7 @@ describe("init", () => {
 						contents: {
 							config: {
 								compilerOptions: expect.objectContaining({
-									types: ["@cloudflare/workers-types", "jest"],
+									types: ["@cloudflare/workers-types", "vitest"],
 								}),
 							},
 							error: undefined,