Skip to content

chore: refactor unit-test and int-test targets #1061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BioPhoton merged 16 commits into from
Aug 14, 2025
Merged

chore: refactor unit-test and int-test targets #1061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3261c0e
chore: refactor unit and int test targets
Aug 12, 2025
ad988ab
chore: refactor unit and int test targets 2
Aug 12, 2025
822a323
chore: add coverage to existing test targets
Aug 12, 2025
3166645
chore: refine e2e and int test targets
Aug 12, 2025
28213f0
chore: refine preset
Aug 12, 2025
139b941
chore: refine targets
Aug 13, 2025
454f986
chore: refine targets 2
Aug 13, 2025
55bc628
chore: refine targets 3
Aug 13, 2025
3541c80
chore: refine preset 2
Aug 13, 2025
444bf05
Merge branch 'main' into chore/refactor-targets
Aug 13, 2025
61eb942
chore: adjust int-test targets
Aug 13, 2025
5b75d06
chore: adjust int-test target
Aug 13, 2025
867b3c6
chore: remove int-target as no int tests available
Aug 13, 2025
88e43d5
chore: add passWithNoTests:true to all test configs
Aug 13, 2025
bdb7f02
chore: remove unused int test config from models and plugin-lighthouse
Aug 13, 2025
9565128
chore: adjust preset
Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 16 additions & 20 deletions code-pushup.preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,8 @@ import eslintPlugin, {
eslintConfigFromNxProject,
} from './packages/plugin-eslint/src/index.js';
import jsPackagesPlugin from './packages/plugin-js-packages/src/index.js';
import jsDocsPlugin, {
JsDocsPluginConfig,
} from './packages/plugin-jsdocs/src/index.js';
import jsDocsPlugin from './packages/plugin-jsdocs/src/index.js';
import type { JsDocsPluginTransformedConfig } from './packages/plugin-jsdocs/src/lib/config.js';
import {
PLUGIN_SLUG,
groups,
Expand Down Expand Up @@ -98,7 +97,7 @@ export const eslintCategories: CategoryConfig[] = [
];

export function getJsDocsCategories(
config: JsDocsPluginConfig,
config: JsDocsPluginTransformedConfig,
): CategoryConfig[] {
return [
{
Expand Down Expand Up @@ -147,7 +146,7 @@ export const lighthouseCoreConfig = async (
};

export const jsDocsCoreConfig = (
config: JsDocsPluginConfig | string[],
config: JsDocsPluginTransformedConfig | string[],
): CoreConfig => ({
plugins: [
jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
Expand Down Expand Up @@ -180,28 +179,25 @@ export const typescriptPluginConfig = async (
export const coverageCoreConfigNx = async (
projectName?: string,
): Promise<CoreConfig> => {
if (projectName) {
throw new Error('coverageCoreConfigNx for single projects not implemented');
}
const targetNames = ['unit-test', 'int-test'];
const targetArgs = [
'-t',
...targetNames,
'--coverage.enabled',
'--skipNxCache',
];
const targetArgs = ['-t', ...targetNames];
return {
plugins: [
await coveragePlugin({
coverageToolCommand: {
command: 'npx',
args: [
'nx',
projectName ? `run --project ${projectName}` : 'run-many',
...targetArgs,
],
args: projectName
? ['nx', 'run-many', '-p', projectName, ...targetArgs]
: ['nx', 'run-many', ...targetArgs],
},
reports: await getNxCoveragePaths(targetNames),
reports: projectName
? [
{
pathToProject: `packages/${projectName}`,
resultsPath: `packages/${projectName}/coverage/lcov.info`,
},
]
: await getNxCoveragePaths(targetNames),
}),
],
categories: coverageCategories,
Expand Down
2 changes: 1 addition & 1 deletion e2e/ci-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/ci-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/cli-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/cli-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/create-cli-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"executor": "@nx/vite:test",
"options": {
"keepServerRunning": true,
"configFile": "e2e/create-cli-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/nx-plugin-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/nx-plugin-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-coverage-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/plugin-coverage-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-eslint-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-js-packages-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/plugin-lighthouse-e2e/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"e2e": {
"executor": "@nx/vite:test",
"options": {
"configFile": "e2e/plugin-lighthouse-e2e/vitest.e2e.config.ts"
"configFile": "{projectRoot}/vitest.e2e.config.ts"
}
}
},
Expand Down
37 changes: 4 additions & 33 deletions examples/plugins/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,10 @@
"sourceRoot": "examples/plugins/src",
"projectType": "library",
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/examples/plugins",
"main": "examples/plugins/src/index.ts",
"tsConfig": "examples/plugins/tsconfig.lib.json",
"assets": ["examples/plugins/*.md"]
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["examples/plugins/**/*.ts"]
}
},
"unit-test": {
"executor": "@nx/vite:test",
"outputs": ["{options.reportsDirectory}"],
"options": {
"configFile": "examples/plugins/vitest.unit.config.ts",
"reportsDirectory": "../../coverage/examples-plugins/unit-tests"
}
},
"int-test": {
"executor": "@nx/vite:test",
"outputs": ["{options.reportsDirectory}"],
"options": {
"configFile": "examples/plugins/vitest.int.config.ts",
"reportsDirectory": "../../coverage/examples-plugins/int-tests"
}
},
"build": {},
"lint": {},
"unit-test": {},
"int-test": {},
"run-collect": {
"command": "npx dist/packages/cli collect --config=examples/plugins/code-pushup.config.ts --persist.format=md",
"dependsOn": [
Expand Down
32 changes: 29 additions & 3 deletions nx.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,35 @@
"assets": ["{projectRoot}/*.md"]
}
},
"unit-test": {
"cache": true,
"outputs": [
"{workspaceRoot}/coverage/{projectName}/unit-tests/lcov.info"
],
"executor": "@nx/vite:test",
"options": {
"configFile": "{projectRoot}/vitest.unit.config.ts",
"passWithNoTests": true,
"coverage": {
"enabled": true
}
}
},
"int-test": {
"cache": true,
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
"executor": "@nx/vite:test",
"options": {
"configFile": "{projectRoot}/vitest.int.config.ts",
"passWithNoTests": true,
"coverage": {
"enabled": true
}
}
},
"e2e": {
"dependsOn": ["^build"]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/eslint.config.?(c)js"],
"executor": "@nx/linter:eslint",
Expand All @@ -27,9 +56,6 @@
]
}
},
"e2e": {
"dependsOn": ["^build"]
},
"nxv-pkg-install": {
"parallelism": false
},
Expand Down
14 changes: 2 additions & 12 deletions packages/ci/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@
"targets": {
"build": {},
"lint": {},
"unit-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/ci/vitest.unit.config.ts"
}
},
"int-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/ci/vitest.int.config.ts"
}
}
"unit-test": {},
"int-test": {}
},
"tags": ["scope:tooling", "type:feature", "publishable"]
}
14 changes: 2 additions & 12 deletions packages/cli/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@
"targets": {
"build": {},
"lint": {},
"unit-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/cli/vitest.unit.config.ts"
}
},
"int-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/cli/vitest.int.config.ts"
}
},
"unit-test": {},
"int-test": {},
"run-help": {
"command": "npx dist/packages/cli --help",
"dependsOn": ["build"]
Expand Down
14 changes: 2 additions & 12 deletions packages/core/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,8 @@
"targets": {
"build": {},
"lint": {},
"unit-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/core/vitest.unit.config.ts"
}
},
"int-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/core/vitest.int.config.ts"
}
}
"unit-test": {},
"int-test": {}
},
"tags": ["scope:core", "type:feature", "publishable"]
}
13 changes: 1 addition & 12 deletions packages/create-cli/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,7 @@
"targets": {
"build": {},
"lint": {},
"unit-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/create-cli/vitest.unit.config.ts"
}
},
"int-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/create-cli/vitest.int.config.ts"
}
},
"unit-test": {},
"exec-node": {
"dependsOn": ["build"],
"command": "node ./dist/packages/create-cli/src/index.js",
Expand Down
29 changes: 0 additions & 29 deletions packages/create-cli/vitest.int.config.ts
View file
Open in desktop

This file was deleted.

13 changes: 1 addition & 12 deletions packages/models/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,7 @@
]
},
"lint": {},
"unit-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/models/vitest.unit.config.ts"
}
},
"int-test": {
"executor": "@nx/vite:test",
"options": {
"configFile": "packages/models/vitest.int.config.ts"
}
}
"unit-test": {}
},
"tags": ["scope:shared", "type:util", "publishable"]
}
29 changes: 0 additions & 29 deletions packages/models/vitest.int.config.ts
View file
Open in desktop

This file was deleted.

Loading
Loading