|
|
@ -38,7 +38,7 @@ |
|
|
|
dependencies: |
|
|
|
"@babel/highlight" "7.0.0-beta.42" |
|
|
|
|
|
|
|
"@babel/core@^7.0.0-beta.40", "@babel/core@^7.0.0-beta.42": |
|
|
|
"@babel/core@^7.0.0-beta.42": |
|
|
|
version "7.0.0-beta.42" |
|
|
|
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-beta.42.tgz#b3a838fddbd19663369a0b4892189fd8d3f82001" |
|
|
|
dependencies: |
|
|
@ -905,8 +905,6 @@ |
|
|
|
lodash "^4.2.0" |
|
|
|
to-fast-properties "^2.0.0" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
"@babel/types@7.0.0-beta.42": |
|
|
|
version "7.0.0-beta.42" |
|
|
|
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.42.tgz#1e2118767684880f6963801b272fd2b3348efacc" |
|
|
@ -915,7 +913,6 @@ |
|
|
|
lodash "^4.2.0" |
|
|
|
to-fast-properties "^2.0.0" |
|
|
|
|
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
"@ledgerhq/currencies@^4.7.3": |
|
|
|
version "4.7.3" |
|
|
|
resolved "https://registry.yarnpkg.com/@ledgerhq/currencies/-/currencies-4.7.3.tgz#0e28c0f1c74cf00b990be6865fbec374f808b71f" |
|
|
@ -1356,11 +1353,6 @@ app-builder-bin-linux@1.7.2: |
|
|
|
version "1.7.2" |
|
|
|
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.7.2.tgz#a764c8e52ecf1b5b068f32c820c6daf1ffed6a8f" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
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.2: |
|
|
|
version "1.8.2" |
|
|
|
resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.2.tgz#ea3290e8806099f686a859bfae6e94b136f0daeb" |
|
|
@ -1368,17 +1360,11 @@ app-builder-bin-linux@1.8.2: |
|
|
|
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" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
|
|
|
|
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" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
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.2: |
|
|
|
version "1.8.2" |
|
|
|
resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.2.tgz#15e96ae41604346efc3c3864e7da0f40200bd4e5" |
|
|
@ -1386,17 +1372,11 @@ app-builder-bin-mac@1.8.2: |
|
|
|
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" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
|
|
|
|
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" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
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.2: |
|
|
|
version "1.8.2" |
|
|
|
resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.2.tgz#5cf9a7a1d07eb75b03367f8ea80efc456746515e" |
|
|
@ -1404,7 +1384,6 @@ app-builder-bin-win@1.8.2: |
|
|
|
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" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
|
|
|
|
app-builder-bin@1.7.2: |
|
|
|
version "1.7.2" |
|
|
@ -1414,15 +1393,6 @@ app-builder-bin@1.7.2: |
|
|
|
app-builder-bin-mac "1.7.2" |
|
|
|
app-builder-bin-win "1.7.2" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
app-builder-bin@1.8.1: |
|
|
|
version "1.8.1" |
|
|
|
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.1.tgz#12c795c5203e59c6927816b2429b340667f634e8" |
|
|
|
optionalDependencies: |
|
|
|
app-builder-bin-linux "1.8.1" |
|
|
|
app-builder-bin-mac "1.8.1" |
|
|
|
app-builder-bin-win "1.8.1" |
|
|
|
======= |
|
|
|
app-builder-bin@1.8.2: |
|
|
|
version "1.8.2" |
|
|
|
resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.2.tgz#a81602e75d1616c80ce29a77762617cbf293c593" |
|
|
@ -1438,7 +1408,6 @@ app-builder-bin@1.8.3: |
|
|
|
app-builder-bin-linux "1.8.3" |
|
|
|
app-builder-bin-mac "1.8.3" |
|
|
|
app-builder-bin-win "1.8.3" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
|
|
|
|
app-root-path@^2.0.1: |
|
|
|
version "2.0.1" |
|
|
@ -1707,10 +1676,6 @@ babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: |
|
|
|
esutils "^2.0.2" |
|
|
|
js-tokens "^3.0.2" |
|
|
|
|
|
|
|
babel-core@7.0.0-bridge.0: |
|
|
|
version "7.0.0-bridge.0" |
|
|
|
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" |
|
|
|
|
|
|
|
babel-core@^6.0.0, babel-core@^6.26.0: |
|
|
|
version "6.26.0" |
|
|
|
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" |
|
|
@ -1735,6 +1700,10 @@ babel-core@^6.0.0, babel-core@^6.26.0: |
|
|
|
slash "^1.0.0" |
|
|
|
source-map "^0.5.6" |
|
|
|
|
|
|
|
babel-core@^7.0.0-0: |
|
|
|
version "7.0.0-bridge.0" |
|
|
|
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece" |
|
|
|
|
|
|
|
babel-eslint@^8.2.1: |
|
|
|
version "8.2.2" |
|
|
|
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b" |
|
|
@ -3125,15 +3094,6 @@ buffers@~0.1.1: |
|
|
|
version "0.1.1" |
|
|
|
resolved "https://registry.yarnpkg.com/buffers/-/buffers-0.1.1.tgz#b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb" |
|
|
|
|
|
|
|
builder-util-runtime@4.0.5, builder-util-runtime@^4.0.5: |
|
|
|
version "4.0.5" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.0.5.tgz#5340cf9886b9283ea6e5b20dc09b5e3e461aef62" |
|
|
|
dependencies: |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
debug "^3.1.0" |
|
|
|
fs-extra-p "^4.5.0" |
|
|
|
sax "^1.2.4" |
|
|
|
|
|
|
|
builder-util-runtime@4.1.0: |
|
|
|
version "4.1.0" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.1.0.tgz#7dcd042d555d2f161a5538d7a0ea8c292daa0683" |
|
|
@ -3143,11 +3103,7 @@ builder-util-runtime@4.1.0: |
|
|
|
fs-extra-p "^4.5.2" |
|
|
|
sax "^1.2.4" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
builder-util-runtime@^4.1.0, builder-util-runtime@^4.2.0, builder-util-runtime@~4.2.0: |
|
|
|
======= |
|
|
|
builder-util-runtime@4.2.0, builder-util-runtime@^4.1.0, builder-util-runtime@^4.2.0, builder-util-runtime@~4.2.0: |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
version "4.2.0" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-4.2.0.tgz#c56aa18d34390143da031c418c9d3a055fbd3522" |
|
|
|
dependencies: |
|
|
@ -3156,25 +3112,6 @@ builder-util-runtime@4.2.0, builder-util-runtime@^4.1.0, builder-util-runtime@^4 |
|
|
|
fs-extra-p "^4.5.2" |
|
|
|
sax "^1.2.4" |
|
|
|
|
|
|
|
builder-util@5.6.5, builder-util@^5.6.5: |
|
|
|
version "5.6.5" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.5.tgz#f2d156541b8df9599456848e057566443dc04c82" |
|
|
|
dependencies: |
|
|
|
"7zip-bin" "~3.1.0" |
|
|
|
app-builder-bin "1.7.2" |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util-runtime "^4.0.5" |
|
|
|
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.3" |
|
|
|
stat-mode "^0.2.2" |
|
|
|
temp-file "^3.1.1" |
|
|
|
|
|
|
|
builder-util@5.6.7: |
|
|
|
version "5.6.7" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.6.7.tgz#662ff2ba4f70416ee0c085126f16af48fbf97900" |
|
|
@ -3194,14 +3131,6 @@ builder-util@5.6.7: |
|
|
|
stat-mode "^0.2.2" |
|
|
|
temp-file "^3.1.1" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
builder-util@^5.6.7: |
|
|
|
version "5.7.2" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.2.tgz#049b4365993f34519c9d56589494cda2257b24d3" |
|
|
|
dependencies: |
|
|
|
"7zip-bin" "~3.1.0" |
|
|
|
app-builder-bin "1.8.1" |
|
|
|
======= |
|
|
|
builder-util@5.7.3: |
|
|
|
version "5.7.3" |
|
|
|
resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.3.tgz#c7150e3a2bd439bd6e29a6b51bcb042001bf131b" |
|
|
@ -3227,7 +3156,6 @@ builder-util@^5.6.7, builder-util@^5.7.0, builder-util@^5.7.3: |
|
|
|
dependencies: |
|
|
|
"7zip-bin" "~3.1.0" |
|
|
|
app-builder-bin "1.8.3" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util-runtime "^4.2.0" |
|
|
|
chalk "^2.3.2" |
|
|
@ -4641,19 +4569,6 @@ dijkstrajs@^1.0.1: |
|
|
|
version "1.0.1" |
|
|
|
resolved "https://registry.yarnpkg.com/dijkstrajs/-/dijkstrajs-1.0.1.tgz#d3cd81221e3ea40742cfcde556d4e99e98ddc71b" |
|
|
|
|
|
|
|
dmg-builder@4.1.2: |
|
|
|
version "4.1.2" |
|
|
|
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.2.tgz#b4d7245dc2e91812395b4268b12f888443ba5f30" |
|
|
|
dependencies: |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util "^5.6.5" |
|
|
|
electron-builder-lib "~20.5.0" |
|
|
|
fs-extra-p "^4.5.2" |
|
|
|
iconv-lite "^0.4.19" |
|
|
|
js-yaml "^3.11.0" |
|
|
|
parse-color "^1.0.0" |
|
|
|
sanitize-filename "^1.6.1" |
|
|
|
|
|
|
|
dmg-builder@4.1.3: |
|
|
|
version "4.1.3" |
|
|
|
resolved "https://registry.yarnpkg.com/dmg-builder/-/dmg-builder-4.1.3.tgz#d336cf398fd331b2dedd7efae4b51b9bfe00aa1c" |
|
|
@ -4844,64 +4759,6 @@ ejs@^2.5.7: |
|
|
|
version "2.5.7" |
|
|
|
resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a" |
|
|
|
|
|
|
|
electron-builder-lib@20.6.2: |
|
|
|
version "20.6.2" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.6.2.tgz#34f38b6172c05f90d34b6b5ed2f2b6922e731a39" |
|
|
|
dependencies: |
|
|
|
"7zip-bin" "~3.1.0" |
|
|
|
app-builder-bin "1.7.2" |
|
|
|
async-exit-hook "^2.0.1" |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util "5.6.7" |
|
|
|
builder-util-runtime "4.1.0" |
|
|
|
chromium-pickle-js "^0.2.0" |
|
|
|
debug "^3.1.0" |
|
|
|
ejs "^2.5.7" |
|
|
|
electron-osx-sign "0.4.10" |
|
|
|
electron-publish "20.6.1" |
|
|
|
fs-extra-p "^4.5.2" |
|
|
|
hosted-git-info "^2.6.0" |
|
|
|
is-ci "^1.1.0" |
|
|
|
isbinaryfile "^3.0.2" |
|
|
|
js-yaml "^3.11.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" |
|
|
|
|
|
|
|
electron-builder-lib@~20.5.0: |
|
|
|
version "20.5.1" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.5.1.tgz#c155345c58d25580d316f6437c251a57e8e92d62" |
|
|
|
dependencies: |
|
|
|
"7zip-bin" "~3.1.0" |
|
|
|
app-builder-bin "1.7.2" |
|
|
|
async-exit-hook "^2.0.1" |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util "5.6.5" |
|
|
|
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.10" |
|
|
|
electron-publish "20.5.0" |
|
|
|
fs-extra-p "^4.5.2" |
|
|
|
hosted-git-info "^2.6.0" |
|
|
|
is-ci "^1.1.0" |
|
|
|
isbinaryfile "^3.0.2" |
|
|
|
js-yaml "^3.11.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" |
|
|
|
|
|
|
|
electron-builder-lib@20.8.0: |
|
|
|
version "20.8.0" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-builder-lib/-/electron-builder-lib-20.8.0.tgz#6bed39a8077594827e2cc8bc7c8ad0adbabe18f0" |
|
|
@ -4960,32 +4817,7 @@ electron-builder-lib@~20.6.2: |
|
|
|
semver "^5.5.0" |
|
|
|
temp-file "^3.1.1" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
electron-builder@^20.6.2: |
|
|
|
version "20.6.2" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.6.2.tgz#40e1d44910ce99c4c0e9200f0b4a18d15d0d00a4" |
|
|
|
======= |
|
|
|
electron-builder@^20.0.4: |
|
|
|
version "20.5.1" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.5.1.tgz#8e6fba76dcd65aeabab60f15bd46f294ee04dd11" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
dependencies: |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util "5.6.7" |
|
|
|
builder-util-runtime "4.1.0" |
|
|
|
chalk "^2.3.2" |
|
|
|
dmg-builder "4.1.2" |
|
|
|
electron-builder-lib "20.6.2" |
|
|
|
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" |
|
|
|
|
|
|
|
electron-builder@^20.8.0: |
|
|
|
electron-builder@^20.0.4, electron-builder@^20.8.0: |
|
|
|
version "20.8.0" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-builder/-/electron-builder-20.8.0.tgz#9f7067dc8a3aa9451d08e0231066556d39d0ffef" |
|
|
|
dependencies: |
|
|
@ -5056,18 +4888,6 @@ electron-osx-sign@0.4.10: |
|
|
|
minimist "^1.2.0" |
|
|
|
plist "^2.1.0" |
|
|
|
|
|
|
|
electron-publish@20.5.0: |
|
|
|
version "20.5.0" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.5.0.tgz#bcef9949c63899d34680e89110e8d38d1016f1f6" |
|
|
|
dependencies: |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util "^5.6.5" |
|
|
|
builder-util-runtime "^4.0.5" |
|
|
|
chalk "^2.3.2" |
|
|
|
fs-extra-p "^4.5.2" |
|
|
|
lazy-val "^1.0.3" |
|
|
|
mime "^2.2.0" |
|
|
|
|
|
|
|
electron-publish@20.6.1: |
|
|
|
version "20.6.1" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.6.1.tgz#1bc8497fc9370f8e39c9212ce0b5857ef1d666fd" |
|
|
@ -5080,8 +4900,6 @@ electron-publish@20.6.1: |
|
|
|
lazy-val "^1.0.3" |
|
|
|
mime "^2.2.0" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
electron-publish@20.8.0: |
|
|
|
version "20.8.0" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-publish/-/electron-publish-20.8.0.tgz#c608c87b4d2e787fdc5c3430417bf8412ac62498" |
|
|
@ -5094,7 +4912,6 @@ electron-publish@20.8.0: |
|
|
|
lazy-val "^1.0.3" |
|
|
|
mime "^2.2.0" |
|
|
|
|
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
electron-rebuild@^1.7.3: |
|
|
|
version "1.7.3" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.7.3.tgz#24ae06ad9dd61cb7e4d688961f49118c40a110eb" |
|
|
@ -5120,11 +4937,6 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30: |
|
|
|
version "1.3.36" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.36.tgz#0eabf71a9ebea9013fb1cc35a390e068624f27e8" |
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
electron-updater@^2.21.3: |
|
|
|
version "2.21.3" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.3.tgz#767bfe6a2a5513cb11c79f94efef6d1ff01fb058" |
|
|
|
======= |
|
|
|
electron-to-chromium@^1.3.40: |
|
|
|
version "1.3.40" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf" |
|
|
@ -5132,7 +4944,6 @@ electron-to-chromium@^1.3.40: |
|
|
|
electron-updater@^2.21.4: |
|
|
|
version "2.21.4" |
|
|
|
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.21.4.tgz#56326defc8072e78e339cc656838ac78e708f50c" |
|
|
|
>>>>>>> Update electron-webpack for use Webpack 4 and Babel 7 |
|
|
|
dependencies: |
|
|
|
bluebird-lst "^1.0.5" |
|
|
|
builder-util-runtime "~4.2.0" |
|
|
@ -5186,7 +4997,7 @@ electron-webpack@^2.0.1: |
|
|
|
webpack-merge "^4.1.2" |
|
|
|
yargs "^11.1.0" |
|
|
|
|
|
|
|
electron@1.8.4: |
|
|
|
electron@1.8.4, electron@^1.8.2: |
|
|
|
version "1.8.4" |
|
|
|
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.4.tgz#cca8d0e6889f238f55b414ad224f03e03b226a38" |
|
|
|
dependencies: |
|
|
@ -8158,6 +7969,9 @@ ledger-test-library@KhalilBellakrid/ledger-test-library-nodejs#7d37482: |
|
|
|
dependencies: |
|
|
|
axios "^0.17.1" |
|
|
|
bindings "^1.3.0" |
|
|
|
electron "^1.8.2" |
|
|
|
electron-builder "^20.0.4" |
|
|
|
electron-rebuild "^1.7.3" |
|
|
|
nan "^2.6.2" |
|
|
|
prebuild-install "^2.2.2" |
|
|
|
|
|
|
@ -11441,7 +11255,7 @@ source-map-support@^0.4.15: |
|
|
|
dependencies: |
|
|
|
source-map "^0.5.6" |
|
|
|
|
|
|
|
source-map-support@^0.5.0, source-map-support@^0.5.3: |
|
|
|
source-map-support@^0.5.0: |
|
|
|
version "0.5.3" |
|
|
|
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" |
|
|
|
dependencies: |
|
|
@ -12378,20 +12192,6 @@ 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" |
|
|
|
dependencies: |
|
|
|
boxen "^1.2.1" |
|
|
|
chalk "^2.0.1" |
|
|
|
configstore "^3.0.0" |
|
|
|
import-lazy "^2.1.0" |
|
|
|
is-installed-globally "^0.1.0" |
|
|
|
is-npm "^1.0.0" |
|
|
|
latest-version "^3.0.0" |
|
|
|
semver-diff "^2.0.0" |
|
|
|
xdg-basedir "^3.0.0" |
|
|
|
|
|
|
|
update-notifier@^2.4.0: |
|
|
|
version "2.4.0" |
|
|
|
resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.4.0.tgz#f9b4c700fbfd4ec12c811587258777d563d8c866" |
|
|
|