Merge pull request #245235 from microsoft/robo/revert_244910_1_99

Revert "chore: pass webviewID with initial version message to sw"

Author: aeschli

src/vs/workbench/contrib/webview/browser/pre/index-no-csp.html

@@ -230,7 +230,7 @@
 				return reject(new Error('Service Workers are not enabled. Webviews will not work. Try disabling private/incognito mode.'));
 			}
 
-			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
+			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&id=${ID}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
 			navigator.serviceWorker.register(swPath)
 				.then(async registration => {
 					/**
@@ -259,7 +259,7 @@
 					navigator.serviceWorker.addEventListener('message', versionHandler);
 
 					const postVersionMessage = (/** @type {ServiceWorker} */ controller) => {
-						controller.postMessage({ channel: 'version', data: { webviewID: ID } });
+						controller.postMessage({ channel: 'version' });
 					};
 
 					// At this point, either the service worker is ready and

src/vs/workbench/contrib/webview/browser/pre/index.html

@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-D+d2/k0hwjyCxorvVPVFGz3TsCJaNh2jVdTq7X+RsTU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-nlLyDpnjtftJG2xvXh2vuy77l7xFTjfOz7Jnj1iXNmA=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 
 	<!-- Disable pinch zooming -->
@@ -236,7 +236,7 @@
 				return reject(new Error('Service Workers are not enabled. Webviews will not work. Try disabling private/incognito mode.'));
 			}
 
-			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
+			const swPath = encodeURI(`service-worker.js?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&id=${ID}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
 			navigator.serviceWorker.register(swPath)
 				.then(async registration => {
 					/**
@@ -265,7 +265,7 @@
 					navigator.serviceWorker.addEventListener('message', versionHandler);
 
 					const postVersionMessage = (/** @type {ServiceWorker} */ controller) => {
-						controller.postMessage({ channel: 'version', data: { webviewID: ID } });
+						controller.postMessage({ channel: 'version' });
 					};
 
 					// At this point, either the service worker is ready and

src/vs/workbench/contrib/webview/browser/pre/service-worker.js

@@ -18,7 +18,7 @@ const searchParams = new URL(location.toString()).searchParams;
 
 const remoteAuthority = searchParams.get('remoteAuthority');
 
-let ID = '';
+const ID = searchParams.get('id');
 
 /**
  * Origin used for resources
@@ -135,7 +135,6 @@ sw.addEventListener('message', async (event) => {
 	switch (event.data.channel) {
 		case 'version': {
 			const source = /** @type {Client} */ (event.source);
-			ID = event.data.webviewID;
 			sw.clients.get(source.id).then(client => {
 				if (client) {
 					client.postMessage({