Skip to content

Commit cbc133d

Browse files
committed
test: Migrate vitest setups to 4.x.x
1 parent 7b6fe88 commit cbc133d

File tree

12 files changed

+83
-65
lines changed

12 files changed

+83
-65
lines changed
Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="vitest" />
21
import { defineConfig } from 'vite';
32
import tsconfigPaths from 'vite-tsconfig-paths';
43
import swc from 'unplugin-swc';
@@ -40,19 +39,4 @@ export default defineConfig({
4039
},
4140
},
4241
},
43-
test: {
44-
environment: 'node',
45-
silent: true,
46-
setupFiles: './tests/vitest.setup.ts',
47-
reporters: ['default', 'junit'],
48-
outputFile: 'reports/junit/junit.xml',
49-
coverage: {
50-
provider: 'v8',
51-
all: true,
52-
include: ['src/**/*.ts'],
53-
exclude: ['src/main.ts', '**/index.ts'],
54-
reportsDirectory: 'reports/vitest/coverage',
55-
reporter: ['text', 'json'],
56-
},
57-
},
5842
});

apps/nest/vitest.config.ts

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { mergeConfig, defineConfig } from 'vitest/config';
2+
import viteConfig from './vite.config';
3+
4+
export default mergeConfig(
5+
viteConfig,
6+
defineConfig({
7+
test: {
8+
environment: 'node',
9+
silent: true,
10+
setupFiles: './tests/vitest.setup.ts',
11+
reporters: ['default', 'junit'],
12+
outputFile: 'reports/junit/junit.xml',
13+
coverage: {
14+
enabled: true,
15+
provider: 'v8',
16+
include: ['src/**/*.ts'],
17+
exclude: ['src/main.ts', '**/index.ts', '*.module.ts'],
18+
reportsDirectory: 'reports/vitest/coverage',
19+
reporter: ['text', 'json'],
20+
},
21+
},
22+
}),
23+
);

packages/js-utils/vite.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ export default defineConfig({
3131
reporters: ['default', 'junit'],
3232
outputFile: 'reports/junit/junit.xml',
3333
coverage: {
34+
enabled: true,
3435
provider: 'v8',
35-
all: true,
3636
thresholds: { branches: 95, lines: 95 },
3737
include: ['src/**/*.ts'],
3838
exclude: ['src/main.ts', 'src/**/index.ts', '**/types/**'],

packages/nest-testing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"build": "vite build",
4242
"types": "tsc --noEmit",
4343
"test": "pnpm run test:vitest",
44-
"test:vitest": "vitest run --coverage"
44+
"test:vitest": "vitest run"
4545
},
4646
"peerDependencies": {
4747
"@nestjs/common": "^11.0.0",

packages/nest-testing/vite.config.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
/// <reference types="vitest" />
21
import { defineConfig } from 'vite';
32
import { resolve } from 'path';
43
import { peerDependencies } from './package.json';
@@ -52,19 +51,4 @@ export default defineConfig({
5251
external: [...Object.keys(peerDependencies)],
5352
},
5453
},
55-
test: {
56-
environment: 'node',
57-
silent: true,
58-
reporters: ['default', 'junit'],
59-
outputFile: 'reports/junit/junit.xml',
60-
coverage: {
61-
provider: 'v8',
62-
all: true,
63-
thresholds: { branches: 80, lines: 80 },
64-
include: ['src/**/*.ts'],
65-
exclude: ['src/main.ts', '**/index.ts'],
66-
reportsDirectory: 'reports/vitest/coverage',
67-
reporter: ['text', 'json'],
68-
},
69-
},
7054
});
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { mergeConfig, defineConfig } from 'vitest/config';
2+
import viteConfig from './vite.config';
3+
4+
export default mergeConfig(
5+
viteConfig,
6+
defineConfig({
7+
test: {
8+
environment: 'node',
9+
silent: true,
10+
reporters: ['default', 'junit'],
11+
outputFile: 'reports/junit/junit.xml',
12+
coverage: {
13+
enabled: true,
14+
provider: 'v8',
15+
thresholds: { branches: 50, lines: 50 },
16+
include: ['src/**/*.ts'],
17+
exclude: ['src/main.ts', 'index.ts', 'types.ts'],
18+
reportsDirectory: 'reports/vitest/coverage',
19+
reporter: ['text', 'json'],
20+
},
21+
},
22+
}),
23+
);

packages/nest-utils/vite.config.ts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,4 @@ export default defineConfig({
5252
external: [...Object.keys(peerDependencies)],
5353
},
5454
},
55-
test: {
56-
environment: 'node',
57-
silent: true,
58-
setupFiles: './tests/vitest.setup.ts',
59-
reporters: ['default', 'junit'],
60-
outputFile: 'reports/junit/junit.xml',
61-
coverage: {
62-
provider: 'v8',
63-
all: true,
64-
thresholds: { branches: 95, lines: 95 },
65-
include: ['src/**/*.ts'],
66-
exclude: ['src/main.ts', 'src/**/index.ts', 'src/**/*types.ts'],
67-
reportsDirectory: 'reports/vitest/coverage',
68-
reporter: ['text', 'json'],
69-
},
70-
},
7155
});
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import { mergeConfig, defineConfig } from 'vitest/config';
2+
import viteConfig from './vite.config';
3+
4+
export default mergeConfig(
5+
viteConfig,
6+
defineConfig({
7+
test: {
8+
environment: 'node',
9+
silent: true,
10+
setupFiles: './tests/vitest.setup.ts',
11+
reporters: ['default', 'junit'],
12+
outputFile: 'reports/junit/junit.xml',
13+
coverage: {
14+
enabled: true,
15+
provider: 'v8',
16+
thresholds: { branches: 90, lines: 90 },
17+
include: ['src/**/*.ts'],
18+
exclude: ['src/main.ts', 'src/**/index.ts', 'src/**/*types.ts', 'src/**/*.module.ts'],
19+
reportsDirectory: 'reports/vitest/coverage',
20+
reporter: ['text', 'json'],
21+
},
22+
},
23+
}),
24+
);

packages/solid/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"@testing-library/jest-dom": "6.9.1",
5555
"@vitest/browser": "4.0.8",
5656
"@vitest/browser-playwright": "4.0.8",
57-
"@vitest/coverage-v8": "4.0.8",
57+
"@vitest/coverage-istanbul": "4.0.8",
5858
"csstype": "3.1.3",
5959
"iconify-icon": "3.0.2",
6060
"solid-js": "1.9.10",

packages/solid/src/modal/built-in/confirm.modal.test.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ import { ModalPortal } from '../modal-portal.component';
66

77
describe(
88
'ConfirmModal',
9+
{
10+
sequential: true,
11+
concurrent: false,
12+
},
913
() => {
1014
let unmount: () => void;
1115
beforeEach(() => {
@@ -79,8 +83,4 @@ describe(
7983
expect(dialog).not.toBeInTheDocument();
8084
});
8185
},
82-
{
83-
sequential: true,
84-
concurrent: false,
85-
},
8686
);

0 commit comments

Comments
 (0)