mirror of
https://github.com/Microsoft/vscode
synced 2024-09-14 06:08:12 +00:00
Revert "chore: bump electron@8.3.0 (#98266)"
This reverts commit 820fd4048f
.
This commit is contained in:
parent
040034f7ae
commit
876f2e70f9
2
.yarnrc
2
.yarnrc
|
@ -1,3 +1,3 @@
|
||||||
disturl "https://atom.io/download/electron"
|
disturl "https://atom.io/download/electron"
|
||||||
target "8.3.0"
|
target "7.2.4"
|
||||||
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, enableWebSQL: false } });
|
window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } });
|
||||||
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();
|
||||||
|
|
|
@ -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": "052d3b44972e6d94ef40054d46c150b7cdd7a5d8"
|
"commitHash": "e4745133a1d3745f066e068b8033c6a269b59caf"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"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": "80.0.3987.165"
|
"version": "78.0.3904.130"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"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": "42cce5a9d0fd905bf4ad7a2528c36572dfb8b5ad"
|
"commitHash": "787378879acfb212ed4ff824bf9f767a24a5cb43a"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"isOnlyProductionDependency": true,
|
"isOnlyProductionDependency": true,
|
||||||
"version": "12.13.0"
|
"version": "12.8.1"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"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": "426d45cd8569fb7731f213159336cea019829ec5"
|
"commitHash": "0552e0d5de46ffa3b481d741f1db5c779e201565"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"isOnlyProductionDependency": true,
|
"isOnlyProductionDependency": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"version": "8.3.0"
|
"version": "7.2.4"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"component": {
|
"component": {
|
||||||
|
|
|
@ -100,7 +100,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": "8.3.0",
|
"electron": "7.2.4",
|
||||||
"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",
|
||||||
|
|
|
@ -9,10 +9,9 @@ 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: window ? window : undefined,
|
window: BrowserWindow.fromWebContents(event.sender),
|
||||||
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,
|
||||||
|
|
|
@ -59,8 +59,7 @@ export class ProxyAuthHandler extends Disposable {
|
||||||
title: 'VS Code',
|
title: 'VS Code',
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webviewTag: true,
|
webviewTag: true
|
||||||
enableWebSQL: false
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -44,7 +44,6 @@ 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
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
@ -165,8 +165,7 @@ export class CodeWindow extends Disposable implements ICodeWindow {
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
|
nodeIntegrationInWorker: RUN_TEXTMATE_IN_WORKER,
|
||||||
webviewTag: true,
|
webviewTag: true
|
||||||
enableWebSQL: false
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -189,8 +189,7 @@ export class IssueMainService implements IIssueService {
|
||||||
title: localize('issueReporter', "Issue Reporter"),
|
title: localize('issueReporter', "Issue Reporter"),
|
||||||
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
|
backgroundColor: data.styles.backgroundColor || DEFAULT_BACKGROUND_COLOR,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true
|
||||||
enableWebSQL: false
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -239,8 +238,7 @@ export class IssueMainService implements IIssueService {
|
||||||
backgroundColor: data.styles.backgroundColor,
|
backgroundColor: data.styles.backgroundColor,
|
||||||
title: localize('processExplorer', "Process Explorer"),
|
title: localize('processExplorer', "Process Explorer"),
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
nodeIntegration: true,
|
nodeIntegration: true
|
||||||
enableWebSQL: false
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -115,8 +115,7 @@ app.on('ready', () => {
|
||||||
backgroundThrottling: false,
|
backgroundThrottling: false,
|
||||||
nodeIntegration: true,
|
nodeIntegration: true,
|
||||||
webSecurity: false,
|
webSecurity: false,
|
||||||
webviewTag: true,
|
webviewTag: true
|
||||||
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@8.3.0:
|
electron@7.2.4:
|
||||||
version "8.3.0"
|
version "7.2.4"
|
||||||
resolved "https://registry.yarnpkg.com/electron/-/electron-8.3.0.tgz#c2b565a4c10d6d287d20164bcd5a478468b940a9"
|
resolved "https://registry.yarnpkg.com/electron/-/electron-7.2.4.tgz#9fc0446dae23ead897af8742470cb18da55c6ce9"
|
||||||
integrity sha512-XRjiIJICZCgUr2vKSUI2PTkfP0gPFqCtqJUaTJSfCTuE3nTrxBKOUNeRMuCzEqspKkpFQU3SB3MdbMSHmZARlQ==
|
integrity sha512-Z+R692uTzXgP8AHrabE+kkrMlQJ6pnAYoINenwj9QSqaD2YbO8IuXU9DMCcUY0+VpA91ee09wFZJNUKYPMnCKg==
|
||||||
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