From 7cf4fa02c91a42f56330da5ea7bf21f5cd79f2d8 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Thu, 14 Dec 2023 06:15:47 +0000
Subject: [PATCH] fix: monaco cross origin worker loading

---
 packages/nc-gui/components/monaco/Editor.vue | 18 +++++++++++-------
 packages/nc-gui/plugins/monaco.ts            | 18 ------------------
 2 files changed, 11 insertions(+), 25 deletions(-)
 delete mode 100644 packages/nc-gui/plugins/monaco.ts

diff --git a/packages/nc-gui/components/monaco/Editor.vue b/packages/nc-gui/components/monaco/Editor.vue
index 4dbfb01049..4e8046987c 100644
--- a/packages/nc-gui/components/monaco/Editor.vue
+++ b/packages/nc-gui/components/monaco/Editor.vue
@@ -1,9 +1,13 @@
 <script setup lang="ts">
-import JsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
-import EditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker'
-import TypescriptWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
+import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'
+import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution'
+
+import EditorWorkerUrl from 'monaco-editor/esm/vs/editor/editor.worker?worker&url'
+import TsWorkerUrl from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker&url'
+import JsonWorkerUrl from 'monaco-editor/esm/vs/language/json/json.worker?worker&url'
+
 import type { editor as MonacoEditor } from 'monaco-editor'
-import { deepCompare, isDrawerOrModalExist, onMounted, ref, watch } from '#imports'
+import { deepCompare, isDrawerOrModalExist, onMounted, ref, watch, initWorker } from '#imports'
 
 interface Props {
   modelValue: string | Record<string, any>
@@ -49,11 +53,11 @@ self.MonacoEnvironment = {
   getWorker(_: any, label: string) {
     switch (label) {
       case 'json':
-        return new JsonWorker()
+        return initWorker(JsonWorkerUrl)
       case 'typescript':
-        return new TypescriptWorker()
+        return initWorker(TsWorkerUrl)
       default:
-        return new EditorWorker()
+        return initWorker(EditorWorkerUrl)
     }
   },
 }
diff --git a/packages/nc-gui/plugins/monaco.ts b/packages/nc-gui/plugins/monaco.ts
deleted file mode 100644
index d942736ae4..0000000000
--- a/packages/nc-gui/plugins/monaco.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import 'monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution'
-import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution'
-
-import EditorWorkerUrl from 'monaco-editor/esm/vs/editor/editor.worker?worker&url'
-import TsWorkerUrl from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker&url'
-import JsonWorkerUrl from 'monaco-editor/esm/vs/language/json/json.worker?worker&url'
-
-import { initWorker } from '#imports'
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-expect-error
-window.MonacoEnvironment = {
-  getWorker(_: string, label: string) {
-    if (label === 'typescript' || label === 'javascript') return initWorker(TsWorkerUrl)
-    if (label === 'json') return initWorker(JsonWorkerUrl)
-    return initWorker(EditorWorkerUrl)
-  },
-}