LP1626157 Ang6 upgrade

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/.gitignore b/.gitignore
index 62dea57..bfcf501 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -360,3 +360,4 @@ Open-ILS/web/js/ui/default/staff/build/
 Open-ILS/web/js/ui/default/staff/node_modules/
 Open-ILS/web/js/ui/default/staff/bower_components/
 Open-ILS/web/js/ui/default/common/build/
+Open-ILS/web/eg2/

diff --git a/Open-ILS/src/eg2/.angular-cli.json b/Open-ILS/src/eg2/.angular-cli.json
deleted file mode 100644 (file)
index 56fbfef..0000000
--- a/Open-ILS/src/eg2/.angular-cli.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "eg"
-  },
-  "apps": [
-    {
-      "name": "eg",
-      "root": "src",
-      "outDir": "dist",
-      "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"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "src/tsconfig.spec.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json",
-      "exclude": "**/node_modules/**"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}

diff --git a/Open-ILS/src/eg2/angular.json b/Open-ILS/src/eg2/angular.json
new file mode 100644 (file)
index 0000000..ad2ee9d
--- /dev/null
+++ b/Open-ILS/src/eg2/angular.json
@@ -0,0 +1,132 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "eg": {
+      "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.css"
+            ],
+            "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": "eg:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "eg:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "eg: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.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": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "eg-e2e": {
+      "root": "",
+      "sourceRoot": "",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "eg:serve"
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "eg",
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "css"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}
\ No newline at end of file

diff --git a/Open-ILS/src/eg2/karma.conf.js b/Open-ILS/src/eg2/karma.conf.js
index af139fa..84af9d1 100644 (file)
--- a/Open-ILS/src/eg2/karma.conf.js
+++ b/Open-ILS/src/eg2/karma.conf.js
@@ -4,19 +4,19 @@
 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: {

diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json
index 88366df..b6a2ecb 100644 (file)
--- a/Open-ILS/src/eg2/package.json
+++ b/Open-ILS/src/eg2/package.json
@@ -12,27 +12,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "5.2.9",
-    "@angular/common": "5.2.9",
-    "@angular/compiler": "5.2.9",
-    "@angular/core": "5.2.9",
-    "@angular/forms": "5.2.9",
-    "@angular/http": "5.2.9",
-    "@angular/platform-browser": "5.2.9",
-    "@angular/platform-browser-dynamic": "5.2.9",
-    "@angular/router": "5.2.9",
-    "@angular/upgrade": "5.2.9",
+    "@angular/animations": "6.0.1",
+    "@angular/common": "6.0.1",
+    "@angular/compiler": "6.0.1",
+    "@angular/core": "6.0.1",
+    "@angular/forms": "6.0.1",
+    "@angular/http": "6.0.1",
+    "@angular/platform-browser": "6.0.1",
+    "@angular/platform-browser-dynamic": "6.0.1",
+    "@angular/router": "6.0.1",
+    "@angular/upgrade": "6.0.1",
     "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.5",
     "core-js": "^2.4.1",
     "jquery": "^3.2.1",
     "ngx-cookie": "^2.0.1",
-    "rxjs": "^5.5.8",
-    "zone.js": "^0.8.25"
+    "rxjs": "^6.1.0",
+    "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular/cli": "1.7.3",
-    "@angular/compiler-cli": "5.2.9",
-    "@angular/language-service": "5.2.9",
+    "@angular-devkit/build-angular": "~0.6.1",
+    "@angular/cli": "6.0.1",
+    "@angular/compiler-cli": "6.0.1",
+    "@angular/language-service": "6.0.1",
     "@types/jasmine": "~2.5.53",
     "@types/jasminewd2": "~2.0.2",
     "@types/jquery": "^3.2.16",
@@ -48,8 +49,9 @@
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.1.2",
+    "rxjs-compat": "^6.1.0",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
-    "typescript": "2.6.2"
+    "typescript": "2.7.2"
   }
 }

diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
index 6879a14..d5f5e7b 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/catalog/search-form.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, AfterViewInit, Renderer} from '@angular/core';
+import {Component, OnInit, AfterViewInit, Renderer2} from '@angular/core';
 import {EgIdlObject} from '@eg/core/idl.service';
 import {EgOrgService} from '@eg/core/org.service';
 import {EgCatalogService,} from '@eg/share/catalog/catalog.service';
