diff --git a/.gitignore b/.gitignore index 68a5062703f245ef331aa04edc2abc68b91cde27..242dea65d07ec3c8963c09ba80f2b6ebf1a6963a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ yarn.lock node_modules npm-debug.log build +dist docs .build .coverage diff --git a/.travis.yml b/.travis.yml index 7c2624386e1eac87aea23eaf17ce7ff912141fc6..1c110e725c9623b2dff8e95d875b9512b4d47494 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,11 @@ language: node_js +env: + global: + - ELECTRON_CACHE=$HOME/.cache/electron + - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder +os: + - linux + - osx node_js: - "8" cache: @@ -13,3 +20,28 @@ script: - ./scripts/lint.sh - ./scripts/build.sh - ./scripts/push-precompiled.sh + - ./scripts/package.sh +deploy: + - provider: releases + api_key: $GH_TOKEN + draft: true + name: Parity Wallet + file: + - ./dist/parity-wallet_0.1.0_amd64.deb + - ./dist/parity-wallet_0.1.0_amd64.snap + - ./dist/parity-wallet-0.1.0-x86_64.AppImage + skip_cleanup: true + on: + condition: $TRAVIS_OS_NAME = linux + branch: ci-package + - provider: releases + api_key: $GH_TOKEN + draft: true + name: Parity Wallet + file: + - "./dist/Parity Wallet Setup 0.1.0.exe" + - "./dist/Parity Wallet-0.1.0.dmg" + skip_cleanup: true + on: + condition: $TRAVIS_OS_NAME = osx + branch: ci-package diff --git a/assets/icon/small-white-1024x1024.png b/assets/icon/small-white-1024x1024.png new file mode 100644 index 0000000000000000000000000000000000000000..97d5fd1894108b273c1e27902c4efe7f53f9a237 Binary files /dev/null and b/assets/icon/small-white-1024x1024.png differ diff --git a/assets/icon/small-white-512x512.png b/assets/icon/small-white-512x512.png new file mode 100644 index 0000000000000000000000000000000000000000..724a14897dade54dfd8cb963016f9583ee551ef1 Binary files /dev/null and b/assets/icon/small-white-512x512.png differ diff --git a/package-lock.json b/package-lock.json index e4f9778ddb04712448f33304f27dda997dd025c1..fef15942343cc594ac95c27fbb1f1b3f5953ded6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,38 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "7zip-bin": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/7zip-bin/-/7zip-bin-3.1.0.tgz", + "integrity": "sha512-juYJNi8JEpTUWXwz8ssa8Oop4n/kwJ/pIQP22vJAVAe6RTRD+0m+e9LRNnfK2EDaX8uwmUzLNGviFQRD6SxeOw==", + "dev": true, + "requires": { + "7zip-bin-linux": "1.3.1", + "7zip-bin-mac": "1.0.1", + "7zip-bin-win": "2.2.0" + } + }, + "7zip-bin-linux": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/7zip-bin-linux/-/7zip-bin-linux-1.3.1.tgz", + "integrity": "sha512-Wv1uEEeHbTiS1+ycpwUxYNuIcyohU6Y6vEqY3NquBkeqy0YhVdsNUGsj0XKSRciHR6LoJSEUuqYUexmws3zH7Q==", + "dev": true, + "optional": true + }, + "7zip-bin-mac": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/7zip-bin-mac/-/7zip-bin-mac-1.0.1.tgz", + "integrity": "sha1-Pmh3i78JJq3GgVlCcHRQXUdVXAI=", + "dev": true, + "optional": true + }, + "7zip-bin-win": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/7zip-bin-win/-/7zip-bin-win-2.2.0.tgz", + "integrity": "sha512-uPHXapEmUtlUKTBx4asWMlxtFUWXzEY0KVEgU7QKhgO2LJzzM3kYxM6yOyUZTtYE6mhK4dDn3FDut9SCQWHzgg==", + "dev": true, + "optional": true + }, "@parity/abi": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/@parity/abi/-/abi-2.1.3.tgz", @@ -15,9 +47,9 @@ } }, "@parity/api": { - "version": "2.1.15", - "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.1.15.tgz", - "integrity": "sha512-RXh4QjT3uKuir+uxjdduVbrF4llppfSToCJ9Yw6LJ7cn9SyV3LMR0MM9xuQSDLX7DXze1FXNWe1rSFQaG3YLTw==", + "version": "2.1.20", + "resolved": "https://registry.npmjs.org/@parity/api/-/api-2.1.20.tgz", + "integrity": "sha512-kl50p0644oDp13zlsu5VmuhstUa4CrgcZQOV+ybQ8cnXT3eVD743S0a5zC9n8Y4RJbLxHUsM7oDkbTG3cj+/OA==", "requires": { "@parity/abi": "2.1.3", "@parity/jsonrpc": "2.1.5", @@ -30,13 +62,25 @@ "isomorphic-fetch": "2.2.1", "js-sha3": "0.5.5", "lodash": "4.17.4", - "store": "2.0.12" + "store": "2.0.12", + "websocket": "1.0.25" }, "dependencies": { "store": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/store/-/store-2.0.12.tgz", "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM=" + }, + "websocket": { + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.25.tgz", + "integrity": "sha512-M58njvi6ZxVb5k7kpnHh2BvNKuBWiwIYvsToErBzWhvBZYwlEiLcyLrG41T1jRcrY9ettqPYEqduLI7ul54CVQ==", + "requires": { + "debug": "2.6.9", + "nan": "2.8.0", + "typedarray-to-buffer": "3.1.2", + "yaeti": "0.0.6" + } } } }, @@ -48,7 +92,7 @@ "version": "github:js-dist-paritytech/dapp-dapp-methods#01dcabc56ecea95cdc87dde81598b7e8469375d6", "dev": true, "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/mobx": "1.1.2", "@parity/ui": "3.1.4", "mobx": "3.6.1", @@ -203,7 +247,7 @@ "version": "github:js-dist-paritytech/dapp-dapp-visible#14e6499495a3421c4a6da4728b8d99dfa1656e1c", "dev": true, "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/ui": "3.1.4", "mobx": "3.6.1", "mobx-react": "4.3.5", @@ -377,9 +421,9 @@ "version": "github:js-dist-paritytech/dapp-status#ea6a3c01d64bd57c5fadf2264efa719a61e70a29", "dev": true, "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "format-number": "3.0.0", "mobx": "3.6.0", "mobx-react": "4.3.5", @@ -449,7 +493,7 @@ "resolved": "https://registry.npmjs.org/@parity/etherscan/-/etherscan-2.1.3.tgz", "integrity": "sha512-GtQMaE8t7PDOcz/K4Ud+Z6EELB47+qG5V6R7iTJ4DcueXVgiMAXK5OiNeKF3Qjd1/M4FIJdFm5NTSdC7bR38+Q==", "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "bignumber.js": "3.0.1", "es6-promise": "4.1.1", "node-fetch": "1.7.3", @@ -480,7 +524,7 @@ "requires": { "@parity/jsonrpc": "2.1.5", "@parity/ledger": "2.1.2", - "@parity/shared": "2.2.24" + "@parity/shared": "2.2.25" }, "dependencies": { "@parity/jsonrpc": { @@ -494,7 +538,7 @@ "version": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", "requires": { "@parity/mobx": "1.1.2", - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "lodash": "4.17.5", "prop-types": "15.6.1", "react-intl": "2.4.0", @@ -533,7 +577,7 @@ "@parity/plugin-signer-default": { "version": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", "requires": { - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "lodash": "4.17.5", "react-intl": "2.4.0", "semantic-ui-react": "0.78.3" @@ -561,7 +605,7 @@ "@parity/plugin-signer-hardware": { "version": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", "requires": { - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "lodash.pick": "4.4.0", "react-intl": "2.4.0", "semantic-ui-react": "0.78.3" @@ -584,14 +628,14 @@ "@parity/plugin-signer-qr": { "version": "github:parity-js/plugin-signer-qr#c275ba13524e9f6759079fabd10faf49cc00cfc0", "requires": { - "@parity/ui": "3.1.3", + "@parity/ui": "3.1.4", "react-intl": "2.4.0" } }, "@parity/shared": { - "version": "2.2.24", - "resolved": "https://registry.npmjs.org/@parity/shared/-/shared-2.2.24.tgz", - "integrity": "sha512-VR4xOc0sa8J0RW2UPEub88VIYWTbJKUBDI3yxnxwb93BeM2emN3V8/EhNjq6UjHcA63PW5twsyegM+Wjf3++Og==", + "version": "2.2.25", + "resolved": "https://registry.npmjs.org/@parity/shared/-/shared-2.2.25.tgz", + "integrity": "sha512-UhhIh6TWPk6IhvLqgsJ+rfzRgxORqo9ytlIjX7QelVRDgmm4QiERLIQnyriSwx+mblbZq7gAv2pw0PJYLiQWXg==", "requires": { "@parity/ledger": "2.1.2", "eventemitter3": "2.0.3", @@ -643,18 +687,49 @@ "loose-envify": "1.3.1", "symbol-observable": "1.1.0" } + }, + "solc": { + "version": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818", + "requires": { + "memorystream": "0.3.1", + "require-from-string": "1.2.1", + "yargs": "4.8.1" + }, + "dependencies": { + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "2.4.1" + } + } + } } } }, "@parity/ui": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.3.tgz", - "integrity": "sha512-o0fhHqQ+JmI796C0D/SiIVSCwRpw8RAnUBVWsaOogHgNJAoMsWvY9CDtpvlEXjxqWnVQxJWf8SDeiK9TnCleBQ==", + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/@parity/ui/-/ui-3.1.4.tgz", + "integrity": "sha512-aG79IOxMBeRsu92Zlq3QsR6Z6PAmlhmOdU9tQP+F9XB/44Y4sGxfSDNucGucWz/Jz0VGerJn53CoACa4Yj5uYA==", "requires": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/etherscan": "2.1.3", "@parity/mobx": "1.1.2", - "@parity/shared": "2.2.24", + "@parity/shared": "2.2.25", "babel-runtime": "6.26.0", "bignumber.js": "4.1.0", "brace": "0.11.0", @@ -933,6 +1008,38 @@ "normalize-path": "2.1.1" } }, + "app-builder-bin": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-1.5.0.tgz", + "integrity": "sha512-kgxrxZNFwvOBNQCw/6G4lXHuC5nQY/zxTQgpF+lCdiGCa1Swx3F6rjVdYYVhjkKVFComRYb+/d0aj0MH7OBVfw==", + "dev": true, + "requires": { + "app-builder-bin-linux": "1.5.0", + "app-builder-bin-mac": "1.5.0", + "app-builder-bin-win": "1.5.0" + } + }, + "app-builder-bin-linux": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/app-builder-bin-linux/-/app-builder-bin-linux-1.5.0.tgz", + "integrity": "sha512-OJbYW6Qm85LZOk2Vg2ujO+uv6N+QX9Jg5Rid2Juls2L1Nv214lwwQvIzVDmGOotNlW1Pz9/O4wnCtv2pCCx2lw==", + "dev": true, + "optional": true + }, + "app-builder-bin-mac": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/app-builder-bin-mac/-/app-builder-bin-mac-1.5.0.tgz", + "integrity": "sha512-Qv9U3kmqZkkRf8gItlNGDtd+14jwppFP+qEa9Uh1n5avOehaI9yn1hTrq4THzrwqNwQx31/eqjnoyzQf58Ib7Q==", + "dev": true, + "optional": true + }, + "app-builder-bin-win": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/app-builder-bin-win/-/app-builder-bin-win-1.5.0.tgz", + "integrity": "sha512-rhWUnCwWeoELvJ8jsQJRvYSVVyR8UEE7ggOKKoJPHwiMEGRphuef4Ds9EIZRdkvvJ7iXeHWYnSEytkh662rOvg==", + "dev": true, + "optional": true + }, "append-transform": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", @@ -1148,6 +1255,12 @@ "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", "dev": true }, + "async-exit-hook": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/async-exit-hook/-/async-exit-hook-2.0.1.tgz", + "integrity": "sha512-NW2cX8m1Q7KPA7a5M2ULQeZ2wR5qI5PAbw5L0UOMxdioVk9PMZ0h1TmyZEkPYrCvYjDlFICusOu1dlEKAAeXBw==", + "dev": true + }, "asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -1155,9 +1268,19 @@ "dev": true }, "attr-accept": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.0.tgz", - "integrity": "sha1-tc01In8WOTWo8d4Q7T66FpQfa+Y=" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.2.tgz", + "integrity": "sha512-NUj0itVSnpFkUYCj3XKSRCZ7N9gPwWcyX/tF7HosqyDBPMSygALivvJIGI8VvlPcunns5khMkpxoNshvmhy/ZQ==", + "requires": { + "core-js": "2.5.3" + }, + "dependencies": { + "core-js": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.3.tgz", + "integrity": "sha1-isw4NFgk8W2DZbfJtCWRaOjtYD4=" + } + } }, "autoprefixer": { "version": "7.1.6", @@ -2491,6 +2614,15 @@ "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", "dev": true }, + "bluebird-lst": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.5.tgz", + "integrity": "sha512-Ey0bDNys5qpYPhZ/oQ9vOEvD0TYQDTILMXWP2iGfvMg7rSDde+oV4aQQgqRH+CvBFNz2BSDQnPGMUl6LKBUUQA==", + "dev": true, + "requires": { + "bluebird": "3.5.1" + } + }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", @@ -2783,6 +2915,134 @@ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" }, + "builder-util": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-5.6.0.tgz", + "integrity": "sha512-5Enhnnm9gCHjzOUnVqqGjuMlx6pPA36VImQ9wgpRIIyfqLPXLVyWHOYbd0CThm/+GFMWx9xwAUyU6uL93+vwMg==", + "dev": true, + "requires": { + "7zip-bin": "3.1.0", + "app-builder-bin": "1.5.0", + "bluebird-lst": "1.0.5", + "builder-util-runtime": "4.0.5", + "chalk": "2.3.1", + "debug": "3.1.0", + "fs-extra-p": "4.5.2", + "is-ci": "1.1.0", + "js-yaml": "3.10.0", + "lazy-val": "1.0.3", + "semver": "5.5.0", + "source-map-support": "0.5.3", + "stat-mode": "0.2.2", + "temp-file": "3.1.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", + "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "5.2.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz", + "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==", + "dev": true, + "requires": { + "source-map": "0.6.1" + } + }, + "supports-color": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, + "builder-util-runtime": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz", + "integrity": "sha512-NT8AxWH6miZQHnZzaTVjVp1uc6C/mWlxi6GQXKpd4CwyTQd3rT7+poOGrcOhtIiHYCL9VEbRsVfxUAPPsgqJdg==", + "dev": true, + "requires": { + "bluebird-lst": "1.0.5", + "debug": "3.1.0", + "fs-extra-p": "4.5.2", + "sax": "1.2.4" + }, + "dependencies": { + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -3059,6 +3319,12 @@ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, + "chromium-pickle-js": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/chromium-pickle-js/-/chromium-pickle-js-0.2.0.tgz", + "integrity": "sha1-BKEGZywYsIWrd02YPfo+oTjyIgU=", + "dev": true + }, "ci-info": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.2.tgz", @@ -3319,6 +3585,12 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, + "compare-version": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz", + "integrity": "sha1-AWLsLZNR9d3VmpICy6k1NmpyUIA=", + "dev": true + }, "compressible": { "version": "2.0.12", "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.12.tgz", @@ -4328,7 +4600,6 @@ "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, "requires": { "ms": "2.0.0" } @@ -4498,6 +4769,40 @@ "integrity": "sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=", "dev": true }, + "dmg-builder": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-4.1.1.tgz", + "integrity": "sha512-AhRa1J1coSVIUE2KpmievfIA8WI3G1Rxhf7qJYkiR5XWkJYp+6W1Z7vaCabRwEtEYyeJ0M8EdZnFT2BCYxEYVA==", + "dev": true, + "requires": { + "bluebird-lst": "1.0.5", + "builder-util": "5.6.0", + "electron-builder-lib": "20.2.0", + "fs-extra-p": "4.5.2", + "iconv-lite": "0.4.19", + "js-yaml": "3.10.0", + "parse-color": "1.0.0", + "sanitize-filename": "1.6.1" + }, + "dependencies": { + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + } + } + }, "dns-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", @@ -4793,6 +5098,12 @@ "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=", "dev": true }, + "dotenv-expand": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-4.2.0.tgz", + "integrity": "sha1-3vHxyl1gWdJKdm5YeULCEQbOEnU=", + "dev": true + }, "drbg.js": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", @@ -4831,6 +5142,12 @@ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", "dev": true }, + "ejs": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.7.tgz", + "integrity": "sha1-zIcsFoiArjxxiXYv1f/ACJbJUYo=", + "dev": true + }, "ejs-loader": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.3.0.tgz", @@ -4861,21 +5178,326 @@ } } }, - "electron": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2.tgz", - "integrity": "sha512-0TV5Hy92g8ACnPn+PVol6a/2uk+khzmRtWxhah/FcKs6StCytm5hD14QqOdZxEdJN8HljXIVCayN/wJX+0wDiQ==", + "electron": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/electron/-/electron-1.8.2.tgz", + "integrity": "sha512-0TV5Hy92g8ACnPn+PVol6a/2uk+khzmRtWxhah/FcKs6StCytm5hD14QqOdZxEdJN8HljXIVCayN/wJX+0wDiQ==", + "dev": true, + "requires": { + "@types/node": "8.9.1", + "electron-download": "3.3.0", + "extract-zip": "1.6.6" + }, + "dependencies": { + "@types/node": { + "version": "8.9.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.1.tgz", + "integrity": "sha512-4JFGIC1RSoFngVsT5EZcL793/uRi/OJ3ilsp9DQUr4LZOaMhNM1pPrt9TqlXOnXj3h73hl6NF31v87eQAPXYTg==", + "dev": true + } + } + }, + "electron-builder": { + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.2.0.tgz", + "integrity": "sha512-gl+veD9FqunV5oGwBVhoHlHeHbVeXYiLoMw8/Cv3b91gC7XuXHoZ3oGbgaVGgycjm7suW8O6QXYaFujE8osnfw==", + "dev": true, + "requires": { + "bluebird-lst": "1.0.5", + "builder-util": "5.6.0", + "builder-util-runtime": "4.0.5", + "chalk": "2.3.1", + "dmg-builder": "4.1.1", + "electron-builder-lib": "20.2.0", + "electron-download-tf": "4.3.4", + "fs-extra-p": "4.5.2", + "is-ci": "1.1.0", + "lazy-val": "1.0.3", + "read-config-file": "3.0.0", + "sanitize-filename": "1.6.1", + "update-notifier": "2.3.0", + "yargs": "11.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "chalk": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", + "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "5.2.0" + } + }, + "cliui": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz", + "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", + "dev": true, + "requires": { + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "wrap-ansi": "2.1.0" + } + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "electron-download-tf": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/electron-download-tf/-/electron-download-tf-4.3.4.tgz", + "integrity": "sha512-SQYDGMLpTgty1bx3NycuDb7dNPzktVSdK2sqPZjyRocauq/uN/V4S2lcpFVLupaHhKlD8zozm9fTpm5UdohvTg==", + "dev": true, + "requires": { + "debug": "3.1.0", + "env-paths": "1.0.0", + "fs-extra": "4.0.3", + "minimist": "1.2.0", + "nugget": "2.0.1", + "path-exists": "3.0.0", + "rc": "1.2.2", + "semver": "5.4.1", + "sumchecker": "2.0.2" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "sumchecker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz", + "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=", + "dev": true, + "requires": { + "debug": "2.6.9" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "supports-color": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "yargs": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-11.0.0.tgz", + "integrity": "sha512-Rjp+lMYQOWtgqojx1dEWorjCofi1YN7AoFvYV7b1gx/7dAAeuI4kN5SZiEvr0ZmsZTOpDRcCqrpI10L31tFkBw==", + "dev": true, + "requires": { + "cliui": "4.0.0", + "decamelize": "1.2.0", + "find-up": "2.1.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.0", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "2.1.1", + "which-module": "2.0.0", + "y18n": "3.2.1", + "yargs-parser": "9.0.2" + } + }, + "yargs-parser": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-9.0.2.tgz", + "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", + "dev": true, + "requires": { + "camelcase": "4.1.0" + } + } + } + }, + "electron-builder-lib": { + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/electron-builder-lib/-/electron-builder-lib-20.2.0.tgz", + "integrity": "sha512-bHESbb/OjO0F+tyUAj2wFXVDpuXweB5YR94/f7CKqdpd7k2LeYJvy+cYtgtVXt4CJyg5Vs4Kmak2VvDfWxbO/A==", "dev": true, "requires": { - "@types/node": "8.9.1", - "electron-download": "3.3.0", - "extract-zip": "1.6.6" + "7zip-bin": "3.1.0", + "app-builder-bin": "1.5.0", + "async-exit-hook": "2.0.1", + "bluebird-lst": "1.0.5", + "builder-util": "5.6.0", + "builder-util-runtime": "4.0.5", + "chromium-pickle-js": "0.2.0", + "debug": "3.1.0", + "ejs": "2.5.7", + "electron-osx-sign": "0.4.8", + "electron-publish": "20.2.0", + "fs-extra-p": "4.5.2", + "hosted-git-info": "2.5.0", + "is-ci": "1.1.0", + "isbinaryfile": "3.0.2", + "js-yaml": "3.10.0", + "lazy-val": "1.0.3", + "minimatch": "3.0.4", + "normalize-package-data": "2.4.0", + "plist": "2.1.0", + "read-config-file": "3.0.0", + "sanitize-filename": "1.6.1", + "semver": "5.5.0", + "temp-file": "3.1.1" }, "dependencies": { - "@types/node": { - "version": "8.9.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.1.tgz", - "integrity": "sha512-4JFGIC1RSoFngVsT5EZcL793/uRi/OJ3ilsp9DQUr4LZOaMhNM1pPrt9TqlXOnXj3h73hl6NF31v87eQAPXYTg==", + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", "dev": true } } @@ -4927,6 +5549,86 @@ } } }, + "electron-osx-sign": { + "version": "0.4.8", + "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.4.8.tgz", + "integrity": "sha1-8Ln63e2eHlTsNfqJh3tcbDTHvEA=", + "dev": true, + "requires": { + "bluebird": "3.5.1", + "compare-version": "0.1.2", + "debug": "2.6.9", + "isbinaryfile": "3.0.2", + "minimist": "1.2.0", + "plist": "2.1.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, + "electron-publish": { + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.2.0.tgz", + "integrity": "sha512-n8MEDVSYXi8ZC8sHJMoSzTrOrV6X+6cWmyQP4M6nh0RZaLcyPa/txWuHDeRNysvhOKJvgQJrf09Fuc+CMSY6zg==", + "dev": true, + "requires": { + "bluebird-lst": "1.0.5", + "builder-util": "5.6.0", + "builder-util-runtime": "4.0.5", + "chalk": "2.3.1", + "fs-extra-p": "4.5.2", + "lazy-val": "1.0.3", + "mime": "2.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.1.tgz", + "integrity": "sha512-QUU4ofkDoMIVO7hcx1iPTISs88wsO8jA92RQIm4JAwZvFGGAV2hSAA1NX7oVj2Ej2Q6NDTcRDjPTFrMCRZoJ6g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "5.2.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "dev": true + }, + "mime": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.2.0.tgz", + "integrity": "sha512-0Qz9uF1ATtl8RKJG4VRfOymh7PyEor6NbrI/61lRfuRe4vx9SNATrvAeTj2EWVRKjEQGskrzWkJBBY5NbaVHIA==", + "dev": true + }, + "supports-color": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.2.0.tgz", + "integrity": "sha512-F39vS48la4YvTZUPVeTqsjsFNrvcMwrV3RLZINsmHo+7djCvuUzSIeXOnZ5hmjef4bajL1dNccN+tg5XAliO5Q==", + "dev": true, + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "electron-to-chromium": { "version": "1.3.28", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.28.tgz", @@ -5005,6 +5707,12 @@ "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", "dev": true }, + "env-paths": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz", + "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=", + "dev": true + }, "enzyme": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.2.0.tgz", @@ -6363,6 +7071,38 @@ "universalify": "0.1.1" } }, + "fs-extra-p": { + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/fs-extra-p/-/fs-extra-p-4.5.2.tgz", + "integrity": "sha512-ZYqFpBdy9w7PsK+vB30j+TnHOyWHm/CJbUq1qqoE8tb71m6qgk5Wa7gp3MYQdlGFxb9vfznF+yD4jcl8l+y91A==", + "dev": true, + "requires": { + "bluebird-lst": "1.0.5", + "fs-extra": "5.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + } + } + }, "fs-readdir-recursive": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", @@ -8638,8 +9378,7 @@ "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", - "dev": true + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, "is-utf8": { "version": "0.2.1", @@ -8673,6 +9412,12 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "isbinaryfile": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz", + "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=", + "dev": true + }, "isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -9438,6 +10183,9 @@ "verror": "1.10.0" } }, + "jsqr": { + "version": "git+https://github.com/cozmo/jsQR.git#d37c764bf43a41ed7c6aa1c17cbdf21b7f9cb69e" + }, "jsx-ast-utils": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", @@ -9544,6 +10292,12 @@ "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", "dev": true }, + "lazy-val": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz", + "integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg==", + "dev": true + }, "lcid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", @@ -10382,8 +11136,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multicast-dns": { "version": "6.2.1", @@ -11024,6 +11777,23 @@ "pbkdf2": "3.0.14" } }, + "parse-color": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-color/-/parse-color-1.0.0.tgz", + "integrity": "sha1-e3SLlag/A/FqlPU15S1/PZRlhhk=", + "dev": true, + "requires": { + "color-convert": "0.5.3" + }, + "dependencies": { + "color-convert": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz", + "integrity": "sha1-vbbGnOZg+t/+CwAHzER+G59ygr0=", + "dev": true + } + } + }, "parse-entities": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.1.1.tgz", @@ -11212,6 +11982,25 @@ } } }, + "plist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/plist/-/plist-2.1.0.tgz", + "integrity": "sha1-V8zbeggh3yGDEhejytVOPhRqECU=", + "dev": true, + "requires": { + "base64-js": "1.2.0", + "xmlbuilder": "8.2.2", + "xmldom": "0.1.27" + }, + "dependencies": { + "base64-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz", + "integrity": "sha1-o5mS1yNYSBGYK+XikLtqU9hnAPE=", + "dev": true + } + } + }, "plur": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", @@ -13097,7 +13886,7 @@ "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-4.2.3.tgz", "integrity": "sha512-QAXuGDqBUPC0p560pskC3yyS8I1jJUnzvZC0PHrd5NayYBQRD4poQfM1D/bxg4jhUaFU4avNhOB3ehMQd4JMvA==", "requires": { - "attr-accept": "1.1.0", + "attr-accept": "1.1.2", "prop-types": "15.5.10" } }, @@ -13123,14 +13912,14 @@ "requires": { "babel-runtime": "6.26.0", "fbjs": "0.8.16", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "warning": "3.0.0" }, "dependencies": { "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -13231,14 +14020,9 @@ "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-2.0.1.tgz", "integrity": "sha512-J/VuCq/udEqry7Z4nXGTbguetfSdRJr1Cv0lYKbVKIW1blfhB0Xe6OjO+5Th5B8884+s40BDFwtqP67h7YTtYA==", "requires": { - "jsqr": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70", + "jsqr": "git+https://github.com/cozmo/jsQR.git#d37c764bf43a41ed7c6aa1c17cbdf21b7f9cb69e", "prop-types": "15.5.10", "webrtc-adapter": "5.0.6" - }, - "dependencies": { - "jsqr": { - "version": "git+https://github.com/cozmo/jsQR.git#1fb946a235abdc7709f04cd0e4aa316a3b6eae70" - } } }, "react-redux": { @@ -14136,15 +14920,15 @@ "integrity": "sha1-sp2+vd3bBtIbWwiWIWf7nqwYl9g=", "requires": { "lodash": "4.17.4", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "raf": "3.4.0", "react-transition-group": "2.2.1" }, "dependencies": { "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -14191,13 +14975,13 @@ "integrity": "sha1-A38495fD5rG1jSU0zMjCx2r09S0=", "requires": { "classnames": "2.2.5", - "prop-types": "15.6.0" + "prop-types": "15.6.1" }, "dependencies": { "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -14228,6 +15012,64 @@ "pify": "2.3.0" } }, + "read-config-file": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-3.0.0.tgz", + "integrity": "sha512-BVm//hhy9uxRbmeZrKAsUu6MUUNvtwkMrc3t15E79M1lLvg6ivHiwQYIEQK65ZtHCSautbgRY4rD8Z4skRk+4Q==", + "dev": true, + "requires": { + "ajv": "6.2.0", + "ajv-keywords": "3.1.0", + "bluebird-lst": "1.0.5", + "dotenv": "5.0.1", + "dotenv-expand": "4.2.0", + "fs-extra-p": "4.5.2", + "js-yaml": "3.10.0", + "json5": "0.5.1", + "lazy-val": "1.0.3" + }, + "dependencies": { + "ajv": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.2.0.tgz", + "integrity": "sha1-r6wpW7qgFSRJ5SJ0LkVHwa6TKNI=", + "dev": true, + "requires": { + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ajv-keywords": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz", + "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74=", + "dev": true + }, + "dotenv": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz", + "integrity": "sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==", + "dev": true + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + } + } + }, "read-file-stdin": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz", @@ -14332,7 +15174,7 @@ "d3-scale": "1.0.6", "d3-shape": "1.2.0", "lodash": "4.17.4", - "prop-types": "15.6.0", + "prop-types": "15.6.1", "react-resize-detector": "1.1.0", "react-smooth": "1.0.0", "recharts-scale": "0.3.2", @@ -14345,9 +15187,9 @@ "integrity": "sha1-rmh03GaTd4m4B1T/VCjfZoGcpQs=" }, "prop-types": { - "version": "15.6.0", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.0.tgz", - "integrity": "sha1-zq8IMCL8RrSjX2nhPvda7Q1jmFY=", + "version": "15.6.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.1.tgz", + "integrity": "sha512-4ec7bY1Y66LymSUOH/zARVYObB23AT2h8cf6e/O6ZALB/N0sqZFEx7rq6EYPX2MkOdKORuooI/H5k9TlR4q7kQ==", "requires": { "fbjs": "0.8.16", "loose-envify": "1.3.1", @@ -14823,9 +15665,9 @@ } }, "rtcpeerconnection-shim": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.8.tgz", - "integrity": "sha512-5Sx90FGru1sQw9aGOM+kHU4i6mbP8eJPgxliu2X3Syhg8qgDybx8dpDTxUwfJvPnubXFnZeRNl59DWr4AttJKQ==", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/rtcpeerconnection-shim/-/rtcpeerconnection-shim-1.2.9.tgz", + "integrity": "sha512-OoZgZKlK5Vy1wizZorQnpPIWHkScm+70psBLBbtBmTHEuID8I/jnLLYApFAsDL5U9P96s8/+pp9WGBHDeJ+kPw==", "requires": { "sdp": "2.6.0" } @@ -14906,6 +15748,15 @@ } } }, + "sanitize-filename": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/sanitize-filename/-/sanitize-filename-1.6.1.tgz", + "integrity": "sha1-YS2hyWRz+gLczaktzVtKsWSmdyo=", + "dev": true, + "requires": { + "truncate-utf8-bytes": "1.0.2" + } + }, "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", @@ -15526,6 +16377,12 @@ "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=", "dev": true }, + "stat-mode": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz", + "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=", + "dev": true + }, "state-toggle": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.0.tgz", @@ -16203,6 +17060,18 @@ "xtend": "4.0.1" } }, + "temp-file": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/temp-file/-/temp-file-3.1.1.tgz", + "integrity": "sha512-W/6SJgtg2SE/5rxgwUwoDhdSXrvUWQBpgKJglaAe6S7mk1kLkI+LUbY/jPZBu3UhydDJZstNNd7AJhnZ0UZHtw==", + "dev": true, + "requires": { + "async-exit-hook": "2.0.1", + "bluebird-lst": "1.0.5", + "fs-extra-p": "4.5.2", + "lazy-val": "1.0.3" + } + }, "term-size": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", @@ -16412,6 +17281,15 @@ "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.1.tgz", "integrity": "sha1-qf2LA5Swro//guBjOgo2zK1bX4Y=" }, + "truncate-utf8-bytes": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/truncate-utf8-bytes/-/truncate-utf8-bytes-1.0.2.tgz", + "integrity": "sha1-QFkjkJWS1W94pYGENLC3hInKXys=", + "dev": true, + "requires": { + "utf8-byte-length": "1.0.4" + } + }, "tryit": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", @@ -16474,7 +17352,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz", "integrity": "sha1-EBezLZhP9VbroQD1AViauhrOLgQ=", - "dev": true, "requires": { "is-typedarray": "1.0.0" } @@ -16892,6 +17769,12 @@ "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" }, + "utf8-byte-length": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.4.tgz", + "integrity": "sha1-9F8VDExm7uloGGUFq5P8u4rWv2E=", + "dev": true + }, "util": { "version": "0.10.3", "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", @@ -17465,7 +18348,7 @@ "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-5.0.6.tgz", "integrity": "sha512-dh2hPQFOPP0tLEYlFxtGI5vuQmRqkOdYni5wMKUHIx5I2dw0TJ1HdG7P+UechRWt6TvwPWhtbjVNQcQf1KXJmQ==", "requires": { - "rtcpeerconnection-shim": "1.2.8", + "rtcpeerconnection-shim": "1.2.9", "sdp": "2.6.0" } }, @@ -17705,6 +18588,18 @@ "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=", "dev": true }, + "xmlbuilder": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz", + "integrity": "sha1-aSSGc0ELS6QuGmE2VR0pIjNap3M=", + "dev": true + }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=", + "dev": true + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", @@ -17718,8 +18613,7 @@ "yaeti": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", - "dev": true + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" }, "yallist": { "version": "2.1.2", @@ -17781,4 +18675,4 @@ "integrity": "sha1-KOwXzwl0PtyrBW3dixsGJizHPDA=" } } -} +} \ No newline at end of file diff --git a/package.electron.json b/package.electron.json index 6a0afc8a4994e23f270271cd056241d912ee2e6e..937e376e60cf0a41e90486acaa9bb7664a2914ee 100644 --- a/package.electron.json +++ b/package.electron.json @@ -1,14 +1,22 @@ { - "name": "Parity", - "version": "1.9.0", - "main": "electron.js", - "author": "Parity Team ", - "repository": { - "type": "git", - "url": "git+https://github.com/paritytech/parity.git" + "appId": "com.parity.wallet", + "directories": { + "buildResources": "./" }, - "keywords": [ - "Ethereum", - "Parity" - ] -} + "linux": { + "category": "Utility", + "target": [ + "AppImage", + "snap", + "deb" + ] + }, + "mac": { + "category": "public.app-category.productivity", + "icon": "./assets/icon/small-white-512x512.png" + }, + "productName": "Parity Wallet", + "win": { + "icon": "./assets/icon/small-white-512x512.png" + } +} \ No newline at end of file diff --git a/package.json b/package.json index f2536138111d82164f2fe8b4c869d739bf4468a2..416abf24698c2f28c80631ad42a9543f89b16d27 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,12 @@ { - "name": "Parity", - "version": "1.10.0", - "main": "src/index.parity.js", - "jsnext:main": "src/index.parity.js", - "author": "Parity Team ", + "name": "parity-wallet", + "version": "0.1.0", + "main": ".build/electron.js", + "jsnext:main": ".build/electron.js", + "author": { + "name": "Parity Team", + "email": "admin@parity.io" + }, "maintainers": [ "Jaco Greeff", "Nicolas Gotchac" @@ -29,7 +32,7 @@ "ci:build": "cross-env NODE_ENV=production npm run build", "clean": "rimraf ./.build ./.coverage ./.happypack", "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info", - "electron": "npm run build:app && electron .build/", + "electron": "npm run build && electron .build/electron.js", "electron:dev": "electron src/index.electron.js --dev", "lint": "npm run lint:css && npm run lint:js", "lint:cached": "npm run lint:css && npm run lint:js:cached", @@ -39,6 +42,7 @@ "lint:js": "eslint --ignore-path .gitignore ./src/", "lint:js:cached": "eslint --cache --ignore-path .gitignore ./src/", "lint:js:fix": "eslint --fix --ignore-path .gitignore ./src/", + "package": "npm run build && electron-builder --config package.electron.json", "start": "npm run clean && npm install && npm run build:inject && npm run start:app", "start:app": "node webpack/dev.server", "test": "cross-env NODE_ENV=test mocha 'src/**/*.spec.js'", @@ -84,6 +88,7 @@ "css-loader": "0.28.4", "ejs-loader": "0.3.0", "electron": "1.8.2", + "electron-builder": "20.2.0", "empty-module": "0.0.2", "enzyme": "3.2.0", "enzyme-adapter-react-16": "1.1.0", @@ -142,13 +147,13 @@ "yargs": "6.6.0" }, "dependencies": { - "@parity/api": "2.1.15", + "@parity/api": "2.1.20", "@parity/plugin-signer-account": "github:parity-js/plugin-signer-account#3acd84ba1965f9ee419edd04d84e13e097e6d661", "@parity/plugin-signer-default": "github:parity-js/plugin-signer-default#dcf8cf23bb050070b6a691413b974b5c2d7d1ce6", "@parity/plugin-signer-hardware": "github:parity-js/plugin-signer-hardware#e8b8a4e67adc37870e370d22805632d08012b9ee", "@parity/plugin-signer-qr": "github:parity-js/plugin-signer-qr#c275ba13524e9f6759079fabd10faf49cc00cfc0", - "@parity/shared": "2.2.24", - "@parity/ui": "3.1.3", + "@parity/shared": "2.2.25", + "@parity/ui": "3.1.4", "is-electron": "2.1.0", "keythereum": "1.0.2", "lodash.flatten": "4.4.0", @@ -174,4 +179,4 @@ "solc": "ngotchac/solc-js", "store": "1.3.20" } -} +} \ No newline at end of file diff --git a/scripts/package.sh b/scripts/package.sh new file mode 100755 index 0000000000000000000000000000000000000000..8814e68528e04695ee32d953d1267d188ddbd271 --- /dev/null +++ b/scripts/package.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Build binaries with electron +if [ "$TRAVIS_BRANCH" == "ci-package" ]; then + if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then npm run package; fi + if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then npm run package -- --mac --win; fi +fi diff --git a/src/SyncWarning/syncWarning.js b/src/SyncWarning/syncWarning.js index dd5c7f0969430360ab599bd43baf38318403b981..bb25377aa9c348a4cdf9f68eec9720d70882af60 100644 --- a/src/SyncWarning/syncWarning.js +++ b/src/SyncWarning/syncWarning.js @@ -23,7 +23,7 @@ import styles from './syncWarning.css'; function SyncWarning ({ className }, { api }) { const statusStore = StatusIndicator.Store.get(api); - const isOk = !statusStore.nodeHealth.overall || (!statusStore.nodeHealth.overall.isNotReadyYet && statusStore.nodeHealth.overall.status === 'ok'); + const isOk = !statusStore.overall || (!statusStore.overall.isNotReadyYet && statusStore.overall.status === 'ok'); if (isOk) { return null; @@ -33,7 +33,7 @@ function SyncWarning ({ className }, { api }) {
{ - statusStore.nodeHealth.overall.message.map((message) => ( + statusStore.overall.message.map((message) => (

{message}

diff --git a/src/index.electron.js b/src/index.electron.js index 920374788c318cb1319de14b1485edd47ce222ff..0e9c56f57c69e277ae81f59746973af524e5632f 100644 --- a/src/index.electron.js +++ b/src/index.electron.js @@ -20,7 +20,7 @@ const path = require('path'); const pick = require('lodash/pick'); const url = require('url'); -const { app, BrowserWindow, session } = electron; +const { app, BrowserWindow, Menu, session } = electron; let mainWindow; // Will send these variables to renderers via IPC @@ -49,6 +49,56 @@ function createWindow () { ); } + // Create the Application's main menu + // https://github.com/electron/electron/blob/master/docs/api/menu.md#examples + const template = [ + { + label: 'Edit', + submenu: [ + { role: 'cut' }, + { role: 'copy' }, + { role: 'paste' }, + { role: 'delete' }, + { role: 'selectall' } + ] + }, + { + label: 'View', + submenu: [ + { role: 'reload' }, + { role: 'forcereload' }, + { role: 'toggledevtools' }, + { type: 'separator' }, + { role: 'resetzoom' }, + { role: 'zoomin' }, + { role: 'zoomout' }, + { type: 'separator' }, + { role: 'togglefullscreen' } + ] + }, + { + role: 'window', + submenu: [ + { role: 'minimize' }, + { role: 'close' } + ] + }, + { + role: 'help', + submenu: [ + { + label: 'Learn More', + click () { require('electron').shell.openExternal('https://parity.io'); } + } + ] + } + ]; + + const menu = Menu.buildFromTemplate(template); + + Menu.setApplicationMenu(menu); + mainWindow.setAutoHideMenuBar(true); + // WS calls have Origin `file://` by default, which is not trusted. // We override Origin header on all WS connections with an authorized one. session.defaultSession.webRequest.onBeforeSendHeaders({ diff --git a/src/secureApi.js b/src/secureApi.js index 55c7667183a388749ac2c552fb49db1da93fad21..537f4467895b05103c360ceac636b9789f9fe1a8 100644 --- a/src/secureApi.js +++ b/src/secureApi.js @@ -202,10 +202,7 @@ export default class SecureApi extends Api { */ isNodeUp () { return fetch(`${this.protocol()}//${this._wsUrl}/api/ping`, { method: 'HEAD', mode: 'no-cors' }) - .then( - (r) => r.status === 200, - () => false - ) + .then(() => true) .catch(() => false); }