Skip to content

Commit b53807f

Browse files
committed
chore: upgrade electron
1 parent 1f7b179 commit b53807f

File tree

4 files changed

+27
-34
lines changed

4 files changed

+27
-34
lines changed

packages/build-tools/src/createConfig.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ exports.createConfig = (config, target = { chrome: 52, firefox: 48 }) => {
3333
objectAssign: 'Object.assign',
3434
transforms: {
3535
modules: false,
36-
asyncAwait: false
36+
asyncAwait: false,
37+
forOf: false
3738
}
3839
}
3940
},

packages/shell-electron/app.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ function createWindow () {
1313
height: 600,
1414
icon: path.join(__dirname, 'icons/128.png'),
1515
webPreferences: {
16-
nodeIntegration: true
16+
nodeIntegration: true,
17+
contextIsolation: false
1718
}
1819
})
1920

packages/shell-electron/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
"access": "public"
2525
},
2626
"dependencies": {
27-
"cross-spawn": "^5.1.0",
28-
"electron": "^7.0.0",
29-
"express": "^4.16.2",
27+
"cross-spawn": "^7.0.3",
28+
"electron": "^12.0.6",
29+
"express": "^4.17.1",
3030
"ip": "^1.1.5",
3131
"socket.io": "^2.0.4"
3232
},

yarn.lock

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1656,16 +1656,16 @@
16561656
resolved "https://registry.yarnpkg.com/@types/node/-/node-15.0.1.tgz#ef34dea0881028d11398be5bf4e856743e3dc35a"
16571657
integrity sha512-TMkXt0Ck1y0KKsGr9gJtWGjttxlZnnvDtphxUOSd0bfaR6Q1jle+sPvrzNR1urqYTWMinoKvjKfXUGsumaO1PA==
16581658

1659-
"@types/node@^12.0.12":
1660-
version "12.20.11"
1661-
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.11.tgz#980832cd56efafff8c18aa148c4085eb02a483f4"
1662-
integrity sha512-gema+apZ6qLQK7k7F0dGkGCWQYsL0qqKORWOQO6tq46q+x+1C0vbOiOqOwRVlh4RAdbQwV/j/ryr3u5NOG1fPQ==
1663-
16641659
"@types/node@^13.9.1":
16651660
version "13.13.51"
16661661
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.51.tgz#a424c5282f99fc1ca41f11b727b6aea80668bcba"
16671662
integrity sha512-66/xg5I5Te4oGi5Jws11PtNmKkZbOPZWyBZZ/l5AOrWj1Dyw+6Ge/JhYTq/2/Yvdqyhrue8RL+DGI298OJ0xcg==
16681663

1664+
"@types/node@^14.6.2":
1665+
version "14.14.44"
1666+
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.44.tgz#df7503e6002847b834371c004b372529f3f85215"
1667+
integrity sha512-+gaugz6Oce6ZInfI/tK4Pq5wIIkJMEJUu92RB3Eu93mtj4wjjjz9EB5mLp5s1pSsLXdC/CPut/xF20ZzAQJbTA==
1668+
16691669
"@types/normalize-package-data@^2.4.0":
16701670
version "2.4.0"
16711671
resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
@@ -3425,15 +3425,6 @@ cross-env@^5.2.0:
34253425
dependencies:
34263426
cross-spawn "^6.0.5"
34273427

3428-
cross-spawn@^5.1.0:
3429-
version "5.1.0"
3430-
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
3431-
integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
3432-
dependencies:
3433-
lru-cache "^4.0.1"
3434-
shebang-command "^1.2.0"
3435-
which "^1.2.9"
3436-
34373428
cross-spawn@^6.0.0, cross-spawn@^6.0.5:
34383429
version "6.0.5"
34393430
resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -4170,13 +4161,13 @@ electron-to-chromium@^1.3.723:
41704161
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.726.tgz#6d3c577e5f5a48904ba891464740896c05e3bdb1"
41714162
integrity sha512-dw7WmrSu/JwtACiBzth8cuKf62NKL1xVJuNvyOg0jvruN/n4NLtGYoTzciQquCPNaS2eR+BT5GrxHbslfc/w1w==
41724163

