@nocobase/server 2.0.0-alpha.20 → 2.0.0-alpha.21

package/lib/application.d.ts

@@ -33,11 +33,11 @@ import { PubSubManager, PubSubManagerOptions } from './pub-sub-manager';
 import { SyncMessageManager } from './sync-message-manager';
 import AesEncryptor from './aes-encryptor';
 import { AuditManager } from './audit-manager';
+import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
 import { Environment } from './environment';
-import { ServiceContainer } from './service-container';
 import { EventQueue, EventQueueOptions } from './event-queue';
-import { BackgroundJobManager, BackgroundJobManagerOptions } from './background-job-manager';
 import { RedisConfig, RedisConnectionManager } from './redis-connection-manager';
+import { ServiceContainer } from './service-container';
 import { WorkerIdAllocator } from './worker-id-allocator';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];

package/lib/application.js

@@ -50,8 +50,8 @@ var import_database = __toESM(require("@nocobase/database"));
 var import_logger = require("@nocobase/logger");
 var import_telemetry = require("@nocobase/telemetry");
 var import_lock_manager = require("@nocobase/lock-manager");
-var import_utils = require("@nocobase/utils");
 var import_snowflake_id = require("@nocobase/snowflake-id");
+var import_utils = require("@nocobase/utils");
 var import_crypto = require("crypto");
 var import_glob = __toESM(require("glob"));
 var import_koa = __toESM(require("koa"));
@@ -80,13 +80,13 @@ var import_package = __toESM(require("../package.json"));
 var import_available_action = require("./acl/available-action");
 var import_aes_encryptor = __toESM(require("./aes-encryptor"));
 var import_audit_manager = require("./audit-manager");
+var import_background_job_manager = require("./background-job-manager");
 var import_environment = require("./environment");
-var import_service_container = require("./service-container");
 var import_event_queue = require("./event-queue");
-var import_background_job_manager = require("./background-job-manager");
 var import_redis_connection_manager = require("./redis-connection-manager");
-var import_worker_id_allocator = require("./worker-id-allocator");
+var import_service_container = require("./service-container");
 var import_snowflake_id_field = require("./snowflake-id-field");
+var import_worker_id_allocator = require("./worker-id-allocator");
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -777,6 +777,12 @@ const _Application = class _Application extends import_koa.default {
   }
   async upgrade(options = {}) {
     this.log.info("upgrading...");
+    const pkgVersion = this.getPackageVersion();
+    const appVersion = await this.version.get();
+    if (process.env.SKIP_SAME_VERSION_UPGRADE === "true" && pkgVersion === appVersion) {
+      this.log.info(`app is already the latest version (${appVersion})`);
+      return;
+    }
     await this.reInit();
     const migrator1 = await this.loadCoreMigrations();
     await migrator1.beforeLoad.up();

package/lib/locale/locale.js

@@ -138,7 +138,7 @@ const _Locale = class _Locale {
         if (!packageName) {
           continue;
         }
-        const res = (0, import_resource.getResource)(packageName, lang);
+        const res = await (0, import_resource.getResource)(packageName, lang);
         if (res) {
           resources[packageName] = { ...res };
           if (packageName.includes(import__.OFFICIAL_PLUGIN_PREFIX)) {

package/lib/locale/resource.js

@@ -40,7 +40,7 @@ __export(resource_exports, {
   getResource: () => getResource
 });
 module.exports = __toCommonJS(resource_exports);
-var import_utils = require("@nocobase/utils");
+var import_promises = __toESM(require("fs/promises"));
 const arr2obj = /* @__PURE__ */ __name((items) => {
   const obj = {};
   for (const item of items) {
@@ -48,7 +48,7 @@ const arr2obj = /* @__PURE__ */ __name((items) => {
   }
   return obj;
 }, "arr2obj");
-const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true) => {
+const getResource = /* @__PURE__ */ __name(async (packageName, lang, isPlugin = true) => {
   const resources = [];
   const prefixes = [isPlugin ? "dist" : "lib"];
   if (process.env.APP_ENV !== "production") {
@@ -70,13 +70,10 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
   }
   for (const prefix of prefixes) {
     try {
-      const file = `${packageName}/${prefix}/locale/${lang}`;
+      const file = `${packageName}/${prefix}/locale/${lang}.json`;
       const f = require.resolve(file);
-      if (process.env.APP_ENV !== "production") {
-        delete require.cache[f];
-      }
-      const resource = (0, import_utils.requireModule)(file);
-      resources.push(resource);
+      const resource = await import_promises.default.readFile(f, "utf8");
+      resources.push(JSON.parse(resource));
     } catch (error) {
     }
     if (resources.length) {
@@ -84,7 +81,7 @@ const getResource = /* @__PURE__ */ __name((packageName, lang, isPlugin = true)
     }
   }
   if (resources.length === 0 && lang.replace("-", "_") !== lang) {
-    return getResource(packageName, lang.replace("-", "_"));
+    return await getResource(packageName, lang.replace("-", "_"));
   }
   return arr2obj(resources);
 }, "getResource");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "2.0.0-alpha.20",
+  "version": "2.0.0-alpha.21",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,20 +10,20 @@
     "@koa/cors": "^5.0.0",
     "@koa/multer": "^3.1.0",
     "@koa/router": "^13.1.0",
-    "@nocobase/acl": "2.0.0-alpha.20",
-    "@nocobase/actions": "2.0.0-alpha.20",
-    "@nocobase/auth": "2.0.0-alpha.20",
-    "@nocobase/cache": "2.0.0-alpha.20",
-    "@nocobase/data-source-manager": "2.0.0-alpha.20",
-    "@nocobase/database": "2.0.0-alpha.20",
-    "@nocobase/evaluators": "2.0.0-alpha.20",
-    "@nocobase/lock-manager": "2.0.0-alpha.20",
-    "@nocobase/logger": "2.0.0-alpha.20",
-    "@nocobase/resourcer": "2.0.0-alpha.20",
-    "@nocobase/sdk": "2.0.0-alpha.20",
-    "@nocobase/snowflake-id": "2.0.0-alpha.20",
-    "@nocobase/telemetry": "2.0.0-alpha.20",
-    "@nocobase/utils": "2.0.0-alpha.20",
+    "@nocobase/acl": "2.0.0-alpha.21",
+    "@nocobase/actions": "2.0.0-alpha.21",
+    "@nocobase/auth": "2.0.0-alpha.21",
+    "@nocobase/cache": "2.0.0-alpha.21",
+    "@nocobase/data-source-manager": "2.0.0-alpha.21",
+    "@nocobase/database": "2.0.0-alpha.21",
+    "@nocobase/evaluators": "2.0.0-alpha.21",
+    "@nocobase/lock-manager": "2.0.0-alpha.21",
+    "@nocobase/logger": "2.0.0-alpha.21",
+    "@nocobase/resourcer": "2.0.0-alpha.21",
+    "@nocobase/sdk": "2.0.0-alpha.21",
+    "@nocobase/snowflake-id": "2.0.0-alpha.21",
+    "@nocobase/telemetry": "2.0.0-alpha.21",
+    "@nocobase/utils": "2.0.0-alpha.21",
     "@types/decompress": "4.2.7",
     "@types/ini": "^1.3.31",
     "@types/koa-send": "^4.1.3",
@@ -59,5 +59,5 @@
     "@types/serve-handler": "^6.1.1",
     "@types/ws": "^8.5.5"
   },
-  "gitHead": "af5ff4eaa490349420135405128da466d72ac74c"
+  "gitHead": "0398c85e979d09e834952e71c5c1a1ccf1a3a8e1"
 }