Merge pull request #366 from stratisproject/ui

Update to Angular 5, prepare for electron-builder

Breeze.UI/electron-builder.json

+{
+  "appId": "com.stratisplatform.breeze",
+  "productName": "Breeze Wallet",
+  "mac": {
+    "category": "com.stratisplatform.breeze"
+  },
+  "directories": {
+      "app": "dist",
+      "output": "app-builds"
+  },
+  "win": {
+      "icon": "dist/assets/images/breeze-logo",
+      "target": ["nsis"],
+      "asarUnpack": "assets/daemon/*"
+  },
+  "nsis": {
+    "oneClick": false
+  },
+  "msi": {
+    "warningsAsErrors": false
+  }
+}

Breeze.UI/main.ts

@@ -157,7 +157,8 @@ function startBitcoinApi() {
   //Start Breeze Bitcoin Daemon
   let apiPath = path.resolve(__dirname, 'assets//daemon//Stratis.BreezeD');
   if (os.platform() === 'win32') {
-      apiPath = path.resolve(__dirname, 'assets\\daemon\\Stratis.BreezeD.exe');
+    apiPath = path.resolve(__dirname, 'assets\\daemon\\Stratis.BreezeD.exe');
+    //apiPath = path.resolve(__dirname, '..\\app.asar.unpacked\\assets\\daemon\\Stratis.BreezeD.exe');
   }
 
   if(!testnet) {
@@ -183,7 +184,8 @@ function startStratisApi() {
   //Start Breeze Stratis Daemon
   let apiPath = path.resolve(__dirname, 'assets//daemon//Stratis.BreezeD');
   if (os.platform() === 'win32') {
-      apiPath = path.resolve(__dirname, 'assets\\daemon\\Stratis.BreezeD.exe');
+    apiPath = path.resolve(__dirname, 'assets\\daemon\\Stratis.BreezeD.exe');
+    //apiPath = path.resolve(__dirname, '..\\app.asar.unpacked\\assets\\daemon\\Stratis.BreezeD.exe');
   }
 
   if (!testnet) {

Breeze.UI/package.json

@@ -34,6 +34,7 @@
     "electron:prod": "npm run build:prod && electron ./dist",
     "package:linux": "npm run build:prod && node package.js --platform=linux --arch=x64",
     "package:windows": "npm run build:prod && node package.js --platform=win32 --arch=ia32",
+    "package:winsetup": "npm run build:prod && npx electron-builder build --windows",
     "package:mac": "npm run build:prod && node package.js --platform=darwin --arch=x64",
     "test": "karma start ./karma.conf.js",
     "pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
@@ -41,44 +42,49 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "4.4.5",
-    "@angular/common": "4.4.5",
-    "@angular/compiler": "4.4.5",
-    "@angular/core": "4.4.5",
-    "@angular/forms": "4.4.5",
-    "@angular/http": "4.4.5",
-    "@angular/platform-browser": "4.4.5",
-    "@angular/platform-browser-dynamic": "4.4.5",
-    "@angular/platform-server": "4.4.5",
-    "@angular/router": "4.4.5",
+    "@angular/animations": "5.0.2",
+    "@angular/common": "5.0.2",
+    "@angular/compiler": "5.0.2",
+    "@angular/core": "5.0.2",
+    "@angular/forms": "5.0.2",
+    "@angular/http": "5.0.2",
+    "@angular/platform-browser": "5.0.2",
+    "@angular/platform-browser-dynamic": "5.0.2",
+    "@angular/platform-server": "5.0.2",
+    "@angular/router": "5.0.2",
     "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
     "bootstrap": "4.0.0-beta",
     "core-js": "2.5.1",
     "electron-context-menu": "0.9.1",
     "enhanced-resolve": "3.4.1",
     "ngx-clipboard": "8.1.1",
-    "ngx-bootstrap": "1.9.3",
-    "rxjs": "5.4.3",
+    "ngx-bootstrap": "2.0.0-beta.8",
+    "rxjs": "5.5.2",
     "zone.js": "0.8.18"
   },
   "devDependencies": {
-    "@angular/cli": "1.4.7",
-    "@angular/compiler-cli": "4.4.5",
+    "@angular/cli": "1.5.3",
+    "@angular/compiler-cli": "5.0.2",
+    "@angular/language-service": "5.0.2",
     "@types/core-js": "0.9.36",
     "@types/jasmine": "2.6.0",
     "@types/node": "7.0.7",
-    "autoprefixer": "7.1.5",
-    "codelyzer": "3.2.1",
+    "autoprefixer": "7.1.6",
+    "circular-dependency-plugin": "4.2.1",
+    "codelyzer": "4.0.1",
     "copyfiles": "1.2.0",
-    "cross-env": "5.1.0",
+    "copy-webpack-plugin": "4.2.1",
+    "cross-env": "5.1.1",
     "css-loader": "0.28.7",
     "cssnano": "3.10.0",
     "electron": "1.7.9",
-    "electron-packager": "9.1.0",
+    "electron-builder": "19.45.5",
+    "electron-packager": "10.1.0",
     "electron-reload": "1.2.2",
     "exports-loader": "0.6.4",
     "file-loader": "1.1.5",
     "html-loader": "0.5.1",
+    "html-webpack-plugin": "2.30.1",
     "istanbul-instrumenter-loader": "3.0.0",
     "jasmine-core": "2.8.0",
     "jasmine-spec-reporter": "4.2.1",
@@ -94,23 +100,26 @@
     "less-loader": "4.0.5",
     "minimist": "1.2.0",
     "mkdirp": "0.5.1",
-    "npm-run-all": "4.1.1",
-    "node-sass": "4.5.3",
+    "npm-run-all": "4.1.2",
+    "npx": "9.7.1",
+    "node-sass": "4.7.2",
     "postcss-loader": "2.0.8",
-    "postcss-url": "7.1.2",
+    "postcss-url": "7.2.1",
     "protractor": "5.2.0",
     "raw-loader": "0.5.1",
     "sass-loader": "6.0.6",
     "script-loader": "0.7.2",
-    "source-map-loader": "0.2.2",
+    "source-map-loader": "0.2.3",
     "style-loader": "0.19.0",
     "stylus-loader": "3.0.1",
     "ts-node": "3.3.0",
-    "tslint": "5.7.0",
-    "typescript": "2.5.3",
+    "tslint": "5.8.0",
+    "typescript": "2.6.1",
+    "uglifyjs-webpack-plugin": "1.1.0",
     "url-loader": "0.6.2",
     "webdriver-manager": "12.0.6",
     "webpack": "3.8.1",
-    "webpack-dev-server": "2.9.2"
+    "webpack-concat-plugin": "1.4.2",
+    "webpack-dev-server": "2.9.4"
   }
 }

Breeze.UI/src/environments/environment.prod.ts → Breeze.UI/src/environments/index.prod.ts

 export const environment = {
-  production: true
+  production: true,
+  silent: false
 };

Breeze.UI/src/environments/environment.ts → Breeze.UI/src/environments/index.ts

@@ -4,5 +4,6 @@
 // The list of which env maps to which file can be found in `angular-cli.json`.
 
 export const environment = {
-  production: false
+  production: false,
+  silent: false
 };

Breeze.UI/tsconfig.json

@@ -26,8 +26,7 @@
       "es2016",
       "dom"
     ]
-  }
-  ,
+  },
   "exclude": [
     "node_modules"
   ]