From 5bf08b76de39021c93f30ae8b6a3d91bf92d827d Mon Sep 17 00:00:00 2001 From: whyour Date: Fri, 3 Mar 2023 23:45:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=BA=90=E5=88=A4=E6=96=AD=EF=BC=8C=E5=9B=9E=E9=80=80?= =?UTF-8?q?=20@monaco-editor/react?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 13 +++++++------ shell/update.sh | 6 +++--- src/utils/init.ts | 5 +++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3cdd3116..597b972e 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "devDependencies": { "@ant-design/icons": "^4.7.0", "@ant-design/pro-layout": "6.38.22", - "@monaco-editor/react": "4.4.6", + "@monaco-editor/react": "4.2.1", "@react-hook/resize-observer": "^1.2.6", "@sentry/react": "^7.12.1", "@types/body-parser": "^1.19.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 22d2d85d..02cde407 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3,7 +3,7 @@ lockfileVersion: 5.4 specifiers: '@ant-design/icons': ^4.7.0 '@ant-design/pro-layout': 6.38.22 - '@monaco-editor/react': 4.4.6 + '@monaco-editor/react': 4.2.1 '@otplib/preset-default': ^12.0.1 '@react-hook/resize-observer': ^1.2.6 '@sentry/node': ^7.12.1 @@ -134,7 +134,7 @@ dependencies: devDependencies: '@ant-design/icons': 4.8.0_biqbaboplfbrettd7655fr4n2y '@ant-design/pro-layout': 6.38.22_biqbaboplfbrettd7655fr4n2y - '@monaco-editor/react': 4.4.6_jywyd5ymizla4bkdnod6po6m6y + '@monaco-editor/react': 4.2.1_jywyd5ymizla4bkdnod6po6m6y '@react-hook/resize-observer': 1.2.6_react@18.2.0 '@sentry/react': 7.28.1_react@18.2.0 '@types/body-parser': 1.19.2 @@ -3365,12 +3365,12 @@ packages: state-local: 1.0.7 dev: true - /@monaco-editor/react/4.4.6_jywyd5ymizla4bkdnod6po6m6y: - resolution: {integrity: sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA==} + /@monaco-editor/react/4.2.1_jywyd5ymizla4bkdnod6po6m6y: + resolution: {integrity: sha512-yN8qVY0PyFIbqPjfrZ5TbR/wrcfeiwoys8+0QkmyfiOzG74vXxSBOPIUxk7Ly+qCj7qWHPq1uDJskzFGaIqaPA==} peerDependencies: monaco-editor: '>= 0.25.0 < 1' - react: ^16.8.0 || ^17.0.0 || ^18.0.0 || 18 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || 18 + react: ^16.8.0 || ^17.0.0 || 18 + react-dom: ^16.8.0 || ^17.0.0 || 18 peerDependenciesMeta: monaco-editor: optional: true @@ -3384,6 +3384,7 @@ packages: prop-types: 15.8.1 react: 18.2.0 react-dom: 18.2.0_react@18.2.0 + state-local: 1.0.7 dev: true /@nicolo-ribaudo/chokidar-2/2.1.8-no-fsevents.3: diff --git a/shell/update.sh b/shell/update.sh index 7735171a..8e113b6c 100755 --- a/shell/update.sh +++ b/shell/update.sh @@ -226,10 +226,10 @@ usage() { ## 更新qinglong update_qinglong() { - local mirror="github" - local githubStatus=$(curl -s -m 2 -IL "https://github.com" | grep 200) + local mirror="gitee" + local githubStatus=$(curl -s -m 2 -IL "https://google.com" | grep 200) if [[ ! -z $githubStatus ]]; then - mirror="gitee" + mirror="github" fi echo -e "使用 ${mirror} 源更新...\n" export isFirstStartServer=false diff --git a/src/utils/init.ts b/src/utils/init.ts index dab86f70..e415d1a7 100644 --- a/src/utils/init.ts +++ b/src/utils/init.ts @@ -1,7 +1,6 @@ import * as Sentry from '@sentry/react'; import { Integrations } from '@sentry/tracing'; import { loader } from '@monaco-editor/react'; -import * as monaco from 'monaco-editor'; export function init(version: string) { // sentry监控 init @@ -27,7 +26,9 @@ export function init(version: string) { // monaco 编辑器配置cdn和locale loader.config({ - monaco, + paths: { + vs: 'https://cdn.staticfile.org/monaco-editor/0.33.0/min/vs', + }, 'vs/nls': { availableLanguages: { '*': 'zh-cn',