feat(core): migrate to Angular 13 and Nx 13

tinesoft · Apr 6, 2022 · c398496 · c398496
1 parent a96bda4
commit c398496
Show file tree

Hide file tree

Showing 20 changed files with 53,119 additions and 22,024 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,7 @@
 !.vscode/extensions.json
 
 # misc
+/.angular/cache
 /.sass-cache
 /connect.lock
 /coverage

diff --git a/angular.json b/angular.json
@@ -1,37 +1,67 @@
 {
   "version": 1,
-  "cli": {
-    "defaultCollection": "@nrwl/angular"
-  },
-  "defaultProject": "ngx-cookieconsent-demo",
-  "schematics": {
-    "@nrwl/angular": {
-      "application": {
-        "linter": "eslint"
-      },
-      "library": {
-        "linter": "eslint"
+  "projects": {
+    "ngx-cookieconsent": {
+      "projectType": "library",
+      "root": "libs/ngx-cookieconsent",
+      "sourceRoot": "libs/ngx-cookieconsent/src",
+      "prefix": "ngc",
+      "architect": {
+        "build": {
+          "builder": "@nrwl/angular:package",
+          "options": {
+            "project": "libs/ngx-cookieconsent/ng-package.json"
+          },
+          "configurations": {
+            "production": {
+              "tsConfig": "libs/ngx-cookieconsent/tsconfig.lib.prod.json"
+            },
+            "development": {
+              "tsConfig": "libs/ngx-cookieconsent/tsconfig.lib.json"
+            }
+          },
+          "defaultConfiguration": "production"
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "outputs": ["coverage/libs/ngx-cookieconsent"],
+          "options": {
+            "jestConfig": "libs/ngx-cookieconsent/jest.config.js",
+            "passWithNoTests": true
+          }
+        },
+        "lint": {
+          "builder": "@nrwl/linter:eslint",
+          "options": {
+            "lintFilePatterns": [
+              "libs/ngx-cookieconsent/src/**/*.ts",
+              "libs/ngx-cookieconsent/src/**/*.html"
+            ]
+          },
+          "outputs": ["{options.outputFile}"]
+        },
+        "compodoc": {
+          "builder": "@twittwer/compodoc:compodoc",
+          "options": {
+            "tsConfig": "libs/ngx-cookieconsent/tsconfig.lib.json",
+            "outputPath": "dist/compodoc/ngx-cookieconsent"
+          },
+          "configurations": {
+            "json": {
+              "exportFormat": "json"
+            }
+          }
+        },
+        "release": {
+          "builder": "@nrwl/workspace:run-commands",
+          "options": {
+            "command": "npx semantic-release",
+            "cwd": "libs/ngx-cookieconsent"
+          }
+        }
       },
-      "storybook-configuration": {
-        "linter": "eslint"
-      }
-    },
-    "@nrwl/angular:application": {
-      "style": "scss",
-      "linter": "eslint",
-      "unitTestRunner": "jest",
-      "e2eTestRunner": "cypress"
+      "tags": []
     },
-    "@nrwl/angular:library": {
-      "style": "scss",
-      "linter": "eslint",
-      "unitTestRunner": "jest"
-    },
-    "@nrwl/angular:component": {
-      "style": "scss"
-    }
-  },
-  "projects": {
     "ngx-cookieconsent-demo": {
       "projectType": "application",
       "root": "apps/ngx-cookieconsent-demo",
@@ -115,7 +145,8 @@
               "apps/ngx-cookieconsent-demo/src/**/*.ts",
               "apps/ngx-cookieconsent-demo/src/**/*.html"
             ]
-          }
+          },
+          "outputs": ["{options.outputFile}"]
         },
         "test": {
           "builder": "@nrwl/jest:jest",
@@ -168,9 +199,7 @@
         "prerender": {
           "builder": "@nguniversal/builders:prerender",
           "options": {
-            "routes": [
-              "/"
-            ]
+            "routes": ["/"]
           },
           "configurations": {
             "production": {
@@ -182,7 +211,8 @@
           },
           "defaultConfiguration": "production"
         }
-      }
+      },
+      "tags": []
     },
     "ngx-cookieconsent-demo-e2e": {
       "root": "apps/ngx-cookieconsent-demo-e2e",
@@ -206,68 +236,12 @@
           "builder": "@nrwl/linter:eslint",
           "options": {
             "lintFilePatterns": ["apps/ngx-cookieconsent-demo-e2e/**/*.{js,ts}"]
-          }
-        }
-      }
-    },
-    "ngx-cookieconsent": {
-      "projectType": "library",
-      "root": "libs/ngx-cookieconsent",
-      "sourceRoot": "libs/ngx-cookieconsent/src",
-      "prefix": "ngc",
-      "architect": {
-        "build": {
-          "builder": "@nrwl/angular:package",
-          "options": {
-            "project": "libs/ngx-cookieconsent/ng-package.json"
-          },
-          "configurations": {
-            "production": {
-              "tsConfig": "libs/ngx-cookieconsent/tsconfig.lib.prod.json"
-            },
-            "development": {
-              "tsConfig": "libs/ngx-cookieconsent/tsconfig.lib.json"
-            }
           },
-          "defaultConfiguration": "production"
-        },
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["coverage/libs/ngx-cookieconsent"],
-          "options": {
-            "jestConfig": "libs/ngx-cookieconsent/jest.config.js",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": [
-              "libs/ngx-cookieconsent/src/**/*.ts",
-              "libs/ngx-cookieconsent/src/**/*.html"
-            ]
-          }
-        },
-        "compodoc": {
-          "builder": "@twittwer/compodoc:compodoc",
-          "options": {
-            "tsConfig": "libs/ngx-cookieconsent/tsconfig.lib.json",
-            "outputPath": "dist/compodoc/ngx-cookieconsent"
-          },
-          "configurations": {
-            "json": {
-              "exportFormat": "json"
-            }
-          }
-        },
-        "release": {
-          "builder": "@nrwl/workspace:run-commands",
-          "options": {
-            "command": "npx semantic-release",
-            "cwd": "libs/ngx-cookieconsent"
-          }
+          "outputs": ["{options.outputFile}"]
         }
