0.3.3

aarkue · Aug 18, 2024 · b575220 · b575220
1 parent aecd348
commit b575220
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 45 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -31,6 +31,7 @@
     "elkjs": "^0.9.3",
     "html-to-image": "^1.11.11",
     "json5": "^2.2.3",
+    "monaco-editor": "^0.50.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-force-graph-2d": "^1.25.5",

diff --git a/frontend/src/lib/editor-loader.ts b/frontend/src/lib/editor-loader.ts
@@ -1,29 +1,29 @@
 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";
+// 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();
-  },
-};
+// 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 });

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
@@ -10,6 +10,6 @@ export default defineConfig({
     },
   },
   optimizeDeps: {
-    exclude: ["monaco-editor"]
+    // exclude: ["monaco-editor"]
   },
 });
diff --git a/tauri/package-lock.json b/tauri/package-lock.json
diff --git a/tauri/package.json b/tauri/package.json
@@ -12,6 +12,7 @@
     "tauri": "tauri"
   },
   "dependencies": {
+    "@monaco-editor/react": "^4.6.0",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-alert-dialog": "^1.0.5",
     "@radix-ui/react-dialog": "^1.0.5",
@@ -31,6 +32,7 @@
     "elkjs": "^0.9.3",
     "html-to-image": "^1.11.11",
     "json5": "^2.2.3",
+    "monaco-editor": "^0.50.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
@@ -41,6 +43,7 @@
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
+    "@tauri-apps/cli": "^1.5.11",
     "@types/node": "^20.9.0",
     "@types/react": "^18.2.15",
     "@types/react-dom": "^18.2.7",
@@ -61,7 +64,6 @@
     "prettier": "3.0.3",
     "tailwindcss": "^3.3.5",
     "typescript": "^5.2.2",
-    "vite": "^4.4.5",
-    "@tauri-apps/cli": "^1.5.11"
+    "vite": "^4.4.5"
   }
 }
diff --git a/tauri/src-tauri/tauri.conf.json b/tauri/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ocedeclare-tauri",
-    "version": "0.3.2"
+    "version": "0.3.3"
   },
   "tauri": {
     "allowlist": {

diff --git a/tauri/vite.config.ts b/tauri/vite.config.ts
@@ -20,6 +20,6 @@ export default defineConfig({
     },
   },
   optimizeDeps: {
-    exclude: ["monaco-editor"]
+    // exclude: ["monaco-editor"]
   },
 });