chore: clean nx targets and npm scripts (#1100)

edbzn · web-flow · commit 37460af0d032 · 2021-11-25T12:27:41.000+01:00
* chore: clean nx targets and npm scripts

* chore(ci): remove `collectCoverageFrom`
diff --git 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: ['<rootDir>/test-setup.ts'],
   globals: {
     'ts-jest': {
diff --git 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/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: ['<rootDir>/src/test-setup.ts'],
   globals: {
     'ts-jest': {
diff --git 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/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: ['<rootDir>/src/test-setup.ts'],
   globals: {
     'ts-jest': {
diff --git 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 && 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
@@ -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"
   },

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`"options": {`
`20`	`20`	`"commands": [`
`21`	`21`	`{`
`22`		`- "command": "nx test-coverage cdk && nx build-test-coverage-badge cdk"`
	`22`	`+ "command": "nx test cdk --codeCoverage && nx build-test-coverage-badge cdk"`
`23`	`23`	`}`
`24`	`24`	`]`
`25`	`25`	`}`
`@@ -68,15 +68,6 @@`
`68`	`68`	`},`
`69`	`69`	`"outputs": ["coverage/libs/cdk"]`
`70`	`70`	`},`
`71`		`- "test-coverage": {`
`72`		`- "executor": "@nrwl/jest:jest",`
`73`		`- "options": {`
`74`		`- "jestConfig": "libs/cdk/jest.config.js",`
`75`		`- "passWithNoTests": true,`
`76`		`- "codeCoverage": true`
`77`		`- },`
`78`		`- "outputs": ["coverage/libs/cdk"]`
`79`		`- },`
`80`	`71`	`"publish": {`
`81`	`72`	`"executor": "@nrwl/workspace:run-commands",`
`82`	`73`	`"options": {`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@`
`25`	`25`	`"options": {`
`26`	`26`	`"commands": [`
`27`	`27`	`{`
`28`		`- "command": "nx test-coverage state && nx test-coverage-badge state"`
	`28`	`+ "command": "nx test state --codeCoverage && nx build-test-coverage-badge state"`
`29`	`29`	`}`
`30`	`30`	`]`
`31`	`31`	`}`
`32`	`32`	`},`
`33`		`- "test-coverage-badge": {`
	`33`	`+ "build-test-coverage-badge": {`
`34`	`34`	`"executor": "@nrwl/workspace:run-commands",`
`35`	`35`	`"options": {`
`36`	`36`	`"commands": [`
`@@ -40,15 +40,6 @@`
`40`	`40`	`]`
`41`	`41`	`}`
`42`	`42`	`},`
`43`		`- "test-coverage": {`
`44`		`- "executor": "@nrwl/jest:jest",`
`45`		`- "options": {`
`46`		`- "jestConfig": "libs/state/jest.config.js",`
`47`		`- "passWithNoTests": true,`
`48`		`- "codeCoverage": true`
`49`		`- },`
`50`		`- "outputs": ["coverage/libs/state"]`
`51`		`- },`
`52`	`43`	`"perfBuild": {`
`53`	`44`	`"executor": "@nrwl/node:build",`
`54`	`45`	`"options": {`