Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump electron@8.3.0 #98266

Merged
merged 1 commit into from May 20, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yarnrc
@@ -1,3 +1,3 @@
disturl "https://atom.io/download/electron"
target "7.2.4"
target "8.3.0"
runtime "electron"
4 changes: 2 additions & 2 deletions build/builtin/main.js
Expand Up @@ -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());
app.on('window-all-closed', () => app.quit());
12 changes: 6 additions & 6 deletions cgmanifest.json
Expand Up @@ -6,7 +6,7 @@
"git": {
"name": "chromium",
"repositoryUrl": "https://chromium.googlesource.com/chromium/src",
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
"commitHash": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
}
},
"licenseDetail": [
Expand Down Expand Up @@ -40,32 +40,32 @@
"SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
],
"isOnlyProductionDependency": true,
"version": "78.0.3904.130"
"version": "80.0.3987.165"
},
{
"component": {
"type": "git",
"git": {
"name": "nodejs",
"repositoryUrl": "https://github.com/nodejs/node",
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
"commitHash": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
}
},
"isOnlyProductionDependency": true,
"version": "12.8.1"
"version": "12.13.0"
},
{
"component": {
"type": "git",
"git": {
"name": "electron",
"repositoryUrl": "https://github.com/electron/electron",
"commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565"
"commitHash": "426d45cd8569fb7731f213159336cea019829ec5"
}
},
"isOnlyProductionDependency": true,
"license": "MIT",
"version": "7.2.4"
"version": "8.3.0"
},
{
"component": {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -100,7 +100,7 @@
"css-loader": "^3.2.0",
"debounce": "^1.0.0",
"deemon": "^1.4.0",
"electron": "7.2.4",
"electron": "8.3.0",
"eslint": "6.8.0",
"eslint-plugin-jsdoc": "^19.1.0",
"event-stream": "3.3.4",
Expand Down
3 changes: 2 additions & 1 deletion src/vs/base/parts/contextmenu/electron-main/contextmenu.ts
Expand Up @@ -9,9 +9,10 @@ import { ISerializableContextMenuItem, CONTEXT_MENU_CLOSE_CHANNEL, CONTEXT_MENU_
export function registerContextMenuListener(): void {
ipcMain.on(CONTEXT_MENU_CHANNEL, (event: IpcMainEvent, contextMenuId: number, items: ISerializableContextMenuItem[], onClickChannel: string, options?: IPopupOptions) => {
const menu = createMenu(event, onClickChannel, items);
const window = BrowserWindow.fromWebContents(event.sender);

menu.popup({
window: BrowserWindow.fromWebContents(event.sender),
window: window ? window : undefined,
x: options ? options.x : undefined,
y: options ? options.y : undefined,
positioningItem: options ? options.positioningItem : undefined,
Expand Down
3 changes: 2 additions & 1 deletion src/vs/code/electron-main/auth.ts
Expand Up @@ -59,7 +59,8 @@ export class ProxyAuthHandler extends Disposable {
title: 'VS Code',
webPreferences: {
nodeIntegration: true,
webviewTag: true
webviewTag: true,
enableWebSQL: false
}
};

Expand Down
1 change: 1 addition & 0 deletions src/vs/code/electron-main/sharedProcess.ts
Expand Up @@ -44,6 +44,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
}
});
Expand Down
3 changes: 2 additions & 1 deletion src/vs/code/electron-main/window.ts
Expand Up @@ -165,7 +165,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
webPreferences: {
nodeIntegration: true,
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
webviewTag: true
webviewTag: true,
enableWebSQL: false
}
};

Expand Down
6 changes: 4 additions & 2 deletions src/vs/platform/issue/electron-main/issueMainService.ts
Expand Up @@ -189,7 +189,8 @@ export class IssueMainService implements IIssueService {
title: localize('issueReporter', "Issue Reporter"),
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
webPreferences: {
nodeIntegration: true
nodeIntegration: true,
enableWebSQL: false
}
});

Expand Down Expand Up @@ -238,7 +239,8 @@ export class IssueMainService implements IIssueService {
backgroundColor: data.styles.backgroundColor,
title: localize('processExplorer', "Process Explorer"),
webPreferences: {
nodeIntegration: true
nodeIntegration: true,
enableWebSQL: false
}
});

Expand Down
3 changes: 2 additions & 1 deletion test/unit/electron/index.js
Expand Up @@ -115,7 +115,8 @@ app.on('ready', () => {
backgroundThrottling: false,
nodeIntegration: true,
webSecurity: false,
webviewTag: true
webviewTag: true,
enableWebSQL: false
}
});

Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -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@8.3.0:
version "8.3.0"
resolved "https://registry.yarnpkg.com/electron/-/electron-8.3.0.tgz#c2b565a4c10d6d287d20164bcd5a478468b940a9"
integrity sha512-XRjiIJICZCgUr2vKSUI2PTkfP0gPFqCtqJUaTJSfCTuE3nTrxBKOUNeRMuCzEqspKkpFQU3SB3MdbMSHmZARlQ==
dependencies:
"@electron/get" "^1.0.1"
"@types/node" "^12.0.12"
Expand Down