mirror of
https://github.com/microsoft/vscode.git
synced 2025-12-24 20:26:08 +00:00
chore: update to electron 17 (#143223)
* chore: bump electron@17.0.0 * Revert "chore: revert to electron@13 (#143851)" This reverts commitdf645f1450. * chore: bump electron@17.1.0 * Revert "ci: fix build with latest node-gyp" This reverts commitc3e948aa30. * chore: revert ci changes for node v16 * chore: update yarn.lock * chore: bump electron@17.1.1
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
],
|
||||
"main": "./out/extension",
|
||||
"devDependencies": {
|
||||
"@types/node": "14.x"
|
||||
"@types/node": "16.x"
|
||||
},
|
||||
"capabilities": {
|
||||
"untrustedWorkspaces": {
|
||||
|
||||
@@ -16,14 +16,14 @@ export function terminateProcess(p: cp.ChildProcess, extensionPath: string): Ter
|
||||
const options: any = {
|
||||
stdio: ['pipe', 'pipe', 'ignore']
|
||||
};
|
||||
cp.execFileSync('taskkill', ['/T', '/F', '/PID', p.pid.toString()], options);
|
||||
cp.execFileSync('taskkill', ['/T', '/F', '/PID', p.pid!.toString()], options);
|
||||
} catch (err) {
|
||||
return { success: false, error: err };
|
||||
}
|
||||
} else if (process.platform === 'darwin' || process.platform === 'linux') {
|
||||
try {
|
||||
const cmd = path.join(extensionPath, 'scripts', 'terminateProcess.sh');
|
||||
const result = cp.spawnSync(cmd, [p.pid.toString()]);
|
||||
const result = cp.spawnSync(cmd, [p.pid!.toString()]);
|
||||
if (result.error) {
|
||||
return { success: false, error: result.error };
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# yarn lockfile v1
|
||||
|
||||
|
||||
"@types/node@14.x":
|
||||
version "14.14.43"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.43.tgz#26bcbb0595b305400e8ceaf9a127a7f905ae49c8"
|
||||
integrity sha512-3pwDJjp1PWacPTpH0LcfhgjvurQvrZFBrC6xxjaUEZ7ifUtT32jtjPxEMMblpqd2Mvx+k8haqQJLQxolyGN/cQ==
|
||||
"@types/node@16.x":
|
||||
version "16.11.6"
|
||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.6.tgz#6bef7a2a0ad684cf6e90fcfe31cecabd9ce0a3ae"
|
||||
integrity sha512-ua7PgUoeQFjmWPcoo9khiPum3Pd60k4/2ZGXt18sm2Slk0W0xZTqt5Y0Ny1NyBiN1EVQ/+FaF9NcY4Qe6rwk5w==
|
||||
|
||||
Reference in New Issue
Block a user