From 3f29a9b6207be3431d2a9be048a8a83e09e14f6c Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 10 Jul 2024 13:13:45 +0800 Subject: [PATCH] upgrade monaco-editor --- packages/ui-default/build/config/webpack.ts | 16 ------- .../ui-default/components/monaco/loader.ts | 24 +++++------ .../ui-default/components/monaco/monaco.ts | 42 +++++++++---------- packages/ui-default/package.json | 17 ++++---- 4 files changed, 41 insertions(+), 58 deletions(-) diff --git a/packages/ui-default/build/config/webpack.ts b/packages/ui-default/build/config/webpack.ts index b74a2e248..5312c9957 100644 --- a/packages/ui-default/build/config/webpack.ts +++ b/packages/ui-default/build/config/webpack.ts @@ -160,14 +160,6 @@ export default async function (env: { watch?: boolean, production?: boolean, mea }, }, }, - { - test: /\.ts$/, - include: /@types\//, - type: 'asset/inline', - generator: { - dataUrl: (buf) => buf.toString(), - }, - }, { test: /\.m?(jsx|tsx|ts)?$/, type: 'javascript/auto', @@ -293,14 +285,6 @@ export default async function (env: { watch?: boolean, production?: boolean, mea /@codingame\/monaco-vscode-(css|fsharp|html|groovy|scss|xml)-default-extension/, root('../../modules/nop.ts'), ), - ...(env.production ? [ - sentryWebpackPlugin({ - authToken: process.env.SENTRY_AUTH_TOKEN, - org: 'hydro-dev', - project: 'hydro-web', - url: 'https://sentry.hydro.ac', - }), - ] : []), new webpack.NormalModuleReplacementPlugin(/core-js\/stable/, root('__core-js.js')), ...env.measure ? [ new BundleAnalyzerPlugin({ analyzerPort: 'auto' }), diff --git a/packages/ui-default/components/monaco/loader.ts b/packages/ui-default/components/monaco/loader.ts index fd8ee9ffa..061ebeb0d 100644 --- a/packages/ui-default/components/monaco/loader.ts +++ b/packages/ui-default/components/monaco/loader.ts @@ -33,17 +33,17 @@ async function legacyLoadExternalModule(target: string) { } const loaders = { - workbench: async () => { - await Promise.all([ - import('@codingame/monaco-vscode-theme-seti-default-extension'), - import('@codingame/monaco-vscode-media-preview-default-extension'), - import('@codingame/monaco-vscode-markdown-language-features-default-extension'), - import('@codingame/monaco-vscode-markdown-math-default-extension'), - import('@codingame/monaco-vscode-configuration-editing-default-extension'), - import('@codingame/monaco-editor-wrapper/features/viewPanels'), - import('@codingame/monaco-editor-wrapper/features/search'), - ]); - }, + // workbench: async () => { + // await Promise.all([ + // import('@codingame/monaco-vscode-theme-seti-default-extension'), + // import('@codingame/monaco-vscode-media-preview-default-extension'), + // import('@codingame/monaco-vscode-markdown-language-features-default-extension'), + // import('@codingame/monaco-vscode-markdown-math-default-extension'), + // import('@codingame/monaco-vscode-configuration-editing-default-extension'), + // import('@codingame/monaco-editor-wrapper/features/viewPanels'), + // import('@codingame/monaco-editor-wrapper/features/search'), + // ]); + // }, markdown: async () => await Promise.all([ import('./languages/markdown'), import('@codingame/monaco-vscode-markdown-basics-default-extension'), @@ -66,7 +66,7 @@ const loaders = { }, }; -let loadPromise = localeLoader['zh-hans'](); +let loadPromise = localeLoader.zh(); let config = false; async function initConfigManager(t: typeof import('./monaco.ts')) { diff --git a/packages/ui-default/components/monaco/monaco.ts b/packages/ui-default/components/monaco/monaco.ts index edcabd188..d00041dee 100644 --- a/packages/ui-default/components/monaco/monaco.ts +++ b/packages/ui-default/components/monaco/monaco.ts @@ -20,27 +20,27 @@ export { export const init = async (workbench = false) => { if (workbench) { - const [ - { default: getWorkbenchServiceOverride }, - { default: getMultiDiffEditorServiceOverride }, - { default: getQuickAccessServiceOverride }, - ] = await Promise.all([ - import('@codingame/monaco-vscode-workbench-service-override'), - import('@codingame/monaco-vscode-multi-diff-editor-service-override'), - import('@codingame/monaco-vscode-quickaccess-service-override'), - ]); - registerServices({ - ...getWorkbenchServiceOverride(), - ...getMultiDiffEditorServiceOverride(), - ...getQuickAccessServiceOverride({ - shouldUseGlobalPicker() { - return true; - }, - isKeybindingConfigurationVisible() { - return true; - }, - }), - }); + // const [ + // { default: getWorkbenchServiceOverride }, + // { default: getMultiDiffEditorServiceOverride }, + // { default: getQuickAccessServiceOverride }, + // ] = await Promise.all([ + // import('@codingame/monaco-vscode-workbench-service-override'), + // import('@codingame/monaco-vscode-multi-diff-editor-service-override'), + // import('@codingame/monaco-vscode-quickaccess-service-override'), + // ]); + // registerServices({ + // ...getWorkbenchServiceOverride(), + // ...getMultiDiffEditorServiceOverride(), + // ...getQuickAccessServiceOverride({ + // shouldUseGlobalPicker() { + // return true; + // }, + // isKeybindingConfigurationVisible() { + // return true; + // }, + // }), + // }); } return initialize({ workspaceProvider: { diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index ccc248f65..9404af329 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -15,11 +15,11 @@ }, "devDependencies": { "@blueprintjs/core": "^5.10.5", - "@codingame/monaco-editor-wrapper": "^6.6.10", - "@codingame/monaco-vscode-language-pack-ko": "5.3.0", - "@codingame/monaco-vscode-language-pack-zh-hans": "5.3.0", - "@codingame/monaco-vscode-language-pack-zh-hant": "5.3.0", - "@codingame/monaco-vscode-typescript-language-features-default-extension": "5.3.0", + "@codingame/monaco-editor-wrapper": "^7.2.1", + "@codingame/monaco-vscode-language-pack-ko": "6.0.3", + "@codingame/monaco-vscode-language-pack-zh-hans": "6.0.3", + "@codingame/monaco-vscode-language-pack-zh-hant": "6.0.3", + "@codingame/monaco-vscode-typescript-language-features-default-extension": "6.0.3", "@cordisjs/core": "3.17.3", "@fontsource/dm-mono": "^5.0.20", "@fontsource/fira-code": "^5.0.18", @@ -47,7 +47,7 @@ "@types/react-dom": "^18.3.0", "@types/redux-logger": "^3.0.13", "@types/uuid": "^10.0.0", - "@types/vscode": "^1.89.0", + "@types/vscode": "^1.91.0", "@types/webpack-env": "^1.18.5", "@vscode/codicons": "^0.0.36", "ajv": "^8.16.0", @@ -85,7 +85,7 @@ "md-editor-rt": "^4.17.3", "mini-css-extract-plugin": "^2.9.0", "moment": "^2.30.1", - "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@5.3.0", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@6.0.3", "monaco-languageclient": "^8.4.0", "monaco-themes": "^0.4.4", "monaco-yaml": "5.1.1", @@ -131,8 +131,7 @@ "util": "^0.12.5", "vditor": "^3.10.4", "vinyl-buffer": "^1.0.1", - "vscode": "npm:@codingame/monaco-vscode-api@^5.3.0", - "vscode-languageclient": "^9.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@^6.0.3", "web-streams-polyfill": "^4.0.0", "webpack": "^5.92.1", "webpack-bundle-analyzer": "^4.10.2",