From 1cd3907d09014cf93d880baf0edf37b2c6be05e9 Mon Sep 17 00:00:00 2001 From: Jim Posen Date: Sat, 9 Dec 2017 13:31:15 -0800 Subject: [PATCH 1/2] Upgrade grpc to 1.7.3. Fixes https://github.com/grpc/grpc-node/pull/45. --- app/package.json | 2 +- app/yarn.lock | 35 ++++++++++++++++++++--------------- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/app/package.json b/app/package.json index dc68b51d..ba28606b 100644 --- a/app/package.json +++ b/app/package.json @@ -15,7 +15,7 @@ }, "license": "MIT", "dependencies": { - "grpc": "^1.6.6", + "grpc": "^1.7.3", "ps-node": "^0.1.6", "react-icons": "^2.2.5" } diff --git a/app/yarn.lock b/app/yarn.lock index 41c79b2f..42fe3766 100644 --- a/app/yarn.lock +++ b/app/yarn.lock @@ -190,6 +190,10 @@ delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" +detect-libc@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" + ecc-jsbn@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505" @@ -289,15 +293,15 @@ graceful-fs@^4.1.2: version "4.1.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658" -grpc@^1.6.6: - version "1.6.6" - resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.6.6.tgz#2051784f6bd6134681fa2c4b5e75dc82c6c23ffa" +grpc@^1.7.3: + version "1.7.3" + resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.7.3.tgz#c9d034324e2ec8a06cfaa577a044a116f96c8c90" dependencies: arguejs "^0.2.3" - lodash "^4.17.4" - nan "^2.7.0" - node-pre-gyp "^0.6.38" - protobufjs "^5.0.2" + lodash "^4.15.0" + nan "^2.0.0" + node-pre-gyp "^0.6.39" + protobufjs "^5.0.0" har-schema@^1.0.5: version "1.0.5" @@ -428,7 +432,7 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -lodash@^4.17.4: +lodash@^4.15.0: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -476,9 +480,9 @@ ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" -nan@^2.7.0: - version "2.7.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46" +nan@^2.0.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" node-fetch@^1.0.1: version "1.7.2" @@ -487,10 +491,11 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-pre-gyp@^0.6.38: - version "0.6.38" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d" +node-pre-gyp@^0.6.39: + version "0.6.39" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" dependencies: + detect-libc "^1.0.2" hawk "3.1.3" mkdirp "^0.5.1" nopt "^4.0.1" @@ -585,7 +590,7 @@ prop-types@15.5.8: dependencies: fbjs "^0.8.9" -protobufjs@^5.0.2: +protobufjs@^5.0.0: version "5.0.2" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.2.tgz#59748d7dcf03d2db22c13da9feb024e16ab80c91" dependencies: From 61f011a557c364d52b444e85d4348eebf698fc3f Mon Sep 17 00:00:00 2001 From: Jim Posen Date: Sat, 9 Dec 2017 13:32:28 -0800 Subject: [PATCH 2/2] Upgrade electron-devtools-installer. Fixes https://github.com/MarshallOfSound/electron-devtools-installer/pull/64 & https://github.com/LN-Zap/zap-desktop/issues/78. --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e6aea68b..2d99cddc 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "css-loader": "^0.28.3", "electron": "^1.6.10", "electron-builder": "^19.8.0", - "electron-devtools-installer": "^2.2.0", + "electron-devtools-installer": "^2.2.1", "enzyme": "^2.9.1", "enzyme-to-json": "^1.5.1", "eslint": "^4.4.1", diff --git a/yarn.lock b/yarn.lock index 08ae9c50..f27e13af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2923,9 +2923,9 @@ electron-debug@^1.2.0: electron-is-dev "^0.1.0" electron-localshortcut "^2.0.0" -electron-devtools-installer@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.0.tgz#9813e6811afcd69ddca3cae5416db72ea7ecfb6a" +electron-devtools-installer@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/electron-devtools-installer/-/electron-devtools-installer-2.2.1.tgz#0beb73ccbf65cbc4d09e706cebda638f839b8c55" dependencies: "7zip" "0.0.6" cross-unzip "0.0.2"