From 6da3f2a313e6be20dfb68a3cd891441c5c31dade Mon Sep 17 00:00:00 2001 From: Chris McGee Date: Thu, 28 Sep 2017 16:13:58 -0400 Subject: [PATCH] update electron --- .babelrc | 2 +- .nvmrc | 2 +- appveyor.yml | 2 +- circle.yml | 6 +++--- package.json | 4 ++-- yarn.lock | 33 ++++++++++++++++++++++++++------- 6 files changed, 34 insertions(+), 15 deletions(-) diff --git a/.babelrc b/.babelrc index 1ad7c353e3..d269c76b7f 100644 --- a/.babelrc +++ b/.babelrc @@ -1,6 +1,6 @@ { "presets": [ - ["env", { "targets": { "node": 7 }, "useBuiltIns": true }], + ["env", { "targets": { "node": "7.9.0", "electron": "1.7.8" }, "useBuiltIns": true }], "stage-0", "react" ], diff --git a/.nvmrc b/.nvmrc index ba7f754d0c..4bc5d61816 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -7.4.0 +7.9.0 diff --git a/appveyor.yml b/appveyor.yml index 5a8bd29c83..1177e9a683 100755 --- a/appveyor.yml +++ b/appveyor.yml @@ -3,7 +3,7 @@ image: Visual Studio 2017 environment: APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z matrix: - - nodejs_version: 7.4.0 + - nodejs_version: 7.9.0 cache: - "%LOCALAPPDATA%\\Yarn" diff --git a/circle.yml b/circle.yml index a070f9083b..916234dea7 100644 --- a/circle.yml +++ b/circle.yml @@ -4,9 +4,9 @@ machine: dependencies: pre: - - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash - - nvm install 7.4.0 - - nvm use 7.4.0 + - curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.4/install.sh | bash + - nvm install 7.9.0 + - nvm use 7.9.0 - curl -o- -L https://yarnpkg.com/install.sh | bash - yarn config set cache-folder ~/.cache/yarn override: diff --git a/package.json b/package.json index e4bd0e0337..e09a47e221 100644 --- a/package.json +++ b/package.json @@ -178,12 +178,12 @@ "d3": "3.5.16", "devtron": "1.4.0", "difflet": "1.0.1", - "electron": "1.6.2", + "electron": "1.7.8", "electron-builder": "19.31.1", "electron-devtools-installer": "2.2.0", "electron-mocha": "4.0.3", "electron-rebuild": "1.6.0", - "electron-updater": "2.10.0", + "electron-updater": "2.10.1", "enzyme": "2.8.2", "eslint": "3.19.0", "eslint-config-airbnb": "14.1.0", diff --git a/yarn.lock b/yarn.lock index a902e5033d..2e1170d832 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,6 +38,10 @@ version "6.0.66" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.66.tgz#5680b74a6135d33d4c00447e7c3dc691a4601625" +"@types/node@^7.0.18": + version "7.0.43" + resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.43.tgz#a187e08495a075f200ca946079c914e1a5fe962c" + "@types/rimraf@^0.0.28": version "0.0.28" resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-0.0.28.tgz#5562519bc7963caca8abf7f128cae3b594d41d06" @@ -1739,6 +1743,14 @@ builder-util-runtime@1.0.5, builder-util-runtime@^1.0.3, builder-util-runtime@^1 debug "^3.0.1" fs-extra-p "^4.4.2" +builder-util-runtime@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/builder-util-runtime/-/builder-util-runtime-1.0.6.tgz#3087c39608470fa1b6ee90a4c565d96bd768c531" + dependencies: + bluebird-lst "^1.0.3" + debug "^3.1.0" + fs-extra-p "^4.4.2" + builder-util@2.0.5, builder-util@^2.0.2, builder-util@^2.0.3, builder-util@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-2.0.5.tgz#ee75a98b38a2aaa60f12290300f06d879bfdef6d" @@ -2640,6 +2652,12 @@ debug@^3.0.0, debug@^3.0.1: dependencies: ms "2.0.0" +debug@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + dependencies: + ms "2.0.0" + debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" @@ -3150,12 +3168,12 @@ electron-to-chromium@^1.3.11, electron-to-chromium@^1.3.18: version "1.3.22" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.22.tgz#4322d52c151406e3eaef74ad02676883e8416418" -electron-updater@2.10.0: - version "2.10.0" - resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.10.0.tgz#cf03a34c82270ccc9ee736c736ef766324bcd9d9" +electron-updater@2.10.1: + version "2.10.1" + resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.10.1.tgz#5763bda9153c08459d7058d9afedccc178b88304" dependencies: bluebird-lst "^1.0.3" - builder-util-runtime "^1.0.3" + builder-util-runtime "^1.0.6" electron-is-dev "^0.3.0" fs-extra-p "^4.4.2" js-yaml "^3.10.0" @@ -3171,10 +3189,11 @@ electron-window@^0.8.0: dependencies: is-electron-renderer "^2.0.0" -electron@1.6.2: - version "1.6.2" - resolved "https://registry.yarnpkg.com/electron/-/electron-1.6.2.tgz#b0ccd7703f86d09c4d2a7273455c3f993f158994" +electron@1.7.8: + version "1.7.8" + resolved "https://registry.yarnpkg.com/electron/-/electron-1.7.8.tgz#27b791a6895171a7d52991b99442cdbd10a3539d" dependencies: + "@types/node" "^7.0.18" electron-download "^3.0.1" extract-zip "^1.0.3"