Basic modifications to get webview resources loading

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

@@ -23,7 +23,8 @@
 			};
 
 			window.addEventListener('message', (e) => {
-				if (e.origin === 'TODO - Does this come from the inner iframe we created?') {
+				if (e.data && (e.data.command === 'onmessage' || e.data.command === 'do-update-state')) {
+					// Came from inner iframe
 					postMessageToVsCode(e.data.command, e.data.data);
 					return;
 				}
@@ -46,7 +47,7 @@
 					handlers[channel] = handler;
 				},
 				preProcessHtml: (text) => {
-					return text.replace(/(?:["'])vscode-resource:([^\s'"]+)(?:["'])/gi, '/resource?path=$1');
+					return text.replace(/(?:["'])vscode-resource:([^\s'"]+)(?:["'])/gi, '/vscode-resource$1');
 				}
 			});
 		}());

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

@@ -256,6 +256,7 @@
 					defaultScript.textContent = `
 					const acquireVsCodeApi = (function() {
 						const originalPostMessage = window.parent.postMessage.bind(window.parent);
+						const targetOrigin = window.parent.origin;
 						let acquired = false;
 
 						let state = ${data.state ? `JSON.parse(${JSON.stringify(data.state)})` : undefined};
@@ -267,11 +268,11 @@
 							acquired = true;
 							return Object.freeze({
 								postMessage: function(msg) {
-									return originalPostMessage({ command: 'onmessage', data: msg }, '*');
+									return originalPostMessage({ command: 'onmessage', data: msg }, targetOrigin);
 								},
 								setState: function(newState) {
 									state = newState;
-									originalPostMessage({ command: 'do-update-state', data: JSON.stringify(newState) }, '*');
+									originalPostMessage({ command: 'do-update-state', data: JSON.stringify(newState) }, targetOrigin);
 									return newState;
 								},
 								getState: function() {