-      }
+      },
+      "tags": [],
+      "implicitDependencies": ["ngx-cookieconsent-demo"]
     }
   }
 }
diff --git a/apps/ngx-cookieconsent-demo-e2e/.eslintrc.json b/apps/ngx-cookieconsent-demo-e2e/.eslintrc.json
@@ -4,9 +4,6 @@
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
-      "parserOptions": {
-        "project": "apps/ngx-cookieconsent-demo-e2e/tsconfig.*?.json"
-      },
       "rules": {}
     },
     {

diff --git a/apps/ngx-cookieconsent-demo/.eslintrc.json b/apps/ngx-cookieconsent-demo/.eslintrc.json
@@ -8,9 +8,6 @@
         "plugin:@nrwl/nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
-      "parserOptions": {
-        "project": ["apps/ngx-cookieconsent-demo/tsconfig.*?.json"]
-      },
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",

diff --git a/apps/ngx-cookieconsent-demo/jest.config.js b/apps/ngx-cookieconsent-demo/jest.config.js
@@ -6,12 +6,6 @@ module.exports = {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig.spec.json',
       stringifyContentPathRegex: '\\.(html|svg)$',
-      astTransformers: {
-        before: [
-          'jest-preset-angular/build/InlineFilesTransformer',
-          'jest-preset-angular/build/StripStylesTransformer',
-        ],
-      },
     },
   },
   coverageDirectory: '../../coverage/apps/ngx-cookieconsent-demo',
@@ -20,4 +14,9 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
+  testRunner: 'jest-jasmine2',
 };
diff --git a/apps/ngx-cookieconsent-demo/src/polyfills.ts b/apps/ngx-cookieconsent-demo/src/polyfills.ts
@@ -22,18 +22,6 @@ import '@angular/localize/init';
  * BROWSER POLYFILLS
  */
 
-/**
- * IE11 requires the following for NgClass support on SVG elements
- */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
-
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags

diff --git a/apps/ngx-cookieconsent-demo/src/test-setup.ts b/apps/ngx-cookieconsent-demo/src/test-setup.ts
@@ -1 +1,14 @@
 import 'jest-preset-angular/setup-jest';
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: false } }
+);
diff --git a/apps/ngx-cookieconsent-demo/tsconfig.server.json b/apps/ngx-cookieconsent-demo/tsconfig.server.json
@@ -1,17 +1,11 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/server",
     "target": "es2019",
