Skip to content

support named export file #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xudafeng merged 3 commits into from
Apr 29, 2025
Merged

support named export file #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b45dba0
chore: 增加 nocacheRequire 导出 (#21)
WynterDing Apr 7, 2025
a18903a
fix: 支持具名导出 locale 文件
WynterDing Apr 29, 2025
b71922b
chore: merge master
WynterDing Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/easy-i18n.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ class EasyI18n {
const { distFile } = this.options;
try {
const data = Utils.noCacheRequire(distFile);
this.existedData = data.default || data;
this.existedData = Utils.extractLocaleFromExport(data);
} catch (e) {
console.error(e);
}
Expand Down Expand Up @@ -188,7 +188,8 @@ class EasyI18n {

async check() {
const { distFile } = this.options;
const checkTarget = Utils.noCacheRequire(distFile);
let checkTarget = Utils.noCacheRequire(distFile);
checkTarget = Utils.extractLocaleFromExport(checkTarget);
const lines = [];
const lineOffset = await this._getLineOffset();
Object.keys(checkTarget).forEach((key, index) => {
Expand Down
12 changes: 12 additions & 0 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,16 @@ Utils.noCacheRequire = function (resolvedPath) {
return require(resolvedPath);
};

Utils.extractLocaleFromExport = function (data) {
// 处理各类场景下的 i18n 数据
const exportValue = data.default || data;
const firstValue = Object.values(exportValue)[0];

if (typeof firstValue === 'object') {
return firstValue;
}

return exportValue;
};

module.exports = Utils;