@@ -19,7 +19,7 @@ export class SearchFormComponent implements OnInit, AfterViewInit {
     showAdvancedSearch: boolean = false;
 
     constructor(
-        private renderer: Renderer,
+        private renderer: Renderer2,
         private org: EgOrgService,
         private cat: EgCatalogService,
         private staffCat: StaffCatalogService

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts
index 86e85f3..a8f2107 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bcsearch/bcsearch.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, Renderer} from '@angular/core';
+import {Component, OnInit, Renderer2} from '@angular/core';
 import {ActivatedRoute} from '@angular/router';
 import {EgNetService} from '@eg/core/net.service';
 import {EgAuthService} from '@eg/core/auth.service';
@@ -13,7 +13,7 @@ export class EgBcSearchComponent implements OnInit {
 
     constructor(
         private route: ActivatedRoute,
-        private renderer: Renderer,
+        private renderer: Renderer2,
         private net: EgNetService,
         private auth: EgAuthService
     ) {}

diff --git a/Open-ILS/src/eg2/src/app/staff/login.component.ts b/Open-ILS/src/eg2/src/app/staff/login.component.ts
index d46bb74..c3a62f4 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/login.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/login.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, Renderer} from '@angular/core';
+import {Component, OnInit, Renderer2} from '@angular/core';
 import {Location} from '@angular/common';
 import {Router, ActivatedRoute} from '@angular/router';
 import {EgAuthService, EgAuthWsState} from '@eg/core/auth.service';
@@ -23,7 +23,7 @@ export class EgStaffLoginComponent implements OnInit {
       private router: Router,
       private route: ActivatedRoute,
       private ngLocation: Location,
-      private renderer: Renderer,
+      private renderer: Renderer2,
       private auth: EgAuthService,
       private store: EgStoreService 
     ) {}

diff --git a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.ts b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.ts
index b8832e9..5d0b112 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/op-change/op-change.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, Input, Renderer} from '@angular/core';
+import {Component, OnInit, Input, Renderer2} from '@angular/core';
 import {EgToastService} from '@eg/share/toast/toast.service';               
 import {EgAuthService} from '@eg/core/auth.service';
 import {EgDialogComponent} from '@eg/share/dialog/dialog.component';
@@ -21,7 +21,7 @@ export class EgOpChangeComponent
 
        constructor(
         private modal: NgbModal, // required for passing to parent
-        private renderer: Renderer,
+        private renderer: Renderer2,
         private toast: EgToastService,
         private auth: EgAuthService) {
         super(modal);

diff --git a/Open-ILS/src/eg2/src/app/staff/splash.component.ts b/Open-ILS/src/eg2/src/app/staff/splash.component.ts
index dd0d4f2..190d8c7 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/splash.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/splash.component.ts
@@ -1,4 +1,4 @@
-import {Component, OnInit, Renderer} from '@angular/core';
+import {Component, OnInit, Renderer2} from '@angular/core';
 import {Router} from '@angular/router';
 
 @Component({
@@ -10,7 +10,7 @@ export class EgStaffSplashComponent implements OnInit {
     catSearchQuery: string;
 
     constructor(
-        private renderer: Renderer,
+        private renderer: Renderer2,
         private router: Router
     ) {}
 

diff --git a/Open-ILS/src/eg2/src/tsconfig.spec.json b/Open-ILS/src/eg2/src/tsconfig.spec.json
index 63d89ff..18bad40 100644 (file)
--- a/Open-ILS/src/eg2/src/tsconfig.spec.json
+++ b/Open-ILS/src/eg2/src/tsconfig.spec.json
@@ -11,7 +11,8 @@
     ]
   },
   "files": [
-    "test.ts"
+    "test.ts",
+    "polyfills.ts"
   ],
   "include": [
     "**/*.spec.ts",

diff --git a/Open-ILS/src/eg2/tslint.json b/Open-ILS/src/eg2/tslint.json
index c24dc29..c6773f5 100644 (file)
--- a/Open-ILS/src/eg2/tslint.json
+++ b/Open-ILS/src/eg2/tslint.json
@@ -15,7 +15,6 @@
     "forin": true,
     "import-blacklist": [
       true,
-      "rxjs",
       "rxjs/Rx"
     ],
     "import-spacing": true,