chore: upgrade monaco-editor@0.54.0

Author: liuxy0551

.github/workflows/CI.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
     push:
-        branches: ["master"]
+        branches: ["main"]
     pull_request:
-        branches: ["master"]
+        branches: ["main"]
 
 jobs:
     build:

.npmignore

@@ -1,3 +1,5 @@
 .github
+.vscode
 src
 tsconfig.json
+*.tgz

README-zh_CN.md

@@ -9,9 +9,10 @@
 
 ## 版本差异
 
-`2.x` 和 `1.x` 的主要区别在于 `monaco-editor` 的版本。
+`3.x`, `2.x`, `1.x` 的主要区别在于 `monaco-editor` 的版本。
 
-- 2.x 版本：当你的产品需要支持国际化时（产品页面支持切换界面语言），可以使用 [2.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/master) 的版本，已验证 monaco-editor `0.52.2` 版本。
+- 3.x 版本：当你的产品需要支持国际化时（产品页面支持切换界面语言），可以使用 [3.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/main) 的版本，已验证 monaco-editor `0.54.0` 版本。
+- 2.x 版本：当你的产品需要支持国际化时（产品页面支持切换界面语言），可以使用 [2.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/2.x-stable) 的版本，已验证 monaco-editor `0.52.2` 版本。
 - 1.x 版本：当你的产品需要支持国际化时（产品页面支持切换界面语言），请使用 [1.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/1.x-stable) 的版本，已验证 monaco-editor `0.30.1` 和 `0.31.1` 版本。
 - 0.x 版本：当你的产品只有一种界面语言时（不需要支持国际化，如仅支持中文），请使用 [0.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/0.x-stable) 的版本，已验证 monaco-editor `0.30.1` 和 `0.31.1` 版本。
 
@@ -25,15 +26,15 @@
 
 ### 简体中文（精简版）
 
-使用到的 `src/locale/dt-zh-hans.json` 是基于 [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/v1.96.2024121109/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json) 精简的。
+使用到的 `src/locale/dt-zh-hans.json` 是基于 [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/main/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json) 精简的。
 
 ### 简体中文（完整版）
 
-使用到的 `src/locale/zh-hans.json` 来源为 [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/v1.96.2024121109/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json)。
+使用到的 `src/locale/zh-hans.json` 来源为 [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/main/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json)。
 
 ### 自定义语言
 
