mirror of
https://github.com/Microsoft/vscode
synced 2024-09-14 06:08:12 +00:00
chore: bump electron@7.3.0
This commit is contained in:
parent
61b03f3af8
commit
113fd1b7bc
2
.yarnrc
2
.yarnrc
|
@ -1,3 +1,3 @@
|
||||||
disturl "https://atom.io/download/electron"
|
disturl "https://atom.io/download/electron"
|
||||||
target "7.2.4"
|
target "7.3.0"
|
||||||
runtime "electron"
|
runtime "electron"
|
||||||
|
|
|
@ -10,7 +10,7 @@ const path = require('path');
|
||||||
let window = null;
|
let window = null;
|
||||||
|
|
||||||
app.once('ready', () => {
|
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.setMenuBarVisibility(false);
|
||||||
window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
|
window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
|
||||||
// window.webContents.openDevTools();
|
// window.webContents.openDevTools();
|
||||||
|
|
|
@ -60,12 +60,12 @@
|
||||||
"git": {
|
"git": {
|
||||||
"name": "electron",
|
"name": "electron",
|
||||||
"repositoryUrl": "https://github.com/electron/electron",
|
"repositoryUrl": "https://github.com/electron/electron",
|
||||||
"commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565"
|
"commitHash": "8f502de1dc5b6df4218a900d0857de7a40301d98"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"isOnlyProductionDependency": true,
|
"isOnlyProductionDependency": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "7.2.4"
|
"version": "7.3.0"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"component": {
|
"component": {
|
||||||
|
|
|
@ -99,7 +99,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.2.4",
|
"electron": "7.3.0",
|
||||||
"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",
|
||||||
|
|
|
@ -59,7 +59,8 @@ export class ProxyAuthHandler extends Disposable {
|
||||||
title: 'VS Code',
|
title: 'VS Code',
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webviewTag: true
|
webviewTag: true,
|
||||||
|
enableWebSQL: false
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,7 @@ export class SharedProcess implements ISharedProcess {
|
||||||
images: false,
|
images: false,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webgl: false,
|
webgl: false,
|
||||||
|
enableWebSQL: false,
|
||||||
disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
|
disableBlinkFeatures: 'Auxclick' // do NOT change, allows us to identify this window as shared-process in the process explorer
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -166,7 +166,8 @@ export class CodeWindow extends Disposable implements ICodeWindow {
|
||||||
preload: URI.parse(this.doGetPreloadUrl()).fsPath,
|
preload: URI.parse(this.doGetPreloadUrl()).fsPath,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
|
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
|
||||||
webviewTag: true
|
webviewTag: true,
|
||||||
|
enableWebSQL: false
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -195,7 +195,8 @@ export class IssueMainService implements ICommonIssueService {
|
||||||
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
|
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
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"),
|
title: localize('processExplorer', "Process Explorer"),
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
preload: URI.parse(require.toUrl('vs/base/parts/sandbox/electron-browser/preload.js')).fsPath,
|
||||||
nodeIntegration: true
|
nodeIntegration: true,
|
||||||
|
enableWebSQL: false
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -116,7 +116,8 @@ app.on('ready', () => {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webSecurity: false,
|
webSecurity: false,
|
||||||
webviewTag: true,
|
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
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -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"
|
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.27.tgz#78ecb8a399066187bb374eede35d9c70565a803d"
|
||||||
integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=
|
integrity sha1-eOy4o5kGYYe7N07t412ccFZagD0=
|
||||||
|
|
||||||
electron@7.2.4:
|
electron@7.3.0:
|
||||||
version "7.2.4"
|
version "7.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9"
|
resolved "https://registry.yarnpkg.com/electron/-/electron-7.3.0.tgz#b4e1bd1efe32314534dba9b60ea5cc688216f3b3"
|
||||||
integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg==
|
integrity sha512-uG3WVhyawWXBUJN+f5GkdCq8z5r+XsvpLLAyUuPo+DL2PXt57YI1wEXc5qTJq9hzlLAcGOlU/4+8pSkYBWOn1A==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@electron/get" "^1.0.1"
|
"@electron/get" "^1.0.1"
|
||||||
"@types/node" "^12.0.12"
|
"@types/node" "^12.0.12"
|
||||||
|
|
Loading…
Reference in a new issue