From 78bf77efc386394dcd18810f7e71fbc765d714a7 Mon Sep 17 00:00:00 2001 From: Edouard Bozon Date: Thu, 25 Nov 2021 11:47:34 +0100 Subject: [PATCH 1/3] chore: clean nx targets and npm scripts --- libs/cdk/project.json | 11 +---------- libs/state/project.json | 13 ++----------- libs/template/project.json | 23 ++--------------------- package.json | 11 +++++------ 4 files changed, 10 insertions(+), 48 deletions(-) diff --git a/libs/cdk/project.json b/libs/cdk/project.json index 5d305dfe9d..1275ae30f8 100644 --- a/libs/cdk/project.json +++ b/libs/cdk/project.json @@ -19,7 +19,7 @@ "options": { "commands": [ { - "command": "nx test-coverage cdk && nx build-test-coverage-badge cdk" + "command": "nx test cdk --codeCoverage && nx build-test-coverage-badge cdk" } ] } @@ -68,15 +68,6 @@ }, "outputs": ["coverage/libs/cdk"] }, - "test-coverage": { - "executor": "@nrwl/jest:jest", - "options": { - "jestConfig": "libs/cdk/jest.config.js", - "passWithNoTests": true, - "codeCoverage": true - }, - "outputs": ["coverage/libs/cdk"] - }, "publish": { "executor": "@nrwl/workspace:run-commands", "options": { diff --git a/libs/state/project.json b/libs/state/project.json index 10bd37e16d..68500307b1 100644 --- a/libs/state/project.json +++ b/libs/state/project.json @@ -25,12 +25,12 @@ "options": { "commands": [ { - "command": "nx test-coverage state && nx test-coverage-badge state" + "command": "nx test state --codeCoverage && nx build-test-coverage-badge state" } ] } }, - "test-coverage-badge": { + "build-test-coverage-badge": { "executor": "@nrwl/workspace:run-commands", "options": { "commands": [ @@ -40,15 +40,6 @@ ] } }, - "test-coverage": { - "executor": "@nrwl/jest:jest", - "options": { - "jestConfig": "libs/state/jest.config.js", - "passWithNoTests": true, - "codeCoverage": true - }, - "outputs": ["coverage/libs/state"] - }, "perfBuild": { "executor": "@nrwl/node:build", "options": { diff --git a/libs/template/project.json b/libs/template/project.json index 7a20798176..ef2f512844 100644 --- a/libs/template/project.json +++ b/libs/template/project.json @@ -60,12 +60,12 @@ "options": { "commands": [ { - "command": "nx test-coverage template && nx test-coverage-badge template" + "command": "nx test template --codeCoverage template && nx build-test-coverage-badge template" } ] } }, - "test-coverage-badge": { + "build-test-coverage-badge": { "executor": "@nrwl/workspace:run-commands", "options": { "commands": [ @@ -75,25 +75,6 @@ ] } }, - "test-coverage": { - "executor": "@nrwl/jest:jest", - "options": { - "jestConfig": "libs/template/jest.config.js", - "passWithNoTests": true, - "codeCoverage": true - }, - "outputs": ["coverage/libs/template"] - }, - "changelog": { - "executor": "@nrwl/workspace:run-commands", - "options": { - "commands": [ - { - "command": "npx conventional-changelog-cli -p angular -k ./libs/template/package.json -i ./libs/template/CHANGELOG.md -s --commit-path ./libs/template --tagPrefix template@" - } - ] - } - }, "link": { "executor": "@nrwl/workspace:run-commands", "options": { diff --git a/package.json b/package.json index 738d786034..60d3aa1bbf 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,11 @@ "scripts": { "ng": "nx", "nx": "nx", - "start": "ng serve", - "build": "ng build", + "start": "nx serve", + "build": "nx build", "test": "nx test", "test:coverage": "nx test --code-coverage", - "lint": "nx workspace-lint && ng lint", - "e2e": "ng e2e", + "lint": "nx workspace-lint && nx lint", "affected:apps": "nx affected:apps", "affected:libs": "nx affected:libs", "affected:build": "nx affected:build", @@ -25,12 +24,12 @@ "update": "nx migrate latest", "dep-graph": "nx dep-graph", "build-docs-page": "nx run-many --projects state,template,cdk --target build-docs", - "chanelog": "nx changelog state", "generate-typescript-docs": "ts-node -P tools/tsconfig.tools.json tools/scripts/docs/generate-typescript-docs.ts", "help": "nx help", + "cdk:publish": "nx publish cdk", "state:publish": "nx publish state", "template:publish": "nx publish template", - "tracebench": "tracerbench compare --controlURL http://localhost:4200/rx-angular/demos --experimentURL http://localhost:4242/rx-angular/demos --markers startRouting,endRouting --headless --report", + "tracerbench": "tracerbench compare --controlURL http://localhost:4200/rx-angular/demos --experimentURL http://localhost:4242/rx-angular/demos --markers startRouting,endRouting --headless --report", "postinstall": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points && node ./decorate-angular-cli.js && husky install", "workspace-generator": "nx workspace-generator" }, From 19354ce4da0f7f078d710b653e18e0251c474b7f Mon Sep 17 00:00:00 2001 From: Edouard Bozon Date: Thu, 25 Nov 2021 11:58:08 +0100 Subject: [PATCH 2/3] chore: clean nx targets and npm scripts --- libs/template/project.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/template/project.json b/libs/template/project.json index ef2f512844..e9afd6a896 100644 --- a/libs/template/project.json +++ b/libs/template/project.json @@ -60,7 +60,7 @@ "options": { "commands": [ { - "command": "nx test template --codeCoverage template && nx build-test-coverage-badge template" + "command": "nx test template --codeCoverage && nx build-test-coverage-badge template" } ] } From 71c86847402d050501087c0f997e6fcebfdd3dc6 Mon Sep 17 00:00:00 2001 From: Edouard Bozon Date: Thu, 25 Nov 2021 12:12:45 +0100 Subject: [PATCH 3/3] chore(ci): remove `collectCoverageFrom` --- libs/cdk/jest.config.js | 4 ---- libs/state/jest.config.js | 5 ----- libs/template/jest.config.js | 5 ----- 3 files changed, 14 deletions(-) diff --git a/libs/cdk/jest.config.js b/libs/cdk/jest.config.js index 29e7a124cc..adf9d731e5 100644 --- a/libs/cdk/jest.config.js +++ b/libs/cdk/jest.config.js @@ -5,10 +5,6 @@ module.exports = { preset: '../../jest.preset.js', coverageReporters: ['lcov', 'cobertura'], coverageDirectory: '../../docs/test-coverage/cdk', - collectCoverageFrom: [ - './src/**/!(index).ts', - '!./src/lib/experimental/**/*.ts', - ], setupFilesAfterEnv: ['/test-setup.ts'], globals: { 'ts-jest': { diff --git a/libs/state/jest.config.js b/libs/state/jest.config.js index f740f10896..8a9f6bd095 100644 --- a/libs/state/jest.config.js +++ b/libs/state/jest.config.js @@ -4,11 +4,6 @@ module.exports = { preset: '../../jest.preset.js', coverageReporters: ['lcov', 'cobertura'], coverageDirectory: '../../docs/test-coverage/state', - collectCoverageFrom: [ - './src/**/!(index).ts', - '!./src/lib/experimental/**/*.ts', - ], - setupFilesAfterEnv: ['/src/test-setup.ts'], globals: { 'ts-jest': { diff --git a/libs/template/jest.config.js b/libs/template/jest.config.js index eda64acb79..f7e70bc5f1 100644 --- a/libs/template/jest.config.js +++ b/libs/template/jest.config.js @@ -3,11 +3,6 @@ module.exports = { preset: '../../jest.preset.js', coverageReporters: ['lcov', 'cobertura'], coverageDirectory: '../../docs/test-coverage/template', - collectCoverageFrom: [ - './src/**/!(index).ts', - '!./src/lib/experimental/**/*.ts', - ], - setupFilesAfterEnv: ['/src/test-setup.ts'], globals: { 'ts-jest': {