Skip to content

Commit 9fd1985

Browse files
author
John Doe
committed
Merge branch 'chore/refactor-targets' into cp-targets
# Conflicts: # code-pushup.preset.ts # examples/plugins/project.json # nx.json # packages/ci/project.json # packages/cli/project.json # packages/core/project.json # packages/create-cli/project.json # packages/models/project.json # packages/nx-plugin/project.json # packages/plugin-coverage/project.json # packages/plugin-eslint/project.json # packages/plugin-js-packages/project.json # packages/plugin-jsdocs/project.json # packages/plugin-lighthouse/project.json # packages/plugin-typescript/project.json # packages/utils/project.json # testing/test-utils/project.json
2 parents 5c24708 + 3541c80 commit 9fd1985

25 files changed

Lines changed: 176 additions & 47 deletions

File tree

‎code-pushup.preset.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import eslintPlugin, {
1717
} from './packages/plugin-eslint/src/index.js';
1818
import jsPackagesPlugin from './packages/plugin-js-packages/src/index.js';
1919
import jsDocsPlugin from './packages/plugin-jsdocs/src/index.js';
20-
import type { JsDocsPluginConfig } from './packages/plugin-jsdocs/src/index.js';
20+
import type { JsDocsPluginTransformedConfig } from './packages/plugin-jsdocs/src/lib/config.js';
2121
import {
2222
PLUGIN_SLUG,
2323
groups,
@@ -147,7 +147,7 @@ export const eslintCategories: CategoryConfig[] = [
147147
];
148148

149149
export function getJsDocsCategories(
150-
config: JsDocsPluginConfig,
150+
config: JsDocsPluginTransformedConfig,
151151
): CategoryConfig[] {
152152
return [
153153
{
@@ -202,7 +202,7 @@ export const lighthouseCoreConfig = async (
202202
};
203203

204204
export const jsDocsCoreConfig = (
205-
config: JsDocsPluginConfig | string[],
205+
config: JsDocsPluginTransformedConfig | string[],
206206
): CoreConfig => ({
207207
plugins: [
208208
jsDocsPlugin(Array.isArray(config) ? { patterns: config } : config),
@@ -257,12 +257,12 @@ export const coverageCoreConfigNx = async (
257257
},
258258
reports: projectName
259259
? [
260-
// Prefer Jest default dir; adjust if your project uses Vitest
261-
`packages/${projectName}/coverage/lcov.info`,
260+
{
261+
pathToProject: `packages/${projectName}`,
262+
resultsPath: `packages/${projectName}/coverage/lcov.info`,
263+
},
262264
]
263-
: await getNxCoveragePaths({
264-
targets: targetNames,
265-
}),
265+
: await getNxCoveragePaths(targetNames),
266266
}),
267267
],
268268
categories: coverageCategories,

‎e2e/ci-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"e2e": {
99
"executor": "@nx/vite:test",
1010
"options": {
11-
"configFile": "e2e/ci-e2e/vitest.e2e.config.ts"
11+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1212
}
1313
}
1414
},

‎e2e/cli-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"e2e": {
99
"executor": "@nx/vite:test",
1010
"options": {
11-
"configFile": "e2e/cli-e2e/vitest.e2e.config.ts"
11+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1212
}
1313
}
1414
},

‎e2e/create-cli-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"executor": "@nx/vite:test",
1010
"options": {
1111
"keepServerRunning": true,
12-
"configFile": "e2e/create-cli-e2e/vitest.e2e.config.ts"
12+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1313
}
1414
}
1515
},

‎e2e/nx-plugin-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"e2e": {
99
"executor": "@nx/vite:test",
1010
"options": {
11-
"configFile": "e2e/nx-plugin-e2e/vitest.e2e.config.ts"
11+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1212
}
1313
}
1414
},

‎e2e/plugin-coverage-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"e2e": {
99
"executor": "@nx/vite:test",
1010
"options": {
11-
"configFile": "e2e/plugin-coverage-e2e/vitest.e2e.config.ts"
11+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1212
}
1313
}
1414
},

‎e2e/plugin-eslint-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"e2e": {
99
"executor": "@nx/vite:test",
1010
"options": {
11-
"configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts"
11+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1212
}
1313
}
1414
},

‎e2e/plugin-js-packages-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"e2e": {
1010
"executor": "@nx/vite:test",
1111
"options": {
12-
"configFile": "e2e/plugin-eslint-e2e/vitest.e2e.config.ts"
12+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1313
}
1414
}
1515
},

‎e2e/plugin-lighthouse-e2e/project.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"e2e": {
99
"executor": "@nx/vite:test",
1010
"options": {
11-
"configFile": "e2e/plugin-lighthouse-e2e/vitest.e2e.config.ts"
11+
"configFile": "{projectRoot}/vitest.e2e.config.ts"
1212
}
1313
}
1414
},

‎examples/plugins/project.json‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@
88
"lint": {},
99
"unit-test": {},
1010
"int-test": {
11+
"cache": true,
12+
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
1113
"executor": "@nx/vite:test",
1214
"options": {
13-
"configFile": "examples/plugins/vitest.int.config.ts"
15+
"configFile": "{projectRoot}/vitest.int.config.ts",
16+
"coverage": {
17+
"enabled": true
18+
}
1419
}
1520
},
1621
"run-collect": {

0 commit comments

Comments
 (0)