@nocobase/server 1.9.0-beta.13 → 1.9.0-beta.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/locale/locale.js +1 -1
- package/lib/locale/resource.js +6 -9
- package/package.json +16 -16
package/lib/locale/locale.js
CHANGED
|
@@ -138,7 +138,7 @@ const _Locale = class _Locale {
|
|
|
138
138
|
if (!packageName) {
|
|
139
139
|
continue;
|
|
140
140
|
}
|
|
141
|
-
const res = (0, import_resource.getResource)(packageName, lang);
|
|
141
|
+
const res = await (0, import_resource.getResource)(packageName, lang);
|
|
142
142
|
if (res) {
|
|
143
143
|
resources[packageName] = { ...res };
|
|
144
144
|
if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {
|
package/lib/locale/resource.js
CHANGED
|
@@ -40,7 +40,7 @@ __export(resource_exports, {
|
|
|
40
40
|
getResource: () => getResource
|
|
41
41
|
});
|
|
42
42
|
module.exports = __toCommonJS(resource_exports);
|
|
43
|
-
var
|
|
43
|
+
var import_promises = __toESM(require("fs/promises"));
|
|
44
44
|
const arr2obj = /* @__PURE__ */ __name((items) => {
|
|
45
45
|
const obj = {};
|
|
46
46
|
for (const item of items) {
|
|
@@ -48,7 +48,7 @@ const arr2obj = /* @__PURE__ */ __name((items) => {
|
|
|
48
48
|
}
|
|
49
49
|
return obj;
|
|
50
50
|
}, "arr2obj");
|
|
51
|
-
const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true) => {
|
|
51
|
+
const getResource = /* @__PURE__ */ __name(async (packageName, lang, isPlugin = true) => {
|
|
52
52
|
const resources = [];
|
|
53
53
|
const prefixes = [isPlugin ? "dist" : "lib"];
|
|
54
54
|
if (process.env.APP_ENV !== "production") {
|
|
@@ -63,13 +63,10 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
|
|
|
63
63
|
}
|
|
64
64
|
for (const prefix of prefixes) {
|
|
65
65
|
try {
|
|
66
|
-
const file = `${packageName}/${prefix}/locale/${lang}`;
|
|
66
|
+
const file = `${packageName}/${prefix}/locale/${lang}.json`;
|
|
67
67
|
const f = require.resolve(file);
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
}
|
|
71
|
-
const resource = (0, import_utils.requireModule)(file);
|
|
72
|
-
resources.push(resource);
|
|
68
|
+
const resource = await import_promises.default.readFile(f, "utf8");
|
|
69
|
+
resources.push(JSON.parse(resource));
|
|
73
70
|
} catch (error) {
|
|
74
71
|
}
|
|
75
72
|
if (resources.length) {
|
|
@@ -77,7 +74,7 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
|
|
|
77
74
|
}
|
|
78
75
|
}
|
|
79
76
|
if (resources.length === 0 && lang.replace("-", "_") !== lang) {
|
|
80
|
-
return getResource(packageName, lang.replace("-", "_"));
|
|
77
|
+
return await getResource(packageName, lang.replace("-", "_"));
|
|
81
78
|
}
|
|
82
79
|
return arr2obj(resources);
|
|
83
80
|
}, "getResource");
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/server",
|
|
3
|
-
"version": "1.9.0-beta.
|
|
3
|
+
"version": "1.9.0-beta.15",
|
|
4
4
|
"main": "lib/index.js",
|
|
5
5
|
"types": "./lib/index.d.ts",
|
|
6
6
|
"license": "AGPL-3.0",
|
|
@@ -10,20 +10,20 @@
|
|
|
10
10
|
"@koa/cors": "^5.0.0",
|
|
11
11
|
"@koa/multer": "^3.1.0",
|
|
12
12
|
"@koa/router": "^13.1.0",
|
|
13
|
-
"@nocobase/acl": "1.9.0-beta.
|
|
14
|
-
"@nocobase/actions": "1.9.0-beta.
|
|
15
|
-
"@nocobase/auth": "1.9.0-beta.
|
|
16
|
-
"@nocobase/cache": "1.9.0-beta.
|
|
17
|
-
"@nocobase/data-source-manager": "1.9.0-beta.
|
|
18
|
-
"@nocobase/database": "1.9.0-beta.
|
|
19
|
-
"@nocobase/evaluators": "1.9.0-beta.
|
|
20
|
-
"@nocobase/lock-manager": "1.9.0-beta.
|
|
21
|
-
"@nocobase/logger": "1.9.0-beta.
|
|
22
|
-
"@nocobase/resourcer": "1.9.0-beta.
|
|
23
|
-
"@nocobase/sdk": "1.9.0-beta.
|
|
24
|
-
"@nocobase/snowflake-id": "1.9.0-beta.
|
|
25
|
-
"@nocobase/telemetry": "1.9.0-beta.
|
|
26
|
-
"@nocobase/utils": "1.9.0-beta.
|
|
13
|
+
"@nocobase/acl": "1.9.0-beta.15",
|
|
14
|
+
"@nocobase/actions": "1.9.0-beta.15",
|
|
15
|
+
"@nocobase/auth": "1.9.0-beta.15",
|
|
16
|
+
"@nocobase/cache": "1.9.0-beta.15",
|
|
17
|
+
"@nocobase/data-source-manager": "1.9.0-beta.15",
|
|
18
|
+
"@nocobase/database": "1.9.0-beta.15",
|
|
19
|
+
"@nocobase/evaluators": "1.9.0-beta.15",
|
|
20
|
+
"@nocobase/lock-manager": "1.9.0-beta.15",
|
|
21
|
+
"@nocobase/logger": "1.9.0-beta.15",
|
|
22
|
+
"@nocobase/resourcer": "1.9.0-beta.15",
|
|
23
|
+
"@nocobase/sdk": "1.9.0-beta.15",
|
|
24
|
+
"@nocobase/snowflake-id": "1.9.0-beta.15",
|
|
25
|
+
"@nocobase/telemetry": "1.9.0-beta.15",
|
|
26
|
+
"@nocobase/utils": "1.9.0-beta.15",
|
|
27
27
|
"@types/decompress": "4.2.7",
|
|
28
28
|
"@types/ini": "^1.3.31",
|
|
29
29
|
"@types/koa-send": "^4.1.3",
|
|
@@ -59,5 +59,5 @@
|
|
|
59
59
|
"@types/serve-handler": "^6.1.1",
|
|
60
60
|
"@types/ws": "^8.5.5"
|
|
61
61
|
},
|
|
62
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "f7285eff753fd268350cfd65cd079a35b8957f0e"
|
|
63
63
|
}
|