From 19c91082f73c17dce5f4b1dfa00d82d720c1f815 Mon Sep 17 00:00:00 2001
From: samuel-p <codes@samuel-philipp.de>
Date: Fri, 27 Nov 2020 19:26:27 +0100
Subject: [PATCH] updated @angular/cli

---
 angular.json       |  1 -
 e2e/tsconfig.json  |  2 +-
 package.json       | 10 +++++-----
 tsconfig.app.json  |  2 +-
 tsconfig.base.json | 23 -----------------------
 tsconfig.json      | 41 ++++++++++++++++++++++-------------------
 tsconfig.spec.json |  2 +-
 7 files changed, 30 insertions(+), 51 deletions(-)
 delete mode 100644 tsconfig.base.json

diff --git a/angular.json b/angular.json
index a9c5904..a458a21 100644
--- a/angular.json
+++ b/angular.json
@@ -46,7 +46,6 @@
               "optimization": true,
               "outputHashing": "all",
               "sourceMap": false,
-              "extractCss": true,
               "namedChunks": false,
               "extractLicenses": true,
               "vendorChunk": false,
diff --git a/e2e/tsconfig.json b/e2e/tsconfig.json
index 6b87cc4..c92199c 100644
--- a/e2e/tsconfig.json
+++ b/e2e/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.base.json",
+  "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "../out-tsc/e2e",
     "module": "commonjs",
diff --git a/package.json b/package.json
index 8cfe011..c27c3e4 100644
--- a/package.json
+++ b/package.json
@@ -37,22 +37,22 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.1000.3",
-    "@angular/cli": "~10.0.3",
+    "@angular-devkit/build-angular": "~0.1100.2",
+    "@angular/cli": "~11.0.2",
     "@angular/compiler-cli": "~11.0.2",
     "@angular/language-service": "~11.0.2",
     "@nguniversal/builders": "^10.1.0",
     "@types/express": "^4.17.8",
     "@types/node": "^14.0.23",
-    "@types/jasmine": "~3.5.11",
+    "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "codelyzer": "^6.0.0",
-    "jasmine-core": "~3.5.0",
+    "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~5.1.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",
     "ts-node": "~8.10.2",
diff --git a/tsconfig.app.json b/tsconfig.app.json
index 44795bd..f758d98 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app",
     "types": []
diff --git a/tsconfig.base.json b/tsconfig.base.json
deleted file mode 100644
index ac05639..0000000
--- a/tsconfig.base.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compileOnSave": false,
-  "compilerOptions": {
-    "baseUrl": "./",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
-    "declaration": false,
-    "downlevelIteration": true,
-    "experimentalDecorators": true,
-    "module": "es2020",
-    "moduleResolution": "node",
-    "importHelpers": true,
-    "target": "es2015",
-    "lib": [
-      "es2018",
-      "dom"
-    ]
-  },
-  "angularCompilerOptions": {
-    "fullTemplateTypeCheck": true,
-    "strictInjectionParameters": true
-  }
-}
diff --git a/tsconfig.json b/tsconfig.json
index e574583..ac05639 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,20 +1,23 @@
-/*
-  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": [],
-  "references": [
-    {
-      "path": "./tsconfig.app.json"
-    },
-    {
-      "path": "./tsconfig.spec.json"
-    },
-    {
-      "path": "./tsconfig.server.json"
-    }
-  ]
-}
\ No newline at end of file
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "experimentalDecorators": true,
+    "module": "es2020",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "lib": [
+      "es2018",
+      "dom"
+    ]
+  },
+  "angularCompilerOptions": {
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
+  }
+}
diff --git a/tsconfig.spec.json b/tsconfig.spec.json
index 1db2e6e..6400fde 100644
--- a/tsconfig.spec.json
+++ b/tsconfig.spec.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "./out-tsc/spec",
     "types": [