@nocobase/plugin-localization 1.2.8-alpha → 1.2.10-alpha

package/dist/externalVersion.js

@@ -11,14 +11,14 @@ module.exports = {
   "@ant-design/icons": "5.2.6",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.2.8-alpha",
+  "@nocobase/client": "1.2.10-alpha",
   "ahooks": "3.7.8",
   "antd": "5.12.8",
   "react": "18.2.0",
-  "@nocobase/database": "1.2.8-alpha",
-  "@nocobase/plugin-ui-schema-storage": "1.2.8-alpha",
-  "@nocobase/server": "1.2.8-alpha",
-  "@nocobase/cache": "1.2.8-alpha",
+  "@nocobase/database": "1.2.10-alpha",
+  "@nocobase/plugin-ui-schema-storage": "1.2.10-alpha",
+  "@nocobase/server": "1.2.10-alpha",
+  "@nocobase/cache": "1.2.10-alpha",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.2.8-alpha"
+  "@nocobase/actions": "1.2.10-alpha"
 };

package/dist/node_modules/deepmerge/package.json

@@ -1 +1 @@
-{"name":"deepmerge","description":"A library for deep (recursive) merging of Javascript objects","keywords":["merge","deep","extend","copy","clone","recursive"],"version":"4.3.1","homepage":"https://github.com/TehShrike/deepmerge","repository":{"type":"git","url":"git://github.com/TehShrike/deepmerge.git"},"main":"dist/cjs.js","engines":{"node":">=0.10.0"},"scripts":{"build":"rollup -c","test":"npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript","test:typescript":"tsc --noEmit test/typescript.ts && ts-node test/typescript.ts","size":"npm run build && uglifyjs --compress --mangle -- ./dist/umd.js | gzip -c | wc -c"},"devDependencies":{"@types/node":"^8.10.54","is-mergeable-object":"1.1.0","is-plain-object":"^5.0.0","jsmd":"^1.0.2","rollup":"^1.23.1","rollup-plugin-commonjs":"^10.1.0","rollup-plugin-node-resolve":"^5.2.0","tape":"^4.11.0","ts-node":"7.0.1","typescript":"=2.2.2","uglify-js":"^3.6.1"},"license":"MIT","_lastModified":"2024-06-25T07:52:22.113Z"}
+{"name":"deepmerge","description":"A library for deep (recursive) merging of Javascript objects","keywords":["merge","deep","extend","copy","clone","recursive"],"version":"4.3.1","homepage":"https://github.com/TehShrike/deepmerge","repository":{"type":"git","url":"git://github.com/TehShrike/deepmerge.git"},"main":"dist/cjs.js","engines":{"node":">=0.10.0"},"scripts":{"build":"rollup -c","test":"npm run build && tape test/*.js && jsmd readme.md && npm run test:typescript","test:typescript":"tsc --noEmit test/typescript.ts && ts-node test/typescript.ts","size":"npm run build && uglifyjs --compress --mangle -- ./dist/umd.js | gzip -c | wc -c"},"devDependencies":{"@types/node":"^8.10.54","is-mergeable-object":"1.1.0","is-plain-object":"^5.0.0","jsmd":"^1.0.2","rollup":"^1.23.1","rollup-plugin-commonjs":"^10.1.0","rollup-plugin-node-resolve":"^5.2.0","tape":"^4.11.0","ts-node":"7.0.1","typescript":"=2.2.2","uglify-js":"^3.6.1"},"license":"MIT","_lastModified":"2024-06-27T14:17:06.986Z"}

package/dist/server/actions/localization.js

@@ -223,8 +223,7 @@ const sync = async (ctx, next) => {
   await next();
 };
 const publish = async (ctx, next) => {
-  const resources = await getResourcesInstance(ctx);
-  ctx.body = await resources.resetCache(ctx.get("X-Locale") || "en-US");
+  ctx.app.localeManager.reload();
   await next();
 };
 var localization_default = { publish, sync };

package/dist/server/plugin.js

@@ -41,7 +41,6 @@ __export(plugin_exports, {
 });
 module.exports = __toCommonJS(plugin_exports);
 var import_server = require("@nocobase/server");
-var import_deepmerge = __toESM(require("deepmerge"));
 var import_path = require("path");
 var import_localization = __toESM(require("./actions/localization"));
 var import_localizationTexts = __toESM(require("./actions/localizationTexts"));
@@ -132,28 +131,8 @@ class PluginLocalizationServer extends import_server.Plugin {
     });
     this.resources = new import_resources.default(this.db, cache);
     this.registerUISchemahook();
-    this.app.resourceManager.use(async (ctx, next) => {
-      await next();
-      const { resourceName, actionName } = ctx.action.params;
-      if (resourceName === "app" && actionName === "getLang") {
-        const custom = await this.resources.getResources(ctx.body.lang || "en-US");
-        const appLang = ctx.body;
-        const resources = { ...appLang.resources };
-        Object.keys(custom).forEach((key) => {
-          const module2 = key.replace("resources.", "");
-          const resource = appLang.resources[module2];
-          const customResource = custom[key];
-          resources[module2] = resource ? (0, import_deepmerge.default)(resource, customResource) : customResource;
-          const pkgName = `${import_server.OFFICIAL_PLUGIN_PREFIX}${module2}`;
-          if (appLang.resources[pkgName]) {
-            resources[pkgName] = { ...resources[module2] };
-          }
-        });
-        ctx.body = {
-          ...appLang,
-          resources
-        };
-      }
+    this.app.localeManager.registerResourceStorer("plugin-localization", {
+      getResources: (lang) => this.resources.getResources(lang)
     });
   }
   async install(options) {

package/dist/server/resources.js

@@ -37,6 +37,9 @@ class Resources {
     this.db = db;
   }
   async getTexts(transaction) {
+    if (!await this.db.collectionExistsInDb("localizationTexts")) {
+      return [];
+    }
     return await this.cache.wrap(`texts`, async () => {
       return await this.db.getRepository("localizationTexts").find({
         fields: ["id", "module", "text"],
@@ -46,6 +49,9 @@ class Resources {
     });
   }
   async getTranslations(locale) {
+    if (!await this.db.collectionExistsInDb("localizationTranslations")) {
+      return [];
+    }
     return await this.cache.wrap(`translations:${locale}`, async () => {
       return await this.db.getRepository("localizationTranslations").find({
         fields: ["textId", "translation"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-localization",
-  "version": "1.2.8-alpha",
+  "version": "1.2.10-alpha",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/localization-management",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/localization-management",
@@ -24,5 +24,5 @@
   "displayName.zh-CN": "本地化",
   "description": "Allows to manage localization resources of the application.",
   "description.zh-CN": "支持管理应用程序的本地化资源。",
-  "gitHead": "23132ae9e60c152ea61b77a6371a41c684d4041a"
+  "gitHead": "378bfb33c8d124ef79074e5474c1cf2199aeb8da"
 }