Skip to content

Commit

Permalink
update electron
Browse files Browse the repository at this point in the history
  • Loading branch information
krystophv committed Sep 28, 2017
1 parent d5c07b9 commit 6da3f2a
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -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"
],
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.4.0
7.9.0
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
33 changes: 26 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1739,6 +1743,14 @@ [email protected], 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"

[email protected], 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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"

[email protected].0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/electron-updater/-/electron-updater-2.10.0.tgz#cf03a34c82270ccc9ee736c736ef766324bcd9d9"
[email protected].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"
Expand All @@ -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"

Expand Down

0 comments on commit 6da3f2a

Please sign in to comment.