wrangler 2.11.1 → 2.12.1

package/bin/wrangler.js

@@ -20,7 +20,7 @@ function runWrangler() {
 		// Note Volta and nvm are also recommended in the official docs:
 		// https://developers.cloudflare.com/workers/get-started/guide#2-install-the-workers-cli
 		console.error(
-			`Wrangler requires at least node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of node.js.
+			`Wrangler requires at least Node.js v${MIN_NODE_VERSION}. You are using v${process.versions.node}. Please update your version of Node.js.
 
 Consider using a Node.js version manager such as https://volta.sh/ or https://github.com/nvm-sh/nvm.`
 		);

package/miniflare-dist/index.mjs

@@ -6230,7 +6230,7 @@ async function main() {
   if (logLevelString === "LOG")
     logLevelString = "INFO";
   const logLevel = MiniflareLogLevel[logLevelString];
-  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel, config.logOptions);
+  config.log = logLevel === MiniflareLogLevel.NONE ? new MiniflareNoOpLog() : new MiniflareLog(logLevel);
   if (logLevel === MiniflareLogLevel.DEBUG) {
     console.log("MINIFLARE OPTIONS:\n", JSON.stringify(config, null, 2));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wrangler",
-	"version": "2.11.1",
+	"version": "2.12.1",
 	"description": "Command-line interface for all things Cloudflare Workers",
 	"keywords": [
 		"wrangler",
@@ -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.10",
+		"@miniflare/tre": "3.0.0-next.12",
 		"@types/better-sqlite3": "^7.6.0",
 		"@types/busboy": "^1.5.0",
 		"@types/command-exists": "^1.2.0",

package/src/__tests__/configuration.test.ts

@@ -65,7 +65,8 @@ describe("normalizeAndValidateConfig()", () => {
 				crons: [],
 			},
 			unsafe: {
-				bindings: [],
+				bindings: undefined,
+				metadata: undefined,
 			},
 			dispatch_namespaces: [],
 			mtls_certificates: [],
@@ -935,6 +936,7 @@ describe("normalizeAndValidateConfig()", () => {
 							extra: "UNSAFE_EXTRA_1",
 						},
 					],
+					metadata: undefined,
 				},
 				no_bundle: true,
 				minify: true,
@@ -2329,7 +2331,7 @@ describe("normalizeAndValidateConfig()", () => {
 		              `);
 			});
 
-			it("should error if unsafe.bindings is not defined", () => {
+			it("should error if neither unsafe.bindings nor unsafe.metadata are defined", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{ unsafe: {} } as unknown as RawConfig,
 					undefined,
@@ -2341,9 +2343,37 @@ describe("normalizeAndValidateConfig()", () => {
 			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
 		              `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"unsafe\\" should contain at least one of \\"bindings\\" or \\"metadata\\" properties but got {}."
+		`);
+			});
+
+			it("should not error if at least unsafe.bindings is defined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { bindings: [] } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			                  "Processing wrangler configuration:
-			                    - The field \\"unsafe\\" is missing the required \\"bindings\\" property."
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
 		              `);
+				expect(diagnostics.hasErrors()).toBe(false);
+			});
+
+			it("should not error if at least unsafe.metadata is defined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: {} } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.hasErrors()).toBe(false);
 			});
 
 			it("should error if unsafe.bindings is an object", () => {
@@ -2453,6 +2483,74 @@ describe("normalizeAndValidateConfig()", () => {
 			              - binding should have a string \\"type\\" field."
 		        `);
 			});
+
+			it("should error if unsafe.metadata is an array", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: [] } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+			  - The field \\"unsafe.metadata\\" should be an object but got []."
+		`);
+			});
+
+			it("should error if unsafe.metadata is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: "BAD" } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"unsafe.metadata\\" should be an object but got \\"BAD\\"."
+		              `);
+			});
+
+			it("should error if unsafe.metadata is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: 999 } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"unsafe.metadata\\" should be an object but got 999."
+		              `);
+			});
+
+			it("should error if unsafe.metadata is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{ unsafe: { metadata: null } } as unknown as RawConfig,
+					undefined,
+					{ env: undefined }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - \\"unsafe\\" fields are experimental and may change or break at any time."
+		              `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			                  "Processing wrangler configuration:
+			                    - The field \\"unsafe.metadata\\" should be an object but got null."
+		              `);
+			});
 		});
 
 		describe("(deprecated)", () => {
@@ -2836,7 +2934,10 @@ describe("normalizeAndValidateConfig()", () => {
 			const r2_buckets: RawConfig["r2_buckets"] = [];
 			const analytics_engine_datasets: RawConfig["analytics_engine_datasets"] =
 				[];
-			const unsafe: RawConfig["unsafe"] = { bindings: [] };
+			const unsafe: RawConfig["unsafe"] = {
+				bindings: undefined,
+				metadata: undefined,
+			};
 			const rawConfig: RawConfig = {
 				define,
 				vars,
@@ -3784,7 +3885,7 @@ describe("normalizeAndValidateConfig()", () => {
 		        `);
 			});
 
-			it("should error if unsafe.bindings is not defined", () => {
+			it("should error if neither unsafe.bindings nor unsafe.metadata are defined", () => {
 				const { diagnostics } = normalizeAndValidateConfig(
 					{ env: { ENV1: { unsafe: {} } } } as unknown as RawConfig,
 					undefined,
@@ -3798,11 +3899,47 @@ describe("normalizeAndValidateConfig()", () => {
 			              - \\"unsafe\\" fields are experimental and may change or break at any time."
 		        `);
 				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe\\" should contain at least one of \\"bindings\\" or \\"metadata\\" properties but got {}."
+		`);
+			});
+
+			it("should not error if at least unsafe.bindings is undefined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { bindings: [] } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.hasErrors()).toBe(false);
+			});
+
+			it("should not error if at least unsafe.metadata is undefined", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: {} } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
 			          "Processing wrangler configuration:
 
 			            - \\"env.ENV1\\" environment configuration
-			              - The field \\"env.ENV1.unsafe\\" is missing the required \\"bindings\\" property."
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
 		        `);
+				expect(diagnostics.hasErrors()).toBe(false);
 			});
 
 			it("should error if unsafe.bindings is an object", () => {
@@ -3944,6 +4081,98 @@ describe("normalizeAndValidateConfig()", () => {
 			                - binding should have a string \\"type\\" field."
 		        `);
 			});
+
+			it("should error if unsafe.metadata is an array", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: [] } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got []."
+		        `);
+			});
+
+			it("should error if unsafe.metadata is a string", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: "BAD" } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got \\"BAD\\"."
+		`);
+			});
+
+			it("should error if unsafe.metadata is a number", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: 999 } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got 999."
+		`);
+			});
+
+			it("should error if unsafe.metadata is null", () => {
+				const { diagnostics } = normalizeAndValidateConfig(
+					{
+						env: { ENV1: { unsafe: { metadata: null } } },
+					} as unknown as RawConfig,
+					undefined,
+					{ env: "ENV1" }
+				);
+
+				expect(diagnostics.renderWarnings()).toMatchInlineSnapshot(`
+			          "Processing wrangler configuration:
+
+			            - \\"env.ENV1\\" environment configuration
+			              - \\"unsafe\\" fields are experimental and may change or break at any time."
+		        `);
+				expect(diagnostics.renderErrors()).toMatchInlineSnapshot(`
+			"Processing wrangler configuration:
+
+			  - \\"env.ENV1\\" environment configuration
+			    - The field \\"env.ENV1.unsafe.metadata\\" should be an object but got null."
+		`);
+			});
 		});
 
 		describe("(deprecated)", () => {

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

@@ -18,7 +18,7 @@ describe("execute", () => {
 		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.`
+			`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/fundamentals/api/get-started/create-token/ for instructions on how to create an api token, and assign its value to CLOUDFLARE_API_TOKEN.`
 		);
 	});
 

package/src/__tests__/dev.test.tsx

@@ -1251,7 +1251,7 @@ describe("wrangler dev", () => {
 			      --experimental-local                         Run on my machine using the Cloudflare Workers runtime  [boolean] [default: false]
 			      --experimental-local-remote-kv               Read/write KV data from/to real namespaces on the Cloudflare network  [boolean] [default: false]
 			      --minify                                     Minify the script  [boolean]
-			      --node-compat                                Enable node.js compatibility  [boolean]
+			      --node-compat                                Enable Node.js compatibility  [boolean]
 			      --persist                                    Enable persistence for local mode, using default path: .wrangler/state  [boolean]
 			      --persist-to                                 Specify directory to use for local persistence (implies --persist)  [string]
 			      --live-reload                                Auto reload HTML pages when change is detected in local mode  [boolean]
@@ -1566,6 +1566,21 @@ describe("wrangler dev", () => {
 		`);
 		});
 	});
