@codingame/monaco-vscode-view-common-service-override 20.4.1 → 21.0.0

package/index.js

@@ -72,7 +72,6 @@ let webviewIframeAlternateDomains;
 registerAssets({
     'vs/workbench/contrib/webview/browser/pre/service-worker.js': () => changeUrlDomain(new URL('./service-override/vs/workbench/contrib/webview/browser/pre/service-worker.js', import.meta.url).href, webviewIframeAlternateDomains),
     'vs/workbench/contrib/webview/browser/pre/index.html': () => changeUrlDomain(new URL('./service-override/vs/workbench/contrib/webview/browser/pre/index.html', import.meta.url).href, webviewIframeAlternateDomains),
-    'vs/workbench/contrib/webview/browser/pre/index-no-csp.html': () => changeUrlDomain(new URL('./service-override/vs/workbench/contrib/webview/browser/pre/index-no-csp.html', import.meta.url).href, webviewIframeAlternateDomains),
     'vs/workbench/contrib/webview/browser/pre/fake.html': () => changeUrlDomain(new URL('./service-override/vs/workbench/contrib/webview/browser/pre/fake.html', import.meta.url).href, webviewIframeAlternateDomains)
 });
 registerServiceInitializePostParticipant(async (accessor) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-view-common-service-override",
-  "version": "20.4.1",
+  "version": "21.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - view-common service-override",
   "keywords": [],
@@ -15,46 +15,46 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "20.4.1",
-    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "20.4.1",
-    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "20.4.1",
-    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "20.4.1",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "20.4.1",
-    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "20.4.1",
-    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "20.4.1",
-    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "20.4.1",
-    "@codingame/monaco-vscode-501b06ab-3f58-516b-8a1a-c29d375d3da4-common": "20.4.1",
-    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "20.4.1",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "20.4.1",
-    "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common": "20.4.1",
-    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "20.4.1",
-    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "20.4.1",
-    "@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common": "20.4.1",
-    "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common": "20.4.1",
-    "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common": "20.4.1",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "20.4.1",
-    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "20.4.1",
-    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "20.4.1",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "20.4.1",
-    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "20.4.1",
-    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "20.4.1",
-    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "20.4.1",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "20.4.1",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "20.4.1",
-    "@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common": "20.4.1",
-    "@codingame/monaco-vscode-api": "20.4.1",
-    "@codingame/monaco-vscode-bc6d9a89-1625-5010-b57e-ff44151144fe-common": "20.4.1",
-    "@codingame/monaco-vscode-bulk-edit-service-override": "20.4.1",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "20.4.1",
-    "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common": "20.4.1",
-    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "20.4.1",
-    "@codingame/monaco-vscode-d941ac7b-412f-57e3-b1bf-f6b0eb253b21-common": "20.4.1",
-    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "20.4.1",
-    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "20.4.1",
-    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "20.4.1",
-    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "20.4.1",
-    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "20.4.1",
-    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "20.4.1"
+    "@codingame/monaco-vscode-0c06bfba-d24d-5c4d-90cd-b40cefb7f811-common": "21.0.0",
+    "@codingame/monaco-vscode-0cc5da60-f921-59b9-bd8c-a018e93c0a6f-common": "21.0.0",
+    "@codingame/monaco-vscode-158b9837-fc78-5d9c-86f5-9134e4358643-common": "21.0.0",
+    "@codingame/monaco-vscode-1b4486de-4fe4-59c4-9e6d-34f265ff6625-common": "21.0.0",
+    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.0.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "21.0.0",
+    "@codingame/monaco-vscode-3109a756-1f83-5d09-945b-9f0fcad928f0-common": "21.0.0",
+    "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "21.0.0",
+    "@codingame/monaco-vscode-4a316137-39d1-5d77-8b53-112db3547c1e-common": "21.0.0",
+    "@codingame/monaco-vscode-4fad3647-b95d-5c19-bab1-bb9de627a5ec-common": "21.0.0",
+    "@codingame/monaco-vscode-523730aa-81e6-55d7-9916-87ad537fe087-common": "21.0.0",
+    "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common": "21.0.0",
+    "@codingame/monaco-vscode-615ce609-8555-545a-a549-47bd9f80e9f8-common": "21.0.0",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "21.0.0",
+    "@codingame/monaco-vscode-6980eeab-47bb-5a48-8e15-32caf0785565-common": "21.0.0",
+    "@codingame/monaco-vscode-6db1b967-5327-5c5c-8c17-bd92774c0fb2-common": "21.0.0",
+    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.0.0",
+    "@codingame/monaco-vscode-72a1b7d3-3f58-5545-9b7e-f579bd003081-common": "21.0.0",
+    "@codingame/monaco-vscode-7869cfe8-f42c-5721-9f2b-7d04a6a41f16-common": "21.0.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "21.0.0",
+    "@codingame/monaco-vscode-897bebad-39df-57cb-8a57-36a271d038be-common": "21.0.0",
+    "@codingame/monaco-vscode-89a82baf-8ded-5b2f-b8af-e5fbd72dc5ad-common": "21.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "21.0.0",
+    "@codingame/monaco-vscode-9a5ab9e7-d838-5831-9eb4-e79ea3764dcb-common": "21.0.0",
+    "@codingame/monaco-vscode-9c84f943-bcb5-5bcf-92a6-91f66a732f26-common": "21.0.0",
+    "@codingame/monaco-vscode-9efc1f50-c7de-55d6-8b28-bcc88bd49b5a-common": "21.0.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "21.0.0",
+    "@codingame/monaco-vscode-ac93482b-2178-52df-a200-ba0d1a4963fb-common": "21.0.0",
+    "@codingame/monaco-vscode-api": "21.0.0",
+    "@codingame/monaco-vscode-bc6d9a89-1625-5010-b57e-ff44151144fe-common": "21.0.0",
+    "@codingame/monaco-vscode-bulk-edit-service-override": "21.0.0",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "21.0.0",
+    "@codingame/monaco-vscode-d26a96d3-122c-5a3d-a04d-deb5ff0f19c0-common": "21.0.0",
+    "@codingame/monaco-vscode-d481a59e-259c-524e-bee1-76483d75d3a1-common": "21.0.0",
+    "@codingame/monaco-vscode-dbfe5f85-b426-55ed-a79b-5f811b395762-common": "21.0.0",
+    "@codingame/monaco-vscode-e59ecb8c-db32-5324-8fe4-cf9921fd92b8-common": "21.0.0",
+    "@codingame/monaco-vscode-e72c94ca-257a-5b75-8b68-5a5fa3c18255-common": "21.0.0",
+    "@codingame/monaco-vscode-f1bbc6d3-6129-583c-a2ba-c80b832993d2-common": "21.0.0",
+    "@codingame/monaco-vscode-f24e325c-2ce0-5bba-8236-bfc4f53180ab-common": "21.0.0",
+    "@codingame/monaco-vscode-ff9fa663-eae3-5274-8573-c2b918871e4b-common": "21.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/service-override/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-pTZgf/zU+f1azdy9x9B5BfoQYdrPJWvIfvvlF2+dasY=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-dk59AsDExia54iNuVBobMQ28rQB/JDlPxdX7gwMIfYU=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -38,6 +38,24 @@
 		const serviceWorkerUri = searchParams.get('serviceWorkerUri');
 		const fakeHtmlUri = searchParams.get('fakeHtmlUri');
 
+		/**
+		 * @param {string} name
+		 * @param {Record<string, string>} [options]
+		 */
+		const perfMark = (name, options = {}) => {
+			performance.mark(`webview/index.html/${name}`, {
+				detail: {
+					id: ID,
+					...options
+				}
+			});
+		}
+
+		perfMark('scriptStart');
+
+		/** @type {MessageChannel | undefined} */
+		let outerIframeMessageChannel;
+
 		/**
 		 * Use polling to track focus of main webview and iframes within the webview
 		 *
@@ -88,6 +106,7 @@
 		const defaultStyles = document.createElement('style');
 		defaultStyles.id = '_defaultStyles';
 		defaultStyles.textContent = `
+		@layer vscode-default {
 			html {
 				scrollbar-color: var(--vscode-scrollbarSlider-background) var(--vscode-editor-background);
 			}
@@ -181,6 +200,7 @@
 			}
 			::highlight(current-find-highlight) {
 				background-color: var(--vscode-editor-findMatchBackground);
+			}
 			}`;
 
 		/**
@@ -221,9 +241,9 @@
 							});
 						};
 					})();
-					delete window.parent;
-					delete window.top;
-					delete window.frameElement;
+					window.parent = window;
+					window.top = window;
+					window.frameElement = null;
 				`;
 		}
 
@@ -238,7 +258,7 @@
 			}
 
 			const swPath = encodeURI(`${serviceWorkerUri}?v=${expectedWorkerVersion}&vscode-resource-base-authority=${searchParams.get('vscode-resource-base-authority')}&id=${ID}&remoteAuthority=${searchParams.get('remoteAuthority') ?? ''}`);
-			navigator.serviceWorker.register(swPath)
+			navigator.serviceWorker.register(swPath, { type: 'module' })
 				.then(async registration => {
 					/**
 					 * @param {MessageEvent} event
@@ -266,7 +286,8 @@
 					navigator.serviceWorker.addEventListener('message', versionHandler);
 
 					const postVersionMessage = (/** @type {ServiceWorker} */ controller) => {
-						controller.postMessage({ channel: 'version' });
+						outerIframeMessageChannel = new MessageChannel();
+						controller.postMessage({ channel: 'version' }, [outerIframeMessageChannel.port2]);
 					};
 
 					// At this point, either the service worker is ready and
