chore: inherit vitest settings from the root (#4800)

Author: petebacondarwin

CONTRIBUTING.md

@@ -205,17 +205,21 @@ As a reviewer, it's important to be thoughtful about the proposed changes and co
 
 Every PR should include tests for the functionality that's being added. Most changes will be to [Wrangler](packages/wrangler/src/__tests__) (using Jest), [Miniflare](packages/miniflare/test) (using Ava), or [C3](packages/create-cloudflare/src/__tests__) (using Vitest), and should include unit tests within the testing harness of those packages.
 
-If your PR includes functionality that's difficult to unit test, you can add a fixture test by creating a new package in the `fixtures/` folder. This allows for adding a test that requires a specific filesystem or worker setup (for instance, `fixtures/no-bundle-import` tests the interaction of Wrangler with a specific set of JS, WASM, text, and binary modules on the filesystem). When adding a fixture test, include a `vitest.config.ts` file within the new package, which will ensure it's run as part of the `workers-sdk` CI. A good default example is the following:
+If your PR includes functionality that's difficult to unit test, you can add a fixture test by creating a new package in the `fixtures/` folder. This allows for adding a test that requires a specific filesystem or worker setup (for instance, `fixtures/no-bundle-import` tests the interaction of Wrangler with a specific set of JS, WASM, text, and binary modules on the filesystem). When adding a fixture test, include a `vitest.config.ts` file within the new package, which will ensure it's run as part of the `workers-sdk` CI. You should merge your own configuration with the default config from the root of the repo.
+
+A good default example is the following:
 
 ```ts
-import { defineConfig } from "vitest/config";
-
-export default defineConfig({
-	test: {
-		testTimeout: 5_000,
-		hookTimeout: 5_000,
-		teardownTimeout: 5_000,
-	},
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
+
+export default mergeConfig(
+  configShared,
+  defineProject({
+    test: {
+      // config overrides
+    }
+  })
 });
 ```
 

fixtures/additional-modules/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 15_000,
-		hookTimeout: 15_000,
-		teardownTimeout: 15_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/ai-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/external-durable-objects-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 25_000,
-		hookTimeout: 25_000,
-		teardownTimeout: 25_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/external-service-bindings-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 25_000,
-		hookTimeout: 25_000,
-		teardownTimeout: 25_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/import-wasm-example/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/interactive-dev-tests/vitest.config.ts

@@ -1,12 +1,12 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 30_000,
-		hookTimeout: 30_000,
-		teardownTimeout: 30_000,
-		useAtomics: true,
-		// `node-pty` doesn't work inside worker threads
-		threads: false,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {
+			// `node-pty` doesn't work inside worker threads
+			threads: false,
+		},
+	})
+);

fixtures/local-mode-tests/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 20_000,
-		hookTimeout: 20_000,
-		teardownTimeout: 20_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/no-bundle-import/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/node-app-pages/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-d1-shim/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-dev-proxy-with-script/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-functions-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-functions-wasm-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-functions-with-routes-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-plugin-mounted-on-root-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-simple-assets/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-workerjs-and-functions-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-workerjs-app/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);

fixtures/pages-workerjs-directory/vitest.config.ts

@@ -1,10 +1,9 @@
-import { defineConfig } from "vitest/config";
+import { defineProject, mergeConfig } from "vitest/config";
+import configShared from "../../vitest.shared";
 
-export default defineConfig({
-	test: {
-		testTimeout: 10_000,
-		hookTimeout: 10_000,
-		teardownTimeout: 10_000,
-		useAtomics: true,
-	},
-});
+export default mergeConfig(
+	configShared,
+	defineProject({
+		test: {},
+	})
+);