Skip to content

Commit 6c1e082

Browse files
ASAS
authored andcommitted
fix: fix mr comments
1 parent 71b5e2c commit 6c1e082

9 files changed

Lines changed: 16 additions & 254 deletions

File tree

eslint.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ export default tseslint.config(
2828
String.raw`^.*/code-pushup\.(config|preset)(\.m?[jt]s)?$`,
2929
'^[./]+/tools/.*$',
3030
'^[./]+/testing/test-vitest-setup/.*$',
31-
'^[./]+/test-vitest-setup/.*$',
3231
],
3332
depConstraints: [
3433
{

packages/cli/vitest.unit.config.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,6 @@ export default defineConfig(() => {
2020
'../../testing/test-setup/src/lib/reset.mocks.ts',
2121
'../../testing/test-setup/src/lib/extend/ui-logger.matcher.ts',
2222
],
23-
coverage: {
24-
...baseConfig.test.coverage,
25-
exclude: [
26-
...baseConfig.test.coverage.exclude,
27-
// All defaults already included
28-
],
29-
},
3023
},
3124
};
3225
});

packages/core/vitest.int.config.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ export default defineConfig(() => {
1515
'../../testing/test-setup/src/lib/console.mock.ts',
1616
'../../testing/test-setup/src/lib/reset.mocks.ts',
1717
],
18-
coverage: {
19-
...baseConfig.test.coverage,
20-
exclude: [
21-
...baseConfig.test.coverage.exclude,
22-
// All defaults already included
23-
],
24-
},
2518
},
2619
};
2720
});

packages/core/vitest.unit.config.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,6 @@ export default defineConfig(() => {
1111
...baseConfig,
1212
test: {
1313
...baseConfig.test,
14-
coverage: {
15-
...baseConfig.test.coverage,
16-
exclude: [
17-
...baseConfig.test.coverage.exclude,
18-
// Core-specific excludes (already has mocks/** and **/types.ts)
19-
],
20-
},
2114
},
2215
};
2316
});

packages/models/eslint.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export default tseslint.config(
1919
},
2020
},
2121
{
22-
ignores: ['packages/models/transformers/**/*'],
22+
ignores: ['packages/models/transformers/**/*.ts'],
2323
},
2424
);

packages/models/transformers/eslint.config.cjs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,4 @@ module.exports = [
88
'@nx/dependency-checks': 'error',
99
},
1010
},
11-
{
12-
files: ['**/*.ts', '**/*.js'],
13-
rules: {
14-
// Allow CommonJS in this transformer package
15-
'import/no-commonjs': 'off',
16-
'@typescript-eslint/no-require-imports': 'off',
17-
'unicorn/prefer-module': 'off',
18-
'functional/immutable-data': 'off',
19-
},
20-
},
2111
];
Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { defineConfig } from 'vitest/config';
2-
import { createSharedUnitVitestConfig } from '../../testing/test-vitest-setup/src/utils/project-config.js';
2+
import {
3+
TYPE_TEST_CONFIG,
4+
createSharedUnitVitestConfig,
5+
} from '../../testing/test-vitest-setup/src/utils/project-config.js';
36

47
export default defineConfig(() => {
58
const baseConfig = createSharedUnitVitestConfig({
@@ -11,24 +14,15 @@ export default defineConfig(() => {
1114
...baseConfig,
1215
test: {
1316
...baseConfig.test,
14-
include: ['src/**/*.{unit,type}.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}'],
17+
...TYPE_TEST_CONFIG,
1518
setupFiles: [
16-
'../../testing/test-setup/src/lib/cliui.mock.ts',
17-
'../../testing/test-setup/src/lib/fs.mock.ts',
18-
'../../testing/test-setup/src/lib/console.mock.ts',
19-
'../../testing/test-setup/src/lib/reset.mocks.ts',
20-
'../../testing/test-setup/src/lib/extend/ui-logger.matcher.ts',
21-
'../../testing/test-setup/src/lib/extend/markdown-table.matcher.ts',
19+
...baseConfig.test.setupFiles,
2220
'../../testing/test-setup/src/lib/extend/path.matcher.ts',
23-
'../../testing/test-setup/src/lib/extend/jest-extended.matcher.ts',
2421
],
2522
coverage: {
2623
...baseConfig.test.coverage,
2724
exclude: [...baseConfig.test.coverage.exclude, 'perf/**'],
2825
},
29-
typecheck: {
30-
include: ['**/*.type.test.ts'],
31-
},
3226
},
3327
};
3428
});

testing/test-vitest-setup/README.md

Lines changed: 0 additions & 205 deletions
This file was deleted.

testing/test-vitest-setup/src/utils/project-config.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
import { tsconfigPathAliases } from './tsconfig-path-aliases.js';
22

3-
// Test timeout constants
43
const UNIT_TEST_TIMEOUT = 5000;
54
const INTEGRATION_TEST_TIMEOUT = 15_000;
65
const E2E_TEST_TIMEOUT = 30_000;
76

7+
export const TYPE_TEST_CONFIG = {
8+
include: [`src/**/*.{unit,type}.test.{js,mjs,cjs,ts,mts,cts,jsx,tsx}`],
9+
typecheck: {
10+
include: ['**/*.type.test.ts'],
11+
},
12+
};
13+
814
export type SharedVitestConfigOptions = {
915
projectRoot: string;
1016
workspaceRoot: string;
1117
};
1218

13-
// Define a unified coverage config interface
1419
type CoverageConfig = {
1520
enabled?: boolean;
1621
provider: 'v8';
@@ -69,8 +74,8 @@ function getDefaultTestSettings(
6974
testTimeout: defaultTimeout,
7075
setupFiles: [
7176
noFsCwd
72-
? '../../testing/test-setup/src/lib/fs-memfs.setup-file.ts' // Only fs, no cwd
73-
: '../../testing/test-setup/src/lib/fs-with-cwd.setup-file.ts', // fs + cwd
77+
? '../../testing/test-setup/src/lib/fs-memfs.setup-file.ts'
78+
: '../../testing/test-setup/src/lib/fs-with-cwd.setup-file.ts',
7479
'../../testing/test-setup/src/lib/cliui.mock.ts',
7580
'../../testing/test-setup/src/lib/git.mock.ts',
7681
'../../testing/test-setup/src/lib/console.mock.ts',

0 commit comments

Comments
 (0)