fix: enable nodeIntegration and webviewTag preferences

The default values are now flipped electron/electron#16235
microsoft · Jun 14, 2019 · fe8a5e4 · fe8a5e4
1 parent 49ac885
commit fe8a5e4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 5 deletions.
diff --git a/build/builtin/main.js b/build/builtin/main.js
@@ -10,7 +10,7 @@ const path = require('path');
 let window = null;
 
 app.once('ready', () => {
-	window = new BrowserWindow({ width: 800, height: 600 });
+	window = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true, webviewTag: true } });
 	window.setMenuBarVisibility(false);
 	window.loadURL(url.format({ pathname: path.join(__dirname, 'index.html'), protocol: 'file:', slashes: true }));
 	// window.webContents.openDevTools();

diff --git a/src/vs/code/electron-main/auth.ts b/src/vs/code/electron-main/auth.ts
@@ -54,7 +54,11 @@ export class ProxyAuthHandler {
 			width: 450,
 			height: 220,
 			show: true,
-			title: 'VS Code'
+			title: 'VS Code',
+			webPreferences: {
+				nodeIntegration: true,
+				webviewTag: true
+			}
 		};
 
 		const focusedWindow = this.windowsMainService.getFocusedWindow();

diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts
@@ -36,7 +36,7 @@ export class SharedProcess implements ISharedProcess {
 			backgroundColor: this.themeMainService.getBackgroundColor(),
 			webPreferences: {
 				images: false,
-				webaudio: false,
+				nodeIntegration: true,
 				webgl: 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
@@ -134,7 +134,9 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 				// want to enforce that Code stays in the foreground. This triggers a disable_hidden_
 				// flag that Electron provides via patch:
 				// https://github.com/electron/libchromiumcontent/blob/master/patches/common/chromium/disable_hidden.patch
-				backgroundThrottling: false
+				backgroundThrottling: false,
+				nodeIntegration: true,
+				webviewTag: true
 			}
 		};
 

diff --git a/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts b/src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts
@@ -385,6 +385,7 @@ export class WebviewElement extends Disposable implements Webview {
 
 		this._webview = document.createElement('webview');
 		this._webview.setAttribute('partition', `webview${Date.now()}`);
+		this._webview.setAttribute('nodeintegration', 'yes');
 		this._webview.setAttribute('webpreferences', 'contextIsolation=yes');
 
 		this._webview.style.flex = '0 1';

diff --git a/test/electron/index.js b/test/electron/index.js
@@ -106,7 +106,9 @@ app.on('ready', () => {
 		show: false,
 		webPreferences: {
 			backgroundThrottling: false,
-			webSecurity: false
+			nodeIntegration: true,
+			webSecurity: false,
+			webviewTag: true
 		}
 	});