fix: editor init error

This commit is contained in:
MystiPanda 2024-06-30 18:01:46 +08:00
parent 28f3044bdd
commit a722581868
3 changed files with 23 additions and 45 deletions

View File

@ -24,7 +24,6 @@
"@emotion/react": "^11.11.4", "@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5", "@emotion/styled": "^11.11.5",
"@juggle/resize-observer": "^3.4.0", "@juggle/resize-observer": "^3.4.0",
"@monaco-editor/react": "^4.6.0",
"@mui/icons-material": "^5.15.20", "@mui/icons-material": "^5.15.20",
"@mui/lab": "5.0.0-alpha.149", "@mui/lab": "5.0.0-alpha.149",
"@mui/material": "^5.15.20", "@mui/material": "^5.15.20",
@ -48,6 +47,7 @@
"react-hook-form": "^7.52.0", "react-hook-form": "^7.52.0",
"react-i18next": "^13.5.0", "react-i18next": "^13.5.0",
"react-markdown": "^9.0.1", "react-markdown": "^9.0.1",
"react-monaco-editor": "^0.55.0",
"react-router-dom": "^6.23.1", "react-router-dom": "^6.23.1",
"react-transition-group": "^4.4.5", "react-transition-group": "^4.4.5",
"react-virtuoso": "^4.7.11", "react-virtuoso": "^4.7.11",

61
pnpm-lock.yaml generated
View File

@ -25,9 +25,6 @@ importers:
"@juggle/resize-observer": "@juggle/resize-observer":
specifier: ^3.4.0 specifier: ^3.4.0
version: 3.4.0 version: 3.4.0
"@monaco-editor/react":
specifier: ^4.6.0
version: 4.6.0(monaco-editor@0.49.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
"@mui/icons-material": "@mui/icons-material":
specifier: ^5.15.20 specifier: ^5.15.20
version: 5.15.20(@mui/material@5.15.20(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1) version: 5.15.20(@mui/material@5.15.20(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(react@18.3.1)
@ -97,6 +94,9 @@ importers:
react-markdown: react-markdown:
specifier: ^9.0.1 specifier: ^9.0.1
version: 9.0.1(@types/react@18.3.3)(react@18.3.1) version: 9.0.1(@types/react@18.3.3)(react@18.3.1)
react-monaco-editor:
specifier: ^0.55.0
version: 0.55.0(@types/react@18.3.3)(monaco-editor@0.49.0)(react@18.3.1)
react-router-dom: react-router-dom:
specifier: ^6.23.1 specifier: ^6.23.1
version: 6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1) version: 6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1)
@ -1546,24 +1546,6 @@ packages:
integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==, integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==,
} }
"@monaco-editor/loader@1.4.0":
resolution:
{
integrity: sha512-00ioBig0x642hytVspPl7DbQyaSWRaolYie/UFNjoTdvoKPzo6xrXLhTk9ixgIKcLH5b5vDOjVNiGyY+uDCUlg==,
}
peerDependencies:
monaco-editor: ">= 0.21.0 < 1"
"@monaco-editor/react@4.6.0":
resolution:
{
integrity: sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw==,
}
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
"@mui/base@5.0.0-beta.20": "@mui/base@5.0.0-beta.20":
resolution: resolution:
{ {
@ -3863,6 +3845,16 @@ packages:
"@types/react": ">=18" "@types/react": ">=18"
react: ">=18" react: ">=18"
react-monaco-editor@0.55.0:
resolution:
{
integrity: sha512-GdEP0Q3Rn1dczfKEEyY08Nes5plWwIYU4sWRBQO0+jsQWQsKMHKCC6+hPRwR7G/4aA3V/iU9jSmWPzVJYMVFSQ==,
}
peerDependencies:
"@types/react": ">=16 <= 18"
monaco-editor: ^0.44.0
react: ">=16 <= 18"
react-refresh@0.14.2: react-refresh@0.14.2:
resolution: resolution:
{ {
@ -4106,12 +4098,6 @@ packages:
integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==, integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==,
} }
state-local@1.0.7:
resolution:
{
integrity: sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w==,
}
stringify-entities@4.0.4: stringify-entities@4.0.4:
resolution: resolution:
{ {
@ -5539,18 +5525,6 @@ snapshots:
"@juggle/resize-observer@3.4.0": {} "@juggle/resize-observer@3.4.0": {}
"@monaco-editor/loader@1.4.0(monaco-editor@0.49.0)":
dependencies:
monaco-editor: 0.49.0
state-local: 1.0.7
"@monaco-editor/react@4.6.0(monaco-editor@0.49.0)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
dependencies:
"@monaco-editor/loader": 1.4.0(monaco-editor@0.49.0)
monaco-editor: 0.49.0
react: 18.3.1
react-dom: 18.3.1(react@18.3.1)
"@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)": "@mui/base@5.0.0-beta.20(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)":
dependencies: dependencies:
"@babel/runtime": 7.24.7 "@babel/runtime": 7.24.7
@ -7026,6 +7000,13 @@ snapshots:
transitivePeerDependencies: transitivePeerDependencies:
- supports-color - supports-color
react-monaco-editor@0.55.0(@types/react@18.3.3)(monaco-editor@0.49.0)(react@18.3.1):
dependencies:
"@types/react": 18.3.3
monaco-editor: 0.49.0
prop-types: 15.8.1
react: 18.3.1
react-refresh@0.14.2: {} react-refresh@0.14.2: {}
react-router-dom@6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1): react-router-dom@6.23.1(react-dom@18.3.1(react@18.3.1))(react@18.3.1):
@ -7182,8 +7163,6 @@ snapshots:
space-separated-tokens@2.0.2: {} space-separated-tokens@2.0.2: {}
state-local@1.0.7: {}
stringify-entities@4.0.4: stringify-entities@4.0.4:
dependencies: dependencies:
character-entities-html4: 2.1.0 character-entities-html4: 2.1.0

View File

@ -20,8 +20,7 @@ import { useThemeMode } from "@/services/states";
import { readProfileFile, saveProfileFile } from "@/services/cmds"; import { readProfileFile, saveProfileFile } from "@/services/cmds";
import { Notice, Switch } from "@/components/base"; import { Notice, Switch } from "@/components/base";
import getSystem from "@/utils/get-system"; import getSystem from "@/utils/get-system";
import MonacoEditor from "react-monaco-editor";
import Editor from "@monaco-editor/react";
interface Props { interface Props {
profileUid: string; profileUid: string;
@ -339,7 +338,7 @@ export const RulesEditorViewer = (props: Props) => {
marginLeft: "10px", marginLeft: "10px",
}} }}
> >
<Editor <MonacoEditor
language="yaml" language="yaml"
theme={themeMode === "light" ? "vs" : "vs-dark"} theme={themeMode === "light" ? "vs" : "vs-dark"}
height="100%" height="100%"