From 113fd1b7bcaaae1bdf9a1ef24e37225f812dfb33 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Wed, 27 May 2020 12:47:39 -0700 Subject: [PATCH] chore: bump electron@7.3.0 --- .yarnrc | 2 +- build/builtin/main.js | 4 ++-- cgmanifest.json | 4 ++-- package.json | 4 ++-- src/vs/code/electron-main/auth.ts | 3 ++- src/vs/code/electron-main/sharedProcess.ts | 1 + src/vs/code/electron-main/window.ts | 3 ++- src/vs/platform/issue/electron-main/issueMainService.ts | 6 ++++-- test/unit/electron/index.js | 3 ++- yarn.lock | 8 ++++---- 10 files changed, 22 insertions(+), 16 deletions(-) diff --git a/.yarnrc b/.yarnrc index d86b284e83e63..00b2ebda693e1 100644 --- a/.yarnrc +++ b/.yarnrc @@ -1,3 +1,3 @@ disturl "https://atom.io/download/electron" -target "7.2.4" +target "7.3.0" runtime "electron" diff --git a/build/builtin/main.js b/build/builtin/main.js index b094a67cac5c7..93cef8cbdad0b 100644 --- a/build/builtin/main.js +++ b/build/builtin/main.js @@ -10,11 +10,11 @@ const path = require('path'); let window = null; app.once('ready', () => { - window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } }); + window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true, enableWebSQL: false } }); window.setMenuBarVisibility(false); window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true })); // window.webContents.openDevTools(); window.once('closed', () => window = null); }); -app.on('window-all-closed', () => app.quit()); \ No newline at end of file +app.on('window-all-closed', () => app.quit()); diff --git a/cgmanifest.json b/cgmanifest.json index 09478ca403e6a..f1ce13c7205ae 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -60,12 +60,12 @@ "git": { "name": "electron", "repositoryUrl": "https://github.com/electron/electron", - "commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565" + "commitHash": "8f502de1dc5b6df4218a900d0857de7a40301d98" } }, "isOnlyProductionDependency": true, "license": "MIT", - "version": "7.2.4" + "version": "7.3.0" }, { "component": { diff --git a/package.json b/package.json index 95ca2584e5306..ce129d249062d 100644 --- a/package.json +++ b/package.json @@ -99,7 +99,7 @@ "css-loader": "^3.2.0", "debounce": "^1.0.0", "deemon": "^1.4.0", - "electron": "7.2.4", + "electron": "7.3.0", "eslint": "6.8.0", "eslint-plugin-jsdoc": "^19.1.0", "event-stream": "3.3.4", @@ -181,4 +181,4 @@ "windows-mutex": "0.3.0", "windows-process-tree": "0.2.4" } -} \ No newline at end of file +} diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts index b74e1c4e9c130..5e09e170c84df 100644 --- a/src/vs/code/electron-main/auth.ts +++ b/src/vs/code/electron-main/auth.ts @@ -59,7 +59,8 @@ export class ProxyAuthHandler extends Disposable { title: 'VS Code', webPreferences: { nodeIntegration: true, - webviewTag: true + webviewTag: true, + enableWebSQL: false } }; diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts index e9f95448a0823..7ace2583d7548 100644 --- a/src/vs/code/electron-main/sharedProcess.ts +++ b/src/vs/code/electron-main/sharedProcess.ts @@ -46,6 +46,7 @@ export class SharedProcess implements ISharedProcess { images: false, nodeIntegration: true, webgl: false, + enableWebSQL: false, disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer } }); diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index 193fa596db1a2..e8116b8899de7 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -166,7 +166,8 @@ export class CodeWindow extends Disposable implements ICodeWindow { preload: URI.parse(this.doGetPreloadUrl()).fsPath, nodeIntegration: true, nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER, - webviewTag: true + webviewTag: true, + enableWebSQL: false } }; diff --git a/src/vs/platform/issue/electron-main/issueMainService.ts b/src/vs/platform/issue/electron-main/issueMainService.ts index 81a5be1fe4bd2..fcd734b4305ca 100644 --- a/src/vs/platform/issue/electron-main/issueMainService.ts +++ b/src/vs/platform/issue/electron-main/issueMainService.ts @@ -195,7 +195,8 @@ export class IssueMainService implements ICommonIssueService { backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR, webPreferences: { preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath, - nodeIntegration: true + nodeIntegration: true, + enableWebSQL: false } }); @@ -245,7 +246,8 @@ export class IssueMainService implements ICommonIssueService { title: localize('processExplorer', "Process Explorer"), webPreferences: { preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath, - nodeIntegration: true + nodeIntegration: true, + enableWebSQL: false } }); diff --git a/test/unit/electron/index.js b/test/unit/electron/index.js index 93a4957936131..1911ffc17723c 100644 --- a/test/unit/electron/index.js +++ b/test/unit/electron/index.js @@ -116,7 +116,8 @@ app.on('ready', () => { nodeIntegration: true, webSecurity: false, webviewTag: true, - preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-browser', 'preload.js') // ensure similar environment as VSCode as tests may depend on this + preload: path.join(__dirname, '..', '..', '..', 'src', 'vs', 'base', 'parts', 'sandbox', 'electron-browser', 'preload.js'), // ensure similar environment as VSCode as tests may depend on this + enableWebSQL: false } }); diff --git a/yarn.lock b/yarn.lock index e559825232dab..551040d97cee0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2715,10 +2715,10 @@ electron-to-chromium@^1.2.7: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d" integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0= -electron@7.2.4: - version "7.2.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9" - integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg== +electron@7.3.0: + version "7.3.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-7.3.0.tgz#b4e1bd1efe32314534dba9b60ea5cc688216f3b3" + integrity sha512-uG3WVhyawWXBUJN+f5GkdCq8z5r+XsvpLLAyUuPo+DL2PXt57YI1wEXc5qTJq9hzlLAcGOlU/4+8pSkYBWOn1A== dependencies: "@electron/get" "^1.0.1" "@types/node" "^12.0.12"