From 44de22b56c3bbf09a81efda6cf0818481c84f2ab Mon Sep 17 00:00:00 2001 From: Igor Gassmann Date: Thu, 29 Mar 2018 15:23:31 -0400 Subject: [PATCH] chore: upgrade electron --- package.json | 10 +-- src/main/index.js | 2 +- yarn.lock | 177 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 136 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index f8c984853..d6a94d855 100644 --- a/package.json +++ b/package.json @@ -42,12 +42,12 @@ "electron-dl": "^1.11.0", "electron-is-dev": "^0.3.0", "electron-log": "^2.2.12", - "electron-publisher-s3": "^20.2.0", - "electron-updater": "^2.21.0", + "electron-publisher-s3": "^20.8.1", + "electron-updater": "^2.21.4", "electron-window-state": "^4.1.1", "find-process": "^1.1.0", "formik": "^0.10.4", - "keytar-prebuild": "4.0.4", + "keytar": "^4.2.1", "localforage": "^1.5.0", "mixpanel-browser": "^2.17.1", "moment": "^2.20.1", @@ -87,8 +87,8 @@ "decompress": "^4.2.0", "del": "^3.0.0", "devtron": "^1.4.0", - "electron": "1.7.12", - "electron-builder": "^20.7.1", + "electron": "1.7.13", + "electron-builder": "^20.8.1", "electron-devtools-installer": "^2.2.3", "electron-webpack": "^1.13.0", "eslint": "^4.19.0", diff --git a/src/main/index.js b/src/main/index.js index 851922dca..2591e20f6 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -1,6 +1,6 @@ /* eslint-disable no-console */ // Module imports -import keytar from 'keytar-prebuild'; +import keytar from 'keytar'; import SemVer from 'semver'; import findProcess from 'find-process'; import url from 'url'; diff --git a/yarn.lock b/yarn.lock index 5c0aeb3d2..7c473e234 100644 --- a/yarn.lock +++ b/yarn.lock @@ -118,8 +118,8 @@ to-fast-properties "^2.0.0" "@types/node@^7.0.18": - version "7.0.57" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.57.tgz#eed149b2c75cdbd7b9823c3fd64ecddbdc68ed9c" + version "7.0.58" + resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.58.tgz#ae852120137f40a29731a559e48003bd2d5d19f7" "@types/webpack-env@^1.13.5": version "1.13.5" @@ -277,6 +277,14 @@ app-builder-bin-linux@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.1.tgz#10e9d344ff8019dbc708e11eca13db91f36607e2" +app-builder-bin-linux@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.3.tgz#4bf638a7bd29365e5534d2ba554baf1350fb4a87" + +app-builder-bin-linux@1.8.4: + version "1.8.4" + resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.4.tgz#9fa4f4f6af21f147cdedc69279940134c77d297f" + app-builder-bin-mac@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.7.2.tgz#c4ee0d950666c97c12a45ac74ec6396be3357644" @@ -285,6 +293,14 @@ app-builder-bin-mac@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.1.tgz#0f3d8ddb3b502cadeebc6db24593a74cd87138d0" +app-builder-bin-mac@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.3.tgz#8e2c63e9d822fce2eee8db2f9f817d7b68532df7" + +app-builder-bin-mac@1.8.4: + version "1.8.4" + resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.4.tgz#abd35353167b037a15353fe44c84b0b17045d12f" + app-builder-bin-win@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.7.2.tgz#7acac890782f4118f09941b343ba06c56452a6f6" @@ -293,6 +309,14 @@ app-builder-bin-win@1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.1.tgz#866ebd5f724143b8f55d365f88c22e221425fa1d" +app-builder-bin-win@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.3.tgz#3598ec1c523dd197e8bb5dfeab3e2fe70905ae79" + +app-builder-bin-win@1.8.4: + version "1.8.4" + resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.4.tgz#ba5f7a7d8ae48d32c400691b3c45f6f746c27748" + app-builder-bin@1.7.2: version "1.7.2" resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.7.2.tgz#daf67060a6bad8f5f611a0d2876d9db897a83f06" @@ -309,6 +333,22 @@ app-builder-bin@1.8.1: app-builder-bin-mac "1.8.1" app-builder-bin-win "1.8.1" +app-builder-bin@1.8.3: + version "1.8.3" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.3.tgz#902174b5864521e5068fe1d8ae5566633a5b9c44" + optionalDependencies: + app-builder-bin-linux "1.8.3" + app-builder-bin-mac "1.8.3" + app-builder-bin-win "1.8.3" + +app-builder-bin@1.8.4: + version "1.8.4" + resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.4.tgz#ca8fd02209c2e0681de97fdb4c559d93381cc812" + optionalDependencies: + app-builder-bin-linux "1.8.4" + app-builder-bin-mac "1.8.4" + app-builder-bin-win "1.8.4" + app-root-path@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46" @@ -491,9 +531,9 @@ autoprefixer@^6.3.1: postcss "^5.2.16" postcss-value-parser "^3.2.3" -aws-sdk@^2.212.1: - version "2.213.1" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.213.1.tgz#bcbfdf1fd7439a948bf53c46bd90c97b4a64925b" +aws-sdk@^2.214.1: + version "2.216.1" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.216.1.tgz#9dbf964206d722240507cc60d46e8d3bae9c34f0" dependencies: buffer "4.9.1" events "1.1.1" @@ -1569,7 +1609,26 @@ builder-util@5.6.7: stat-mode "^0.2.2" temp-file "^3.1.1" -builder-util@5.7.2, builder-util@^5.6.7, builder-util@^5.7.0, builder-util@^5.7.1: +builder-util@5.7.4: + version "5.7.4" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.4.tgz#d6e9a56e2865f0d0a504a07ea0f8dc35185b4795" + dependencies: + "7zip-bin" "~3.1.0" + app-builder-bin "1.8.3" + bluebird-lst "^1.0.5" + builder-util-runtime "^4.2.0" + chalk "^2.3.2" + debug "^3.1.0" + fs-extra-p "^4.5.2" + is-ci "^1.1.0" + js-yaml "^3.11.0" + lazy-val "^1.0.3" + semver "^5.5.0" + source-map-support "^0.5.4" + stat-mode "^0.2.2" + temp-file "^3.1.1" + +builder-util@^5.6.7, builder-util@^5.7.0: version "5.7.2" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.2.tgz#049b4365993f34519c9d56589494cda2257b24d3" dependencies: @@ -1588,6 +1647,25 @@ builder-util@5.7.2, builder-util@^5.6.7, builder-util@^5.7.0, builder-util@^5.7. stat-mode "^0.2.2" temp-file "^3.1.1" +builder-util@^5.7.4: + version "5.7.5" + resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.5.tgz#58f8d2b7a35445c5fb45bff50b39bbed554c9863" + dependencies: + "7zip-bin" "~3.1.0" + app-builder-bin "1.8.4" + bluebird-lst "^1.0.5" + builder-util-runtime "^4.2.0" + chalk "^2.3.2" + debug "^3.1.0" + fs-extra-p "^4.5.2" + is-ci "^1.1.0" + js-yaml "^3.11.0" + lazy-val "^1.0.3" + semver "^5.5.0" + source-map-support "^0.5.4" + stat-mode "^0.2.2" + temp-file "^3.1.1" + builtin-modules@^1.0.0, builtin-modules@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -2768,21 +2846,25 @@ ejs@^2.5.7: version "2.5.7" resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" -electron-builder-lib@20.7.1: - version "20.7.1" - resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.7.1.tgz#c1d5abe0ed42606dcf92e46d4fdedc09f6d21ee3" +ejs@^2.5.8: + version "2.5.8" + resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.8.tgz#2ab6954619f225e6193b7ac5f7c39c48fefe4380" + +electron-builder-lib@20.8.1: + version "20.8.1" + resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.8.1.tgz#633167c55f183951b031b59261a923968c098073" dependencies: "7zip-bin" "~3.1.0" - app-builder-bin "1.8.1" + app-builder-bin "1.8.3" async-exit-hook "^2.0.1" bluebird-lst "^1.0.5" - builder-util "5.7.2" + builder-util "5.7.4" builder-util-runtime "4.2.0" chromium-pickle-js "^0.2.0" debug "^3.1.0" - ejs "^2.5.7" + ejs "^2.5.8" electron-osx-sign "0.4.10" - electron-publish "20.7.0" + electron-publish "20.8.1" fs-extra-p "^4.5.2" hosted-git-info "^2.6.0" is-ci "^1.1.0" @@ -2826,23 +2908,23 @@ electron-builder-lib@~20.6.2: semver "^5.5.0" temp-file "^3.1.1" -electron-builder@^20.7.1: - version "20.7.1" - resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.7.1.tgz#209eac9892a8f97e9e0ec312e9c50c4e7c0b4758" +electron-builder@^20.8.1: + version "20.8.1" + resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.8.1.tgz#3d19607a7f7d3ee7f3e110a6fc66c720ed1d2cc0" dependencies: bluebird-lst "^1.0.5" - builder-util "5.7.2" + builder-util "5.7.4" builder-util-runtime "4.2.0" chalk "^2.3.2" dmg-builder "4.1.3" - electron-builder-lib "20.7.1" + electron-builder-lib "20.8.1" 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" + update-notifier "^2.4.0" yargs "^11.0.0" electron-devtools-installer@^2.2.3: @@ -2921,26 +3003,26 @@ electron-publish@20.6.1: lazy-val "^1.0.3" mime "^2.2.0" -electron-publish@20.7.0, electron-publish@~20.7.0: - version "20.7.0" - resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.7.0.tgz#1bdc02365b199cd817e635bcd251670a39e014ce" +electron-publish@20.8.1, electron-publish@~20.8.1: + version "20.8.1" + resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.8.1.tgz#ec5730efbda88c6566a47395d433d7b122782675" dependencies: bluebird-lst "^1.0.5" - builder-util "^5.7.1" + builder-util "^5.7.4" builder-util-runtime "^4.2.0" chalk "^2.3.2" fs-extra-p "^4.5.2" lazy-val "^1.0.3" mime "^2.2.0" -electron-publisher-s3@^20.2.0: - version "20.7.0" - resolved "https://registry.yarnpkg.com/electron-publisher-s3/-/electron-publisher-s3-20.7.0.tgz#3c2cc2f8b5959258883d646996e88c276224cb33" +electron-publisher-s3@^20.8.1: + version "20.8.1" + resolved "https://registry.yarnpkg.com/electron-publisher-s3/-/electron-publisher-s3-20.8.1.tgz#cd5ed34597f7c72ec753b6fa881162aa5a99bbbe" dependencies: - aws-sdk "^2.212.1" + aws-sdk "^2.214.1" bluebird-lst "^1.0.5" - builder-util "^5.7.1" - electron-publish "~20.7.0" + builder-util "^5.7.4" + electron-publish "~20.8.1" fs-extra-p "^4.5.2" mime "^2.2.0" @@ -2948,9 +3030,9 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: version "1.3.40" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf" -electron-updater@^2.21.0: - version "2.21.3" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.3.tgz#767bfe6a2a5513cb11c79f94efef6d1ff01fb058" +electron-updater@^2.21.4: + version "2.21.4" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.4.tgz#56326defc8072e78e339cc656838ac78e708f50c" dependencies: bluebird-lst "^1.0.5" builder-util-runtime "~4.2.0" @@ -3012,9 +3094,9 @@ electron-window-state@^4.1.1: jsonfile "^2.2.3" mkdirp "^0.5.1" -electron@1.7.12: - version "1.7.12" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.12.tgz#dcc61a2c1b0c3df25f68b3425379a01abd01190e" +electron@1.7.13: + version "1.7.13" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.13.tgz#10851baec77d686d95812f34425c17e48ac1413f" dependencies: "@types/node" "^7.0.18" electron-download "^3.0.1" @@ -5395,12 +5477,12 @@ jsx-ast-utils@^2.0.0, jsx-ast-utils@^2.0.1: dependencies: array-includes "^3.0.3" -keytar-prebuild@4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/keytar-prebuild/-/keytar-prebuild-4.0.4.tgz#eb6354c68f2b3609dc325ef8709844632652d602" +keytar@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/keytar/-/keytar-4.2.1.tgz#8a06a6577fdf6373e0aa6b112277e63dec77fd12" dependencies: - nan "2.7.0" - prebuild-install "^2.2.2" + nan "2.8.0" + prebuild-install "^2.4.1" killable@^1.0.0: version "1.0.0" @@ -6079,9 +6161,9 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" +nan@2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" nan@^2.3.0, nan@^2.3.2: version "2.10.0" @@ -7016,7 +7098,7 @@ postcss@^6.0.1: source-map "^0.6.1" supports-color "^5.3.0" -prebuild-install@^2.2.2: +prebuild-install@^2.4.1: version "2.5.1" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.1.tgz#0f234140a73760813657c413cdccdda58296b1da" dependencies: @@ -8978,14 +9060,15 @@ upath@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d" -update-notifier@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.3.0.tgz#4e8827a6bb915140ab093559d7014e3ebb837451" +update-notifier@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.4.0.tgz#f9b4c700fbfd4ec12c811587258777d563d8c866" dependencies: boxen "^1.2.1" chalk "^2.0.1" configstore "^3.0.0" import-lazy "^2.1.0" + is-ci "^1.0.10" is-installed-globally "^0.1.0" is-npm "^1.0.0" latest-version "^3.0.0"