+
+	describe("`nodejs_compat` compatibility flag", () => {
+		it("should conflict with the --node-compat option", async () => {
+			writeWranglerToml();
+			fs.writeFileSync("index.js", `export default {};`);
+
+			await expect(
+				runWrangler(
+					"dev index.js --compatibility-flag=nodejs_compat --node-compat"
+				)
+			).rejects.toThrowErrorMatchingInlineSnapshot(
+				`"The \`nodejs_compat\` compatibility flag cannot be used in conjunction with the legacy \`--node-compat\` flag. If you want to use the Workers runtime Node.js compatibility features, please remove the \`--node-compat\` argument from your CLI command or \`node_compat = true\` from your config file."`
+			);
+		});
+	});
 });
 
 function mockGetZones(domain: string, zones: { id: string }[] = []) {

package/src/__tests__/init.test.ts

@@ -1392,7 +1392,7 @@ describe("init", () => {
 						contents: {
 							config: {
 								compilerOptions: expect.objectContaining({
-									types: ["@cloudflare/workers-types", "vitest"],
+									types: ["@cloudflare/workers-types"],
 								}),
 							},
 							error: undefined,
@@ -2719,17 +2719,18 @@ describe("init", () => {
 			DATA_BLOB_ONE = \\"DATA_BLOB_ONE\\"
 			DATA_BLOB_TWO = \\"DATA_BLOB_TWO\\"
 
-			[[unsafe.bindings]]
-			type = \\"some unsafe thing\\"
-			name = \\"UNSAFE_BINDING_ONE\\"
+			[unsafe]
+			  [[unsafe.bindings]]
+			  type = \\"some unsafe thing\\"
+			  name = \\"UNSAFE_BINDING_ONE\\"
 
 			[unsafe.bindings.data.some]
 			unsafe = \\"thing\\"
 
-			[[unsafe.bindings]]
-			type = \\"another unsafe thing\\"
-			name = \\"UNSAFE_BINDING_TWO\\"
-			data = 1_337
+			  [[unsafe.bindings]]
+			  type = \\"another unsafe thing\\"
+			  name = \\"UNSAFE_BINDING_TWO\\"
+			  data = 1_337
 			"
 		`);
 			expect(std.out).toContain("cd isolinear-optical-chip");

package/src/__tests__/middleware.test.ts

@@ -750,6 +750,7 @@ describe("unchanged functionality when wrapping with middleware", () => {
 });
 
 describe("multiple middleware", () => {
+	runInTempDir();
 	it("should respond correctly with D1 databases, scheduled testing, and formatted dev errors", async () => {
 		// Kitchen sink test to check interaction between multiple middlewares
 		const scriptContent = `
@@ -769,7 +770,7 @@ describe("multiple middleware", () => {
 					const stmt = await env.DB.prepare("INSERT INTO test (id, value) VALUES (?, ?)");
 					await stmt.bind(1, "one").run();
 			  }
-			}	
+			}
 		`;
 		fs.writeFileSync("index.js", scriptContent);