ng10-upgrade

Upgrading to Angular 10
duluca · Jul 10, 2020 · 54c438d · 54c438d
2 parents 497a6af + 96601a8
commit 54c438d
Show file tree

Hide file tree

Showing 48 changed files with 3,573 additions and 2,797 deletions.
diff --git a/browserslist → .browserslistrc b/browserslist → .browserslistrc
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 > LemonMart was implemented with a [Route-first approach](https://techtalkdc.com/router-first-architecture-in-spas/) to designing SPAs.
 
+![Angular Version](https://img.shields.io/badge/angular-v10-326839)
 [![CircleCI](https://circleci.com/gh/duluca/lemon-mart.svg?style=svg)](https://circleci.com/gh/duluca/lemon-mart)
 [![Coverage Status](https://coveralls.io/repos/github/duluca/lemon-mart/badge.svg?branch=master)](https://coveralls.io/github/duluca/lemon-mart?branch=master)
 [![DeepScan grade](https://deepscan.io/api/projects/2669/branches/18284/badge/grade.svg)](https://deepscan.io/dashboard#view=project&pid=2669&bid=18284)

diff --git a/angular.json b/angular.json
@@ -35,9 +35,11 @@
               "src/safari-pinned-tab.svg",
               "src/mstile-150x150.png"
             ],
-            "styles": ["src/lemonmart-theme.scss", "src/styles.css"],
-            "scripts": [],
-            "es5BrowserSupport": true
+            "styles": [
+              "src/lemonmart-theme.scss",
+              "src/styles.css"
+            ],
+            "scripts": []
           },
           "configurations": {
             "production": {

diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lemon-mart",
-  "version": "9.0.0",
+  "version": "10.0.0",
   "license": "MIT",
   "config": {
     "imageRepo": "073020584345.dkr.ecr.us-east-1.amazonaws.com/lemon-mart",
@@ -60,46 +60,46 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "9.1.7",
-    "@angular/cdk": "9.2.3",
-    "@angular/common": "9.1.7",
-    "@angular/compiler": "9.1.7",
-    "@angular/core": "9.1.7",
-    "@angular/fire": "^6.0.0",
-    "@angular/flex-layout": "^9.0.0-beta.30",
-    "@angular/forms": "9.1.7",
-    "@angular/material": "9.2.3",
-    "@angular/platform-browser": "9.1.7",
-    "@angular/platform-browser-dynamic": "9.1.7",
-    "@angular/router": "9.1.7",
-    "@ngrx/data": "^9.1.2",
-    "@ngrx/effects": "^9.1.2",
-    "@ngrx/entity": "^9.1.2",
-    "@ngrx/store": "^9.1.2",
-    "@ngrx/store-devtools": "^9.1.2",
-    "firebase": "^7.14.4",
+    "@angular/animations": "10.0.2",
+    "@angular/cdk": "10.0.1",
+    "@angular/common": "10.0.2",
+    "@angular/compiler": "10.0.2",
+    "@angular/core": "10.0.2",
+    "@angular/fire": "^6.0.2",
+    "@angular/flex-layout": "^10.0.0-beta.32",
+    "@angular/forms": "10.0.2",
+    "@angular/material": "10.0.1",
+    "@angular/platform-browser": "10.0.2",
+    "@angular/platform-browser-dynamic": "10.0.2",
+    "@angular/router": "10.0.2",
+    "@ngrx/data": "^9.2.0",
+    "@ngrx/effects": "^9.2.0",
+    "@ngrx/entity": "^9.2.0",
+    "@ngrx/store": "^9.2.0",
+    "@ngrx/store-devtools": "^9.2.0",
+    "firebase": "^7.15.5",
     "jwt-decode": "^2.2.0",
-    "ngx-mask": "^9.0.2",
-    "rxjs": "^6.5.5",
+    "ngx-mask": "^9.1.2",
+    "rxjs": "^6.6.0",
     "subsink": "^1.0.1",
-    "ts-enum-util": "^4.0.1",
+    "ts-enum-util": "^4.0.2",
     "tslib": "^2.0.0",
     "zone.js": "^0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.901.6",
-    "@angular/cli": "9.1.6",
-    "@angular/compiler-cli": "9.1.7",
-    "@angular/language-service": "9.1.7",
-    "@types/jasmine": "~3.5.10",
+    "@angular-devkit/build-angular": "~0.1000.1",
+    "@angular/cli": "10.0.1",
+    "@angular/compiler-cli": "10.0.2",
+    "@angular/language-service": "10.0.2",
+    "@types/jasmine": "~3.5.11",
     "@types/jasminewd2": "~2.0.8",
     "@types/jsonwebtoken": "^8.5.0",
     "@types/jwt-decode": "^2.2.1",
-    "@types/node": "^14.0.1",
+    "@types/node": "^14.0.19",
     "angular-unit-test-helper": "^9.4.0",
-    "codelyzer": "^5.2.2",
+    "codelyzer": "^6.0.0",
     "cross-conf-env": "^1.1.2",
-    "dev-norms": "^1.7.0",
+    "dev-norms": "^1.7.1",
     "fake-jwt-sign": "^1.1.1",
     "http-server": "^0.12.3",
     "import-sort": "^6.0.0",
@@ -109,27 +109,27 @@
     "init-dev-env": "^1.0.0",
     "jasmine": "^3.5.0",
     "jasmine-core": "~3.5.0",
-    "jasmine-spec-reporter": "~5.0.2",
+    "jasmine-spec-reporter": "~5.0.0",
     "js-beautify": "^1.11.0",
-    "karma": "^5.0.5",
-    "karma-chrome-launcher": "^3.1.0",
+    "karma": "~5.1.0",
+    "karma-chrome-launcher": "~3.1.0",
     "karma-cli": "~2.0.0",
-    "karma-coverage-istanbul-reporter": "^3.0.2",
+    "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-edge-launcher": "^0.4.2",
     "karma-htmlfile-reporter": "^0.3.8",
-    "karma-jasmine": "^3.1.1",
-    "karma-jasmine-html-reporter": "^1.5.4",
+    "karma-jasmine": "~3.3.0",
+    "karma-jasmine-html-reporter": "^1.5.0",
     "npm-run-all": "^4.1.5",
     "open-cli": "^6.0.1",
     "prettier": "^2.0.5",
-    "protractor": "^7.0.0",
+    "protractor": "~7.0.0",
     "rimraf": "^3.0.2",
-    "ts-node": "~8.10.1",
-    "tslint": "^6.1.2",
+    "ts-node": "~8.10.2",
+    "tslint": "~6.1.0",
     "tslint-config-prettier": "^1.18.0",
-    "tslint-etc": "^1.10.1",
+    "tslint-etc": "^1.11.1",
     "tslint-plugin-prettier": "^2.3.0",
-    "typescript": "^3.8.3"
+    "typescript": "^3.9.6"
   },
   "importSort": {
     ".ts, .tsx": {

diff --git a/projects/ch10/browserslist → projects/ch10/.browserslistrc b/projects/ch10/browserslist → projects/ch10/.browserslistrc
diff --git a/projects/ch10/e2e/tsconfig.json b/projects/ch10/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/projects/ch10/tsconfig.app.json b/projects/ch10/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

diff --git a/projects/ch10/tsconfig.spec.json b/projects/ch10/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

diff --git a/projects/ch11/browserslist → projects/ch11/.browserslistrc b/projects/ch11/browserslist → projects/ch11/.browserslistrc
diff --git a/projects/ch11/e2e/tsconfig.json b/projects/ch11/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/projects/ch11/src/app/common/base-form.class.spec.ts b/projects/ch11/src/app/common/base-form.class.spec.ts
@@ -1,3 +1,4 @@
+import { Directive } from '@angular/core'
 import { FormGroup } from '@angular/forms'
 
 import { BaseFormComponent } from './base-form.class'
@@ -6,6 +7,7 @@ interface ITestData {
   name: string
 }
 
+@Directive()
 class TestFormComponent extends BaseFormComponent<ITestData> {
   buildForm(): FormGroup {
     return jasmine.createSpyObj('form', [])

diff --git a/projects/ch11/src/app/common/base-form.class.ts b/projects/ch11/src/app/common/base-form.class.ts
@@ -1,6 +1,14 @@
-import { EventEmitter, Input, Output, SimpleChange, SimpleChanges } from '@angular/core'
+import {
+  Directive,
+  EventEmitter,
+  Input,
+  Output,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core'
 import { AbstractControl, FormGroup } from '@angular/forms'
 
+@Directive()
 export abstract class BaseFormComponent<TFormData extends object> {
   @Input() initialData: TFormData
   @Input() disable: boolean

diff --git a/projects/ch11/tsconfig.app.json b/projects/ch11/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

diff --git a/projects/ch11/tsconfig.spec.json b/projects/ch11/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

diff --git a/projects/ch12/browserslist → projects/ch12/.browserslistrc b/projects/ch12/browserslist → projects/ch12/.browserslistrc
diff --git a/projects/ch12/e2e/tsconfig.json b/projects/ch12/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/projects/ch12/src/app/common/base-form.class.spec.ts b/projects/ch12/src/app/common/base-form.class.spec.ts
@@ -1,3 +1,4 @@
+import { Directive } from '@angular/core'
 import { FormGroup } from '@angular/forms'
 
 import { BaseFormComponent } from './base-form.class'
@@ -6,6 +7,7 @@ interface ITestData {
   name: string
 }
 
+@Directive()
 class TestFormComponent extends BaseFormComponent<ITestData> {
   buildForm(): FormGroup {
     return jasmine.createSpyObj('form', [])

diff --git a/projects/ch12/src/app/common/base-form.class.ts b/projects/ch12/src/app/common/base-form.class.ts
@@ -1,6 +1,14 @@
-import { EventEmitter, Input, Output, SimpleChange, SimpleChanges } from '@angular/core'
+import {
+  Directive,
+  EventEmitter,
+  Input,
+  Output,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core'
 import { AbstractControl, FormGroup } from '@angular/forms'
 
+@Directive()
 export abstract class BaseFormComponent<TFormData extends object> {
   @Input() initialData: TFormData
   @Input() disable: boolean

diff --git a/projects/ch12/tsconfig.app.json b/projects/ch12/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

diff --git a/projects/ch12/tsconfig.spec.json b/projects/ch12/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

diff --git a/projects/ch13/browserslist → projects/ch13/.browserslistrc b/projects/ch13/browserslist → projects/ch13/.browserslistrc
diff --git a/projects/ch13/e2e/tsconfig.json b/projects/ch13/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/projects/ch13/src/app/common/base-form.class.spec.ts b/projects/ch13/src/app/common/base-form.class.spec.ts
@@ -1,3 +1,4 @@
+import { Directive } from '@angular/core'
 import { FormGroup } from '@angular/forms'
 
 import { BaseFormComponent } from './base-form.class'
@@ -6,6 +7,7 @@ interface ITestData {
   name: string
 }
 
+@Directive()
 class TestFormComponent extends BaseFormComponent<ITestData> {
   buildForm(): FormGroup {
     return jasmine.createSpyObj('form', [])

diff --git a/projects/ch13/src/app/common/base-form.class.ts b/projects/ch13/src/app/common/base-form.class.ts
@@ -1,6 +1,14 @@
-import { EventEmitter, Input, Output, SimpleChange, SimpleChanges } from '@angular/core'
+import {
+  Directive,
+  EventEmitter,
+  Input,
+  Output,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core'
 import { AbstractControl, FormGroup } from '@angular/forms'
 
+@Directive()
 export abstract class BaseFormComponent<TFormData extends object> {
   @Input() initialData: TFormData
   @Input() disable: boolean

diff --git a/projects/ch13/tsconfig.app.json b/projects/ch13/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []

diff --git a/projects/ch13/tsconfig.spec.json b/projects/ch13/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/spec",
     "types": [

diff --git a/projects/ch14/browserslist → projects/ch14/.browserslistrc b/projects/ch14/browserslist → projects/ch14/.browserslistrc
diff --git a/projects/ch14/e2e/tsconfig.json b/projects/ch14/e2e/tsconfig.json
@@ -1,9 +1,9 @@
 {
-  "extends": "../../../tsconfig.json",
+  "extends": "../../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../../out-tsc/e2e",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es2018",
     "types": [
       "jasmine",
       "jasminewd2",

diff --git a/projects/ch14/src/app/common/base-form.class.spec.ts b/projects/ch14/src/app/common/base-form.class.spec.ts
@@ -1,3 +1,4 @@
+import { Directive } from '@angular/core'
 import { FormGroup } from '@angular/forms'
 
 import { BaseFormComponent } from './base-form.class'
@@ -6,6 +7,7 @@ interface ITestData {
   name: string
 }
 
+@Directive()
 class TestFormComponent extends BaseFormComponent<ITestData> {
   buildForm(): FormGroup {
     return jasmine.createSpyObj('form', [])

diff --git a/projects/ch14/src/app/common/base-form.class.ts b/projects/ch14/src/app/common/base-form.class.ts
@@ -1,6 +1,14 @@
-import { EventEmitter, Input, Output, SimpleChange, SimpleChanges } from '@angular/core'
+import {
+  Directive,
+  EventEmitter,
+  Input,
+  Output,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core'
 import { AbstractControl, FormGroup } from '@angular/forms'
 
+@Directive()
 export abstract class BaseFormComponent<TFormData extends object> {
   @Input() initialData: TFormData
   @Input() disable: boolean

diff --git a/projects/ch14/tsconfig.app.json b/projects/ch14/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../tsconfig.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "outDir": "../../out-tsc/app",
     "types": []