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>2019-10-26 03:35:18 +0300
committerGitHub <noreply@github.com>2019-10-26 03:35:18 +0300
commit8beb0c2e3c136d2ba4f39c2a9b36d8f5ec8d9476 (patch)
treeadcc6b88cfdfb76f255c45bbdfe6f858e43fbedd
parentda0afcff64ff1efc6ae6580294537b3b87dd682e (diff)
chore: Bump electron@6.1.2 (#83266)
-rw-r--r--.yarnrc2
-rw-r--r--cgmanifest.json4
-rw-r--r--src/typings/electron.d.ts11
3 files changed, 13 insertions, 4 deletions
diff --git a/.yarnrc b/.yarnrc
index c54f7d6d6e3..4c8b70bf6f6 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron"
-target "6.0.12"
+target "6.1.2"
runtime "electron"
diff --git a/cgmanifest.json b/cgmanifest.json
index ab492ebff47..43cc181ef26 100644
--- a/cgmanifest.json
+++ b/cgmanifest.json
@@ -60,12 +60,12 @@
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
- "commitHash": "1e50380fab37f407c4d357e1e30ecbc3d5a703b8"
+ "commitHash": "dabaa7557a165cc107f89fd7c3e3c3210f9b5758"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
- "version": "6.0.12"
+ "version": "6.1.2"
},
{
"component": {
diff --git a/src/typings/electron.d.ts b/src/typings/electron.d.ts
index f1d41613b51..6d90d8c0b1a 100644
--- a/src/typings/electron.d.ts
+++ b/src/typings/electron.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Electron 6.0.12
+// Type definitions for Electron 6.1.2
// Project: http://electronjs.org/
// Definitions by: The Electron Team <https://github.com/electron/electron>
// Definitions: https://github.com/electron/electron-typescript-definitions
@@ -70,6 +70,7 @@ declare namespace Electron {
interface RendererInterface extends CommonInterface {
BrowserWindowProxy: typeof BrowserWindowProxy;
+ contextBridge: ContextBridge;
desktopCapturer: DesktopCapturer;
ipcRenderer: IpcRenderer;
remote: Remote;
@@ -83,6 +84,7 @@ declare namespace Electron {
const autoUpdater: AutoUpdater;
const clipboard: Clipboard;
const contentTracing: ContentTracing;
+ const contextBridge: ContextBridge;
const crashReporter: CrashReporter;
const desktopCapturer: DesktopCapturer;
const dialog: Dialog;
@@ -2511,6 +2513,13 @@ declare namespace Electron {
stopRecording(resultFilePath: string): Promise<string>;
}
+ interface ContextBridge extends EventEmitter {
+
+ // Docs: http://electronjs.org/docs/api/context-bridge
+
+ exposeInMainWorld(apiKey: string, api: Record<string, any>): void;
+ }
+
interface Cookie {
// Docs: http://electronjs.org/docs/api/structures/cookie