Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/microsoft/vscode.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobo <hop2deep@gmail.com>2022-08-13 09:08:37 +0300
committerGitHub <noreply@github.com>2022-08-13 09:08:37 +0300
commit1a582f7c079d1eb4c89d4f637da2fc2fcb688b31 (patch)
treea10f9095ded45e0ecb8c697a1ae29b36b129c247
parent99e003463f734f8a1cbf5d67f89a74bfb619455d (diff)
chore: update electron@19.0.12 (#158025)
-rw-r--r--.yarnrc2
-rw-r--r--cgmanifest.json4
-rw-r--r--package.json2
-rw-r--r--src/vs/platform/extensions/electron-main/extensionHostStarter.ts6
-rw-r--r--yarn.lock8
5 files changed, 11 insertions, 11 deletions
diff --git a/.yarnrc b/.yarnrc
index 818a30bbcd1..afa220d0f75 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,4 +1,4 @@
disturl "https://electronjs.org/headers"
-target "19.0.11"
+target "19.0.12"
runtime "electron"
build_from_source "true"
diff --git a/cgmanifest.json b/cgmanifest.json
index 2e877eb9912..9ca8377ac29 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -60,12 +60,12 @@
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
- "commitHash": "a5cafd174d2027529d0b251e5b8e58da2b364e5b"
+ "commitHash": "b05ccd812e3bb3de5b1546a313e298961653e942"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
- "version": "19.0.11"
+ "version": "19.0.12"
},
{
"component": {
diff --git a/package.json b/package.json
index e850c1b310c..0a9fcf9696b 100644
--- a/package.json
+++ b/package.json
@@ -137,7 +137,7 @@
"cssnano": "^4.1.11",
"debounce": "^1.0.0",
"deemon": "^1.4.0",
- "electron": "19.0.11",
+ "electron": "19.0.12",
"eslint": "8.7.0",
"eslint-plugin-header": "3.1.1",
"eslint-plugin-jsdoc": "^39.3.2",
diff --git a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
index ca52229c320..277f3de4294 100644
--- a/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
+++ b/src/vs/platform/extensions/electron-main/extensionHostStarter.ts
@@ -32,7 +32,7 @@ declare namespace UtilityProcessProposedApi {
constructor(modulePath: string, args?: string[] | undefined, options?: UtilityProcessOptions);
postMessage(channel: string, message: any, transfer?: Electron.MessagePortMain[]): void;
kill(signal?: number | string): boolean;
- on(event: 'exit', listener: (code: number | undefined) => void): this;
+ on(event: 'exit', listener: (event: Electron.Event, code: number) => void): this;
on(event: 'spawn', listener: () => void): this;
}
}
@@ -338,8 +338,8 @@ class UtilityExtensionHostProcess extends Disposable {
this._register(Event.fromNodeEventEmitter<void>(this._process, 'spawn')(() => {
this._logService.info(`UtilityProcess<${this.id}>: received spawn event.`);
}));
- this._register(Event.fromNodeEventEmitter<number | undefined>(this._process, 'exit')((code: number | undefined) => {
- code = code || 0;
+ const onExit = Event.fromNodeEventEmitter<number>(this._process, 'exit', (_, code: number) => code);
+ this._register(onExit((code: number) => {
this._logService.info(`UtilityProcess<${this.id}>: received exit event with code ${code}.`);
this._hasExited = true;
this._onExit.fire({ pid: this._process!.pid!, code, signal: '' });
diff --git a/yarn.lock b/yarn.lock
index 379cc598476..111a20536f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3708,10 +3708,10 @@ electron-to-chromium@^1.4.202:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.207.tgz#9c3310ebace2952903d05dcaba8abe3a4ed44c01"
integrity sha512-piH7MJDJp4rJCduWbVvmUd59AUne1AFBJ8JaRQvk0KzNTSUnZrVXHCZc+eg+CGE4OujkcLJznhGKD6tuAshj5Q==
-electron@19.0.11:
- version "19.0.11"
- resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.11.tgz#0c0a52abc08694fd38916d9270baf45bb7752a27"
- integrity sha512-GPM6C1Ze17/gR4koTE171MxrI5unYfFRgXQdkMdpWM2Cd55LMUrVa0QHCsfKpsaloufv9T65lsOn0uZuzCw5UA==
+electron@19.0.12:
+ version "19.0.12"
+ resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.12.tgz#73d11cc2a3e4dbcd61fdc1c39561e7a7911046e9"
+ integrity sha512-GOvG0t2NCeJYIfmC3g/dnEAQ71k3nQDbRVqQhpi2YbsYMury0asGJwqnVAv2uZQEwCwSx4XOwOQARTFEG/msWw==
dependencies:
"@electron/get" "^1.14.1"
"@types/node" "^16.11.26"