Merge pull request #1439 from josehernandezfintecheandomx/enhancement/upgrade_angular10

Upgrade to Angular 10

angular.json

@@ -31,6 +31,7 @@
               "src/assets"
             ],
             "styles": [
+              "node_modules/font-awesome/css/font-awesome.css",
               "src/main.scss",
               {"inject":false,
                 "input": "src/theme/deeppurple-amber.scss",
@@ -57,7 +58,11 @@
                 "bundleName": "theme/pictonblue-yellowgreen"
 }
             ],
-            "scripts": []
+            "scripts": [],
+            "allowedCommonJsDependencies": [
+              "lodash",
+              "@ckeditor/ckeditor5-build-classic"
+            ]
           },
           "configurations": {
             "production": {

package.json

@@ -26,19 +26,19 @@
     "postinstall": "ngcc"
   },
   "dependencies": {
-    "@angular/animations": "9.1.12",
+    "@angular/animations": "10.2.5",
-    "@angular/cdk": "9.2.4",
+    "@angular/cdk": "10.2.7",
-    "@angular/common": "9.1.12",
+    "@angular/common": "10.2.5",
-    "@angular/compiler": "9.1.12",
+    "@angular/compiler": "10.2.5",
-    "@angular/core": "9.1.12",
+    "@angular/core": "10.2.5",
-    "@angular/flex-layout": "9.0.0-beta.31",
+    "@angular/flex-layout": "10.0.0-beta.32",
-    "@angular/forms": "9.1.12",
+    "@angular/forms": "10.2.5",
-    "@angular/localize": "9.1.12",
+    "@angular/localize": "10.2.5",
-    "@angular/material": "9.2.4",
+    "@angular/material": "10.2.7",
-    "@angular/platform-browser": "9.1.12",
+    "@angular/platform-browser": "10.2.5",
-    "@angular/platform-browser-dynamic": "9.1.12",
+    "@angular/platform-browser-dynamic": "10.2.5",
-    "@angular/router": "9.1.12",
+    "@angular/router": "10.2.5",
-    "@angular/service-worker": "9.1.12",
+    "@angular/service-worker": "10.2.5",
     "@ckeditor/ckeditor5-angular": "1.2.3",
     "@ckeditor/ckeditor5-build-classic": "21.0.0",
     "@fortawesome/angular-fontawesome": "0.6.1",
@@ -48,16 +48,17 @@
     "@ngx-translate/http-loader": "^6.0.0",
     "chart.js": "3.0.0-alpha",
     "core-js": "2.5.0",
+    "font-awesome": "^4.7.0",
     "lodash": "4.17.21",
     "rxjs": "6.6.2",
-    "tslib": "1.10.0",
+    "tslib": "^2.0.0",
-    "zone.js": "0.10.2"
+    "zone.js": "0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.901.12",
+    "@angular-devkit/build-angular": "0.1002.4",
-    "@angular/cli": "9.1.12",
+    "@angular/cli": "10.2.4",
-    "@angular/compiler-cli": "9.1.12",
+    "@angular/compiler-cli": "10.2.5",
-    "@angular/language-service": "9.1.12",
+    "@angular/language-service": "10.2.5",
     "@biesbjerg/ngx-translate-extract": "2.3.4",
     "@ngx-rocket/scripts": "3.0.3",
     "@types/jasmine": "3.3.13",
@@ -68,22 +69,22 @@
     "hads": "1.7.3",
     "htmlhint": "0.11.0",
     "https-proxy-agent": "2.2.1",
-    "jasmine-core": "3.4.0",
+    "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "4.2.1",
+    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "6.3.16",
+    "karma": "~5.0.0",
-    "karma-chrome-launcher": "2.2.0",
+    "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "2.0.0",
-    "karma-coverage-istanbul-reporter": "2.0.5",
+    "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "2.0.1",
+    "karma-jasmine": "~4.0.0",
     "karma-junit-reporter": "1.2.0",
-    "protractor": "5.4.2",
+    "protractor": "~7.0.0",
     "stylelint": "10.0.1",
     "stylelint-config-recommended-scss": "3.3.0",
     "stylelint-config-standard": "18.3.0",
     "stylelint-scss": "3.6.1",
     "ts-node": "8.2.0",
-    "tslint": "5.16.0",
+    "tslint": "~6.1.0",
-    "typescript": "3.8.3"
+    "typescript": "4.0.8"
   },
   "repository": {
     "type": "git",

src/app/app.module.ts

@@ -1,6 +1,6 @@
 /** Angular Imports */
 import { NgModule } from '@angular/core';
-import { BrowserModule, HammerModule } from '@angular/platform-browser';
+import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { HttpClientModule } from '@angular/common/http';
 import { ServiceWorkerModule } from '@angular/service-worker';
@@ -49,7 +49,6 @@ import { AppRoutingModule } from './app-routing.module';
   imports: [
     BrowserModule,
     BrowserAnimationsModule,
-    HammerModule,
     HttpClientModule,
     CoreModule,
     HomeModule,

src/main.scss

@@ -9,8 +9,3 @@
 // Global Imports
 /* You can add global styles to this file, and also import other style files */
 @import "assets/styles/helper";
-
-
-// 3rd party libraries
-$fa-font-path: "../node_modules/font-awesome/fonts";
-@import "../node_modules/font-awesome/scss/font-awesome.scss";

tsconfig.json

@@ -4,7 +4,7 @@
     "baseUrl": "src",
     "downlevelIteration": true,
     "importHelpers": true,
-    "module": "esnext",
+    "module": "es2020",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,

tslint.json

@@ -76,7 +76,6 @@
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [