Update to Angular6

nokia · Jul 1, 2018 · acdcfe6 · acdcfe6
1 parent 5dca413
commit acdcfe6
Show file tree

Hide file tree

Showing 26 changed files with 2,448 additions and 1,636 deletions.
diff --git a/.angular-cli.json b/.angular-cli.json
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 *.iml
 node_modules
 npm-debug.log
+yarn-error.log
 .npmrc
 dist/
 coverage

diff --git a/angular.json b/angular.json
@@ -0,0 +1,128 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "CloudFlow": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "polyfills": "src/polyfills.ts",
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "CloudFlow:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "CloudFlow:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "CloudFlow:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "karmaConfig": "./karma.conf.js",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [],
+            "styles": [
+              "src/styles.scss"
+            ],
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    },
+    "CloudFlow-e2e": {
+      "root": "",
+      "sourceRoot": "e2e",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "CloudFlow:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "CloudFlow",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "cf",
+      "styleext": "scss"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "cf"
+    }
+  }
+}
diff --git a/karma.conf.js b/karma.conf.js
@@ -4,30 +4,28 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', '@angular/cli'],
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-jasmine-html-reporter'),
       require('karma-coverage-istanbul-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     client:{
       clearContext: false // leave Jasmine Spec Runner output visible in browser
     },
     coverageIstanbulReporter: {
-      reports: [ 'html', 'lcovonly' ],
+      dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ],
       fixWebpackSourcePaths: true
     },
-    angularCli: {
-      environment: 'dev'
-    },
+
     reporters: ['progress', 'kjhtml'],
     port: 9876,
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome'],
+    browsers: ['ChromeHeadless'],
     singleRun: false
   });
 };
diff --git a/package.json b/package.json
@@ -1,72 +1,78 @@
 {
   "name": "CloudFlow",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "license": "Apache-2.0",
+  "private": true,
+  "engines": {
+    "node": "^8.0.0",
+    "yarn": "^1.3.2",
+    "npm": "^5.0.0"
+  },
   "scripts": {
     "ng": "ng",
     "start": "ng serve --ssl --host 0.0.0.0 --port 4200 --publicHost http://0.0.0.0:4200 --disableHostCheck --proxy-config proxy.conf.json",
-    "build": "ng build --aot --prod --output-hashing=bundles",
+    "build": "ng build --aot --prod --output-hashing=bundles --no-progress",
     "test": "ng test",
-    "test-ci": "ng test --singleRun",
-    "test-coverage": "ng test --singleRun --code-coverage --reporters=coverage-istanbul",
-    "lint": "ng lint --type-check",
+    "test-ci": "ng test --watch=false --no-progress",
+    "test-coverage": "ng test --watch-false --code-coverage --reporters=coverage-istanbul",
+    "lint": "ng lint CloudFlow --type-check",
     "e2e": "ng e2e",
     "ci": "npm run lint && npm run test-ci && npm run build"
   },
-  "private": true,
   "dependencies": {
-    "@angular/animations": "5.2.10",
-    "@angular/common": "5.2.10",
-    "@angular/compiler": "5.2.10",
-    "@angular/core": "5.2.10",
-    "@angular/forms": "5.2.10",
-    "@angular/http": "5.2.10",
-    "@angular/platform-browser": "5.2.10",
-    "@angular/platform-browser-dynamic": "5.2.10",
-    "@angular/router": "5.2.10",
-    "@ng-bootstrap/ng-bootstrap": "1.1.2",
-    "angular-oauth2-oidc": "~3.1.0",
+    "@angular/animations": "6.0.7",
+    "@angular/common": "6.0.7",
+    "@angular/compiler": "6.0.7",
+    "@angular/core": "6.0.7",
+    "@angular/forms": "6.0.7",
+    "@angular/http": "6.0.7",
+    "@angular/platform-browser": "6.0.7",
+    "@angular/platform-browser-dynamic": "6.0.7",
+    "@angular/router": "6.0.7",
+    "@ng-bootstrap/ng-bootstrap": "2.2.0",
+    "angular-oauth2-oidc": "~4.0.2",
     "angular-split": "1.0.0-rc.3",
     "awesome-bootstrap-checkbox": "^1.0.1",
-    "bootstrap": "4.1.0",
-    "clipboard": "^1.7.1",
-    "codemirror": "^5.33.0",
-    "core-js": "^2.5.0",
+    "bootstrap": "4.1.1",
+    "codemirror": "^5.39.0",
+    "core-js": "^2.5.7",
     "dagre": "^0.7.4",
     "font-awesome": "^4.7.0",
     "jquery": "^3.2.1",
-    "js-yaml": "^3.9.1",
-    "jsplumb": "2.6.9",
-    "moment": "^2.18.1",
-    "ngx-clipboard": "~10.0.0",
+    "js-yaml": "^3.12.0",
+    "jsplumb": "2.7.9",
+    "moment": "^2.22.2",
+    "ngx-clipboard": "~11.1.1",
     "open-sans-fontface": "^1.4.0",
-    "rxjs": "^5.5.0",
-    "sweetalert2": "^6.11.1",
-    "zone.js": "^0.8.16"
+    "rxjs": "^6.2.1",
+    "rxjs-compat": "^6.2.1",
+    "sweetalert2": "^7.24.4",
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.4",
-    "@angular/compiler-cli": "5.2.10",
-    "@angular/language-service": "5.2.10",
-    "@types/codemirror": "^0.0.55",
+    "@angular-devkit/build-angular": "~0.6.8",
+    "@angular/cli": "^6.0.8",
+    "@angular/compiler-cli": "6.0.7",
+    "@angular/language-service": "6.0.7",
+    "@types/codemirror": "^0.0.57",
     "@types/dagre": "0.7.39",
     "@types/jasmine": "~2.5.53",
     "@types/jquery": "^3.2.11",
-    "@types/js-yaml": "^3.9.0",
-    "@types/node": "^6.0.60",
-    "codelyzer": "~4.0.1",
+    "@types/js-yaml": "^3.11.1",
+    "@types/node": "^8.0.0",
+    "codelyzer": "~4.4.2",
     "dedent-js": "^1.0.1",
-    "jasmine-core": "~2.6.2",
-    "jasmine-spec-reporter": "~4.1.0",
-    "karma": "~1.7.0",
+    "jasmine-core": "~3.1.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~2.0.4",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "~1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.2.1",
-    "karma-jasmine": "~1.1.0",
-    "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.1.2",
-    "ts-node": "~3.2.0",
-    "tslint": "~5.8.0",
-    "typescript": "~2.5.3"
+    "karma-coverage-istanbul-reporter": "^2.0.1",
+    "karma-jasmine": "~1.1.2",
+    "karma-jasmine-html-reporter": "^1.2.0",
+    "protractor": "~5.3.2",
+    "ts-node": "~5.0.1",
+    "tslint": "~5.10.0",
+    "typescript": "~2.7.2"
   }
 }
diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html
@@ -1,7 +1,7 @@
 <div class="modal-header">
   <h4 class="modal-title">
     <img src="assets/icon256.svg" height="32" width="32" class="mr-2" />
-    CloudFlow <small class="text-muted">v0.5.2</small>
+    CloudFlow <small class="text-muted">v0.6.0</small>
   </h4>
   <button type="button" class="close" aria-label="Close" (click)="modal.dismiss('')">
     <span aria-hidden="true">&times;</span>
@@ -13,6 +13,8 @@ <h4 class="modal-title">
   </p>
   <p>
     <small>Copyright (C) 2017-2018 Nokia</small>
-    <a href="http://github.com/nokia/CloudFlow" target="_blank"><i class="fa fa-github" aria-hidden="true"></i></a>
+    <a href="http://github.com/nokia/CloudFlow" target="_blank" rel="noopener noreferrer" title="CloudFlow on Github" style="margin-left: .4em">
+      <i class="fa fa-github" aria-hidden="true"></i>
+    </a>
   </p>
 </div>
diff --git a/src/app/engines/graph/graph.ts b/src/app/engines/graph/graph.ts
@@ -13,7 +13,6 @@ declare module 'jsplumb' {
     }
 
     interface jsPlumbInstance { /*tslint:disable-line */
-        setContainer(p: any): void;
         setZoom(n: number): void;
         getAllConnections(): any[];
         getConnections(p?: any): any[];
@@ -24,7 +23,7 @@ declare module 'jsplumb' {
 export class Graph {
     private static readonly Anchors = ["Bottom", "Top"];
     private static readonly EndpointStyle = {radius: 6, fill: "#456"};
-    private p: jsPlumbInstance = jsPlumb.getInstance() /* jsplumb typings is messed up again */;
+    private p: jsPlumbInstance = jsPlumb.getInstance();
     private zoom: Zoom;
 
     private connectAll(edges: GraphEdge[]) {