Merge branch '15-update-to-angular-12' into 'master'

Resolve "Update to Angular 12"

Closes #15

See merge request muni-kypo-crp/frontend-angular/models/kypo2-angular-topology-model!19

angular.json

@@ -13,7 +13,6 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "aot": true,
             "outputPath": "dist/graph-topology-model",
             "index": "src/index.html",
             "main": "src/main.ts",
@@ -26,7 +25,13 @@
             "styles": [
               "src/styles.css"
             ],
-            "scripts": []
+            "scripts": [],
+            "vendorChunk": true,
+            "extractLicenses": false,
+            "buildOptimizer": false,
+            "sourceMap": true,
+            "optimization": false,
+            "namedChunks": true
           },
           "configurations": {
             "production": {
@@ -46,12 +51,12 @@
               "outputHashing": "all",
               "sourceMap": false,
               "namedChunks": false,
-              "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
               "buildOptimizer": true
             }
-          }
+          },
+          "defaultConfiguration": ""
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -97,7 +102,7 @@
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
             "protractorConfig": "e2e/protractor.conf.js",
-            "devServerTarget": "graph-topology-model:serve"
+            "devServerTarget": "graph-topology-model:serve:development"
           },
           "configurations": {
             "production": {

package.json

@@ -10,7 +10,7 @@
     "e2e": "ng e2e",
     "ci-test": "ng test --browsers ChromeHeadless --watch=false",
     "prettier-check": "prettier --check \"projects/**/*.ts\"",
-    "build-library": "ng build --prod kypo2-topology-graph-model",
+    "build-library": "ng build --configuration production kypo2-topology-graph-model",
     "create-package": "cd dist/kypo2-topology-graph-model && npm pack",
     "build-and-pack": "npm install && npm run build-library && npm run create-package",
     "ci-update-version": "cd ./projects/kypo2-topology-graph-model/ && npm version $VERSION",
@@ -24,43 +24,43 @@
   },
   "private": false,
   "dependencies": {
-    "@angular/common": "^11.0.8",
-    "@angular/core": "^11.0.8",
-    "@angular/compiler": "^11.0.8",
-    "@angular/animations": "^11.0.8",
-    "@angular/forms": "^11.0.8",
-    "@angular/platform-browser": "^11.0.8",
-    "@angular/platform-browser-dynamic": "^11.0.8",
-    "tslib": "^2.0.0",
+    "@angular/common": "^12.0.3",
+    "@angular/core": "^12.0.3",
+    "@angular/compiler": "^12.0.3",
+    "@angular/animations": "^12.0.3",
+    "@angular/forms": "^12.0.3",
+    "@angular/platform-browser": "^12.0.3",
+    "@angular/platform-browser-dynamic": "^12.0.3",
+    "tslib": "^2.2.0",
     "typescript-collections": "~1.3.3",
-    "@angular/router": "^11.0.8",
+    "@angular/router": "^12.0.3",
     "core-js": "^2.5.4",
     "rxjs": "^6.5.4",
-    "zone.js": "~0.10.3"
+    "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@angular/compiler-cli": "^11.0.8",
-    "@angular-devkit/architect": "^0.1100.6",
-    "@angular-devkit/build-angular": "~0.1100.6",
-    "@angular/language-service": "^11.0.8",
-    "@angular-eslint/builder": "^0.8.0-beta.0",
-    "@angular-eslint/eslint-plugin": "^0.8.0-beta.0",
-    "@angular-eslint/eslint-plugin-template": "^0.8.0-beta.0",
-    "@angular-eslint/schematics": "^0.8.0-beta.0",
-    "@angular-eslint/template-parser": "^0.8.0-beta.0",
-    "@typescript-eslint/parser": "^4.3.0",
-    "@typescript-eslint/eslint-plugin": "^4.7.0",
+    "@angular/compiler-cli": "^12.0.3",
+    "@angular-devkit/architect": "^0.1200.3",
+    "@angular-devkit/build-angular": "~12.0.3",
+    "@angular/language-service": "^12.0.3",
+    "@angular-eslint/builder": "^12.0.0",
+    "@angular-eslint/eslint-plugin": "^12.0.0",
+    "@angular-eslint/eslint-plugin-template": "^12.0.0",
+    "@angular-eslint/schematics": "^12.0.0",
+    "@angular-eslint/template-parser": "^12.0.0",
+    "@typescript-eslint/parser": "^4.23.0",
+    "@typescript-eslint/eslint-plugin": "^4.23.0",
     "eslint": "^7.13.0",
-    "ng-packagr": "^11.0.3",
-    "typescript": "~4.0.5",
-    "@angular/cli": "~11.0.6",
-    "@types/d3": "^5.0.0",
+    "ng-packagr": "^12.0.3",
+    "typescript": "~4.2.4",
+    "@angular/cli": "~12.0.3",
+    "@types/d3": "^5.16.0",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
-    "karma": "~5.1.1",
+    "karma": "~6.3.3",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",

projects/kypo2-topology-graph-model/package.json

 {
   "name": "@muni-kypo-crp/topology-model",
-  "version": "11.0.1",
+  "version": "12.0.0",
   "peerDependencies": {
-    "@angular/common": "~11.0.8",
-    "@angular/core": "~11.0.8",
+    "@angular/common": "^12.0.3",
+    "@angular/core": "^12.0.3",
     "typescript-collections": "~1.3.3"
   },
   "dependencies": {
-    "tslib": "^2.0.0"
+    "tslib": "^2.2.0"
   }
 }

projects/kypo2-topology-graph-model/src/test.ts

@@ -3,8 +3,8 @@
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 import 'core-js/es7/reflect';
-import 'zone.js/dist/zone';
-import 'zone.js/dist/zone-testing';
+import 'zone.js';
+import 'zone.js/testing';
 
 declare const require: any;
 

projects/kypo2-topology-graph-model/tsconfig.lib.prod.json

@@ -4,6 +4,6 @@
     "declarationMap": false
   },
   "angularCompilerOptions": {
-    "enableIvy": false
+    "compilationMode": "partial"
   }
-}
\ No newline at end of file
+}

src/environments/environment.ts

 // This file can be replaced during build by using the `fileReplacements` array.
-// `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
+// `ng build --configuration production` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
 export const environment = {
@@ -12,4 +12,4 @@ export const environment = {
  * import the following file, but please comment it out in production mode
  * because it will have performance impact when throw error
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

src/polyfills.ts

@@ -55,7 +55,7 @@
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone'; // Included with Angular CLI.
+import 'zone.js'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS

src/test.ts

 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';