From ea815155c87b879c955d5ff4585340dd627f61e1 Mon Sep 17 00:00:00 2001 From: Abhijeet Prasad Date: Thu, 18 Jul 2024 10:22:13 -0400 Subject: [PATCH] test: Remove explict casting of baseconfig in vite configs --- packages/astro/vite.config.ts | 6 +----- packages/nestjs/vite.config.ts | 5 +---- packages/replay-internal/vitest.config.ts | 3 +-- packages/solid/vite.config.ts | 5 +---- packages/solidstart/vite.config.ts | 5 +---- packages/svelte/vite.config.ts | 5 +---- packages/sveltekit/vite.config.ts | 6 +----- 7 files changed, 7 insertions(+), 28 deletions(-) diff --git a/packages/astro/vite.config.ts b/packages/astro/vite.config.ts index 6a035a7635e7..1094fe0d79da 100644 --- a/packages/astro/vite.config.ts +++ b/packages/astro/vite.config.ts @@ -1,13 +1,9 @@ -import type { UserConfig } from 'vitest'; - import baseConfig from '../../vite/vite.config'; export default { ...baseConfig, test: { - // test exists, no idea why TS doesn't recognize it - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, environment: 'jsdom', }, }; diff --git a/packages/nestjs/vite.config.ts b/packages/nestjs/vite.config.ts index d82e61610307..ff64487a9265 100644 --- a/packages/nestjs/vite.config.ts +++ b/packages/nestjs/vite.config.ts @@ -1,13 +1,10 @@ -import type { UserConfig } from 'vitest'; import { defineConfig } from 'vitest/config'; import baseConfig from '../../vite/vite.config'; export default defineConfig({ ...baseConfig, test: { - // test exists, no idea why TS doesn't recognize it - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, environment: 'node', }, }); diff --git a/packages/replay-internal/vitest.config.ts b/packages/replay-internal/vitest.config.ts index 9b4a2451c0c4..cd592247ba07 100644 --- a/packages/replay-internal/vitest.config.ts +++ b/packages/replay-internal/vitest.config.ts @@ -1,4 +1,3 @@ -import type { UserConfig } from 'vitest'; import { defineConfig } from 'vitest/config'; import baseConfig from '../../vite/vite.config'; @@ -6,7 +5,7 @@ import baseConfig from '../../vite/vite.config'; export default defineConfig({ ...baseConfig, test: { - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, coverage: {}, globals: true, setupFiles: ['./test.setup.ts'], diff --git a/packages/solid/vite.config.ts b/packages/solid/vite.config.ts index 1dfe27d70c66..416c98e877b3 100644 --- a/packages/solid/vite.config.ts +++ b/packages/solid/vite.config.ts @@ -1,14 +1,11 @@ import solidPlugin from 'vite-plugin-solid'; -import type { UserConfig } from 'vitest'; import baseConfig from '../../vite/vite.config'; export default { ...baseConfig, plugins: [solidPlugin({ hot: !process.env.VITEST })], test: { - // test exists, no idea why TS doesn't recognize it - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, environment: 'jsdom', }, }; diff --git a/packages/solidstart/vite.config.ts b/packages/solidstart/vite.config.ts index 1dfe27d70c66..416c98e877b3 100644 --- a/packages/solidstart/vite.config.ts +++ b/packages/solidstart/vite.config.ts @@ -1,14 +1,11 @@ import solidPlugin from 'vite-plugin-solid'; -import type { UserConfig } from 'vitest'; import baseConfig from '../../vite/vite.config'; export default { ...baseConfig, plugins: [solidPlugin({ hot: !process.env.VITEST })], test: { - // test exists, no idea why TS doesn't recognize it - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, environment: 'jsdom', }, }; diff --git a/packages/svelte/vite.config.ts b/packages/svelte/vite.config.ts index 50b07efd9b71..e9d974325af1 100644 --- a/packages/svelte/vite.config.ts +++ b/packages/svelte/vite.config.ts @@ -1,14 +1,11 @@ import { svelte } from '@sveltejs/vite-plugin-svelte'; -import type { UserConfig } from 'vitest'; import baseConfig from '../../vite/vite.config'; export default { ...baseConfig, plugins: [svelte({ hot: !process.env.VITEST })], test: { - // test exists, no idea why TS doesn't recognize it - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, environment: 'jsdom', alias: [{ find: /^svelte$/, replacement: 'svelte/internal' }], }, diff --git a/packages/sveltekit/vite.config.ts b/packages/sveltekit/vite.config.ts index d6cbc4cce230..4f8ead0177f9 100644 --- a/packages/sveltekit/vite.config.ts +++ b/packages/sveltekit/vite.config.ts @@ -1,16 +1,12 @@ import { dirname, resolve } from 'path'; import { fileURLToPath } from 'url'; -import type { UserConfig } from 'vitest'; - import baseConfig from '../../vite/vite.config'; export default { ...baseConfig, test: { - // test exists, no idea why TS doesn't recognize it - // eslint-disable-next-line @typescript-eslint/no-explicit-any - ...(baseConfig as UserConfig & { test: any }).test, + ...baseConfig.test, setupFiles: ['./test/vitest.setup.ts'], alias: [ {