0.3.2

frontend/src/components/CELEditor.tsx

@@ -4,8 +4,8 @@ import { VisualEditorContext } from "@/routes/visual-editor/helper/VisualEditorC
 import type { Variable } from "@/types/generated/Variable";
 import { useMonaco, Editor, loader } from "@monaco-editor/react";
 import { useContext, useEffect, useMemo } from "react";
-import * as monaco from "monaco-editor";
-loader.config({ monaco });
+import { initEditorLoader } from "@/lib/editor-loader";
+initEditorLoader();
 export default function CELEditor({
   cel,
   onChange,

frontend/src/components/JsonEditor.tsx

@@ -1,5 +1,7 @@
+import { initEditorLoader } from "@/lib/editor-loader";
 import { Editor} from "@monaco-editor/react";
 
+initEditorLoader();
 export default function JSONEditor({
   value,
   onChange,

frontend/src/lib/editor-loader.ts

@@ -0,0 +1,32 @@
+import { loader } from "@monaco-editor/react";
+
+import * as monaco from "monaco-editor";
+import EditorWorker from "monaco-editor/esm/vs/editor/editor.worker?worker";
+import JsonWorker from "monaco-editor/esm/vs/language/json/json.worker?worker";
+import CssWorker from "monaco-editor/esm/vs/language/css/css.worker?worker";
+import HtmlWorker from "monaco-editor/esm/vs/language/html/html.worker?worker";
+import TsWorker from "monaco-editor/esm/vs/language/typescript/ts.worker?worker";
+
+self.MonacoEnvironment = {
+  getWorker(_, label) {
+    if (label === "json") {
+      return new JsonWorker();
+    }
+    if (label === "css" || label === "scss" || label === "less") {
+      return new CssWorker();
+    }
+    if (label === "html" || label === "handlebars" || label === "razor") {
+      return new HtmlWorker();
+    }
+    if (label === "typescript" || label === "javascript") {
+      return new TsWorker();
+    }
+    return new EditorWorker();
+  },
+};
+
+export function initEditorLoader() {
+  loader.config({ monaco });
+
+  void (loader.init().then(/* ... */));
+}

frontend/vite.config.ts

@@ -9,4 +9,7 @@ export default defineConfig({
       "@": path.resolve(__dirname, "./src"),
     },
   },
+  optimizeDeps: {
+    exclude: ["monaco-editor"]
+  },
 });

tauri/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ocedeclare-tauri",
-    "version": "0.3.1"
+    "version": "0.3.2"
   },
   "tauri": {
     "allowlist": {

tauri/vite.config.ts

@@ -19,4 +19,7 @@ export default defineConfig({
       "@": path.resolve(__dirname, "../frontend/src"),
     },
   },
+  optimizeDeps: {
+    exclude: ["monaco-editor"]
+  },
 });