Unverified Commit a41d68db authored by Pieterjan Vanhoof's avatar Pieterjan Vanhoof Committed by GitHub

Merge pull request #366 from stratisproject/ui

Update to Angular 5, prepare for electron-builder
parents ccafe8c3 5deb9d0f
{
"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
}
}
...@@ -158,6 +158,7 @@ function startBitcoinApi() { ...@@ -158,6 +158,7 @@ function startBitcoinApi() {
let apiPath = path.resolve(__dirname, 'assets//daemon//Stratis.BreezeD'); let apiPath = path.resolve(__dirname, 'assets//daemon//Stratis.BreezeD');
if (os.platform() === 'win32') { 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) { if(!testnet) {
...@@ -184,6 +185,7 @@ function startStratisApi() { ...@@ -184,6 +185,7 @@ function startStratisApi() {
let apiPath = path.resolve(__dirname, 'assets//daemon//Stratis.BreezeD'); let apiPath = path.resolve(__dirname, 'assets//daemon//Stratis.BreezeD');
if (os.platform() === 'win32') { 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) { if (!testnet) {
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
"electron:prod": "npm run build:prod && electron ./dist", "electron:prod": "npm run build:prod && electron ./dist",
"package:linux": "npm run build:prod && node package.js --platform=linux --arch=x64", "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: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", "package:mac": "npm run build:prod && node package.js --platform=darwin --arch=x64",
"test": "karma start ./karma.conf.js", "test": "karma start ./karma.conf.js",
"pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build", "pree2e": "webdriver-manager update --standalone false --gecko false --quiet && npm run build",
...@@ -41,44 +42,49 @@ ...@@ -41,44 +42,49 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "4.4.5", "@angular/animations": "5.0.2",
"@angular/common": "4.4.5", "@angular/common": "5.0.2",
"@angular/compiler": "4.4.5", "@angular/compiler": "5.0.2",
"@angular/core": "4.4.5", "@angular/core": "5.0.2",
"@angular/forms": "4.4.5", "@angular/forms": "5.0.2",
"@angular/http": "4.4.5", "@angular/http": "5.0.2",
"@angular/platform-browser": "4.4.5", "@angular/platform-browser": "5.0.2",
"@angular/platform-browser-dynamic": "4.4.5", "@angular/platform-browser-dynamic": "5.0.2",
"@angular/platform-server": "4.4.5", "@angular/platform-server": "5.0.2",
"@angular/router": "4.4.5", "@angular/router": "5.0.2",
"@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5", "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.5",
"bootstrap": "4.0.0-beta", "bootstrap": "4.0.0-beta",
"core-js": "2.5.1", "core-js": "2.5.1",
"electron-context-menu": "0.9.1", "electron-context-menu": "0.9.1",
"enhanced-resolve": "3.4.1", "enhanced-resolve": "3.4.1",
"ngx-clipboard": "8.1.1", "ngx-clipboard": "8.1.1",
"ngx-bootstrap": "1.9.3", "ngx-bootstrap": "2.0.0-beta.8",
"rxjs": "5.4.3", "rxjs": "5.5.2",
"zone.js": "0.8.18" "zone.js": "0.8.18"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "1.4.7", "@angular/cli": "1.5.3",
"@angular/compiler-cli": "4.4.5", "@angular/compiler-cli": "5.0.2",
"@angular/language-service": "5.0.2",
"@types/core-js": "0.9.36", "@types/core-js": "0.9.36",
"@types/jasmine": "2.6.0", "@types/jasmine": "2.6.0",
"@types/node": "7.0.7", "@types/node": "7.0.7",
"autoprefixer": "7.1.5", "autoprefixer": "7.1.6",
"codelyzer": "3.2.1", "circular-dependency-plugin": "4.2.1",
"codelyzer": "4.0.1",
"copyfiles": "1.2.0", "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", "css-loader": "0.28.7",
"cssnano": "3.10.0", "cssnano": "3.10.0",
"electron": "1.7.9", "electron": "1.7.9",
"electron-packager": "9.1.0", "electron-builder": "19.45.5",
"electron-packager": "10.1.0",
"electron-reload": "1.2.2", "electron-reload": "1.2.2",
"exports-loader": "0.6.4", "exports-loader": "0.6.4",
"file-loader": "1.1.5", "file-loader": "1.1.5",
"html-loader": "0.5.1", "html-loader": "0.5.1",
"html-webpack-plugin": "2.30.1",
"istanbul-instrumenter-loader": "3.0.0", "istanbul-instrumenter-loader": "3.0.0",
"jasmine-core": "2.8.0", "jasmine-core": "2.8.0",
"jasmine-spec-reporter": "4.2.1", "jasmine-spec-reporter": "4.2.1",
...@@ -94,23 +100,26 @@ ...@@ -94,23 +100,26 @@
"less-loader": "4.0.5", "less-loader": "4.0.5",
"minimist": "1.2.0", "minimist": "1.2.0",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"npm-run-all": "4.1.1", "npm-run-all": "4.1.2",
"node-sass": "4.5.3", "npx": "9.7.1",
"node-sass": "4.7.2",
"postcss-loader": "2.0.8", "postcss-loader": "2.0.8",
"postcss-url": "7.1.2", "postcss-url": "7.2.1",
"protractor": "5.2.0", "protractor": "5.2.0",
"raw-loader": "0.5.1", "raw-loader": "0.5.1",
"sass-loader": "6.0.6", "sass-loader": "6.0.6",
"script-loader": "0.7.2", "script-loader": "0.7.2",
"source-map-loader": "0.2.2", "source-map-loader": "0.2.3",
"style-loader": "0.19.0", "style-loader": "0.19.0",
"stylus-loader": "3.0.1", "stylus-loader": "3.0.1",
"ts-node": "3.3.0", "ts-node": "3.3.0",
"tslint": "5.7.0", "tslint": "5.8.0",
"typescript": "2.5.3", "typescript": "2.6.1",
"uglifyjs-webpack-plugin": "1.1.0",
"url-loader": "0.6.2", "url-loader": "0.6.2",
"webdriver-manager": "12.0.6", "webdriver-manager": "12.0.6",
"webpack": "3.8.1", "webpack": "3.8.1",
"webpack-dev-server": "2.9.2" "webpack-concat-plugin": "1.4.2",
"webpack-dev-server": "2.9.4"
} }
} }
export const environment = { export const environment = {
production: true production: true,
silent: false
}; };
...@@ -4,5 +4,6 @@ ...@@ -4,5 +4,6 @@
// The list of which env maps to which file can be found in `angular-cli.json`. // The list of which env maps to which file can be found in `angular-cli.json`.
export const environment = { export const environment = {
production: false production: false,
silent: false
}; };
...@@ -26,8 +26,7 @@ ...@@ -26,8 +26,7 @@
"es2016", "es2016",
"dom" "dom"
] ]
} },
,
"exclude": [ "exclude": [
"node_modules" "node_modules"
] ]
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment