diff --git a/package.json b/package.json index 2800bb6fc..871d45c5b 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,5 @@ "supertest": "^7.0.0", "typescript": "5.7.2", "wtfnode": "^0.10.0" - }, - "resolutions": { - "cosmokit": "1.6.3", - "monaco-editor": "0.50.0" } } diff --git a/packages/ui-default/components/monaco/nls.js b/packages/ui-default/components/monaco/nls.js index f9f3aab8a..1eddfaf32 100644 --- a/packages/ui-default/components/monaco/nls.js +++ b/packages/ui-default/components/monaco/nls.js @@ -1,3 +1,5 @@ +export { getNLSLanguage, getNLSMessages } from 'monaco-editor/esm/vs/nls.messages'; + function format(message, args) { let result; if (!args.length) result = message; @@ -10,16 +12,14 @@ function format(message, args) { return result; } -export const getConfiguredDefaultLocale = () => 'zh'; - let CURRENT_LOCALE_DATA = {}; // eslint-disable-line @typescript-eslint/naming-convention export function localize(path, message, ...args) { - return format(CURRENT_LOCALE_DATA[path.key || path] || message, args); + return format(CURRENT_LOCALE_DATA[path.key || path] || CURRENT_LOCALE_DATA[message] || message, args); } export function localize2(data, message, ...args) { - const original = localize(message, args); + const original = localize(data, message, args); return { value: original, original, @@ -29,11 +29,3 @@ export function localize2(data, message, ...args) { export function setLocaleData(data) { CURRENT_LOCALE_DATA = Object.assign(...Object.values(data)); } - -export function loadMessageBundle() { - return localize; -} - -export function config() { - return loadMessageBundle; -} diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 2e084bd63..3b6020d27 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -72,7 +72,7 @@ "md-editor-rt": "^5.2.1", "mini-css-extract-plugin": "^2.9.2", "moment": "^2.30.1", - "monaco-editor": "0.50.0", + "monaco-editor": "0.52.2", "monaco-editor-nls": "^3.1.0", "monaco-editor-webpack-plugin": "^7.1.0", "monaco-themes": "^0.4.4",