Skip to content

Commit bdcd747

Browse files
deepak1556deepak1556
authored
chore: update to electron 17 (microsoft#143223)
* chore: bump electron@17.0.0 * Revert "chore: revert to electron@13 (microsoft#143851)" This reverts commit df645f1. * chore: bump electron@17.1.0 * Revert "ci: fix build with latest node-gyp" This reverts commit c3e948a. * chore: revert ci changes for node v16 * chore: update yarn.lock * chore: bump electron@17.1.1
1 parent 1cb2b18 commit bdcd747

8 files changed

Lines changed: 15 additions & 20 deletions

File tree

‎automation/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"devDependencies": {
3030
"@types/mkdirp": "^1.0.1",
3131
"@types/ncp": "2.0.1",
32-
"@types/node": "14.x",
32+
"@types/node": "16.x",
3333
"@types/tmp": "0.2.2",
3434
"cpx2": "3.0.0",
3535
"npm-run-all": "^4.1.5",

‎automation/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.1.tgz#3b5c3a26393c19b400844ac422bd0f631a94d69d"
2222
integrity sha512-aK9jxMypeSrhiYofWWBf/T7O+KwaiAHzM4sveCdWPn71lzUSMimRnKzhXDKfKwV1kWoBo2P1aGgaIYGLf9/ljw==
2323

24-
"@types/node@14.x":
25-
version "14.14.43"
26-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
27-
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
24+
"@types/node@16.x":
25+
version "16.11.6"
26+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
27+
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
2828

2929
"@types/tmp@0.2.2":
3030
version "0.2.2"

‎integration/browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"devDependencies": {
1010
"@types/mkdirp": "^1.0.1",
11-
"@types/node": "14.x",
11+
"@types/node": "16.x",
1212
"@types/optimist": "0.0.29",
1313
"@types/rimraf": "^2.0.4",
1414
"@types/tmp": "0.1.0",

‎integration/browser/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.0.tgz#b417deda18cf8400f278733499ad5547ed1abec4"
3434
integrity sha512-GnZbirvmqZUzMgkFn70c74OQpTTUcCzlhQliTzYjQMqg+hVKcDnxdL19Ne3UdYzdMA/+W3eb646FWn/ZaT1NfQ==
3535

36-
"@types/node@14.x":
37-
version "14.14.43"
38-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
39-
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
36+
"@types/node@16.x":
37+
version "16.11.6"
38+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
39+
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
4040

4141
"@types/optimist@0.0.29":
4242
version "0.0.29"

‎smoke/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@types/mkdirp": "^1.0.1",
2222
"@types/mocha": "^8.2.0",
2323
"@types/ncp": "2.0.1",
24-
"@types/node": "14.x",
24+
"@types/node": "16.x",
2525
"@types/node-fetch": "^2.5.10",
2626
"@types/rimraf": "3.0.2",
2727
"npm-run-all": "^4.1.5",

‎smoke/yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
resolved "https://registry.yarnpkg.com/@types/node/-/node-13.11.0.tgz#390ea202539c61c8fa6ba4428b57e05bc36dc47b"
5959
integrity sha512-uM4mnmsIIPK/yeO+42F2RQhGUIs39K2RFmugcJANppXe6J1nvH87PvzPZYpza7Xhhs8Yn9yIAVdLZ84z61+0xQ==
6060

61-
"@types/node@14.x":
62-
version "14.14.43"
63-
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
64-
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
61+
"@types/node@16.x":
62+
version "16.11.6"
63+
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
64+
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
6565

6666
"@types/rimraf@3.0.2":
6767
version "3.0.2"

‎unit/electron/index.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,6 @@ const net = require('net');
2020
const createStatsCollector = require('mocha/lib/stats-collector');
2121
const { applyReporter, importMochaReporter } = require('../reporter');
2222

23-
// Disable render process reuse, we still have
24-
// non-context aware native modules in the renderer.
25-
app.allowRendererProcessReuse = false;
26-
2723
const optimist = require('optimist')
2824
.describe('grep', 'only run tests matching <pattern>').alias('grep', 'g').alias('grep', 'f').string('grep')
2925
.describe('run', 'only run tests from <file>').string('run')

‎unit/node/index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ const excludeModules = [
3030
'vs/base/parts/storage/test/node/storage.test.js', // same as above, due to direct dependency to sqlite native module
3131
'vs/workbench/contrib/testing/test/common/testResultStorage.test.js', // TODO@connor4312 https://github.com/microsoft/vscode/issues/137853
3232
'vs/workbench/contrib/testing/test/common/testResultService.test.js', // TODO@connor4312 https://github.com/microsoft/vscode/issues/137853
33-
'vs/platform/files/test/common/files.test.js' // TODO@bpasero enable once we ship Electron 16
3433
];
3534

3635
/**

0 commit comments

Comments
 (0)