Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update to Electron 6.x #75802

Merged
merged 602 commits into from
Sep 13, 2019
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
602 commits
Select commit Hold shift + click to select a range
438dbae
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
6f67412
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
eadf90e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
24baed8
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
3e2137d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
8b60801
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
e04d7ee
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
c236b98
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
b04ab8f
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
29dd76e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
0e3fd52
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
0a42812
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
ee06c48
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
77b0afd
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
fa057c5
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
b37922a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
5d58933
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
af4ccd3
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
7a1656c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
4befda6
Merge remote-tracking branch 'origin/master' into HEAD
Sep 3, 2019
e6c902d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
d366921
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
136e07d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
f30ce7b
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
d4d924a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
43c0e06
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
f269e25
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
f278d18
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
5d5d07e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
8f2df7c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
08e186f
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
4f87ca7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
1f2f377
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
e9e87d1
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
9b5a6f6
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
9d42864
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
3f62931
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
a58b414
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
7b69832
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
a2df3c0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
09a699e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
5eb9925
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
ed3fee0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
39e30e7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
929c9ac
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
bca0338
chore: Bump [email protected]
deepak1556 Sep 4, 2019
c3f39af
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
c8f6695
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
627c367
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
a96d23e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 4, 2019
86b3df8
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
b6afd0a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
a8267b3
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
9385344
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
cb3deee
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
62783f0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
da83170
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
5f3cbda
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
9702b9d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
5026228
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
bca4cef
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
2eb49ce
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
180b77b
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
dd03761
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
8c2bb50
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
64be4dd
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
2424dae
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
0db4054
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
068cd21
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
83beb0e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
7c4d03a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
7173885
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
651e723
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
b35cdfc
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
a644054
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
f98d6c3
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
3e54481
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
0dd605c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
a91e316
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
3949a86
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
54fa069
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
e541730
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
d83aabf
Merge remote-tracking branch 'origin/master' into HEAD
Sep 5, 2019
4124349
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
9695067
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
ceca6a7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
5c5897d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
2cdc661
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
52480a4
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
38963f9
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
7240526
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
b45c49e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
b3d19e6
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
9711749
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
e058e95
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
f0d8470
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
6449c75
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
6fcc13d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
69908c7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
63793fd
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
da3fc09
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
84536f9
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
d0f648d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
454b637
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
039ef75
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
e710d58
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
5d2aae8
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
9a55e7e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
d1846d4
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
dd4f0b0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
509bf8d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
eeee33a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 6, 2019
fdb0378
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
b30a73e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
d6b1e32
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
905cf4e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
c257f44
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
3f4b3e0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
5d0ab28
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
9b73cba
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
65a0011
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
9a09f02
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
dc67f3c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
b87aff9
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
9652a73
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
a782e63
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
56e5dbc
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
4ff085a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
bccb589
Merge remote-tracking branch 'origin/master' into HEAD
Sep 9, 2019
918d9c7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
9a46d44
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
60cd483
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
36250ad
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
5a394c5
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
7b55e3d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
61bb49d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
8f7dd73
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
cd82e68
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
b9c9b22
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
305ea70
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
d5923be
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
799e528
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
198ae70
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
b134e13
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
4490d98
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
8460cba
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
a58bfc7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
f797c6e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
81e3421
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
c82ac1c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
5cafa4d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
9eb8bb4
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
2912aa8
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
494add2
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
e0b27fb
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
e0e9dba
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
41ad7be
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
2cb45e1
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
8151a72
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
64ca757
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
babbc01
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
6ef7e17
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
2752944
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
292c83d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
0cc12da
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
d8f6c88
Merge remote-tracking branch 'origin/master' into HEAD
Sep 10, 2019
71c0997
Merge branch 'master' into electron-6.0.x
bpasero Sep 11, 2019
6a6eaa7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
6ab2fe3
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
e2a5860
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
a742b44
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
d582bf5
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
fb8510f
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
32bb388
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
20907bd
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
3f74a02
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
068bcc0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
29c1dca
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
7b6c570
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
2f43556
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
b455429
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
b001fb8
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
9ec6e85
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
2565eb6
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
f5ea48a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
9cfce78
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
768ef49
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
825ac8c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
2d2f577
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
cbbc0f6
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
a98c9ab
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
8ac4dde
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
58d86a0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
9fe7c01
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
d30b3e9
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
2b4d2da
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
f66a27f
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
84e8011
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
ecfe646
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
0b23385
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
be78317
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
a456dd3
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
9009193
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
c87c535
Merge remote-tracking branch 'origin/master' into HEAD
Sep 11, 2019
58321b0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
2728185
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
2379919
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
72c900d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
4aceb31
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
2f25cf1
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
cfcadf2
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
6d961d0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
3e0bf57
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
e81cd9a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
dff5304
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
7195ff0
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
eb8e59d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
af1be63
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
2d0f273
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
7f384d7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
3af546e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
1cf07fa
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
83a9288
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
822fe2f
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
539b331
chore: bump [email protected]
deepak1556 Sep 12, 2019
a990865
chore: update native-watchdog
deepak1556 Sep 12, 2019
4c6f203
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
ec61e4d
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
15ef98a
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
8af6f8c
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
cc4ab0e
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
de6f255
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
5a01469
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
eae73dc
Merge remote-tracking branch 'origin/master' into HEAD
Sep 12, 2019
56fba48
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
6011ec1
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
16f16a9
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
d1a13ae
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
12118a5
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
d92cfaf
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
2555e23
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
a715df3
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
254f683
partially revert build changes
bpasero Sep 13, 2019
17fbc66
build change
bpasero Sep 13, 2019
7d97d83
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
8b9dc82
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
fe0becd
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
1f06282
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
e4158b7
Merge remote-tracking branch 'origin/master' into HEAD
Sep 13, 2019
c937d89
Merge branch 'master' into electron-6.0.x
bpasero Sep 13, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yarnrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron"
target "4.2.4"
target "6.0.0-beta.9"
runtime "electron"
2 changes: 1 addition & 1 deletion build/builtin/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const path = require('path');
let window = null;

