diff --git a/frontend/package-lock.json b/frontend/package-lock.json index c1d0797..0f92dfa 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -28,6 +28,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", @@ -3012,9 +3013,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001615", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001615.tgz", - "integrity": "sha512-1IpazM5G3r38meiae0bHRnPhz+CBQ3ZLqbQMtrg+AsTPKAXgW38JNsXkyZ+v8waCsDmPq87lmfun5Q2AGysNEQ==", + "version": "1.0.30001651", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", + "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", "dev": true, "funding": [ { @@ -5606,8 +5607,7 @@ "node_modules/monaco-editor": { "version": "0.50.0", "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz", - "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==", - "peer": true + "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==" }, "node_modules/ms": { "version": "2.1.2", diff --git a/frontend/package.json b/frontend/package.json index a87fdb2..a4702b0 100644 --- 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 index 3beba0e..e602785 100644 --- 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 index df61545..38053ea 100644 --- 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 index 0599624..e60a134 100644 --- a/tauri/package-lock.json +++ b/tauri/package-lock.json @@ -8,6 +8,7 @@ "name": "frontend", "version": "0.0.0", "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", @@ -27,6 +28,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", @@ -983,6 +985,30 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@monaco-editor/loader": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.4.0.tgz", + "integrity": "sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==", + "dependencies": { + "state-local": "^1.0.6" + }, + "peerDependencies": { + "monaco-editor": ">= 0.21.0 < 1" + } + }, + "node_modules/@monaco-editor/react": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.6.0.tgz", + "integrity": "sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw==", + "dependencies": { + "@monaco-editor/loader": "^1.4.0" + }, + "peerDependencies": { + "monaco-editor": ">= 0.25.0 < 1", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -3020,11 +3046,11 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -3115,9 +3141,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001561", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001561.tgz", - "integrity": "sha512-NTt0DNoKe958Q0BE0j0c1V9jbUzhBxHIEJy7asmGrpE0yG63KTV7PLHPnK2E1O9RsQrQ081I3NLuXGS6zht3cw==", + "version": "1.0.30001651", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", + "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", "dev": true, "funding": [ { @@ -4511,9 +4537,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -5506,6 +5532,11 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/monaco-editor": { + "version": "0.50.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz", + "integrity": "sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==" + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -6505,6 +6536,11 @@ "node": ">=0.10.0" } }, + "node_modules/state-local": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz", + "integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==" + }, "node_modules/string.prototype.matchall": { "version": "4.0.10", "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", @@ -7030,9 +7066,9 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/tauri/package.json b/tauri/package.json index 3668de1..816e158 100644 --- 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 index ffa0326..aa0ffc8 100644 --- 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 index 5c9d6be..36b98b2 100644 --- a/tauri/vite.config.ts +++ b/tauri/vite.config.ts @@ -20,6 +20,6 @@ export default defineConfig({ }, }, optimizeDeps: { - exclude: ["monaco-editor"] + // exclude: ["monaco-editor"] }, });