Fixes microsoft#134234: Remove __uniqueWebWorkerExtensionHostOrigin…

… option
guibber · Nov 30, 2021 · 97a39f3 · 97a39f3
1 parent af13cd0
commit 97a39f3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts b/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.ts
@@ -92,30 +92,23 @@ export class WebWorkerExtensionHost extends Disposable implements IExtensionHost
 		}
 
 		const forceHTTPS = (location.protocol === 'https:');
+		const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
+		const commit = this._productService.commit;
+		const quality = this._productService.quality;
+		if (webEndpointUrlTemplate && commit && quality) {
+			const baseUrl = (
+				webEndpointUrlTemplate
+					.replace('{{uuid}}', generateUuid())
+					.replace('{{commit}}', commit)
+					.replace('{{quality}}', quality)
+			);
+			const base = (
+				forceHTTPS
+					? `${baseUrl}/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html`
+					: `${baseUrl}/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html`
+			);
 
-		let uniqueWebWorkerExtensionHostOrigin = true;
-		if (this._environmentService.options && typeof this._environmentService.options.__uniqueWebWorkerExtensionHostOrigin !== 'undefined') {
-			uniqueWebWorkerExtensionHostOrigin = this._environmentService.options.__uniqueWebWorkerExtensionHostOrigin;
-		}
-		if (uniqueWebWorkerExtensionHostOrigin) {
-			const webEndpointUrlTemplate = this._productService.webEndpointUrlTemplate;
-			const commit = this._productService.commit;
-			const quality = this._productService.quality;
-			if (webEndpointUrlTemplate && commit && quality) {
-				const baseUrl = (
-					webEndpointUrlTemplate
-						.replace('{{uuid}}', generateUuid())
-						.replace('{{commit}}', commit)
-						.replace('{{quality}}', quality)
-				);
-				const base = (
-					forceHTTPS
-						? `${baseUrl}/out/vs/workbench/services/extensions/worker/httpsWebWorkerExtensionHostIframe.html`
-						: `${baseUrl}/out/vs/workbench/services/extensions/worker/httpWebWorkerExtensionHostIframe.html`
-				);
-
-				return base + suffix;
-			}
+			return base + suffix;
 		}
 
 		if (this._productService.webEndpointUrl) {

diff --git a/src/vs/workbench/workbench.web.api.ts b/src/vs/workbench/workbench.web.api.ts
@@ -364,13 +364,6 @@ interface IWorkbenchConstructionOptions {
 	 */
 	readonly webWorkerExtensionHostIframeSrc?: string;
 
-	/**
-	 * [TEMPORARY]: This will be removed soon.
-	 * Use an unique origin for the web worker extension host.
-	 * Defaults to true.
-	 */
-	readonly __uniqueWebWorkerExtensionHostOrigin?: boolean;
-
 	/**
 	 * A factory for web sockets.
 	 */