From c8123dee962847abcbd988d8c180ae1dec0b56d5 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jan 2020 15:06:11 -0800 Subject: [PATCH] Fix webviews for electron 7 Caused by #83796 Also re-enables the webview tests --- .../vscode-api-tests/src/singlefolder-tests/webview.test.ts | 2 +- src/vs/code/electron-main/app.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts index e149da8995b..e785f1d4afb 100644 --- a/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts +++ b/extensions/vscode-api-tests/src/singlefolder-tests/webview.test.ts @@ -13,7 +13,7 @@ const webviewId = 'myWebview'; const testDocument = join(vscode.workspace.rootPath || '', './bower.json'); -suite.skip('Webview tests', () => { +suite('Webview tests', () => { const disposables: vscode.Disposable[] = []; function _register(disposable: T) { diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 549c348240b..712d6f05c5b 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -191,7 +191,8 @@ export class CodeApplication extends Disposable { webPreferences.nodeIntegration = false; // Verify URLs being loaded - if (isValidWebviewSource(params.src) && isValidWebviewSource(webPreferences.preload)) { + // https://github.com/electron/electron/issues/21553 + if (isValidWebviewSource(params.src) && isValidWebviewSource((webPreferences as { preloadURL: string }).preloadURL)) { return; } -- GitLab