-    "types": [
-      "node"
-    ]
+    "types": ["node"]
   },
-  "files": [
-    "src/main.server.ts",
-    "server.ts"
-  ],
+  "files": ["src/main.server.ts", "server.ts"],
   "angularCompilerOptions": {
     "entryModule": "./src/app/app.server.module#AppServerModule"
   }

diff --git a/apps/ngx-cookieconsent-demo/tsconfig.spec.json b/apps/ngx-cookieconsent-demo/tsconfig.spec.json
@@ -6,5 +6,5 @@
     "types": ["jest", "node"]
   },
   "files": ["src/test-setup.ts"],
-  "include": ["**/*.spec.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
 }
diff --git a/decorate-angular-cli.js b/decorate-angular-cli.js
@@ -62,7 +62,7 @@ function symlinkNgCLItoNxCLI() {
 
 try {
   symlinkNgCLItoNxCLI();
-  require('@nrwl/cli/lib/decorate-cli').decorateCli();
+  require('nx/src/cli/decorate-cli').decorateCli();
   output.log({ title: 'Angular CLI has been decorated to enable computation caching.' });
 } catch(e) {
   output.error({ title: 'Decoration of the Angular CLI did not complete successfully' });

diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,8 @@
+const { getJestProjects } = require('@nrwl/jest');
+
 module.exports = {
   projects: [
+    ...getJestProjects(),
     '<rootDir>/apps/ngx-cookieconsent-demo',
     '<rootDir>/libs/ngx-cookieconsent',
   ],

diff --git a/libs/ngx-cookieconsent/.eslintrc.json b/libs/ngx-cookieconsent/.eslintrc.json
@@ -8,9 +8,6 @@
         "plugin:@nrwl/nx/angular",
         "plugin:@angular-eslint/template/process-inline-templates"
       ],
-      "parserOptions": {
-        "project": ["libs/ngx-cookieconsent/tsconfig.*?.json"]
-      },
       "rules": {
         "@angular-eslint/directive-selector": [
           "error",

diff --git a/libs/ngx-cookieconsent/jest.config.js b/libs/ngx-cookieconsent/jest.config.js
@@ -6,12 +6,6 @@ module.exports = {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig.spec.json',
       stringifyContentPathRegex: '\\.(html|svg)$',
-      astTransformers: {
-        before: [
-          'jest-preset-angular/build/InlineFilesTransformer',
-          'jest-preset-angular/build/StripStylesTransformer',
-        ],
-      },
     },
   },
   coverageDirectory: '../../coverage/libs/ngx-cookieconsent',
@@ -20,4 +14,9 @@ module.exports = {
     'jest-preset-angular/build/serializers/ng-snapshot',
     'jest-preset-angular/build/serializers/html-comment',
   ],
+  transform: {
+    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular',
+  },
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
+  testRunner: 'jest-jasmine2',
 };
diff --git a/libs/ngx-cookieconsent/src/test-setup.ts b/libs/ngx-cookieconsent/src/test-setup.ts
@@ -1,5 +1,17 @@
 import 'jest-preset-angular/setup-jest';
 
-
 import 'cookieconsent/build/cookieconsent.min.js';
 //import 'cookieconsent/build/cookieconsent.min.css';
+
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting,
+} from '@angular/platform-browser-dynamic/testing';
+
+getTestBed().resetTestEnvironment();
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: false } }
+);
diff --git a/libs/ngx-cookieconsent/tsconfig.lib.json b/libs/ngx-cookieconsent/tsconfig.lib.json
@@ -9,6 +9,6 @@
     "types": [],
     "lib": ["dom", "es2018"]
   },
-  "exclude": ["src/test-setup.ts", "**/*.spec.ts"],
+  "exclude": ["src/test-setup.ts", "**/*.spec.ts", "**/*.test.ts"],
   "include": ["**/*.ts"]
 }
diff --git a/libs/ngx-cookieconsent/tsconfig.lib.prod.json b/libs/ngx-cookieconsent/tsconfig.lib.prod.json
@@ -1,4 +1,3 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
   "extends": "./tsconfig.lib.json",
   "compilerOptions": {