From 1ecaae20c384cf64bf2bbf8259c625e3876f9ebc Mon Sep 17 00:00:00 2001 From: daiwei Date: Tue, 21 Jan 2025 16:31:45 +0800 Subject: [PATCH] chore(test): remove deprecated environmentMatchGlobs --- package.json | 10 +++++----- vitest.config.ts | 3 --- vitest.unit.config.ts => vitest.unit-dom.config.ts | 4 +++- vitest.unit-node.config.ts | 13 +++++++++++++ vitest.workspace.ts | 3 ++- 5 files changed, 23 insertions(+), 10 deletions(-) rename vitest.unit.config.ts => vitest.unit-dom.config.ts (64%) create mode 100644 vitest.unit-node.config.ts diff --git a/package.json b/package.json index 03897cb198..3c4c7b34ad 100644 --- a/package.json +++ b/package.json @@ -17,15 +17,15 @@ "format": "prettier --write --cache .", "format-check": "prettier --check --cache .", "test": "vitest", - "test-unit": "vitest --project unit", - "test-e2e": "node scripts/build.js vue -f global -d && vitest --project e2e", + "test-unit": "vitest --project=unit-node --project=unit-dom", + "test-e2e": "node scripts/build.js vue -f global -d && vitest --project=e2e", "test-dts": "run-s build-dts test-dts-only", "test-dts-only": "tsc -p packages-private/dts-built-test/tsconfig.json && tsc -p ./packages-private/dts-test/tsconfig.test.json", - "test-coverage": "vitest run --project unit --coverage", + "test-coverage": "vitest run --project=unit-node --project=unit-dom --coverage", "prebench": "node scripts/build.js -pf esm-browser reactivity", "prebench-compare": "node scripts/build.js -pf esm-browser reactivity", - "bench": "vitest bench --project=unit --outputJson=temp/bench.json", - "bench-compare": "vitest bench --project=unit --compare=temp/bench.json", + "bench": "vitest bench --project=unit-node --project=unit-dom --outputJson=temp/bench.json", + "bench-compare": "vitest bench --project=unit-node --project=unit-dom --compare=temp/bench.json", "release": "node scripts/release.js", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", "dev-esm": "node scripts/dev.js -if esm-bundler-runtime", diff --git a/vitest.config.ts b/vitest.config.ts index 3fce4ce87c..33e38d11db 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -25,9 +25,6 @@ export default defineConfig({ globals: true, pool: 'threads', setupFiles: 'scripts/setup-vitest.ts', - environmentMatchGlobs: [ - ['packages/{vue,vue-compat,runtime-dom}/**', 'jsdom'], - ], sequence: { hooks: 'list', }, diff --git a/vitest.unit.config.ts b/vitest.unit-dom.config.ts similarity index 64% rename from vitest.unit.config.ts rename to vitest.unit-dom.config.ts index 0082997e0d..b2aafebea5 100644 --- a/vitest.unit.config.ts +++ b/vitest.unit-dom.config.ts @@ -3,7 +3,9 @@ import config from './vitest.config' export default mergeConfig(config, { test: { - name: 'unit', + name: 'unit-dom', + include: ['packages/{vue,vue-compat,runtime-dom}/**/*.spec.ts'], exclude: [...configDefaults.exclude, '**/e2e/**'], + environment: 'jsdom', }, }) diff --git a/vitest.unit-node.config.ts b/vitest.unit-node.config.ts new file mode 100644 index 0000000000..b95a411c7a --- /dev/null +++ b/vitest.unit-node.config.ts @@ -0,0 +1,13 @@ +import { configDefaults, mergeConfig } from 'vitest/config' +import config from './vitest.config' + +export default mergeConfig(config, { + test: { + name: 'unit-node', + exclude: [ + ...configDefaults.exclude, + '**/e2e/**', + 'packages/{vue,vue-compat,runtime-dom}/**/*.spec.ts', + ], + }, +}) diff --git a/vitest.workspace.ts b/vitest.workspace.ts index a20586e7cf..f1f8814d29 100644 --- a/vitest.workspace.ts +++ b/vitest.workspace.ts @@ -1,6 +1,7 @@ import { defineWorkspace } from 'vitest/config' export default defineWorkspace([ - './vitest.unit.config.ts', + './vitest.unit-node.config.ts', + './vitest.unit-dom.config.ts', './vitest.e2e.config.ts', ]) -- 2.47.3