update types to match vitest v2

fixtures/local-mode-tests/tests/logging.test.ts

@@ -1,12 +1,12 @@
 import path from "node:path";
 import { setTimeout } from "node:timers/promises";
 import util from "node:util";
-import { afterEach, beforeEach, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, expect, it, Mock, vi } from "vitest";
 import { unstable_dev } from "wrangler";
 
 let output = "";
 function spyOnConsoleMethod(name: keyof typeof console) {
-	vi.spyOn(console, name).mockImplementation((...args: unknown[]) => {
+	(vi.spyOn(console, name) as Mock).mockImplementation((...args: unknown[]) => {
 		output += util.format(...args) + "\n";
 	});
 }

packages/create-cloudflare/e2e-tests/helpers.ts

@@ -1,3 +1,4 @@
+import assert from "assert";
 import {
 	createWriteStream,
 	mkdirSync,
@@ -284,6 +285,7 @@ export const waitForExit = async (
 export const createTestLogStream = (ctx: TaskContext) => {
 	// The .ansi extension allows for editor extensions that format ansi terminal codes
 	const fileName = `${normalizeTestName(ctx)}.ansi`;
+	assert(ctx.task.suite, "Suite must be defined");
 	return createWriteStream(path.join(getLogPath(ctx.task.suite), fileName), {
 		flags: "a",
 	});

packages/vitest-pool-workers/src/pool/index.ts

@@ -56,13 +56,23 @@ import type {
 import type { Readable } from "node:stream";
 import type { MessagePort } from "node:worker_threads";
 import type {
-	ResolvedConfig,
 	RunnerRPC,
 	RuntimeRPC,
+	SerializedConfig,
 	WorkerContext,
 } from "vitest";
 import type { ProcessPool, Vitest, WorkspaceProject } from "vitest/node";
 
+interface SerializedOptions {
+	// Defined in `src/pool/index.ts`
+	main?: string;
+	durableObjectBindingDesignators?: Map<
+		string /* bound name */,
+		DurableObjectDesignator
+	>;
+	isolatedStorage?: boolean;
+}
+
 // https://github.com/vitest-dev/vitest/blob/v2.0.5/packages/vite-node/src/client.ts#L468
 declare const __vite_ssr_import__: unknown;
 assert(
@@ -678,7 +688,7 @@ async function runTests(
 	mf: Miniflare,
 	workerName: string,
 	project: Project,
-	config: ResolvedConfig,
+	config: SerializedConfig,
 	files: string[],
 	invalidates: string[] = []
 ) {
@@ -970,6 +980,7 @@ export default function (ctx: Vitest): ProcessPool {
 				// serialisable. `getSerializableConfig()` may also return references to
 				// the same objects, so override it with a new object.
 				config.poolOptions = {
+					// @ts-expect-error Vitest provides no way to extend this type
 					threads: {
 						// Allow workers to be re-used by removing the isolation requirement
 						isolate: false,
@@ -991,7 +1002,7 @@ export default function (ctx: Vitest): ProcessPool {
 						// project, so we know whether to call out to the loopback service
 						// to push/pop the storage stack between tests.
 						isolatedStorage: project.options.isolatedStorage,
-					},
+					} satisfies SerializedOptions,
 				};
 
 				const mf = await getProjectMiniflare(ctx, project);
@@ -1063,7 +1074,7 @@ export default function (ctx: Vitest): ProcessPool {
 			// assert(testModule && thingModule);
 			// thingModule.importers.add(testModule);
 		},
-		async collectTests(specs, invalidates) {
+		async collectTests(_specs, _invalidates) {
 			// TODO: This is a new API introduced in Vitest v2+ which we should consider supporting at some point
 			throw new Error(
 				"The Cloudflare Workers Vitest integration does not support the `.collect()` or `vitest list` APIs"

packages/vitest-pool-workers/src/worker/lib/cloudflare/test-runner.ts

@@ -11,7 +11,7 @@ import {
 import { VitestTestRunner } from "vitest/runners";
 import workerdUnsafe from "workerd:unsafe";
 import type { CancelReason, Suite, Test } from "@vitest/runner";
-import type { ResolvedConfig, WorkerGlobalState, WorkerRPC } from "vitest";
+import type { SerializedConfig, WorkerGlobalState, WorkerRPC } from "vitest";
 
 // When `DEBUG` is `true`, runner operations will be logged and slowed down
 // TODO(soon): remove this
@@ -114,7 +114,7 @@ export default class WorkersTestRunner extends VitestTestRunner {
 	readonly state: WorkerGlobalState;
 	readonly isolatedStorage: boolean;
 
-	constructor(config: ResolvedConfig) {
+	constructor(config: SerializedConfig) {
 		super(config);
 
 		// @ts-expect-error `this.workerState` has "private" access, how quaint :D

packages/wrangler/src/__tests__/vitest.setup.ts

@@ -206,7 +206,7 @@ vi.mock("execa", async (importOriginal) => {
 	const realModule = await importOriginal<typeof import("execa")>();
 	return {
 		...realModule,
-		execa: vi.fn<Parameters<typeof realModule.execa>>((...args) => {
+		execa: vi.fn((...args: Parameters<typeof realModule.execa>) => {
 			return args[0] === "mockpm"
 				? Promise.resolve()
 				: realModule.execa(...args);

tools/dependabot/__tests__/generate-dependabot-pr-changesets.test.ts

@@ -159,10 +159,10 @@ describe("writeChangeSet()", () => {
 	`;
 		writeChangeSet("some-prefix", "1234", header, body);
 		expect(writeFileSync).toHaveBeenCalledOnce();
-		expect((writeFileSync as Mock).mock.lastCall[0]).toMatchInlineSnapshot(
+		expect((writeFileSync as Mock).mock.lastCall?.[0]).toMatchInlineSnapshot(
 			`".changeset/some-prefix-1234.md"`
 		);
-		expect((writeFileSync as Mock).mock.lastCall[1]).toMatchInlineSnapshot(`
+		expect((writeFileSync as Mock).mock.lastCall?.[1]).toMatchInlineSnapshot(`
 			"---
 			"package-name": patch
 			---