diff --git a/code/addons/a11y/vitest.config.ts b/code/addons/a11y/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/addons/a11y/vitest.config.ts +++ b/code/addons/a11y/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/addons/docs/vitest.config.ts b/code/addons/docs/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/addons/docs/vitest.config.ts +++ b/code/addons/docs/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/addons/links/vitest.config.ts b/code/addons/links/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/addons/links/vitest.config.ts +++ b/code/addons/links/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/addons/onboarding/vitest.config.ts b/code/addons/onboarding/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/addons/onboarding/vitest.config.ts +++ b/code/addons/onboarding/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/addons/pseudo-states/vitest.config.ts b/code/addons/pseudo-states/vitest.config.ts index 5347797a6664..0e10a6f31d49 100644 --- a/code/addons/pseudo-states/vitest.config.ts +++ b/code/addons/pseudo-states/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/addons/themes/vitest.config.ts b/code/addons/themes/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/addons/themes/vitest.config.ts +++ b/code/addons/themes/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/addons/vitest/vitest.config.ts b/code/addons/vitest/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/addons/vitest/vitest.config.ts +++ b/code/addons/vitest/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/builders/builder-vite/vitest.config.ts b/code/builders/builder-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/builders/builder-vite/vitest.config.ts +++ b/code/builders/builder-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/builders/builder-webpack5/vitest.config.ts b/code/builders/builder-webpack5/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/builders/builder-webpack5/vitest.config.ts +++ b/code/builders/builder-webpack5/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/core/vitest.config.ts b/code/core/vitest.config.ts index c2f7f17e8149..ea2ba22d0869 100644 --- a/code/core/vitest.config.ts +++ b/code/core/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../vitest.workspace'; +import { vitestCommonConfig } from '../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/angular/vitest.config.ts b/code/frameworks/angular/vitest.config.ts index 4aad18113b65..4b2a516b6426 100644 --- a/code/frameworks/angular/vitest.config.ts +++ b/code/frameworks/angular/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/ember/vitest.config.ts b/code/frameworks/ember/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/ember/vitest.config.ts +++ b/code/frameworks/ember/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/nextjs-vite/vitest.config.ts b/code/frameworks/nextjs-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/nextjs-vite/vitest.config.ts +++ b/code/frameworks/nextjs-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/nextjs/vitest.config.ts b/code/frameworks/nextjs/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/nextjs/vitest.config.ts +++ b/code/frameworks/nextjs/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/preact-vite/vitest.config.ts b/code/frameworks/preact-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/preact-vite/vitest.config.ts +++ b/code/frameworks/preact-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/react-native-web-vite/vitest.config.ts b/code/frameworks/react-native-web-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/react-native-web-vite/vitest.config.ts +++ b/code/frameworks/react-native-web-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/react-vite/vitest.config.ts b/code/frameworks/react-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/react-vite/vitest.config.ts +++ b/code/frameworks/react-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/react-webpack5/vitest.config.ts b/code/frameworks/react-webpack5/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/react-webpack5/vitest.config.ts +++ b/code/frameworks/react-webpack5/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/server-webpack5/vitest.config.ts b/code/frameworks/server-webpack5/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/server-webpack5/vitest.config.ts +++ b/code/frameworks/server-webpack5/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/svelte-vite/vitest.config.ts b/code/frameworks/svelte-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/svelte-vite/vitest.config.ts +++ b/code/frameworks/svelte-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/sveltekit/vitest.config.ts b/code/frameworks/sveltekit/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/sveltekit/vitest.config.ts +++ b/code/frameworks/sveltekit/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/vue3-vite/vitest.config.ts b/code/frameworks/vue3-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/vue3-vite/vitest.config.ts +++ b/code/frameworks/vue3-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/frameworks/web-components-vite/vitest.config.ts b/code/frameworks/web-components-vite/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/frameworks/web-components-vite/vitest.config.ts +++ b/code/frameworks/web-components-vite/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/lib/cli-sb/vitest.config.ts b/code/lib/cli-sb/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/lib/cli-sb/vitest.config.ts +++ b/code/lib/cli-sb/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/lib/cli-storybook/vitest.config.ts b/code/lib/cli-storybook/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/lib/cli-storybook/vitest.config.ts +++ b/code/lib/cli-storybook/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/lib/codemod/vitest.config.ts b/code/lib/codemod/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/lib/codemod/vitest.config.ts +++ b/code/lib/codemod/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/lib/core-webpack/vitest.config.ts b/code/lib/core-webpack/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/lib/core-webpack/vitest.config.ts +++ b/code/lib/core-webpack/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/lib/create-storybook/vitest.config.ts b/code/lib/create-storybook/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/lib/create-storybook/vitest.config.ts +++ b/code/lib/create-storybook/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/lib/csf-plugin/vitest.config.ts b/code/lib/csf-plugin/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/lib/csf-plugin/vitest.config.ts +++ b/code/lib/csf-plugin/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/presets/server-webpack/vitest.config.ts b/code/presets/server-webpack/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/presets/server-webpack/vitest.config.ts +++ b/code/presets/server-webpack/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/renderers/html/vitest.config.ts b/code/renderers/html/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/renderers/html/vitest.config.ts +++ b/code/renderers/html/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/renderers/preact/vitest.config.ts b/code/renderers/preact/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/renderers/preact/vitest.config.ts +++ b/code/renderers/preact/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/renderers/react/vitest.config.ts b/code/renderers/react/vitest.config.ts index a5664ea547c3..22543b823778 100644 --- a/code/renderers/react/vitest.config.ts +++ b/code/renderers/react/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/renderers/server/vitest.config.ts b/code/renderers/server/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/renderers/server/vitest.config.ts +++ b/code/renderers/server/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/renderers/svelte/vitest.config.ts b/code/renderers/svelte/vitest.config.ts index f80ba91df63f..5b0263c4d8f8 100644 --- a/code/renderers/svelte/vitest.config.ts +++ b/code/renderers/svelte/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default defineConfig( mergeConfig(vitestCommonConfig, { diff --git a/code/renderers/vue3/vitest.config.ts b/code/renderers/vue3/vitest.config.ts index a38043181627..f3a883cf21fd 100644 --- a/code/renderers/vue3/vitest.config.ts +++ b/code/renderers/vue3/vitest.config.ts @@ -2,7 +2,7 @@ import { defineConfig, mergeConfig } from 'vitest/config'; import vue from '@vitejs/plugin-vue'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/renderers/web-components/vitest.config.ts b/code/renderers/web-components/vitest.config.ts index 7420176b2e46..16d2fd08535c 100644 --- a/code/renderers/web-components/vitest.config.ts +++ b/code/renderers/web-components/vitest.config.ts @@ -1,6 +1,6 @@ import { defineConfig, mergeConfig } from 'vitest/config'; -import { vitestCommonConfig } from '../../vitest.workspace'; +import { vitestCommonConfig } from '../../vitest.shared'; export default mergeConfig( vitestCommonConfig, diff --git a/code/vitest-storybook.config.mts b/code/vitest-storybook.config.mts index 215b9a59e9e9..2ede258444db 100644 --- a/code/vitest-storybook.config.mts +++ b/code/vitest-storybook.config.mts @@ -4,7 +4,7 @@ import { storybookTest } from '@storybook/addon-vitest/vitest-plugin'; import Inspect from 'vite-plugin-inspect'; -import { vitestCommonConfig } from './vitest.workspace'; +import { vitestCommonConfig } from './vitest.shared'; const extraPlugins: any[] = []; if (process.env.INSPECT === 'true') { diff --git a/code/vitest.config.ts b/code/vitest.config.ts index 7cf69b767e92..584e12d93b81 100644 --- a/code/vitest.config.ts +++ b/code/vitest.config.ts @@ -6,6 +6,17 @@ export default defineConfig({ NODE_ENV: 'test', }, + projects: [ + 'vitest-storybook.config.mts', + 'addons/*/vitest.config.ts', + 'frameworks/*/vitest.config.ts', + 'lib/*/vitest.config.ts', + 'core/vitest.config.ts', + 'builders/*/vitest.config.ts', + 'presets/*/vitest.config.ts', + 'renderers/*/vitest.config.ts', + ], + coverage: { all: false, provider: 'istanbul', diff --git a/code/vitest.workspace.ts b/code/vitest.shared.ts similarity index 74% rename from code/vitest.workspace.ts rename to code/vitest.shared.ts index 210fcedad8f2..c2709d10593b 100644 --- a/code/vitest.workspace.ts +++ b/code/vitest.shared.ts @@ -1,17 +1,6 @@ import { resolve } from 'node:path'; -import { defineConfig, defineWorkspace } from 'vitest/config'; - -export default defineWorkspace([ - 'vitest-storybook.config.mts', - 'addons/*/vitest.config.ts', - 'frameworks/*/vitest.config.ts', - 'lib/*/vitest.config.ts', - 'core/vitest.config.ts', - 'builders/*/vitest.config.ts', - 'presets/*/vitest.config.ts', - 'renderers/*/vitest.config.ts', -]); +import { defineConfig } from 'vitest/config'; /** * CircleCI reports the wrong number of threads to Node.js, so we need to set it manually. Unit