Update to angular 6 with rxjs compatibility fix

static/.angular-cli.json

@@ -1,66 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "optCC"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "../public",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "styles.css",
-        "../node_modules/jquery-ui-bundle/jquery-ui.css",
-        "../node_modules/bootstrap/dist/css/bootstrap.min.css"
-      ],
-      "scripts": [
-        "../node_modules/jquery/dist/jquery.js",
-        "../node_modules/bootstrap/dist/js/bootstrap.min.js"
-      ],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts",
-        "e2e": "environments/environment.e2e.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "files": "src/**/*.ts",
-      "project": "src/tsconfig.app.json"
-    },
-    {
-      "files": "src/**/*.ts",
-      "project": "src/tsconfig.spec.json"
-    },
-    {
-      "files": "src/**/*.ts",
-      "project": "e2e/tsconfig.e2e.json"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}

static/angular.json

@@ -0,0 +1,149 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "optCC": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "../public",
+            "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.css",
+              "node_modules/jquery-ui-bundle/jquery-ui.css",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css"
+            ],
+            "scripts": [
+              "node_modules/jquery/dist/jquery.js",
+              "node_modules/bootstrap/dist/js/bootstrap.min.js"
+            ]
+          },
+          "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"
+                }
+              ]
+            },
+            "e2e": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.e2e.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "optCC:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "optCC:build:production"
+            },
+            "e2e": {
+              "browserTarget": "optCC:build:e2e"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "optCC: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": [
+              "node_modules/jquery/dist/jquery.js",
+              "node_modules/bootstrap/dist/js/bootstrap.min.js"
+            ],
+            "styles": [
+              "src/styles.css",
+              "node_modules/jquery-ui-bundle/jquery-ui.css",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css"
+            ],
+            "assets": [
+              "src/assets",
+              "src/favicon.ico"
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    },
+    "optCC-e2e": {
+      "root": "",
+      "sourceRoot": "e2e",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "optCC:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": []
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "optCC",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "css"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}

static/karma.conf.js

@@ -4,33 +4,30 @@
 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-remap-istanbul'),
       require('karma-spec-reporter'),
-      require('@angular/cli/plugins/karma')
+      require('@angular-devkit/build-angular/plugins/karma')
     ],
     files: [
       {pattern: './src/test.ts', watched: false}
     ],
     preprocessors: {
-      './src/test.ts': ['@angular/cli']
+      
     },
     mime: {
       'text/x-typescript': ['ts', 'tsx']
     },
     remapIstanbulReporter: {
-      reports: {
+      dir: require('path').join(__dirname, 'coverage'), reports: {
         html: 'coverage',
         lcovonly: './coverage/coverage.lcov'
       }
     },
-    angularCli: {
+    
-      config: './.angular-cli.json',
-      environment: 'dev'
-    },
     reporters: config.angularCli && config.angularCli.codeCoverage
       ? ['spec', 'karma-remap-istanbul']
       : ['spec'],

static/package.json

@@ -15,47 +15,50 @@
     "e2e": "ng e2e --serve=false"
   },
   "dependencies": {
-    "@angular/animations": "^5.0.0",
+    "@angular/animations": "^6.0.7",
-    "@angular/cdk": "^5.0.0",
+    "@angular/cdk": "^6.0.7",
-    "@angular/cli": "^1.5.0",
+    "@angular/cli": "^6.0.7",
-    "@angular/common": "^5.0.0",
+    "@angular/common": "^6.0.7",
-    "@angular/compiler": "^5.0.0",
+    "@angular/compiler": "^6.0.7",
-    "@angular/compiler-cli": "^5.0.0",
+    "@angular/compiler-cli": "^6.0.7",
-    "@angular/core": "^5.0.0",
+    "@angular/core": "^6.0.7",
-    "@angular/forms": "^5.0.0",
+    "@angular/forms": "^6.0.7",
-    "@angular/http": "^5.0.0",
+    "@angular/http": "^6.0.7",
-    "@angular/material": "^5.0.0",
+    "@angular/material": "^6.0.7",
-    "@angular/platform-browser": "^5.0.0",
+    "@angular/platform-browser": "^6.0.7",
-    "@angular/platform-browser-dynamic": "^5.0.0",
+    "@angular/platform-browser-dynamic": "^6.0.7",
-    "@angular/router": "^5.0.0",
+    "@angular/router": "^6.0.7",
-    "@swimlane/ngx-charts": "^7.1.0",
+    "@swimlane/ngx-charts": "^8.1.0",
-    "@swimlane/ngx-datatable": "^11.0.4",
+    "@swimlane/ngx-datatable": "^13.0.1",
     "bootstrap": "^3.3.7",
     "d3": "^4.11.0",
     "file-saver": "^1.3.8",
     "jquery": "^3.1.0",
     "jquery-ui": "^1.12.0",
     "jquery-ui-bundle": "^1.11.4",
-    "ngx-bootstrap": "^2.0.0-beta.8",
+    "ngx-bootstrap": "^3.0.1",
     "ngx-clipboard": "^8.1.0",
     "ngx-cookie-service": "^1.0.9",
     "ngx-infinite-scroll": "^0.5.2",
+    "rxjs-compat": "^6.2.1",
     "ts-helpers": "^1.1.2",
-    "typescript": "^2.6.1"
+    "typescript": "^2.7.2",
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
     "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.89",
-    "codelyzer": "~2.0.0-beta.1",
+    "codelyzer": "^4.4.2",
     "jasmine-core": "^2.5.2",
     "jasmine-spec-reporter": "^3.2.0",
-    "karma": "^1.5.0",
+    "karma": "^2.0.4",
     "karma-chrome-launcher": "^2.0.0",
     "karma-jasmine": "^1.1.0",
     "karma-spec-reporter": "0.0.30",
-    "protractor": "~5.1.1",
+    "protractor": "^5.3.2",
     "protractor-jasmine2-screenshot-reporter": "^0.3.2",
     "ts-node": "1.2.1",
-    "tslint": "^4.3.0"
+    "tslint": "^5.10.0",
+    "@angular-devkit/build-angular": "~0.6.8"
   }
 }

static/src/tsconfig.spec.json

@@ -11,7 +11,8 @@
     ]
   },
   "files": [
-    "test.ts"
+    "test.ts",
+    "polyfills.ts"
   ],
   "include": [
     "**/*.spec.ts"

static/tslint.json

@@ -13,8 +13,7 @@
     "eofline": true,
     "forin": true,
     "import-blacklist": [
-      true,
+      true
-      "rxjs"
     ],
     "import-spacing": true,
     "indent": [