-如果你想使用其他语言或者精简后的 `src/locale/dt-zh-hans.json` 文件不能满足要求，你可以在 [vscode-loc/i18n](https://github.com/microsoft/vscode-loc/tree/v1.96.2024121109/i18n) 找到其他语言的 JSON 文件，放入你的工程文件夹下以便使用自定义路径。
+如果你想使用其他语言或者精简后的 `src/locale/dt-zh-hans.json` 文件不能满足要求，你可以在 [vscode-loc/i18n](https://github.com/microsoft/vscode-loc/tree/main/i18n) 找到其他语言的 JSON 文件，放入你的工程文件夹下以便使用自定义路径。
 
 
 ## 使用示例
@@ -113,6 +114,6 @@ setLocale('dt-zh-hans');
 
 ## 注意事项
 
-- 目前验证的 `monaco-editor` 版本为 `0.52.2`。
-- 对应的 `vscode-loc` 版本为 `1.91.1`。
+- 目前验证的 `monaco-editor` 版本为 `0.54.0`。
+- 对应的 `vscode-loc` 版本为 `main`。
 - 如果自定义语言不生效，可能是上述两个包的版本没有对应，`vscode-loc` 不同版本的 JSON 文件结构是有变化的（如 1.63.3 和 1.91.1），其他版本请自行验证。

README.md

@@ -4,14 +4,15 @@
 
 English | [简体中文](./README-zh_CN.md)
 
-The purpose of this plugin is to set the interface language when using `monaco-editor`. The main implementation idea is to override the `monaco-editor/esm/vs/nls.js` file to achieve the effect of interface language switching.
+The purpose of this plugin is to set the interface language when using `monaco-editor`. The main implementation idea is to override the `monaco-editor/esm/vs/nls.messages.js` file to achieve the effect of interface language switching.
 
 
 ## Version difference
 
-The main difference between `2.x` and `1.x` lies in the version of `monaco-editor`.
+The main difference between `3.x`, `2.x` and `1.x` lies in the version of `monaco-editor`.
 
-- The 2.x: When your product needs to support internationalization (the product page supports switching interface languages), please use version [2.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/master). It has been verified with `monaco-editor` versions `0.52.2`.
+- The 3.x: When your product needs to support internationalization (the product page supports switching interface languages), please use version [3.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/main). It has been verified with `monaco-editor` versions `0.54.0`.
+- The 2.x: When your product needs to support internationalization (the product page supports switching interface languages), please use version [2.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/2.x-stable). It has been verified with `monaco-editor` versions `0.52.2`.
 - The 1.x: When your product needs to support internationalization (the product page supports switching interface languages), please use version [1.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/1.x-stable). It has been verified with `monaco-editor` versions `0.30.1` and `0.31.1`.
 - The 0.x: When your product only has one interface language (does not need to support internationalization, such as only supporting Chinese), please use version [0.x](https://github.com/DTStack/monaco-editor-i18n-plugin/tree/0.x-stable). It has been verified with `monaco-editor` versions `0.30.1` and `0.31.1`.
 
@@ -25,16 +26,16 @@ The main difference between `2.x` and `1.x` lies in the version of `monaco-edito
 
 ### dt-zh-hans (Simplified version for dtstack)
 
-The used `src/locale/dt-zh-hans.json` is lite based on [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/v1.96.2024121109/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json).
+The used `src/locale/dt-zh-hans.json` is lite based on [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/main/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json).
 
 ### Simplified Chinese (Full version)
 
-The used `src/locale/zh-hans.json` is from [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/v1.96.2024121109/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json)。
+The used `src/locale/zh-hans.json` is from [vscode-loc/i18n/zh-hans](https://github.com/microsoft/vscode-loc/blob/main/i18n/vscode-language-pack-zh-hans/translations/main.i18n.json)。
 
 
 ### custom languages
 
-If you want to use another languages or if the simplified `src/scale/dt-zh-hans.json` file does not meet the requirements, you can find JSON files in other languages in [vscode-loc/i18n](https://github.com/microsoft/vscode-loc/tree/v1.96.2024121109/i18n), and place them in your project folder for custom path usage.
+If you want to use another languages or if the simplified `src/scale/dt-zh-hans.json` file does not meet the requirements, you can find JSON files in other languages in [vscode-loc/i18n](https://github.com/microsoft/vscode-loc/tree/main/i18n), and place them in your project folder for custom path usage.
 
 
 ## Example usage
@@ -114,6 +115,6 @@ setLocale('dt-zh-hans');
 
 ## Notice
 
--   The currently verified versions of `monaco-editor` are `0.52.2`.
--   The corresponding version of `vscode doc` is `1.91.1`.
+-   The currently verified versions of `monaco-editor` are `0.54.0`.
+-   The corresponding version of `vscode-loc` is `main`.
 -   If custom language doesn't work, it may be due to a mismatch between the versions of the two packages. The JSON file structure in later versions of `vscode-loc` has changed (like `1.63.3` and `1.91.1`), Please verify other versions yourself.

package.json

@@ -1,6 +1,6 @@
 {
     "name": "monaco-editor-i18n-plugin",
-    "version": "2.0.2",
+    "version": "3.0.0",
     "description": "A i18n plugin for the Monaco editor",
     "main": "out/index.js",
     "typings": "./out/index.d.ts",
@@ -25,7 +25,7 @@
         "webpack": "^5.68.0"
     },
     "peerDependencies": {
-        "monaco-editor": "0.52.2",
+        "monaco-editor": "0.54.0",
         "webpack": "^5"
     },
     "keywords": [

pnpm-lock.yaml

@@ -5,9 +5,7 @@
 
 import type * as webpack from "webpack";
 
-const replaceNls = require.resolve("./loaders/replaceNls");
 const replaceNlsMessages = require.resolve("./loaders/replaceNlsMessages");
-const replaceLocalizeLoader = require.resolve("./loaders/replaceLocalize");
 
 export declare namespace MonacoEditorI18nPlugin {
     interface IMonacoEditorI18nPluginOpts {
@@ -33,17 +31,10 @@ function createLoaderRules(options: MonacoEditorI18nPlugin.IMonacoEditorI18nPlug
             enforce: "pre",
             include: /[\\\/]monaco-editor[\\\/]esm/,
             use: [
-                {
-                    loader: replaceNls,
-                    options,
-                },
                 {
                     loader: replaceNlsMessages,
                     options,
                 },
-                {
-                    loader: replaceLocalizeLoader,
-                },
             ],
         },
     ];

src/index.ts

@@ -2,24 +2,55 @@ import type { PitchLoaderDefinitionFunction } from "webpack";
 import { MonacoEditorI18nPlugin } from "..";
 
 const fs = require("fs");
-const nlsMessages = require.resolve("../nls.messages");
+const pathModule = require("path");
 
 // replace monaco-editor/esm/vs/nls.messages.js
 const replaceNlsMessages: PitchLoaderDefinitionFunction<MonacoEditorI18nPlugin.IMonacoEditorI18nPluginOpts> = function (
     content: string
 ) {
-    const pathRegExp = /monaco-editor[\\\/]esm[\\\/]vs[\\\/]nls\.message\.js$/;
+    const pathRegExp = /monaco-editor[\\\/]esm[\\\/]vs[\\\/]nls\.messages\.js$/;
     if (!pathRegExp.test(this.resourcePath)) return content;
 
-    let _content = fs.readFileSync(nlsMessages, { encoding: "utf8" });
-    if (_content.includes("windowKey") && _content.includes("localStorageKey")) {
-        const { windowKey, localStorageKey } = this.getOptions() || {};
+    // Resolve nls.keys.json from monaco-editor package
+    const esmDir = this.resourcePath.split(/[\\\/]vs[\\\/]nls\.messages\.js$/)[0];
+    const nlsKeysPath = pathModule.join(esmDir, "nls.keys.json");
+    const nlsKeys: [string, string[]][] = JSON.parse(fs.readFileSync(nlsKeysPath, "utf8"));
 
-        _content = _content.replace(/const windowKey = \("[^"]*"\);/g, `${windowKey};`);
-        _content = _content.replace(/const localStorageKey = \("[^"]*"\);/g, `${localStorageKey};`);
+    // Build flat entries: [[modulePath, key, index], ...]
+    // nls.keys.json may have duplicate keys (same key at multiple indices),
+    // so we must track every index, not just the last one.
+    const entries: [string, string, number][] = [];
+    let idx = 0;
+    for (const [modulePath, keys] of nlsKeys) {
+        for (const key of keys) {
+            entries.push([modulePath, key, idx++]);
+        }
     }
 
-    return _content;
+    const { windowKey = "__DT_LOCALE__", localStorageKey = "dt-locale" } = this.getOptions() || {};
+
+    return `
+const _nlsEntries = ${JSON.stringify(entries)};
+
+export function getNLSMessages() {
+    if (typeof window === "undefined") return undefined;
+    const locale = window.localStorage.getItem("${localStorageKey}") || "en-US";
+    const localeData = window["${windowKey}"]?.[locale] || {};
+    const messages = [];
+    for (const [modulePath, key, index] of _nlsEntries) {
+        const val = (localeData[modulePath] || {})[key];
+        if (val !== undefined) messages[index] = val;
+    }
+    return messages;
+}
+
+export function getNLSLanguage() {
+    if (typeof window === "undefined") return undefined;
+    const locale = window.localStorage.getItem("${localStorageKey}") || "en-US";
+    const map = { "en-US": "en", "zh-CN": "zh-cn" };
+    return map[locale];
+}
+`;
 };
 
 module.exports = replaceNlsMessages;