[pull] main from cloudflare:main

.changeset/improve-d1-errors.md

@@ -0,0 +1,9 @@
+---
+"wrangler": patch
+---
+
+Improve D1 error messages for missing or conflicting options
+
+Error messages for `d1 execute`, `d1 export`, `d1 time-travel restore`, and `d1 insights` now clearly state which option is missing or conflicting, explain why the combination is invalid, and suggest how to fix the issue.
+
+Additionally, duration validation errors in `d1 insights` are now thrown as `UserError` instead of plain `Error`, ensuring they are displayed cleanly to users rather than as unexpected crashes.

.github/dependabot.yml

@@ -42,7 +42,7 @@ updates:
     labels:
       - "miniflare"
       - "dependencies"
-      - "skip-pr-description-validation"
+      - "ci:skip-pr-description-validation"
     allow:
       - dependency-name: "workerd"
       - dependency-name: "@cloudflare/workers-types"

fixtures/dynamic-worker-loading/tests/index.test.ts

@@ -1,25 +1,23 @@
-import { readFileSync } from "node:fs";
-import { join, resolve } from "node:path";
-import { fetch } from "undici";
+import { resolve } from "node:path";
 import { afterAll, beforeAll, describe, it } from "vitest";
-import { runWranglerDev } from "../../shared/src/run-wrangler-long-lived";
+import { createTestHarness } from "wrangler";
 
 describe("dynamic worker loading", () => {
-	let ip: string, port: number, stop: (() => Promise<unknown>) | undefined;
+	const server = createTestHarness({
+		root: resolve(__dirname, ".."),
+		workers: [{ configPath: "wrangler.jsonc" }],
+	});
 
 	beforeAll(async () => {
-		({ ip, port, stop } = await runWranglerDev(resolve(__dirname, ".."), [
-			"--port=0",
-			"--inspector-port=0",
-		]));
+		await server.listen();
 	});
 
 	afterAll(async () => {
-		await stop?.();
+		await server.close();
 	});
 
 	it("should respond with response from dynamic worker", async ({ expect }) => {
-		let response = await fetch(`http://${ip}:${port}/my-worker`);
+		let response = await server.fetch("/my-worker");
 		let text = await response.text();
 		expect(response.status).toBe(200);
 		expect(text).toMatchInlineSnapshot(
@@ -28,7 +26,7 @@ describe("dynamic worker loading", () => {
 	});
 
 	it("should load different worker if ID changes", async ({ expect }) => {
-		let response = await fetch(`http://${ip}:${port}/my-other-worker`);
+		let response = await server.fetch("/my-other-worker");
 		let text = await response.text();
 		expect(response.status).toBe(200);
 		expect(text).toMatchInlineSnapshot(

fixtures/import-npm/packages/import-example/tests/index.test.ts

@@ -1,25 +1,24 @@
 import { resolve } from "path";
-import { fetch } from "undici";
 import { afterAll, beforeAll, describe, it } from "vitest";
-import { runWranglerDev } from "../../../../shared/src/run-wrangler-long-lived";
+import { createTestHarness } from "wrangler";
 
 describe("wrangler correctly imports wasm files with npm resolution", () => {
-	let ip: string, port: number, stop: (() => Promise<unknown>) | undefined;
+	const server = createTestHarness({
+		root: resolve(__dirname, ".."),
+		workers: [{ configPath: "wrangler.jsonc" }],
+	});
 
 	beforeAll(async () => {
-		({ ip, port, stop } = await runWranglerDev(resolve(__dirname, ".."), [
-			"--port=0",
-			"--inspector-port=0",
-		]));
+		await server.listen();
 	});
 
 	afterAll(async () => {
-		await stop?.();
+		await server.close();
 	});
 
 	// if the worker compiles, is running, and returns 21 (7 * 3) we can assume that the wasm module was imported correctly
 	it("responds", async ({ expect }) => {
-		const response = await fetch(`http://${ip}:${port}/`);
+		const response = await server.fetch("/");
 		const text = await response.text();
 		expect(text).toBe("21, 21");
 	});

fixtures/import-npm/packages/import-example/tsconfig.json

@@ -5,7 +5,7 @@
 		"module": "preserve",
 		"lib": ["ES2020"],
 		"types": ["node"],
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"noEmit": true,
 		"skipLibCheck": true
 	},

fixtures/import-npm/turbo.json

@@ -2,6 +2,7 @@
 	"extends": ["//"],
 	"tasks": {
 		"_clean_install": {
+			"dependsOn": ["wrangler#build"],
 			"outputs": ["node_modules"]
 		},
 		"check:type": {
@@ -14,7 +15,7 @@
 			"dependsOn": ["_clean_install"]
 		},
 		"test:ci": {
-			"dependsOn": ["_clean_install", "wrangler#build"]
+			"dependsOn": ["_clean_install"]
 		}
 	}
 }

fixtures/import-wasm-example/tests/index.test.ts

@@ -1,25 +1,24 @@
 import { resolve } from "path";
-import { fetch } from "undici";
 import { afterAll, beforeAll, describe, it } from "vitest";
-import { runWranglerDev } from "../../shared/src/run-wrangler-long-lived";
+import { createTestHarness } from "wrangler";
 
 describe("wrangler correctly imports wasm files with npm resolution", () => {
-	let ip: string, port: number, stop: (() => Promise<unknown>) | undefined;
+	const server = createTestHarness({
+		root: resolve(__dirname, ".."),
+		workers: [{ configPath: "wrangler.jsonc" }],
+	});
 
 	beforeAll(async () => {
-		({ ip, port, stop } = await runWranglerDev(resolve(__dirname, ".."), [
-			"--port=0",
-			"--inspector-port=0",
-		]));
+		await server.listen();
 	});
 
 	afterAll(async () => {
-		await stop?.();
+		await server.close();
 	});
 
 	// if the worker compiles, is running, and returns 21 (7 * 3) we can assume that the wasm module was imported correctly
 	it("responds", async ({ expect }) => {
-		const response = await fetch(`http://${ip}:${port}/`);
+		const response = await server.fetch("/");
 		const text = await response.text();
 		expect(text).toBe("21, 21");
 	});

fixtures/import-wasm-example/tsconfig.json

@@ -5,7 +5,7 @@
 		"module": "preserve",
 		"lib": ["ES2020"],
 		"types": ["node"],
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"noEmit": true,
 		"skipLibCheck": true
 	},