daohualiuxiang
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: bump electron@8.3.3

pull/100923/head
deepak1556 2020-06-19 11:12:28 -07:00
parent 9206176f45
commit d2f06fbcec
6 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.yarnrc
View File

@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron" disturl "https://atom.io/download/electron"
target "7.3.1" target "8.3.3"
runtime "electron" runtime "electron"

12
cgmanifest.json
View File

@ -6,7 +6,7 @@
"git": { "git": {
"name": "chromium", "name": "chromium",
"repositoryUrl": "https://chromium.googlesource.com/chromium/src", "repositoryUrl": "https://chromium.googlesource.com/chromium/src",
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf" "commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
} }
}, },
"licenseDetail": [ "licenseDetail": [
@ -40,7 +40,7 @@
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." "SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
], ],
"isOnlyProductionDependency": true, "isOnlyProductionDependency": true,
"version": "78.0.3904.130" "version": "80.0.3987.165"
}, },
{ {
"component": { "component": {
@ -48,11 +48,11 @@
"git": { "git": {
"name": "nodejs", "name": "nodejs",
"repositoryUrl": "https://github.com/nodejs/node", "repositoryUrl": "https://github.com/nodejs/node",
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a" "commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
} }
}, },
"isOnlyProductionDependency": true, "isOnlyProductionDependency": true,
"version": "12.8.1" "version": "12.13.0"
}, },
{ {
"component": { "component": {
@ -60,12 +60,12 @@
"git": { "git": {
"name": "electron", "name": "electron",
"repositoryUrl": "https://github.com/electron/electron", "repositoryUrl": "https://github.com/electron/electron",
"commitHash": "bc8fc0d406d32e4c02f3ec9f161deaacbe4f5989" "commitHash": "87fd06bc96bce8f46ca05b8315657fd230bcac85"
} }
}, },
"isOnlyProductionDependency": true, "isOnlyProductionDependency": true,
"license": "MIT", "license": "MIT",
"version": "7.3.1" "version": "8.3.3"
}, },
{ {
"component": { "component": {

2
package.json
View File

@ -98,7 +98,7 @@
"css-loader": "^3.2.0", "css-loader": "^3.2.0",
"debounce": "^1.0.0", "debounce": "^1.0.0",
"deemon": "^1.4.0", "deemon": "^1.4.0",
"electron": "7.3.1", "electron": "8.3.3",
"eslint": "6.8.0", "eslint": "6.8.0",
"eslint-plugin-jsdoc": "^19.1.0", "eslint-plugin-jsdoc": "^19.1.0",
"event-stream": "3.3.4", "event-stream": "3.3.4",

3
src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
View File

@ -9,9 +9,10 @@ import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_
export function registerContextMenuListener(): void { export function registerContextMenuListener(): void {
ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => { ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
const menu = createMenu(event, onClickChannel, items); const menu = createMenu(event, onClickChannel, items);
const window = BrowserWindow.fromWebContents(event.sender);
menu.popup({ menu.popup({
window: BrowserWindow.fromWebContents(event.sender), window: window ? window : undefined,
x: options ? options.x : undefined, x: options ? options.x : undefined,
y: options ? options.y : undefined, y: options ? options.y : undefined,
positioningItem: options ? options.positioningItem : undefined, positioningItem: options ? options.positioningItem : undefined,

2
src/vs/platform/launch/electron-main/launchMainService.ts
View File

@ -156,6 +156,8 @@ export class LaunchMainService implements ILaunchMainService {
else { else {
const lastActive = this.windowsMainService.getLastActiveWindow(); const lastActive = this.windowsMainService.getLastActiveWindow();
if (lastActive) { if (lastActive) {
// Force focus the app before requesting window focus
app.focus({ steal: true });
lastActive.focus(); lastActive.focus();
usedWindows = [lastActive]; usedWindows = [lastActive];

8
yarn.lock
View File

@ -2713,10 +2713,10 @@ electron-to-chromium@^1.2.7:
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0= integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=
electron@7.3.1: electron@8.3.3:
version "7.3.1" version "8.3.3"
resolved "https://registry.yarnpkg.com/electron/-/electron-7.3.1.tgz#3574f85866b97a8712265442dbf7244cac639910" resolved "https://registry.yarnpkg.com/electron/-/electron-8.3.3.tgz#8ce07dcbafa097d00b94d1dd58a2a3b30fe6f803"
integrity sha512-T1yuQqjTpRIh/oQ1rIhuN2aIk0YZaielyn09oxrMMwvL+C3bHvpPUJSCZrtVSzdUmTORhQRM9FZPzheBsneVUA== integrity sha512-/LGnjnE9BQzkn2VpjflLi7jpQxYIp+maqmiDPy6ww76hkQvt/LJ991ewdHpfLR4or3VqzPIu+AK+ZJrTlDAWyw==
dependencies: dependencies:
"@electron/get" "^1.0.1" "@electron/get" "^1.0.1"
"@types/node" "^12.0.12" "@types/node" "^12.0.12"