Cleanup and add webview.experimental.useIframes setting

Author: mjbvz

src/vs/workbench/contrib/webview/browser/pre/host.js

@@ -5,7 +5,7 @@
 // @ts-check
 (function () {
 	const id = document.location.search.match(/\bid=([\w-]+)/)[1];
-	const noServiceWorker = /noServiceWorker/.test(document.location.search);
+	const onElectron = /platform=electron/.test(document.location.search);
 
 	const hostMessaging = new class HostMessaging {
 		constructor() {
@@ -37,7 +37,7 @@
 	}();
 
 	const workerReady = new Promise(async (resolveWorkerReady) => {
-		if (noServiceWorker) {
+		if (onElectron) {
 			return resolveWorkerReady();
 		}
 
@@ -100,11 +100,15 @@
 		postMessage: hostMessaging.postMessage.bind(hostMessaging),
 		onMessage: hostMessaging.onMessage.bind(hostMessaging),
 		ready: workerReady,
-		fakeLoad: !noServiceWorker,
-		rewriteCSP: (csp, endpoint) => {
-			const endpointUrl = new URL(endpoint);
-			return csp.replace(/(vscode-webview-resource|vscode-resource):(?=(\s|;|$))/g, endpointUrl.origin);
-		}
+		fakeLoad: !onElectron,
+		rewriteCSP: onElectron
+			? (csp) => {
+				return csp.replace(/vscode-resource:(?=(\s|;|$))/g, 'vscode-webview-resource:');
+			}
+			: (csp, endpoint) => {
+				const endpointUrl = new URL(endpoint);
+				return csp.replace(/(vscode-webview-resource|vscode-resource):(?=(\s|;|$))/g, endpointUrl.origin);
+			}
 	};
 
 	(/** @type {any} */ (window)).createWebviewManager(host);

src/vs/workbench/contrib/webview/electron-browser/iframeWebviewElement.ts

@@ -16,7 +16,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/themeing';
 import { WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
 import { IFrameWebview } from 'vs/workbench/contrib/webview/browser/webviewElement';
-import { WebviewResourceRequestManager } from 'vs/workbench/contrib/webview/electron-browser/webviewResourceRequestManager';
+import { rewriteVsCodeResourceUrls, WebviewResourceRequestManager } from 'vs/workbench/contrib/webview/electron-browser/resourceLoading';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 
 /**
@@ -50,7 +50,7 @@ export class ElectronIframeWebview extends IFrameWebview {
 	}
 
 	protected initElement() {
-		this.element!.src = `${Schemas.vscodeWebview}://${this.id}/index.html?id=${this.id}&bnoServiceWorker`;
+		this.element!.src = `${Schemas.vscodeWebview}://${this.id}/index.html?id=${this.id}&platform=electron`;
 	}
 
 	public set contentOptions(options: WebviewContentOptions) {
@@ -79,16 +79,6 @@ export class ElectronIframeWebview extends IFrameWebview {
 	}
 
 	protected preprocessHtml(value: string): string {
-		return value
-			.replace(/(["'])vscode-resource:(\/\/([^\s\/'"]+?)(?=\/))?([^\s'"]+?)(["'])/gi, (match, startQuote, _1, scheme, path, endQuote) => {
-				if (scheme) {
-					return `${startQuote}${Schemas.vscodeWebviewResource}://${this.id}/${scheme}${path}${endQuote}`;
-				}
-				if (!path.startsWith('//')) {
-					// Add an empty authority if we don't already have one
-					path = '//' + path;
-				}
-				return `${startQuote}${Schemas.vscodeWebviewResource}://${this.id}/file${path}${endQuote}`;
-			});
+		return rewriteVsCodeResourceUrls(this.id, value);
 	}
 }

src/vs/workbench/contrib/webview/electron-browser/webviewResourceRequestManager.ts renamed to src/vs/workbench/contrib/webview/electron-browser/resourceLoading.ts

@@ -14,6 +14,27 @@ import { IRemoteAuthorityResolverService } from 'vs/platform/remote/common/remot
 import { IWebviewManagerService } from 'vs/platform/webview/common/webviewManagerService';
 import { WebviewContentOptions, WebviewExtensionDescription } from 'vs/workbench/contrib/webview/browser/webview';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { Schemas } from 'vs/base/common/network';
+
+/**
+ * Try to rewrite `vscode-resource:` urls in html
+ */
+export function rewriteVsCodeResourceUrls(
+	id: string,
+	html: string,
+): string {
+	return html
+		.replace(/(["'])vscode-resource:(\/\/([^\s\/'"]+?)(?=\/))?([^\s'"]+?)(["'])/gi, (_match, startQuote, _1, scheme, path, endQuote) => {
+			if (scheme) {
+				return `${startQuote}${Schemas.vscodeWebviewResource}://${id}/${scheme}${path}${endQuote}`;
+			}
+			if (!path.startsWith('//')) {
+				// Add an empty authority if we don't already have one
+				path = '//' + path;
+			}
+			return `${startQuote}${Schemas.vscodeWebviewResource}://${id}/file${path}${endQuote}`;
+		});
+}
 
 /**
  * Manages the loading of resources inside of a webview.

src/vs/workbench/contrib/webview/electron-browser/webviewElement.ts

@@ -26,7 +26,7 @@ import { WebviewThemeDataProvider } from 'vs/workbench/contrib/webview/browser/t
 import { Webview, WebviewContentOptions, WebviewExtensionDescription, WebviewOptions } from 'vs/workbench/contrib/webview/browser/webview';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
 import { WebviewFindDelegate, WebviewFindWidget } from '../browser/webviewFindWidget';
-import { WebviewResourceRequestManager } from './webviewResourceRequestManager';
+import { WebviewResourceRequestManager, rewriteVsCodeResourceUrls } from './resourceLoading';
 
 class WebviewKeyboardHandler {
 
@@ -250,21 +250,7 @@ export class ElectronWebviewBasedWebview extends BaseWebview<WebviewTag> impleme
 	public set html(value: string) {
 		this._myLogService.debug(`Webview(${this.id}): will set html`);
 
-		super.html = this.preprocessHtml(value);
-	}
-
-	private preprocessHtml(value: string): string {
-		return value
-			.replace(/(["'])vscode-resource:(\/\/([^\s\/'"]+?)(?=\/))?([^\s'"]+?)(["'])/gi, (match, startQuote, _1, scheme, path, endQuote) => {
-				if (scheme) {
-					return `${startQuote}${Schemas.vscodeWebviewResource}://${this.id}/${scheme}${path}${endQuote}`;
-				}
-				if (!path.startsWith('//')) {
-					// Add an empty authority if we don't already have one
-					path = '//' + path;
-				}
-				return `${startQuote}${Schemas.vscodeWebviewResource}://${this.id}/file${path}${endQuote}`;
-			});
+		super.html = rewriteVsCodeResourceUrls(this.id, value);
 	}
 
 	public mountTo(parent: HTMLElement) {

src/vs/workbench/contrib/webview/electron-browser/webviewService.ts

@@ -32,12 +32,8 @@ export class ElectronWebviewService implements IWebviewService {
 		contentOptions: WebviewContentOptions,
 		extension: WebviewExtensionDescription | undefined,
 	): WebviewElement {
-		const useExternalEndpoint = this._configService.getValue<string>('webview.experimental.useExternalEndpoint');
-		if (useExternalEndpoint) {
-			return this._instantiationService.createInstance(ElectronIframeWebview, id, options, contentOptions, extension, this._webviewThemeDataProvider);
-		} else {
-			return this._instantiationService.createInstance(ElectronWebviewBasedWebview, id, options, contentOptions, extension, this._webviewThemeDataProvider);
-		}
+		const useIframes = this._configService.getValue<string>('webview.experimental.useIframes');
+		return this._instantiationService.createInstance(useIframes ? ElectronIframeWebview : ElectronWebviewBasedWebview, id, options, contentOptions, extension, this._webviewThemeDataProvider);
 	}
 
 	createWebviewOverlay(