Skip to content

Commit ba74094

Browse files
author
John Doe
committed
Merge branch 'chore/refactor-targets' into cp-targets
# Conflicts: # packages/ci/project.json # packages/core/project.json # packages/create-cli/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
2 parents 5dba960 + bdb7f02 commit ba74094

18 files changed

Lines changed: 20 additions & 245 deletions

File tree

‎examples/plugins/project.json‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
"build": {},
88
"lint": {},
99
"unit-test": {},
10-
"int-test": {
11-
"cache": true,
12-
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
13-
"executor": "@nx/vite:test",
14-
"options": {
15-
"configFile": "{projectRoot}/vitest.int.config.ts",
16-
"coverage": {
17-
"enabled": true
18-
}
19-
}
20-
},
10+
"int-test": {},
2111
"run-collect": {
2212
"command": "npx dist/packages/cli collect --config=examples/plugins/code-pushup.config.ts --persist.format=md",
2313
"dependsOn": [

‎nx.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@
181181
"executor": "@nx/vite:test",
182182
"options": {
183183
"configFile": "{projectRoot}/vitest.unit.config.ts",
184+
"passWithNoTests": true,
184185
"coverage": {
185186
"enabled": true
186187
}
@@ -192,6 +193,7 @@
192193
"executor": "@nx/vite:test",
193194
"options": {
194195
"configFile": "{projectRoot}/vitest.int.config.ts",
196+
"passWithNoTests": true,
195197
"coverage": {
196198
"enabled": true
197199
}

‎packages/ci/project.json‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,7 @@
77
"build": {},
88
"lint": {},
99
"unit-test": {},
10-
"int-test": {
11-
"cache": true,
12-
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
13-
"executor": "@nx/vite:test",
14-
"options": {
15-
"configFile": "{projectRoot}/vitest.int.config.ts",
16-
"coverage": {
17-
"enabled": true
18-
}
19-
}
20-
},
21-
"unit-test": {},
10+
"int-test": {},
2211
"code-pushup": {
2312
"dependsOn": [
2413
"code-pushup-coverage",

‎packages/cli/project.json‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
"build": {},
88
"lint": {},
99
"unit-test": {},
10-
"int-test": {
11-
"cache": true,
12-
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
13-
"executor": "@nx/vite:test",
14-
"options": {
15-
"configFile": "{projectRoot}/vitest.int.config.ts",
16-
"coverage": {
17-
"enabled": true
18-
}
19-
}
20-
},
10+
"int-test": {},
2111
"run-help": {
2212
"command": "npx dist/packages/cli --help",
2313
"dependsOn": ["build"]

‎packages/core/project.json‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,7 @@
77
"build": {},
88
"lint": {},
99
"unit-test": {},
10-
"int-test": {
11-
"cache": true,
12-
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
13-
"executor": "@nx/vite:test",
14-
"options": {
15-
"configFile": "{projectRoot}/vitest.int.config.ts",
16-
"coverage": {
17-
"enabled": true
18-
}
19-
}
20-
},
10+
"int-test": {},
2111
"code-pushup": {
2212
"dependsOn": [
2313
"code-pushup-coverage",

‎packages/create-cli/project.json‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,6 @@
77
"build": {},
88
"lint": {},
99
"unit-test": {},
10-
"int-test": {
11-
"cache": true,
12-
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
13-
"executor": "@nx/vite:test",
14-
"options": {
15-
"configFile": "{projectRoot}/vitest.int.config.ts",
16-
"coverage": {
17-
"enabled": true
18-
}
19-
}
20-
},
2110
"code-pushup": {
2211
"dependsOn": [
2312
"code-pushup-coverage",
@@ -26,6 +15,11 @@
2615
"code-pushup-typescript"
2716
]
2817
},
18+
"exec-node": {
19+
"dependsOn": ["build"],
20+
"command": "node ./dist/packages/create-cli/src/index.js",
21+
"options": {}
22+
},
2923
"code-pushup-coverage": {},
3024
"code-pushup-jsdocs": {},
3125
"code-pushup-js-packages": {},

‎packages/create-cli/vitest.int.config.ts‎

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

‎packages/models/project.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,7 @@
3333
]
3434
},
3535
"lint": {},
36-
"unit-test": {},
37-
"int-test": {
38-
"executor": "@nx/vite:test",
39-
"options": {
40-
"configFile": "{projectRoot}/vitest.int.config.ts",
41-
"coverage": {
42-
"enabled": true
43-
}
44-
}
45-
}
36+
"unit-test": {}
4637
},
4738
"tags": ["scope:shared", "type:util", "publishable"]
4839
}

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

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

‎packages/nx-plugin/project.json‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,20 +41,7 @@
4141
}
4242
},
4343
"unit-test": {},
44-
"build": {},
45-
"lint": {},
46-
"unit-test": {},
47-
"int-test": {
48-
"cache": true,
49-
"outputs": ["{workspaceRoot}/coverage/{projectName}/int-tests/lcov.info"],
50-
"executor": "@nx/vite:test",
51-
"options": {
52-
"configFile": "{projectRoot}/vitest.int.config.ts",
53-
"coverage": {
54-
"enabled": true
55-
}
56-
}
57-
},
44+
"int-test": {},
5845
"code-pushup": {
5946
"dependsOn": [
6047
"code-pushup-coverage",

0 commit comments

Comments
 (0)