From 5da9819ca5ce15ef4de9cf4a84affbd581383483 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 8 Jul 2022 12:32:55 +0200
Subject: [PATCH] fix(frontend): fix sendRequest

---
 frontend/package-lock.json                | 17 +++++++++++
 frontend/package.json                     |  1 +
 frontend/src/lib/components/Editor.svelte | 36 +++++++++++++++--------
 3 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 4d9728aebb..0ebb3a609e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -13,6 +13,7 @@
 				"fuse.js": "^6.4.6",
 				"highlight.js": "^11.5.1",
 				"monaco-editor": "^0.33.0",
+				"monaco-editor-workers": "^0.33.0",
 				"monaco-languageclient": "^2.0.2",
 				"vscode-ws-jsonrpc": "^1.0.1"
 			},
@@ -4187,6 +4188,14 @@
 			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz",
 			"integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
 		},
+		"node_modules/monaco-editor-workers": {
+			"version": "0.33.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.33.0.tgz",
+			"integrity": "sha512-KrIju+r4mKCzGi9kDVqUIze78EilSf8VbvNOQD7p14LSVah5fy1Z3z5QRYDDgHcHFEkzT7vbVMRnBRy6CI/aHQ==",
+			"dependencies": {
+				"monaco-editor": "0.33.0"
+			}
+		},
 		"node_modules/monaco-languageclient": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.0.2.tgz",
@@ -9788,6 +9797,14 @@
 			"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz",
 			"integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw=="
 		},
+		"monaco-editor-workers": {
+			"version": "0.33.0",
+			"resolved": "https://registry.npmjs.org/monaco-editor-workers/-/monaco-editor-workers-0.33.0.tgz",
+			"integrity": "sha512-KrIju+r4mKCzGi9kDVqUIze78EilSf8VbvNOQD7p14LSVah5fy1Z3z5QRYDDgHcHFEkzT7vbVMRnBRy6CI/aHQ==",
+			"requires": {
+				"monaco-editor": "0.33.0"
+			}
+		},
 		"monaco-languageclient": {
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.0.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index 4a8ce06401..c9c2fd628f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -57,6 +57,7 @@
 		"fuse.js": "^6.4.6",
 		"highlight.js": "^11.5.1",
 		"monaco-editor": "^0.33.0",
+		"monaco-editor-workers": "^0.33.0",
 		"monaco-languageclient": "^2.0.2",
 		"vscode-ws-jsonrpc": "^1.0.1"
 	}
diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index ae8d7571b2..de05c0bdaf 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { browser } from '$app/env'
+	import { browser, dev } from '$app/env'
 	import { page } from '$app/stores'
 	import { buildExtraLib } from '$lib/utils'
 	import type monaco from 'monaco-editor'
@@ -8,6 +8,7 @@
 	import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
 	import type { DocumentUri, MessageTransports } from 'monaco-languageclient'
 	import { createEventDispatcher, onDestroy, onMount } from 'svelte'
+	import { buildWorkerDefinition } from 'monaco-editor-workers'
 
 	let divEl: HTMLDivElement | null = null
 	let editor: monaco.editor.IStandaloneCodeEditor
@@ -28,15 +29,23 @@
 	const dispatch = createEventDispatcher()
 
 	if (browser) {
-		// @ts-ignore
-		self.MonacoEnvironment = {
-			getWorker: function (_moduleId: any, label: string) {
-				if (label === 'json') {
-					return new jsonWorker()
-				} else if (label === 'typescript' || label === 'javascript') {
-					return new tsWorker()
-				} else {
-					return new editorWorker()
+		if (dev) {
+			buildWorkerDefinition(
+				'../../../node_modules/monaco-editor-workers/dist/workers',
+				import.meta.url,
+				false
+			)
+		} else {
+			// @ts-ignore
+			self.MonacoEnvironment = {
+				getWorker: function (_moduleId: any, label: string) {
+					if (label === 'json') {
+						return new jsonWorker()
+					} else if (label === 'typescript' || label === 'javascript') {
+						return new tsWorker()
+					} else {
+						return new editorWorker()
+					}
 				}
 			}
 		}
@@ -85,8 +94,11 @@
 			const { CloseAction, ErrorAction } = await import('vscode-languageclient')
 			const vscode = await import('vscode')
 
-			const { RequestType, toSocket, WebSocketMessageReader, WebSocketMessageWriter } =
-				await import('vscode-ws-jsonrpc')
+			const { toSocket, WebSocketMessageReader, WebSocketMessageWriter } = await import(
+				'vscode-ws-jsonrpc'
+			)
+
+			const { RequestType } = await import('vscode-jsonrpc')
 
 			function createLanguageClient(
 				transports: MessageTransports,