chore(*): nx migrate latest

chore(*): test coverage flag is set in all jest configs
csaszika · May 23, 2021 · 86fdc02 · 86fdc02
1 parent 68774d0
commit 86fdc02
Show file tree

Hide file tree

Showing 60 changed files with 13,051 additions and 14,071 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -80,7 +80,9 @@
         {
             "files": ["*.ts", "*.tsx"],
             "extends": ["plugin:@nrwl/nx/typescript"],
-            "parserOptions": { "project": "./tsconfig.*?.json" },
+            "parserOptions": {
+                "project": "./tsconfig.*?.json"
+            },
             "rules": {}
         },
         {

diff --git a/angular.json b/angular.json
@@ -46,10 +46,15 @@
                         "main": "apps/plan-it/src/main.ts",
                         "polyfills": "apps/plan-it/src/polyfills.ts",
                         "tsConfig": "apps/plan-it/tsconfig.app.json",
-                        "aot": true,
                         "assets": ["apps/plan-it/src/favicon.ico", "apps/plan-it/src/assets"],
                         "styles": ["apps/plan-it/src/styles.scss", "./node_modules/@angular/material/prebuilt-themes/purple-green.css"],
-                        "scripts": []
+                        "scripts": [],
+                        "vendorChunk": true,
+                        "extractLicenses": false,
+                        "buildOptimizer": false,
+                        "sourceMap": true,
+                        "optimization": false,
+                        "namedChunks": true
                     },
                     "configurations": {
                         "production": {

diff --git a/apps/plan-it/.eslintrc.json b/apps/plan-it/.eslintrc.json
@@ -5,10 +5,26 @@
         {
             "files": ["*.ts"],
             "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-            "parserOptions": { "project": ["apps/plan-it/tsconfig.*?.json"] },
+            "parserOptions": {
+                "project": ["apps/plan-it/tsconfig.*?.json"]
+            },
             "rules": {
-                "@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "pi", "style": "camelCase" }],
-                "@angular-eslint/component-selector": ["error", { "type": "element", "prefix": "pi", "style": "kebab-case" }]
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "pi",
+                        "style": "camelCase"
+                    }
+                ],
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "pi",
+                        "style": "kebab-case"
+                    }
+                ]
             }
         },
         {

diff --git a/apps/plan-it/jest.config.js b/apps/plan-it/jest.config.js
@@ -13,8 +13,8 @@ module.exports = {
     },
     coverageDirectory: '../../coverage/apps/plan-it',
     snapshotSerializers: [
-        'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
-        'jest-preset-angular/build/AngularSnapshotSerializer.js',
-        'jest-preset-angular/build/HTMLCommentSerializer.js',
+        'jest-preset-angular/build/serializers/no-ng-attributes',
+        'jest-preset-angular/build/serializers/ng-snapshot',
+        'jest-preset-angular/build/serializers/html-comment',
     ],
 };
diff --git a/apps/plan-it/src/environments/environment.ts b/apps/plan-it/src/environments/environment.ts
@@ -13,4 +13,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.
diff --git a/apps/plan-it/src/polyfills.ts b/apps/plan-it/src/polyfills.ts
@@ -57,7 +57,7 @@
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone'; // Included with Angular CLI.
+import 'zone.js'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS

diff --git a/apps/plan-it/src/test-setup.ts b/apps/plan-it/src/test-setup.ts
@@ -1,4 +1,4 @@
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 // eslint-disable-next-line  ordered-imports/ordered-imports
 import '@angular-extensions/pretty-html-log';
 // eslint-disable-next-line  ordered-imports/ordered-imports

diff --git a/libs/animations/.eslintrc.json b/libs/animations/.eslintrc.json
@@ -5,10 +5,26 @@
         {
             "files": ["*.ts"],
             "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-            "parserOptions": { "project": ["libs/animations/tsconfig.*?.json"] },
+            "parserOptions": {
+                "project": ["libs/animations/tsconfig.*?.json"]
+            },
             "rules": {
-                "@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "pi", "style": "camelCase" }],
-                "@angular-eslint/component-selector": ["error", { "type": "element", "prefix": "pi", "style": "kebab-case" }]
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "pi",
+                        "style": "camelCase"
+                    }
+                ],
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "pi",
+                        "style": "kebab-case"
+                    }
+                ]
             }
         },
         {

diff --git a/libs/design-core/.eslintrc.json b/libs/design-core/.eslintrc.json
@@ -10,6 +10,10 @@
             },
             "rules": {}
         },
-        { "files": ["*.html"], "extends": ["plugin:@nrwl/nx/angular-template"], "rules": {} }
+        {
+            "files": ["*.html"],
+            "extends": ["plugin:@nrwl/nx/angular-template"],
+            "rules": {}
+        }
     ]
 }