app.once('ready', () => {
window = new BrowserWindow({ width: 800, height: 600 });
window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } });
window.setMenuBarVisibility(false);
window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
// window.webContents.openDevTools();
Expand Down
1,302 changes: 813 additions & 489 deletions build/lib/watch/yarn.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "chromium",
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
"commitHash": "c6a08e5368de4352903e702cde750b33239a50ab"
"commitHash": "e723fd7cc353b569dbcf371b3d361eb4199a122e"
}
},
"licenseDetail": [
Expand Down Expand Up @@ -40,32 +40,32 @@
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
],
"isOnlyProductionDependency": true,
"version": "69.0.3497.128"
"version": "76.0.3809.26"
},
{
"component": {
"type": "git",
"git": {
"name": "nodejs",
"repositoryUrl": "https://github.com/nodejs/node",
"commitHash": "8c70b2084ce5f76ea1e3b3c4ccdeee4483fe338b"
"commitHash": "0a300f60bce0c8f0cb3d846fcb0e1f55f26013ee"
}
},
"isOnlyProductionDependency": true,
"version": "10.11.0"
"version": "12.0.0"
},
{
"component": {
"type": "git",
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
"commitHash": "c1b5a1cfc8a14a337540193daecfa5d0f50dd7bb"
"commitHash": "f3346437bec4cfbf9c16d6f109e980be559df1b8"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
"version": "4.2.4"
"version": "6.0.0-beta.9"
},
{
"component": {
Expand Down
2 changes: 1 addition & 1 deletion extensions/markdown-language-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -325,4 +325,4 @@
"webpack": "^4.1.0",
"webpack-cli": "^2.0.10"
}
}
}
1,109 changes: 860 additions & 249 deletions extensions/markdown-language-features/yarn.lock

Large diffs are not rendered by default.

21 changes: 15 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@
"https-proxy-agent": "^2.2.1",
"iconv-lite": "0.4.23",
"jschardet": "1.6.0",
"keytar": "4.2.1",
"keytar": "4.8.0",
"minimist": "1.2.0",
"native-is-elevated": "^0.2.1",
"native-keymap": "1.2.5",
"native-keymap": "microsoft/node-native-keymap#node_v12",
"native-watchdog": "1.0.0",
"node-pty": "0.9.0-beta17",
"node-pty": "^0.9.0-beta18",
"onigasm-umd": "^2.2.2",
"semver": "^5.5.0",
"spdlog": "^0.9.0",
"sqlite3": "^4.0.8",
"sudo-prompt": "8.2.0",
"v8-inspect-profiler": "^0.0.20",
"vscode-chokidar": "1.6.5",
"vscode-nsfw": "1.1.2",
"vscode-chokidar": "microsoft/chokidar#fsevents_node12_compat",
"vscode-nsfw": "microsoft/vscode-nsfw#nan_update",
"vscode-proxy-agent": "0.4.0",
"vscode-ripgrep": "^1.2.5",
"vscode-sqlite3": "4.0.7",
"vscode-textmate": "^4.1.1",
"xterm": "3.15.0-beta42",
"xterm-addon-search": "0.1.0-beta6",
Expand Down Expand Up @@ -154,5 +154,14 @@
"windows-foreground-love": "0.1.0",
"windows-mutex": "0.2.1",
"windows-process-tree": "0.2.3"
},
"//": [
"There are no prebuilt binaries available for the v8 7.6 ABI",
"node-pre-gyp will fallback to source build but that will fail for",
"modules using older version of nan, this resolves nan to the",
"version we require for building with v8 7.6."
],
"resolutions": {
"nan": "2.14.0"
}
}
4 changes: 2 additions & 2 deletions remote/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"onigasm-umd": "^2.2.2",
"semver": "^5.5.0",
"spdlog": "^0.9.0",
"vscode-chokidar": "1.6.5",
"vscode-nsfw": "1.1.1",
"vscode-chokidar": "microsoft/chokidar#fsevents_node12_compat",
"vscode-nsfw": "microsoft/vscode-nsfw#nan_update",
"vscode-proxy-agent": "0.4.0",
"vscode-ripgrep": "^1.2.5",
"vscode-textmate": "^4.1.1",
Expand Down
Loading