Merge branch 'feature/update-angular' into develop

angular.json

@@ -50,7 +50,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
-              "extractCss": true,
               "namedChunks": true,
               "aot": true,
               "extractLicenses": true,
@@ -79,7 +78,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
-              "extractCss": true,
               "namedChunks": true,
               "aot": true,
               "extractLicenses": true,
@@ -108,7 +106,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": true,
-              "extractCss": true,
               "namedChunks": true,
               "aot": true,
               "extractLicenses": true,

e2e/tsconfig.json

@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",

package.json

@@ -16,17 +16,17 @@
   },
   "private": false,
   "dependencies": {
-    "@angular/animations": "~10.0.3",
+    "@angular/animations": "~11.2.6",
-    "@angular/cdk": "~10.0.1",
+    "@angular/cdk": "~11.2.5",
-    "@angular/common": "~10.0.3",
+    "@angular/common": "~11.2.6",
-    "@angular/compiler": "~10.0.3",
+    "@angular/compiler": "~11.2.6",
-    "@angular/core": "~10.0.3",
+    "@angular/core": "~11.2.6",
-    "@angular/flex-layout": "^10.0.0-beta.32",
+    "@angular/flex-layout": "^11.0.0-beta.33",
-    "@angular/forms": "~10.0.3",
+    "@angular/forms": "~11.2.6",
-    "@angular/material": "^10.0.1",
+    "@angular/material": "^11.2.5",
-    "@angular/platform-browser": "~10.0.3",
+    "@angular/platform-browser": "~11.2.6",
-    "@angular/platform-browser-dynamic": "~10.0.3",
+    "@angular/platform-browser-dynamic": "~11.2.6",
-    "@angular/router": "~10.0.3",
+    "@angular/router": "~11.2.6",
     "bootstrap": "^4.5.0",
     "ipfs-css": "^1.2.0",
     "rxjs": "~6.6.0",
@@ -34,20 +34,20 @@
     "zone.js": "~0.10.3"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.2",
+    "@angular-devkit/build-angular": "~0.1102.5",
-    "@angular/cli": "~10.0.2",
+    "@angular/cli": "~11.2.5",
-    "@angular/compiler-cli": "~10.0.3",
+    "@angular/compiler-cli": "~11.2.6",
-    "@angular/language-service": "~10.0.3",
+    "@angular/language-service": "~11.2.6",
-    "@types/jasmine": "~3.5.0",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
     "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.0.0",
+    "karma": "~6.2.0",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
-    "karma-jasmine": "~3.3.0",
+    "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~7.0.0",
     "rxjs-tslint-rules": "^4.33.3",
@@ -56,6 +56,6 @@
     "tslint-consistent-codestyle": "^1.16.0",
     "tslint-origin-ordered-imports-rule": "^1.3.0-0",
     "tslint-rxjs-subject-restrictions-rule": "^1.0.4",
-    "typescript": "~3.9.6"
+    "typescript": "~4.1.5"
   }
 }

src/app/app-routing.module.ts

@@ -8,7 +8,7 @@ const routes: Routes = [{
 }];
 
 @NgModule({
-  imports: [RouterModule.forRoot(routes, { useHash: environment.useHash })],
+  imports: [RouterModule.forRoot(routes, { useHash: environment.useHash, relativeLinkResolution: 'legacy' })],
   exports: [RouterModule]
 })
 export class AppRoutingModule { }

src/app/app.component.spec.ts

@@ -1,9 +1,9 @@
-import { async, TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', (): void => {
-  beforeEach(async((): void => {
+  beforeEach(waitForAsync((): void => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule

src/app/pages/pages.component.spec.ts

@@ -1,11 +1,11 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { PagesComponent } from './pages.component';
 
 describe('PagesComponent', (): void => {
   let component: PagesComponent;
   let fixture: ComponentFixture<PagesComponent>;
 
-  beforeEach(async((): void => {
+  beforeEach(waitForAsync((): void => {
     TestBed.configureTestingModule({
       declarations: [PagesComponent]
     })

tsconfig.app.json

@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": []

tsconfig.base.json

@@ -1,29 +0,0 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "forceConsistentCasingInFileNames": true,
-    "strict": true,
-    "noImplicitReturns": true,
-    "noFallthroughCasesInSwitch": true,
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "module": "es2020",
-    "lib": [
-      "es2018",
-      "dom"
-    ]
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true,
-    "strictTemplates": true
-  }
-}

tsconfig.json

@@ -1,20 +1,29 @@
-/*
+/* To learn more about this file see: https://angular.io/config/tsconfig. */
-  This is a "Solution Style" tsconfig.json file, and is used by editors and TypeScript’s language server to improve development experience.
-  It is not intended to be used to perform a compilation.
-
-  To learn more about this file see: https://angular.io/config/solution-tsconfig.
-*/
 {
-  "files": [],
+  "compileOnSave": false,
-  "references": [
+  "compilerOptions": {
-    {
+    "baseUrl": "./",
-      "path": "./tsconfig.app.json"
+    "outDir": "./dist/out-tsc",
-    },
+    "forceConsistentCasingInFileNames": true,
-    {
+    "strict": true,
-      "path": "./tsconfig.spec.json"
+    "noImplicitReturns": true,
-    },
+    "noFallthroughCasesInSwitch": true,
-    {
+    "sourceMap": true,
-      "path": "./e2e/tsconfig.json"
+    "declaration": false,
-    }
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "module": "es2020",
+    "lib": [
+      "es2018",
+      "dom"
     ]
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true,
+    "strictTemplates": true
+  }
 }

tsconfig.spec.json

@@ -1,6 +1,6 @@
 /* To learn more about this file see: https://angular.io/config/tsconfig. */
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [