fix: #212

libnyanpasu · Dec 30, 2023 · 190a36a · 190a36a
1 parent fee3885
commit 190a36a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "build:nightly": "tauri build -f default-meta nightly -c ./backend/tauri/tauri.nightly.conf.json",
     "tauri": "tauri",
     "web:dev": "vite",
-    "web:build": "tsc --noEmit && vite build",
+    "web:build": "vite build",
     "web:serve": "vite preview",
     "lint": "run-s lint:*",
     "lint:prettier": "prettier --check .",

diff --git a/src/components/profile/editor-viewer.tsx b/src/components/profile/editor-viewer.tsx
@@ -1,22 +1,19 @@
-import { useEffect, useRef } from "react";
-import { useLockFn } from "ahooks";
-import { useRecoilValue } from "recoil";
-import { useTranslation } from "react-i18next";
+import { readProfileFile, saveProfileFile } from "@/services/cmds";
+import { atomThemeMode } from "@/services/states";
 import {
   Button,
   Dialog,
   DialogActions,
   DialogContent,
   DialogTitle,
 } from "@mui/material";
-import { atomThemeMode } from "@/services/states";
-import { readProfileFile, saveProfileFile } from "@/services/cmds";
+import { useLockFn } from "ahooks";
+import { useEffect, useRef } from "react";
+import { useTranslation } from "react-i18next";
+import { useRecoilValue } from "recoil";
 
-import "monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js";
-import "monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js";
-import "monaco-editor/esm/vs/editor/contrib/folding/browser/folding.js";
-import { editor } from "monaco-editor/esm/vs/editor/editor.api";
 import { useNotification } from "@/hooks/use-notification";
+import { monaco } from "@/services/monaco";
 
 interface Props {
   uid: string;
@@ -31,7 +28,7 @@ export const EditorViewer = (props: Props) => {
 
   const { t } = useTranslation();
   const editorRef = useRef<any>();
-  const instanceRef = useRef<editor.IStandaloneCodeEditor | null>(null);
+  const instanceRef = useRef<monaco.editor.IStandaloneCodeEditor | null>(null);
   const themeMode = useRecoilValue(atomThemeMode);
 
   useEffect(() => {
@@ -43,7 +40,7 @@ export const EditorViewer = (props: Props) => {
       if (!dom) return;
       if (instanceRef.current) instanceRef.current.dispose();
 
-      instanceRef.current = editor.create(editorRef.current, {
+      instanceRef.current = monaco.editor.create(editorRef.current, {
         value: data,
         language: mode,
         theme: themeMode === "light" ? "vs" : "vs-dark",

diff --git a/src/components/setting/mods/config-viewer.tsx b/src/components/setting/mods/config-viewer.tsx
@@ -2,7 +2,6 @@ import { BaseDialog, DialogRef } from "@/components/base";
 import { getRuntimeYaml } from "@/services/cmds";
 import { atomThemeMode } from "@/services/states";
 import { Chip } from "@mui/material";
-import { editor } from "monaco-editor/esm/vs/editor/editor.api";
 import {
   forwardRef,
   useEffect,
@@ -13,16 +12,14 @@ import {
 import { useTranslation } from "react-i18next";
 import { useRecoilValue } from "recoil";
 
-import "monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js";
-import "monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js";
-import "monaco-editor/esm/vs/editor/contrib/folding/browser/folding.js";
+import { monaco } from "@/services/monaco";
 
 export const ConfigViewer = forwardRef<DialogRef>((props, ref) => {
   const { t } = useTranslation();
   const [open, setOpen] = useState(false);
 
   const editorRef = useRef<any>();
-  const instanceRef = useRef<editor.IStandaloneCodeEditor | null>(null);
+  const instanceRef = useRef<monaco.editor.IStandaloneCodeEditor | null>(null);
   const themeMode = useRecoilValue(atomThemeMode);
 
   useEffect(() => {
@@ -44,7 +41,7 @@ export const ConfigViewer = forwardRef<DialogRef>((props, ref) => {
         if (!dom) return;
         if (instanceRef.current) instanceRef.current.dispose();
 
-        instanceRef.current = editor.create(editorRef.current, {
+        instanceRef.current = monaco.editor.create(editorRef.current, {
           value: data ?? "# Error\n",
           language: "yaml",
           theme: themeMode === "light" ? "vs" : "vs-dark",

diff --git a/src/services/monaco.ts b/src/services/monaco.ts
@@ -0,0 +1,10 @@
+// features
+import "monaco-editor/esm/vs/editor/editor.all.js";
+
+// langs
+import "monaco-editor/esm/vs/basic-languages/javascript/javascript.contribution.js";
+import "monaco-editor/esm/vs/basic-languages/yaml/yaml.contribution.js";
+
+import * as monaco from "monaco-editor/esm/vs/editor/editor.api";
+
+export { monaco };