diff --git a/libs/environments/.eslintrc.json b/libs/environments/.eslintrc.json
@@ -5,12 +5,32 @@
         {
             "files": ["*.ts"],
             "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-            "parserOptions": { "project": ["libs/environments/tsconfig.*?.json"] },
+            "parserOptions": {
+                "project": ["libs/environments/tsconfig.*?.json"]
+            },
             "rules": {
-                "@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "pi", "style": "camelCase" }],
-                "@angular-eslint/component-selector": ["error", { "type": "element", "prefix": "pi", "style": "kebab-case" }]
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "pi",
+                        "style": "camelCase"
+                    }
+                ],
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "pi",
+                        "style": "kebab-case"
+                    }
+                ]
             }
         },
-        { "files": ["*.html"], "extends": ["plugin:@nrwl/nx/angular-template"], "rules": {} }
+        {
+            "files": ["*.html"],
+            "extends": ["plugin:@nrwl/nx/angular-template"],
+            "rules": {}
+        }
     ]
 }
diff --git a/libs/environments/jest.config.js b/libs/environments/jest.config.js
@@ -4,17 +4,17 @@ module.exports = {
     setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
     globals: {
         'ts-jest': {
-            tsConfig: '<rootDir>/tsconfig.spec.json',
             stringifyContentPathRegex: '\\.(html|svg)$',
             astTransformers: {
                 before: ['jest-preset-angular/build/InlineFilesTransformer', 'jest-preset-angular/build/StripStylesTransformer'],
             },
+            tsconfig: '<rootDir>/tsconfig.spec.json',
         },
     },
     coverageDirectory: '../../coverage/libs/environments',
     snapshotSerializers: [
-        'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
-        'jest-preset-angular/build/AngularSnapshotSerializer.js',
-        'jest-preset-angular/build/HTMLCommentSerializer.js',
+        'jest-preset-angular/build/serializers/no-ng-attributes',
+        'jest-preset-angular/build/serializers/ng-snapshot',
+        'jest-preset-angular/build/serializers/html-comment',
     ],
 };
diff --git a/libs/environments/src/lib/environment.ts b/libs/environments/src/lib/environment.ts
@@ -22,4 +22,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.
diff --git a/libs/environments/src/test-setup.ts b/libs/environments/src/test-setup.ts
@@ -1 +1 @@
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
diff --git a/libs/features/creatable-plan-list/.eslintrc.json b/libs/features/creatable-plan-list/.eslintrc.json
@@ -5,12 +5,32 @@
         {
             "files": ["*.ts"],
             "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-            "parserOptions": { "project": ["libs/features/creatable-plan-list/tsconfig.*?.json"] },
+            "parserOptions": {
+                "project": ["libs/features/creatable-plan-list/tsconfig.*?.json"]
+            },
             "rules": {
-                "@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "pi", "style": "camelCase" }],
-                "@angular-eslint/component-selector": ["error", { "type": "element", "prefix": "pi", "style": "kebab-case" }]
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "pi",
+                        "style": "camelCase"
+                    }
+                ],
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "pi",
+                        "style": "kebab-case"
+                    }
+                ]
             }
         },
-        { "files": ["*.html"], "extends": ["plugin:@nrwl/nx/angular-template"], "rules": {} }
+        {
+            "files": ["*.html"],
+            "extends": ["plugin:@nrwl/nx/angular-template"],
+            "rules": {}
+        }
     ]
 }
diff --git a/libs/features/creatable-plan-list/jest.config.js b/libs/features/creatable-plan-list/jest.config.js
@@ -11,12 +11,13 @@ module.exports = {
             },
         },
     },
+    collectCoverage: true,
     coverageDirectory: '../../../coverage/libs/features/creatable-plan-list',
     coverageReporters: ['html', 'lcov'],
     reporters: ['default'],
     snapshotSerializers: [
-        'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
-        'jest-preset-angular/build/AngularSnapshotSerializer.js',
-        'jest-preset-angular/build/HTMLCommentSerializer.js',
+        'jest-preset-angular/build/serializers/no-ng-attributes',
+        'jest-preset-angular/build/serializers/ng-snapshot',
+        'jest-preset-angular/build/serializers/html-comment',
     ],
 };
diff --git a/libs/features/creatable-plan-list/src/test-setup.ts b/libs/features/creatable-plan-list/src/test-setup.ts
@@ -1,4 +1,4 @@
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 import * as jestJqueryMatchers from 'jest-jquery-matchers';
 
 jest.addMatchers(jestJqueryMatchers);