4173-
electron@^7.0.0:
4174-
version "7.3.3"
4175-
resolved "https://registry.yarnpkg.com/electron/-/electron-7.3.3.tgz#f61502a3d42d85adfecd8e37f98da449b591f8af"
4176-
integrity sha512-PrJEsuRiaAhTDHtbH3EM+RIne+nZ6ifGChUadmtmPqHUQ+rIhf4jSi2ZN768IgBDw4SidMJiCrvQRiuDha9+Ew==
4164+
electron@^12.0.6:
4165+
version "12.0.6"
4166+
resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.6.tgz#2d72fa5a7db553dca3a771b22aa13a676122b4af"
4167+
integrity sha512-+fqhpdG6Fd6LzsizMdaSPC1I8tfsMT8/7fsYBgABED3hEWdus/rt6CQ54P3/EWZyQebtyHR6HXtlofUqKMV3KQ==
41774168
dependencies:
41784169
"@electron/get" "^1.0.1"
4179-
"@types/node" "^12.0.12"
4170+
"@types/node" "^14.6.2"
41804171
extract-zip "^1.0.3"
41814172

41824173
elegant-spinner@^1.0.1:
@@ -4232,9 +4223,9 @@ end-of-stream@^1.1.0:
42324223
once "^1.4.0"
42334224

42344225
engine.io-client@~3.5.0:
4235-
version "3.5.1"
4236-
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.1.tgz#b500458a39c0cd197a921e0e759721a746d0bdb9"
4237-
integrity sha512-oVu9kBkGbcggulyVF0kz6BV3ganqUeqXvD79WOFKa+11oK692w1NyFkuEj4xrkFRpZhn92QOqTk4RQq5LiBXbQ==
4226+
version "3.5.2"
4227+
resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
4228+
integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
42384229
dependencies:
42394230
component-emitter "~1.3.0"
42404231
component-inherit "0.0.3"
@@ -4245,7 +4236,7 @@ engine.io-client@~3.5.0:
42454236
parseqs "0.0.6"
42464237
parseuri "0.0.6"
42474238
ws "~7.4.2"
4248-
xmlhttprequest-ssl "~1.5.4"
4239+
xmlhttprequest-ssl "~1.6.2"
42494240
yeast "0.1.2"
42504241

42514242
engine.io-parser@~2.2.0:
@@ -4732,7 +4723,7 @@ exit-hook@^1.0.0:
47324723
resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
47334724
integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
47344725

4735-
express@^4.16.2, express@^4.17.1:
4726+
express@^4.17.1:
47364727
version "4.17.1"
47374728
resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
47384729
integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -6675,7 +6666,7 @@ lowercase-keys@^2.0.0:
66756666
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
66766667
integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
66776668

6678-
lru-cache@^4.0.1, lru-cache@^4.1.2:
6669+
lru-cache@^4.1.2:
66796670
version "4.1.5"
66806671
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
66816672
integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -10886,10 +10877,10 @@ ws@^7.4.4, ws@~7.4.2:
1088610877
resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
1088710878
integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
1088810879

10889-
xmlhttprequest-ssl@~1.5.4:
10890-
version "1.5.5"
10891-
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
10892-
integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
10880+
xmlhttprequest-ssl@~1.6.2:
10881+
version "1.6.2"
10882+
resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.2.tgz#dd6899bfbcf684b554e393c30b13b9f3b001a7ee"
10883+
integrity sha512-tYOaldF/0BLfKuoA39QMwD4j2m8lq4DIncqj1yuNELX4vz9+z/ieG/vwmctjJce+boFHXstqhWnHSxc4W8f4qg==
1089310884

1089410885
xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.1:
1089510886
version "4.0.2"

0 commit comments

Comments
 (0)