Skip to content
This repository was archived by the owner on Apr 1, 2020. It is now read-only.

Commit b5d452d

Browse files
authored
Dependency: Upgrade to electron 2.0.1 (#2218)
Dependency: Upgrade to electron 2.0.2
1 parent 48a6816 commit b5d452d

3 files changed

Lines changed: 70 additions & 37 deletions

File tree

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -927,11 +927,11 @@
927927
"cross-env": "3.1.3",
928928
"css-loader": "0.28.4",
929929
"detect-indent": "^5.0.0",
930-
"electron": "1.8.6",
930+
"electron": "2.0.2",
931931
"electron-builder": "^20.5.1",
932932
"electron-devtools-installer": "^2.2.3",
933933
"electron-mocha": "5.0.0",
934-
"electron-rebuild": "1.6.0",
934+
"electron-rebuild": "^1.7.3",
935935
"enzyme": "^3.3.0",
936936
"enzyme-adapter-react-16": "^1.1.1",
937937
"enzyme-to-json": "^3.3.1",
@@ -955,6 +955,7 @@
955955
"minimatch": "3.0.4",
956956
"mkdirp": "0.5.1",
957957
"mocha": "3.1.2",
958+
"node-abi": "^2.4.1",
958959
"nyc": "^11.4.1",
959960
"oni-release-downloader": "^0.0.10",
960961
"opencollective": "1.0.3",

test/common/runInProcTest.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,15 @@ export const runInProcTest = (
184184
writeLogs(rendererLogs)
185185
console.log("--- " + testName + " ---")
186186

187-
const mainProcessLogs: any[] = await oni.client.getMainProcessLogs()
188187
console.log("---LOGS (Main): " + testName)
189-
mainProcessLogs.forEach(l => {
190-
console.log(l)
191-
})
188+
if (!result.passed) {
189+
const mainProcessLogs: any[] = await oni.client.getMainProcessLogs()
190+
mainProcessLogs.forEach(l => {
191+
console.log(l)
192+
})
193+
} else {
194+
console.log("Skipping log output since test passed.")
195+
}
192196
console.log("--- " + testName + " ---")
193197

194198
console.log("")

yarn.lock

Lines changed: 59 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2269,9 +2269,9 @@ cli-spinners@^0.1.2:
22692269
version "0.1.2"
22702270
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c"
22712271

2272-
cli-spinners@^1.0.0:
2273-
version "1.1.0"
2274-
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
2272+
cli-spinners@^1.0.1:
2273+
version "1.3.1"
2274+
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a"
22752275

22762276
cli-table@^0.3.1:
22772277
version "0.3.1"
@@ -3128,7 +3128,7 @@ detect-indent@^5.0.0:
31283128
version "5.0.0"
31293129
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
31303130

3131-
detect-libc@^1.0.2:
3131+
detect-libc@^1.0.2, detect-libc@^1.0.3:
31323132
version "1.0.3"
31333133
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
31343134

@@ -3472,12 +3472,13 @@ electron-publish@20.5.0:
34723472
lazy-val "^1.0.3"
34733473
mime "^2.2.0"
34743474

3475-
electron-rebuild@1.6.0:
3476-
version "1.6.0"
3477-
resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.6.0.tgz#e8d26f4d8e9fe5388df35864b3658e5cfd4dcb7e"
3475+
electron-rebuild@^1.7.3:
3476+
version "1.7.3"
3477+
resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.7.3.tgz#24ae06ad9dd61cb7e4d688961f49118c40a110eb"
34783478
dependencies:
34793479
colors "^1.1.2"
34803480
debug "^2.6.3"
3481+
detect-libc "^1.0.3"
34813482
fs-extra "^3.0.1"
34823483
node-abi "^2.0.0"
34833484
node-gyp "^3.6.0"
@@ -3503,9 +3504,9 @@ electron-window@^0.8.0:
35033504
dependencies:
35043505
is-electron-renderer "^2.0.0"
35053506

3506-
electron@1.8.6:
3507-
version "1.8.6"
3508-
resolved "https://registry.yarnpkg.com/electron/-/electron-1.8.6.tgz#6d45e377b321a35b78a794b64e40b2cf8face6ae"
3507+
electron@2.0.2:
3508+
version "2.0.2"
3509+
resolved "https://registry.yarnpkg.com/electron/-/electron-2.0.2.tgz#b77e05f83419cc5ec921a2d21f35b55e4bfc3d68"
35093510
dependencies:
35103511
"@types/node" "^8.0.24"
35113512
electron-download "^3.0.1"
@@ -6940,9 +6941,9 @@ no-case@^2.2.0:
69406941
dependencies:
69416942
lower-case "^1.1.1"
69426943

6943-
node-abi@^2.0.0:
6944-
version "2.1.2"
6945-
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.1.2.tgz#4da6caceb6685fcd31e7dd1994ef6bb7d0a9c0b2"
6944+
node-abi@^2.0.0, node-abi@^2.4.1:
6945+
version "2.4.1"
6946+
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.4.1.tgz#7628c4d4ec4e9cd3764ceb3652f36b2e7f8d4923"
69466947
dependencies:
69476948
semver "^5.4.1"
69486949

@@ -7410,13 +7411,13 @@ ora@^0.2.3:
74107411
object-assign "^4.0.1"
74117412

74127413
ora@^1.2.0:
7413-
version "1.3.0"
7414-
resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a"
7414+
version "1.4.0"
7415+
resolved "https://registry.yarnpkg.com/ora/-/ora-1.4.0.tgz#884458215b3a5d4097592285f93321bb7a79e2e5"
74157416
dependencies:
7416-
chalk "^1.1.1"
7417+
chalk "^2.1.0"
74177418
cli-cursor "^2.1.0"
7418-
cli-spinners "^1.0.0"
7419-
log-symbols "^1.0.2"
7419+
cli-spinners "^1.0.1"
7420+
log-symbols "^2.1.0"
74207421

74217422
original@>=0.0.5:
74227423
version "1.0.0"
@@ -7450,7 +7451,14 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.2:
74507451
version "1.0.2"
74517452
resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
74527453

7453-
osenv@0, osenv@^0.1.4:
7454+
osenv@0:
7455+
version "0.1.5"
7456+
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
7457+
dependencies:
7458+
os-homedir "^1.0.0"
7459+
os-tmpdir "^1.0.0"
7460+
7461+
osenv@^0.1.4:
74547462
version "0.1.4"
74557463
resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.4.tgz#42fe6d5953df06c8064be6f176c3d05aaaa34644"
74567464
dependencies:
@@ -8688,9 +8696,9 @@ request-promise-native@^1.0.3, request-promise-native@^1.0.5:
86888696
stealthy-require "^1.1.0"
86898697
tough-cookie ">=2.3.3"
86908698

8691-
request@2, request@^2.45.0, request@^2.79.0, request@^2.83.0, request@~2.83.0:
8692-
version "2.83.0"
8693-
resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
8699+
request@2:
8700+
version "2.86.0"
8701+
resolved "https://registry.yarnpkg.com/request/-/request-2.86.0.tgz#2b9497f449b0a32654c081a5cf426bbfb5bf5b69"
86948702
dependencies:
86958703
aws-sign2 "~0.7.0"
86968704
aws4 "^1.6.0"
@@ -8710,7 +8718,6 @@ request@2, request@^2.45.0, request@^2.79.0, request@^2.83.0, request@~2.83.0:
87108718
performance-now "^2.1.0"
87118719
qs "~6.5.1"
87128720
safe-buffer "^5.1.1"
8713-
stringstream "~0.0.5"
87148721
tough-cookie "~2.3.3"
87158722
tunnel-agent "^0.6.0"
87168723
uuid "^3.1.0"
@@ -8742,6 +8749,33 @@ request@2.81.0, request@~2.81.0:
87428749
tunnel-agent "^0.6.0"
87438750
uuid "^3.0.0"
87448751

8752+
request@^2.45.0, request@^2.79.0, request@^2.83.0, request@~2.83.0:
8753+
version "2.83.0"
8754+
resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356"
8755+
dependencies:
8756+
aws-sign2 "~0.7.0"
8757+
aws4 "^1.6.0"
8758+
caseless "~0.12.0"
8759+
combined-stream "~1.0.5"
8760+
extend "~3.0.1"
8761+
forever-agent "~0.6.1"
8762+
form-data "~2.3.1"
8763+
har-validator "~5.0.3"
8764+
hawk "~6.0.2"
8765+
http-signature "~1.2.0"
8766+
is-typedarray "~1.0.0"
8767+
isstream "~0.1.2"
8768+
json-stringify-safe "~5.0.1"
8769+
mime-types "~2.1.17"
8770+
oauth-sign "~0.8.2"
8771+
performance-now "^2.1.0"
8772+
qs "~6.5.1"
8773+
safe-buffer "^5.1.1"
8774+
stringstream "~0.0.5"
8775+
tough-cookie "~2.3.3"
8776+
tunnel-agent "^0.6.0"
8777+
uuid "^3.1.0"
8778+
87458779
request@^2.81.0:
87468780
version "2.85.0"
87478781
resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
@@ -8908,13 +8942,7 @@ rx@^4.1.0:
89088942
version "4.1.0"
89098943
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
89108944

8911-
rxjs@^5.1.1:
8912-
version "5.5.2"
8913-
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.2.tgz#28d403f0071121967f18ad665563255d54236ac3"
8914-
dependencies:
8915-
symbol-observable "^1.0.1"
8916-
8917-
rxjs@^5.4.2, rxjs@^5.5.2:
8945+
rxjs@^5.1.1, rxjs@^5.4.2, rxjs@^5.5.2:
89188946
version "5.5.10"
89198947
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
89208948
dependencies:
@@ -9746,7 +9774,7 @@ symbol-observable@^0.2.2:
97469774
version "0.2.4"
97479775
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40"
97489776

9749-
symbol-observable@^1.0.1, symbol-observable@^1.0.3:
9777+
symbol-observable@^1.0.3:
97509778
version "1.0.4"
97519779
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
97529780

0 commit comments

Comments
 (0)