Skip to content

Commit d9c0411

Browse files
author
John Doe
committed
Merge branch 'main' into add-plugin-targets
2 parents 26068d4 + 2ae961a commit d9c0411

File tree

30 files changed

+68
-312
lines changed

30 files changed

+68
-312
lines changed

code-pushup.preset.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,7 @@ export const coverageCoreConfigNx = async (
220220
projectName?: string,
221221
): Promise<CoreConfig> => {
222222
const targetNames = ['unit-test', 'int-test'];
223-
const targetArgs = [
224-
'-t',
225-
...targetNames,
226-
'--coverage.enabled',
227-
'--skipNxCache',
228-
];
223+
const targetArgs = ['-t', ...targetNames];
229224
return {
230225
plugins: [
231226
await coveragePlugin({

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: 4 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,39 +4,10 @@
44
"sourceRoot": "examples/plugins/src",
55
"projectType": "library",
66
"targets": {
7-
"build": {
8-
"executor": "@nx/js:tsc",
9-
"outputs": ["{options.outputPath}"],
10-
"options": {
11-
"outputPath": "dist/examples/plugins",
12-
"main": "examples/plugins/src/index.ts",
13-
"tsConfig": "examples/plugins/tsconfig.lib.json",
14-
"assets": ["examples/plugins/*.md"]
15-
}
16-
},
17-
"lint": {
18-
"executor": "@nx/linter:eslint",
19-
"outputs": ["{options.outputFile}"],
20-
"options": {
21-
"lintFilePatterns": ["examples/plugins/**/*.ts"]
22-
}
23-
},
24-
"unit-test": {
25-
"executor": "@nx/vite:test",
26-
"outputs": ["{options.reportsDirectory}"],
27-
"options": {
28-
"configFile": "examples/plugins/vitest.unit.config.ts",
29-
"reportsDirectory": "../../coverage/examples-plugins/unit-tests"
30-
}
31-
},
32-
"int-test": {
33-
"executor": "@nx/vite:test",
34-
"outputs": ["{options.reportsDirectory}"],
35-
"options": {
36-
"configFile": "examples/plugins/vitest.int.config.ts",
37-
"reportsDirectory": "../../coverage/examples-plugins/int-tests"
38-
}
39-
},
7+
"build": {},
8+
"lint": {},
9+
"unit-test": {},
10+
"int-test": {},
4011
"run-collect": {
4112
"command": "npx dist/packages/cli collect --config=examples/plugins/code-pushup.config.ts --persist.format=md",
4213
"dependsOn": [

0 commit comments

Comments
 (0)