From 776b6aee02d4ead5d0e7a9af00e6652b58b02c07 Mon Sep 17 00:00:00 2001
From: Henning Dieterichs <henning.dieterichs@live.de>
Date: Sat, 21 Mar 2020 12:52:20 +0100
Subject: [PATCH] Fixes monaco webworker and chunk loading issues.

---
 extension/src/Server.ts    | 6 +++++-
 extension/src/WebViews.ts  | 4 +++-
 webview/src/model/Model.ts | 9 ++++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/extension/src/Server.ts b/extension/src/Server.ts
index 22d7716..af67c8e 100644
--- a/extension/src/Server.ts
+++ b/extension/src/Server.ts
@@ -59,8 +59,12 @@ export class Server {
 		return `http://localhost:${port}/index.html?serverPort=${this.port}&serverSecret=${this.secret}${inWebView}${expr}`;
 	}
 
+	public get publicPath(): string {
+		return `http://localhost:${this.port}/`;
+	}
+
 	public get mainBundleUrl(): string {
-		return `http://localhost:${this.port}/main.js`;
+		return `${this.publicPath}main.js`;
 	}
 
 	public get port(): number {
diff --git a/extension/src/WebViews.ts b/extension/src/WebViews.ts
index 8c2265d..52ce878 100644
--- a/extension/src/WebViews.ts
+++ b/extension/src/WebViews.ts
@@ -62,7 +62,7 @@ export function getHtml(server: Server) {
         <html>
 			<head>
 			<meta charset="UTF-8">
-			<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src *; style-src * 'unsafe-inline';">
+			<meta http-equiv="Content-Security-Policy" content="default-src * 'unsafe-inline' 'unsafe-eval'; script-src * 'unsafe-inline' 'unsafe-eval'; connect-src * 'unsafe-inline'; img-src * data: blob: 'unsafe-inline'; frame-src *; style-src * 'unsafe-inline'; worker-src * data: 'unsafe-inline' 'unsafe-eval'; font-src * 'unsafe-inline' 'unsafe-eval';">
             <style>
                 html { height: 100%; width: 100%; padding: 0; margin: 0; }
                 body { height: 100%; width: 100%; padding: 0; margin: 0; }
@@ -74,6 +74,7 @@ export function getHtml(server: Server) {
 					window.webViewData = ${JSON.stringify({
 						serverSecret: server.secret,
 						serverPort: server.port,
+						publicPath: server.publicPath,
 					})};
 					const api = window.VsCodeApi = acquireVsCodeApi();
 					window.addEventListener('message', event => {
@@ -89,6 +90,7 @@ export function getHtml(server: Server) {
 						}
 					});
 				</script>
+				
 				${
 					isDev
 						? `<iframe sandbox="allow-top-navigation allow-scripts allow-same-origin allow-popups allow-pointer-lock allow-forms" src="${server.getIndexUrl(
diff --git a/webview/src/model/Model.ts b/webview/src/model/Model.ts
index d49fbaf..65bd693 100644
--- a/webview/src/model/Model.ts
+++ b/webview/src/model/Model.ts
@@ -17,9 +17,15 @@ import { Disposable } from "@hediet/std/disposable";
 import { startInterval } from "@hediet/std/timer";
 
 declare const window: Window & {
-	webViewData?: { serverSecret: string; serverPort: number };
+	webViewData?: {
+		serverSecret: string;
+		serverPort: number;
+		publicPath: string;
+	};
 };
 
+declare let __webpack_public_path__: string;
+
 export class Model {
 	public readonly dispose = Disposable.fn();
 	public readonly runningMode: "standalone" | "webView" | "webViewIFrame" =
@@ -83,6 +89,7 @@ export class Model {
 			this.port = data.serverPort;
 			this.serverSecret = data.serverSecret;
 			this.runningMode = "webView";
+			__webpack_public_path__ = data.publicPath;
 
 			const updateTheme = () => {
 				const isLight = document.body.classList.contains(