diff --git a/libs/features/dashboard/.eslintrc.json b/libs/features/dashboard/.eslintrc.json
@@ -5,12 +5,32 @@
         {
             "files": ["*.ts"],
             "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-            "parserOptions": { "project": ["libs/features/dashboard/tsconfig.*?.json"] },
+            "parserOptions": {
+                "project": ["libs/features/dashboard/tsconfig.*?.json"]
+            },
             "rules": {
-                "@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "pi", "style": "camelCase" }],
-                "@angular-eslint/component-selector": ["error", { "type": "element", "prefix": "pi", "style": "kebab-case" }]
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "pi",
+                        "style": "camelCase"
+                    }
+                ],
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "pi",
+                        "style": "kebab-case"
+                    }
+                ]
             }
         },
-        { "files": ["*.html"], "extends": ["plugin:@nrwl/nx/angular-template"], "rules": {} }
+        {
+            "files": ["*.html"],
+            "extends": ["plugin:@nrwl/nx/angular-template"],
+            "rules": {}
+        }
     ]
 }
diff --git a/libs/features/dashboard/jest.config.js b/libs/features/dashboard/jest.config.js
@@ -11,12 +11,13 @@ module.exports = {
             },
         },
     },
+    collectCoverage: true,
     coverageDirectory: '../../../coverage/libs/features/dashboard',
     coverageReporters: ['html', 'lcov'],
     reporters: ['default'],
     snapshotSerializers: [
-        'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
-        'jest-preset-angular/build/AngularSnapshotSerializer.js',
-        'jest-preset-angular/build/HTMLCommentSerializer.js',
+        'jest-preset-angular/build/serializers/no-ng-attributes',
+        'jest-preset-angular/build/serializers/ng-snapshot',
+        'jest-preset-angular/build/serializers/html-comment',
     ],
 };
diff --git a/libs/features/dashboard/src/test-setup.ts b/libs/features/dashboard/src/test-setup.ts
@@ -1,4 +1,4 @@
-import 'jest-preset-angular';
+import 'jest-preset-angular/setup-jest';
 import * as jestJqueryMatchers from 'jest-jquery-matchers';
 
 jest.addMatchers(jestJqueryMatchers);
diff --git a/libs/features/football-plans/.eslintrc.json b/libs/features/football-plans/.eslintrc.json
@@ -5,12 +5,32 @@
         {
             "files": ["*.ts"],
             "extends": ["plugin:@nrwl/nx/angular", "plugin:@angular-eslint/template/process-inline-templates"],
-            "parserOptions": { "project": ["libs/features/football-plans/tsconfig.*?.json"] },
+            "parserOptions": {
+                "project": ["libs/features/football-plans/tsconfig.*?.json"]
+            },
             "rules": {
-                "@angular-eslint/directive-selector": ["error", { "type": "attribute", "prefix": "pi", "style": "camelCase" }],
-                "@angular-eslint/component-selector": ["error", { "type": "element", "prefix": "pi", "style": "kebab-case" }]
+                "@angular-eslint/directive-selector": [
+                    "error",
+                    {
+                        "type": "attribute",
+                        "prefix": "pi",
+                        "style": "camelCase"
+                    }
+                ],
+                "@angular-eslint/component-selector": [
+                    "error",
+                    {
+                        "type": "element",
+                        "prefix": "pi",
+                        "style": "kebab-case"
+                    }
+                ]
             }
         },
-        { "files": ["*.html"], "extends": ["plugin:@nrwl/nx/angular-template"], "rules": {} }
+        {
+            "files": ["*.html"],
+            "extends": ["plugin:@nrwl/nx/angular-template"],
+            "rules": {}
+        }
     ]
 }
diff --git a/libs/features/football-plans/jest.config.js b/libs/features/football-plans/jest.config.js
@@ -11,12 +11,13 @@ module.exports = {
             },
         },
     },
+    collectCoverage: true,
     coverageDirectory: '../../../coverage/libs/features/football-plans',
     coverageReporters: ['html', 'lcov'],
     reporters: ['default'],
     snapshotSerializers: [
-        'jest-preset-angular/build/AngularNoNgAttributesSnapshotSerializer.js',
-        'jest-preset-angular/build/AngularSnapshotSerializer.js',
-        'jest-preset-angular/build/HTMLCommentSerializer.js',
+        'jest-preset-angular/build/serializers/no-ng-attributes',
+        'jest-preset-angular/build/serializers/ng-snapshot',
+        'jest-preset-angular/build/serializers/html-comment',
     ],
 };
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		import 'jest-preset-angular';
		import 'jest-preset-angular/setup-jest';