Skip to content

Commit

Permalink
update electron version
Browse files Browse the repository at this point in the history
  • Loading branch information
@kimorkim
kimorkim committed Oct 16, 2017
1 parent fdb0ba9 commit b321013
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 24 deletions.
5 changes: 4 additions & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
"babel-preset-env": "^1.2.1",
"babel-preset-react": "^6.23.0",
"electron-compilers": "^5.5.1",
"electron-prebuilt-compile": "1.6.11",
"electron-prebuilt-compile": "1.7.8",
"electron-rebuild": "^1.6.0",
"mocha": "^2.5.3",
"rebuild": "electron-rebuild -v 1.7.8",
"rimraf": "^2.5.2",
"spectron": "^3.2.3"
},
Expand All @@ -47,6 +49,7 @@
"object.assign": "^4.0.4",
"q": "^1.4.1",
"rxjs": "^5.3.0",
"serialport": "^5.0.0",
"socket.io": "^1.7.3",
"socket.io-client": "^1.7.3",
"tar": "2.2.1",
Expand Down
1 change: 0 additions & 1 deletion src/main/ChildWindowManager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ class ChildWindowManager {

this.hardwareWindow.setMenu(null);
this.hardwareWindow.setMenuBarVisibility(false);
console.log(path.join(__dirname, 'entry-hw', 'app', 'index.html'));
this.hardwareWindow.loadURL('file:///' + path.join(__dirname, '..', 'renderer', 'bower_components', 'entry-hw', 'app', 'index.html'));
this.hardwareWindow.on('closed', ()=> {
this.hardwareWindow = null;
Expand Down
133 changes: 111 additions & 22 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1235,6 +1235,10 @@ binary@^0.3.0:
buffers "~0.1.1"
chainsaw "~0.1.0"

[email protected]:
version "1.3.0"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"

bindings@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11"
Expand Down Expand Up @@ -1566,7 +1570,7 @@ [email protected], commander@~2.8.1:
dependencies:
graceful-readlink ">= 1.0.0"

commander@^2.9.0:
commander@^2.11.0, commander@^2.9.0:
version "2.11.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"

Expand Down Expand Up @@ -1879,6 +1883,12 @@ [email protected]:
dependencies:
ms "0.7.2"

debug@^2.6.6:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
dependencies:
ms "2.0.0"

debug@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
Expand Down Expand Up @@ -2273,15 +2283,15 @@ electron-packager@^8.5.2:
sanitize-filename "^1.6.0"
semver "^5.3.0"

electron-prebuilt-compile@1.6.11:
version "1.6.11"
resolved "https://registry.yarnpkg.com/electron-prebuilt-compile/-/electron-prebuilt-compile-1.6.11.tgz#277beb1d8ffcff4a69b79e5e58f39c3ba46a98da"
electron-prebuilt-compile@1.7.8:
version "1.7.8"
resolved "https://registry.yarnpkg.com/electron-prebuilt-compile/-/electron-prebuilt-compile-1.7.8.tgz#f3a1ac4c56e98d4706ed4c7fd8ff551b1be000b4"
dependencies:
babel-plugin-array-includes "^2.0.3"
babel-plugin-transform-async-to-generator "^6.8.0"
babel-preset-es2016-node5 "^1.1.2"
babel-preset-react "^6.11.1"
electron "1.6.11"
electron "1.7.8"
electron-compile "*"
electron-compilers "*"
yargs "^6.6.0"
Expand Down Expand Up @@ -2330,9 +2340,9 @@ electron-winstaller@^2.5.0:
lodash.template "^4.2.2"
temp "^0.8.3"

electron@1.6.11:
version "1.6.11"
resolved "https://registry.yarnpkg.com/electron/-/electron-1.6.11.tgz#be79c0ebdcefedb5bf28117409800fa53baceffa"
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"
Expand Down Expand Up @@ -2706,7 +2716,15 @@ fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"

fstream@^1.0.0, fstream@^1.0.11, fstream@^1.0.2:
fstream-ignore@^1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
dependencies:
fstream "^1.0.0"
inherits "2"
minimatch "^3.0.0"

fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.11, fstream@^1.0.2:
version "1.0.11"
resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171"
dependencies:
Expand Down Expand Up @@ -2987,7 +3005,7 @@ hash-sum@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04"

hawk@~3.1.3:
hawk@3.1.3, hawk@~3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
dependencies:
Expand Down Expand Up @@ -3894,6 +3912,10 @@ nan@^2.3.2, nan@^2.4.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.6.2.tgz#e4ff34e6c95fdfb5aecc08de6596f43605a7db45"

nan@^2.6.2:
version "2.7.0"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.7.0.tgz#d95bf721ec877e08db276ed3fc6eb78f9083ad46"

natives@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/natives/-/natives-1.1.0.tgz#e9ff841418a6b2ec7a495e939984f78f163e6e31"
Expand Down Expand Up @@ -3947,6 +3969,21 @@ node-gyp@^3.4.0, node-gyp@^3.6.0:
tar "^2.0.0"
which "1"

node-pre-gyp@^0.6.36:
version "0.6.38"
resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.38.tgz#e92a20f83416415bb4086f6d1fb78b3da73d113d"
dependencies:
hawk "3.1.3"
mkdirp "^0.5.1"
nopt "^4.0.1"
npmlog "^4.0.2"
rc "^1.1.7"
request "2.81.0"
rimraf "^2.6.1"
semver "^5.3.0"
tar "^2.2.1"
tar-pack "^3.4.0"

node-source-walk@^3.2.0:
version "3.2.1"
resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-3.2.1.tgz#12bb1b9a3fb1873f785c4a7547b6034f953f669f"
Expand All @@ -3959,6 +3996,13 @@ node-source-walk@^3.2.0:
dependencies:
abbrev "1"

nopt@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
dependencies:
abbrev "1"
osenv "^0.1.4"

nopt@~1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
Expand Down Expand Up @@ -4016,7 +4060,7 @@ npm-run-path@^2.0.0:
dependencies:
path-key "^2.0.0"

"npmlog@0 || 1 || 2 || 3 || 4":
"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.2:
version "4.1.2"
resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
dependencies:
Expand Down Expand Up @@ -4091,7 +4135,7 @@ object.assign@^4.0.4:
function-bind "^1.1.0"
object-keys "^1.0.10"

[email protected], once@^1.3.0, once@^1.4.0:
[email protected], once@^1.3.0, once@^1.3.3, once@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
dependencies:
Expand All @@ -4113,19 +4157,19 @@ opn@^5.0.0:
dependencies:
is-wsl "^1.1.0"

[email protected], optimist@~0.3.5:
version "0.3.7"
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
dependencies:
wordwrap "~0.0.2"

optimist@^0.6.1, optimist@~0.6.1:
version "0.6.1"
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.6.1.tgz#da3ea74686fa21a19a111c326e90eb15a0196686"
dependencies:
minimist "~0.0.1"
wordwrap "~0.0.2"

optimist@~0.3.5:
version "0.3.7"
resolved "https://registry.yarnpkg.com/optimist/-/optimist-0.3.7.tgz#c90941ad59e4273328923074d2cf2e7cbc6ec0d9"
dependencies:
wordwrap "~0.0.2"

optionator@^0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
Expand Down Expand Up @@ -4168,7 +4212,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"

osenv@0:
osenv@0, osenv@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
dependencies:
Expand Down Expand Up @@ -4552,6 +4596,10 @@ progress-stream@^1.1.0:
speedometer "~0.1.2"
through2 "~0.2.3"

promirepl@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/promirepl/-/promirepl-1.0.1.tgz#2951aaeba2bf3fe2274ff63a16d94c04ca60872e"

promise@^6.0.1:
version "6.1.0"
resolved "https://registry.yarnpkg.com/promise/-/promise-6.1.0.tgz#2ce729f6b94b45c26891ad0602c5c90e04c6eef6"
Expand Down Expand Up @@ -4612,7 +4660,7 @@ random-path@^0.1.0:
base32-encode "^0.1.0"
murmur-32 "^0.1.0"

rc@^1.1.2:
rc@^1.1.2, rc@^1.1.7:
version "1.2.1"
resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
dependencies:
Expand Down Expand Up @@ -4705,6 +4753,12 @@ readable-stream@~1.0.2, readable-stream@~1.0.24, readable-stream@~1.0.26:
isarray "0.0.1"
string_decoder "~0.10.x"

"rebuild@electron-rebuild -v 1.7.8":
version "0.1.2"
resolved "https://registry.yarnpkg.com/rebuild/-/rebuild-0.1.2.tgz#03acdea5515130b479092746e093daf8cf883e93"
dependencies:
optimist "0.3.x"

redent@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
Expand Down Expand Up @@ -4784,7 +4838,7 @@ replace-comments-x@^1.0.1:
dependencies:
is-string "^1.0.4"

request@2, request@^2.45.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0, request@~2.81.0:
request@2, request@2.81.0, request@^2.45.0, request@^2.55.0, request@^2.72.0, request@^2.79.0, request@^2.81.0, request@~2.81.0:
version "2.81.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
dependencies:
Expand Down Expand Up @@ -4881,6 +4935,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1:
dependencies:
glob "^7.0.5"

rimraf@^2.5.1:
version "2.6.2"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
dependencies:
glob "^7.0.5"

rimraf@~2.2.6, rimraf@~2.2.8:
version "2.2.8"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"
Expand Down Expand Up @@ -4998,6 +5058,18 @@ semver@~5.0.1:
version "5.0.3"
resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a"

serialport@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/serialport/-/serialport-5.0.0.tgz#08a1a494eaf5acdc34b5a7423c1877d997d2a8cf"
dependencies:
bindings "1.3.0"
commander "^2.11.0"
debug "^2.6.6"
nan "^2.6.2"
node-pre-gyp "^0.6.36"
promirepl "^1.0.1"
safe-buffer "^5.0.1"

set-blocking@^2.0.0, set-blocking@~2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
Expand Down Expand Up @@ -5390,6 +5462,19 @@ tabtab@^2.2.1:
npmlog "^2.0.3"
object-assign "^4.1.0"

tar-pack@^3.4.0:
version "3.4.0"
resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
dependencies:
debug "^2.2.0"
fstream "^1.0.10"
fstream-ignore "^1.0.5"
once "^1.3.3"
readable-stream "^2.1.4"
rimraf "^2.5.1"
tar "^2.2.1"
uid-number "^0.0.6"

tar-stream@^1.5.0:
version "1.5.4"
resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.4.tgz#36549cf04ed1aee9b2a30c0143252238daf94016"
Expand All @@ -5408,7 +5493,7 @@ tar-stream@~0.4.0:
readable-stream "^1.0.27-1"
xtend "^4.0.0"

[email protected], tar@^2.0.0:
[email protected], tar@^2.0.0, tar@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
dependencies:
Expand Down Expand Up @@ -5607,6 +5692,10 @@ uglify-to-browserify@~1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7"

uid-number@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"

[email protected]:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"
Expand Down

0 comments on commit b321013

Please sign in to comment.