@@ -343,6 +364,7 @@
 
 			async signalReady() {
 				const start = (/** @type {string} */ parentOrigin) => {
+					perfMark('signalingReady');
 					window.parent.postMessage({ target: ID, channel: 'webview-ready', data: {} }, parentOrigin, [this.channel.port2]);
 				};
 
@@ -888,6 +910,7 @@
 		window.addEventListener('drag', handleInnerDragEvent);
 		window.addEventListener('drop', handleInnerDropEvent);
 
+
 		onDomReady(() => {
 			if (!document.body) {
 				return;
@@ -934,9 +957,12 @@
 			// update iframe-contents
 			let updateId = 0;
 			hostMessaging.onMessage('content', async (_event, /** @type {import('../webviewMessages').UpdateContentEvent} */ data) => {
+				perfMark('content/started');
+
 				const currentUpdateId = ++updateId;
 				try {
 					await workerReady;
+					perfMark('content/workerReady');
 				} catch (e) {
 					console.error(`Webview fatal error: ${e}`);
 					hostMessaging.postMessage('fatal-error', { message: e + '' });
@@ -1025,12 +1051,15 @@
 				 * @param {Document} contentDocument
 				 */
 				function onFrameLoaded(contentDocument) {
+					perfMark('content/innerFrameLoaded')
+
 					// Workaround for https://bugs.chromium.org/p/chromium/issues/detail?id=978325
 					setTimeout(() => {
 						contentDocument.open();
 						contentDocument.write(newDocument);
 						contentDocument.close();
 						hookupOnLoadHandlers(newFrame);
+						perfMark('content/wroteInnerContent')
 
 						if (initialStyleVersion !== styleVersion) {
 							applyStyles(contentDocument, contentDocument.body);
@@ -1091,6 +1120,21 @@
 							contentWindow.focus();
 						}
 
+						// Get body size
+						const docEl = contentDocument.documentElement;
+						if (docEl) {
+							const postSize = () => {
+								hostMessaging.postMessage('updated-intrinsic-content-size', {
+									width: docEl.offsetWidth,
+									height: docEl.offsetHeight
+								});
+							};
+
+							const resizeObserver = new ResizeObserver(postSize);
+							resizeObserver.observe(docEl);
+							postSize();
+						}
+
 						pendingMessages.forEach((message) => {
 							contentWindow.postMessage(message.message, window.origin, message.transfer);
 						});
@@ -1170,9 +1214,21 @@
 					contentWindow.addEventListener('dragenter', handleInnerDragStartEvent);
 					contentWindow.addEventListener('dragover', handleInnerDragEvent);
 					contentWindow.addEventListener('drag', handleInnerDragEvent);
+					contentWindow.addEventListener('drop', handleInnerDropEvent);
 
 					unloadMonitor.onIframeLoaded(newFrame);
 				}
+
+				if (!disableServiceWorker && outerIframeMessageChannel) {
+					outerIframeMessageChannel.port1.onmessage = event => {
+						switch (event.data.channel) {
+							case 'load-resource':
+							case 'load-localhost':
+								hostMessaging.postMessage(event.data.channel, event.data);
+								return;
+						}
+					};
+				}
 			});
 
 			// propagate vscode-context-menu-visible class

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

@@ -26,6 +26,19 @@ let outerIframeMessagePort;
  */
 const resourceBaseAuthority = searchParams.get('vscode-resource-base-authority');
 
+/**
+ * @param {string} name
+ * @param {Record<string, string>} [options]
+ */
+const perfMark = (name, options = {}) => {
+	performance.mark(`webview/service-worker/${name}`, {
+		detail: {
+			...options
+		}
+	});
+}
+
+perfMark('scriptStart');
 
 /** @type {number} */
 const resolveTimeout = 30_000;
@@ -55,8 +68,8 @@ class RequestStore {
 	}
 
 	/**
- * @returns {{ requestId: number, promise: Promise<RequestStoreResult<T>> }}
- */
+	 * @returns {{ requestId: number, promise: Promise<RequestStoreResult<T>> }}
+	 */
 	create() {
 		const requestId = ++this.requestPool;
 
@@ -129,8 +142,10 @@ sw.addEventListener('message', async (event) => {
 	const source = event.source;
 	switch (event.data.channel) {
 		case 'version': {
+			perfMark('version/request');
 			outerIframeMessagePort = event.ports[0];
 			sw.clients.get(source.id).then(client => {
+				perfMark('version/reply');
 				if (client) {
 					client.postMessage({
 						channel: 'version',