Skip to content

Commit b1f60e4

Browse files
author
Szymon.Poltorak
committed
refactor(): wip use common vitest on few files
1 parent 553fa74 commit b1f60e4

File tree

6 files changed

+48
-164
lines changed

6 files changed

+48
-164
lines changed

‎e2e/ci-e2e/vitest.e2e.config.ts‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,10 @@
11
/// <reference types="vitest" />
2-
import { defineConfig } from 'vite';
3-
import { tsconfigPathAliases } from '../../tools/vitest-tsconfig-path-aliases.js';
2+
import { createE2eConfig } from '../../tools/vitest-config-factory.js';
43

5-
export default defineConfig({
6-
cacheDir: '../../node_modules/.vite/ci-e2e',
7-
test: {
8-
reporters: ['basic'],
9-
testTimeout: 60_000,
10-
globals: true,
11-
alias: tsconfigPathAliases(),
12-
pool: 'threads',
13-
poolOptions: { threads: { singleThread: true } },
14-
cache: {
15-
dir: '../../node_modules/.vitest',
16-
},
17-
environment: 'node',
18-
include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
19-
globalSetup: './global-setup.ts',
20-
setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
21-
},
4+
export default createE2eConfig('ci-e2e', {
5+
projectRoot: new URL('../../', import.meta.url),
6+
testTimeout: 60_000,
7+
globalSetup: ['./global-setup.ts'],
8+
coverage: { enabled: false },
9+
cacheKey: 'ci-e2e',
2210
});

‎e2e/plugin-typescript-e2e/vitest.e2e.config.ts‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,9 @@
11
/// <reference types="vitest" />
2-
import { defineConfig } from 'vite';
3-
import { tsconfigPathAliases } from '../../tools/vitest-tsconfig-path-aliases.js';
2+
import { createE2eConfig } from '../../tools/vitest-config-factory.js';
43

5-
export default defineConfig({
6-
cacheDir: '../../node_modules/.vite/plugin-typescript-e2e',
7-
test: {
8-
reporters: ['basic'],
9-
testTimeout: 20_000,
10-
globals: true,
11-
alias: tsconfigPathAliases(),
12-
pool: 'threads',
13-
poolOptions: { threads: { singleThread: true } },
14-
coverage: {
15-
reporter: ['text', 'lcov'],
16-
reportsDirectory: '../../coverage/plugin-typescript-e2e/e2e-tests',
17-
exclude: ['mocks/**', '**/types.ts'],
18-
},
19-
cache: {
20-
dir: '../../node_modules/.vitest',
21-
},
22-
environment: 'node',
23-
include: ['tests/**/*.e2e.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
24-
setupFiles: ['../../testing/test-setup/src/lib/reset.mocks.ts'],
25-
},
4+
export default createE2eConfig('plugin-typescript-e2e', {
5+
projectRoot: new URL('../../', import.meta.url),
6+
testTimeout: 20_000,
7+
coverage: { enabled: true, reportsSubdir: 'e2e-tests' },
8+
cacheKey: 'plugin-typescript-e2e',
269
});

‎packages/core/vitest.int.config.ts‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,7 @@
11
/// <reference types="vitest" />
2-
import { defineConfig } from 'vite';
3-
import { tsconfigPathAliases } from '../../tools/vitest-tsconfig-path-aliases.js';
2+
import { createIntConfig } from '../../tools/vitest-config-factory.js';
43

5-
export default defineConfig({
6-
cacheDir: '../../node_modules/.vite/core',
7-
test: {
8-
reporters: ['basic'],
9-
globals: true,
10-
cache: {
11-
dir: '../../node_modules/.vitest',
12-
},
13-
alias: tsconfigPathAliases(),
14-
pool: 'threads',
15-
poolOptions: { threads: { singleThread: true } },
16-
coverage: {
17-
reporter: ['text', 'lcov'],
18-
reportsDirectory: '../../coverage/core/int-tests',
19-
exclude: ['mocks/**', '**/types.ts'],
20-
},
21-
environment: 'node',
22-
include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
23-
globalSetup: ['../../global-setup.ts'],
24-
setupFiles: [
25-
'../../testing/test-setup/src/lib/console.mock.ts',
26-
'../../testing/test-setup/src/lib/reset.mocks.ts',
27-
'../../testing/test-setup/src/lib/portal-client.mock.ts',
28-
],
29-
},
4+
export default createIntConfig('core', {
5+
projectRoot: new URL('../../', import.meta.url),
6+
setupFiles: ['testing/test-setup/src/lib/portal-client.mock.ts'],
307
});

‎packages/core/vitest.unit.config.ts‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,15 @@
11
/// <reference types="vitest" />
2-
import { defineConfig } from 'vite';
3-
import { tsconfigPathAliases } from '../../tools/vitest-tsconfig-path-aliases.js';
2+
import { createUnitConfig } from '../../tools/vitest-config-factory.js';
43

5-
export default defineConfig({
6-
cacheDir: '../../node_modules/.vite/core',
7-
test: {
8-
reporters: ['basic'],
9-
globals: true,
10-
cache: {
11-
dir: '../../node_modules/.vitest',
12-
},
13-
alias: tsconfigPathAliases(),
14-
pool: 'threads',
15-
poolOptions: { threads: { singleThread: true } },
16-
coverage: {
17-
reporter: ['text', 'lcov'],
18-
reportsDirectory: '../../coverage/core/unit-tests',
19-
exclude: ['mocks/**', '**/types.ts'],
20-
},
21-
environment: 'node',
22-
include: ['src/**/*.unit.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
23-
globalSetup: ['../../global-setup.ts'],
24-
setupFiles: [
25-
'../../testing/test-setup/src/lib/cliui.mock.ts',
26-
'../../testing/test-setup/src/lib/fs.mock.ts',
27-
'../../testing/test-setup/src/lib/git.mock.ts',
28-
'../../testing/test-setup/src/lib/console.mock.ts',
29-
'../../testing/test-setup/src/lib/reset.mocks.ts',
30-
'../../testing/test-setup/src/lib/portal-client.mock.ts',
31-
'../../testing/test-setup/src/lib/extend/ui-logger.matcher.ts',
32-
'../../testing/test-setup/src/lib/extend/markdown-table.matcher.ts',
33-
'../../testing/test-setup/src/lib/extend/jest-extended.matcher.ts',
34-
],
35-
},
4+
export default createUnitConfig('core', {
5+
projectRoot: new URL('../../', import.meta.url),
6+
setupFiles: [
7+
'testing/test-setup/src/lib/cliui.mock.ts',
8+
'testing/test-setup/src/lib/fs.mock.ts',
9+
'testing/test-setup/src/lib/git.mock.ts',
10+
'testing/test-setup/src/lib/portal-client.mock.ts',
11+
'testing/test-setup/src/lib/extend/ui-logger.matcher.ts',
12+
'testing/test-setup/src/lib/extend/markdown-table.matcher.ts',
13+
'testing/test-setup/src/lib/extend/jest-extended.matcher.ts',
14+
],
3615
});

‎packages/utils/vitest.int.config.ts‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,8 @@
11
/// <reference types="vitest" />
2-
import { defineConfig } from 'vite';
3-
import { tsconfigPathAliases } from '../../tools/vitest-tsconfig-path-aliases.js';
2+
import { createIntConfig } from '../../tools/vitest-config-factory.js';
43

5-
export default defineConfig({
6-
cacheDir: '../../node_modules/.vite/utils',
7-
test: {
8-
reporters: ['basic'],
9-
globals: true,
10-
cache: {
11-
dir: '../../node_modules/.vitest',
12-
},
13-
alias: tsconfigPathAliases(),
14-
pool: 'threads',
15-
poolOptions: { threads: { singleThread: true } },
16-
coverage: {
17-
reporter: ['text', 'lcov'],
18-
reportsDirectory: '../../coverage/utils/int-tests',
19-
exclude: ['mocks/**', 'perf/**', '**/types.ts'],
20-
},
21-
environment: 'node',
22-
include: ['src/**/*.int.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
23-
globalSetup: ['../../global-setup.ts'],
24-
setupFiles: [
25-
'../../testing/test-setup/src/lib/cliui.mock.ts',
26-
'../../testing/test-setup/src/lib/console.mock.ts',
27-
'../../testing/test-setup/src/lib/reset.mocks.ts',
28-
],
29-
},
4+
export default createIntConfig('utils', {
5+
projectRoot: new URL('../../', import.meta.url),
6+
setupFiles: ['testing/test-setup/src/lib/cliui.mock.ts'],
7+
coverage: { exclude: ['perf/**'] },
308
});

‎packages/utils/vitest.unit.config.ts‎

Lines changed: 14 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
11
/// <reference types="vitest" />
2-
import { defineConfig } from 'vite';
3-
import { tsconfigPathAliases } from '../../tools/vitest-tsconfig-path-aliases.js';
2+
import { createUnitConfig } from '../../tools/vitest-config-factory.js';
43

5-
export default defineConfig({
6-
cacheDir: '../../node_modules/.vite/utils',
7-
test: {
8-
reporters: ['basic'],
9-
globals: true,
10-
cache: {
11-
dir: '../../node_modules/.vitest',
12-
},
13-
alias: tsconfigPathAliases(),
14-
pool: 'threads',
15-
poolOptions: { threads: { singleThread: true } },
16-
coverage: {
17-
reporter: ['text', 'lcov'],
18-
reportsDirectory: '../../coverage/utils/unit-tests',
19-
exclude: ['mocks/**', 'perf/**', '**/types.ts'],
20-
},
21-
environment: 'node',
22-
include: ['src/**/*.{unit,type}.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
23-
typecheck: {
24-
include: ['**/*.type.test.ts'],
25-
},
26-
globalSetup: ['../../global-setup.ts'],
27-
setupFiles: [
28-
'../../testing/test-setup/src/lib/cliui.mock.ts',
29-
'../../testing/test-setup/src/lib/fs.mock.ts',
30-
'../../testing/test-setup/src/lib/console.mock.ts',
31-
'../../testing/test-setup/src/lib/reset.mocks.ts',
32-
'../../testing/test-setup/src/lib/extend/ui-logger.matcher.ts',
33-
'../../testing/test-setup/src/lib/extend/markdown-table.matcher.ts',
34-
'../../testing/test-setup/src/lib/extend/path.matcher.ts',
35-
'../../testing/test-setup/src/lib/extend/jest-extended.matcher.ts',
36-
],
37-
},
4+
export default createUnitConfig('utils', {
5+
projectRoot: new URL('../../', import.meta.url),
6+
include: ['src/**/*.{unit,type}.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
7+
typecheckInclude: ['**/*.type.test.ts'],
8+
setupFiles: [
9+
'testing/test-setup/src/lib/cliui.mock.ts',
10+
'testing/test-setup/src/lib/fs.mock.ts',
11+
'testing/test-setup/src/lib/extend/ui-logger.matcher.ts',
12+
'testing/test-setup/src/lib/extend/markdown-table.matcher.ts',
13+
'testing/test-setup/src/lib/extend/path.matcher.ts',
14+
'testing/test-setup/src/lib/extend/jest-extended.matcher.ts',
15+
],
16+
coverage: { exclude: ['perf/**'] },
3817
});

0 commit comments

Comments
 (0)