@nocobase/server 0.21.0-alpha.1 → 0.21.0-alpha.10

package/lib/application.d.ts

@@ -22,9 +22,16 @@ import { InstallOptions, PluginManager } from './plugin-manager';
 import { DataSourceManager, SequelizeDataSource } from '@nocobase/data-source-manager';
 export type PluginType = string | typeof Plugin;
 export type PluginConfiguration = PluginType | [PluginType, any];
-export interface ResourcerOptions {
+export interface ResourceManagerOptions {
     prefix?: string;
 }
+/**
+ * this interface is deprecated and should not be used.
+ * @deprecated
+ * use {@link ResourceManagerOptions} instead
+ */
+export interface ResourcerOptions extends ResourceManagerOptions {
+}
 export interface AppLoggerOptions {
     request: RequestLoggerOptions;
     system: SystemLoggerOptions;
@@ -35,7 +42,13 @@ export interface AppTelemetryOptions extends TelemetryOptions {
 export interface ApplicationOptions {
     database?: IDatabaseOptions | Database;
     cacheManager?: CacheManagerOptions;
-    resourcer?: ResourcerOptions;
+    /**
+     * this property is deprecated and should not be used.
+     * @deprecated
+     * use {@link ApplicationOptions.resourceManager} instead
+     */
+    resourcer?: ResourceManagerOptions;
+    resourceManager?: ResourceManagerOptions;
     bodyParser?: any;
     cors?: any;
     dataWrapping?: boolean;
@@ -44,9 +57,15 @@ export interface ApplicationOptions {
     plugins?: PluginConfiguration[];
     acl?: boolean;
     logger?: AppLoggerOptions;
+    /**
+     * @internal
+     */
     pmSock?: string;
     name?: string;
     authManager?: AuthManagerOptions;
+    /**
+     * @internal
+     */
     perfHooks?: boolean;
     telemetry?: AppTelemetryOptions;
 }
@@ -65,6 +84,12 @@ interface ActionsOptions {
     resourceName?: string;
     resourceNames?: string[];
 }
+interface LoadOptions {
+    reload?: boolean;
+    hooks?: boolean;
+    sync?: boolean;
+    [key: string]: any;
+}
 interface StartOptions {
     cliArgs?: any[];
     dbSync?: boolean;
@@ -139,7 +164,13 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     get mainDataSource(): SequelizeDataSource;
     get db(): Database;
     get logger(): SystemLogger;
-    get resourcer(): import("@nocobase/data-source-manager").ResourceManager;
+    get resourceManager(): import("@nocobase/resourcer").ResourceManager;
+    /**
+     * This method is deprecated and should not be used.
+     * Use {@link #resourceManager} instead.
+     * @deprecated
+     */
+    get resourcer(): import("@nocobase/resourcer").ResourceManager;
     protected _cacheManager: CacheManager;
     get cacheManager(): CacheManager;
     protected _cache: Cache;
@@ -210,13 +241,13 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
     collection(options: CollectionOptions): import("@nocobase/database").Collection<any, any>;
     /**
      * This method is deprecated and should not be used.
-     * Use {@link #this.resourcer.define()} instead.
+     * Use {@link #this.resourceManager.define()} instead.
      * @deprecated
      */
     resource(options: ResourceOptions): import("@nocobase/resourcer").Resource;
     /**
      * This method is deprecated and should not be used.
-     * Use {@link #this.resourcer.registerActions()} instead.
+     * Use {@link #this.resourceManager.registerActionHandlers()} instead.
      * @deprecated
      */
     actions(handlers: any, options?: ActionsOptions): void;
@@ -226,8 +257,8 @@ export declare class Application<StateT = DefaultState, ContextT = DefaultContex
      * @internal
      */
     reInit(): Promise<void>;
-    load(options?: any): Promise<void>;
-    reload(options?: any): Promise<void>;
+    load(options?: LoadOptions): Promise<void>;
+    reload(options?: LoadOptions): Promise<void>;
     /**
      * This method is deprecated and should not be used.
      * Use {@link this.pm.get()} instead.

package/lib/application.js

@@ -59,6 +59,7 @@ var import_plugin_manager = require("./plugin-manager");
 var import_data_source_manager = require("@nocobase/data-source-manager");
 var import_package = __toESM(require("../package.json"));
 var import_main_data_source = require("./main-data-source");
+var import_validate_filter_params = __toESM(require("./middlewares/validate-filter-params"));
 const _Application = class _Application extends import_koa.default {
   constructor(options) {
     super();
@@ -132,6 +133,14 @@ const _Application = class _Application extends import_koa.default {
   get logger() {
     return this._logger;
   }
+  get resourceManager() {
+    return this.mainDataSource.resourceManager;
+  }
+  /**
+   * This method is deprecated and should not be used.
+   * Use {@link #resourceManager} instead.
+   * @deprecated
+   */
   get resourcer() {
     return this.mainDataSource.resourceManager;
   }
@@ -270,19 +279,19 @@ const _Application = class _Application extends import_koa.default {
   }
   /**
    * This method is deprecated and should not be used.
-   * Use {@link #this.resourcer.define()} instead.
+   * Use {@link #this.resourceManager.define()} instead.
    * @deprecated
    */
   resource(options) {
-    return this.resourcer.define(options);
+    return this.resourceManager.define(options);
   }
   /**
    * This method is deprecated and should not be used.
-   * Use {@link #this.resourcer.registerActions()} instead.
+   * Use {@link #this.resourceManager.registerActionHandlers()} instead.
    * @deprecated
    */
   actions(handlers, options) {
-    return this.resourcer.registerActions(handlers);
+    return this.resourceManager.registerActionHandlers(handlers);
   }
   command(name, desc, opts) {
     return this.cli.command(name, desc, opts).allowUnknownOption();
@@ -502,7 +511,7 @@ const _Application = class _Application extends import_koa.default {
     if (this.activatedCommand) {
       return;
     }
-    if (options.reqId) {
+    if (options == null ? void 0 : options.reqId) {
       this.context.reqId = options.reqId;
       this._logger = this._logger.child({ reqId: this.context.reqId });
     }
@@ -531,6 +540,8 @@ const _Application = class _Application extends import_koa.default {
       });
       if (options == null ? void 0 : options.throwError) {
         throw error;
+      } else {
+        this.log.error(error);
       }
     } finally {
       const _actionCommand = this._actionCommand;
@@ -755,7 +766,8 @@ const _Application = class _Application extends import_koa.default {
     this._cli = this.createCLI();
     this._i18n = (0, import_helper.createI18n)(options);
     this.context.db = this.db;
-    this.context.resourcer = this.resourcer;
+    this.context.resourcer = this.resourceManager;
+    this.context.resourceManager = this.resourceManager;
     this.context.cacheManager = this._cacheManager;
     this.context.cache = this._cache;
     const plugins = this._pm ? this._pm.options.plugins : options.plugins;
@@ -773,15 +785,12 @@ const _Application = class _Application extends import_koa.default {
       default: "basic",
       ...this.options.authManager || {}
     });
-    this.resource({
+    this.resourceManager.define({
       name: "auth",
       actions: import_auth.actions
     });
     this._dataSourceManager.use(this._authManager.middleware(), { tag: "auth" });
-    this.resourcer.use(this._authManager.middleware(), { tag: "auth" });
-    if (this.options.acl !== false) {
-      this.resourcer.use(this.acl.middleware(), { tag: "acl", after: ["auth"] });
-    }
+    this._dataSourceManager.use(import_validate_filter_params.default, { tag: "validate-filter-params", before: ["auth"] });
     this._locales = new import_locale.Locale((0, import_helper.createAppProxy)(this));
     if (options.perfHooks) {
       (0, import_helper.enablePerfHooks)(this);
@@ -798,7 +807,8 @@ const _Application = class _Application extends import_koa.default {
       name: "main",
       database: this.createDatabase(options),
       acl: (0, import_acl.createACL)(),
-      resourceManager: (0, import_helper.createResourcer)(options)
+      resourceManager: (0, import_helper.createResourcer)(options),
+      useACL: options.acl
     });
     this._dataSourceManager = new import_data_source_manager.DataSourceManager();
     this.dataSourceManager.dataSources.set("main", mainDataSourceInstance);

package/lib/commands/pm.js

@@ -55,6 +55,13 @@ var pm_default = /* @__PURE__ */ __name((app) => {
       throw new import_plugin_command_error.PluginCommandError(`Failed to update plugin`, { cause: error });
     }
   });
+  pm.command("enable-all").ipc().preload().action(async () => {
+    try {
+      await app.pm.enable("*");
+    } catch (error) {
+      throw new import_plugin_command_error.PluginCommandError(`Failed to enable plugin`, { cause: error });
+    }
+  });
   pm.command("enable").ipc().preload().arguments("<plugins...>").action(async (plugins) => {
     try {
       await app.pm.enable(plugins);

package/lib/commands/start.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,18 +17,33 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var start_exports = {};
 __export(start_exports, {
   default: () => start_default
 });
 module.exports = __toCommonJS(start_exports);
+var import_utils = require("@nocobase/utils");
+var import_fs = __toESM(require("fs"));
+var import_path = require("path");
 var import_application_not_install = require("../errors/application-not-install");
 var start_default = /* @__PURE__ */ __name((app) => {
   app.command("start").auth().option("--db-sync").option("--quickstart").action(async (...cliArgs) => {
     const [options] = cliArgs;
-    console.log("start options", options);
-    if (options.quickstart) {
+    const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
+    const upgrading = await (0, import_utils.fsExists)(file);
+    if (upgrading) {
+      await app.upgrade();
+      await import_fs.default.promises.rm(file);
+    } else if (options.quickstart) {
       if (await app.isInstalled()) {
         await app.upgrade();
       } else {

package/lib/gateway/ws-server.js

@@ -70,10 +70,14 @@ const _WSServer = class _WSServer {
       });
     });
     import_app_supervisor.AppSupervisor.getInstance().on("appError", async ({ appName, error }) => {
+      let message = error.message;
+      if (error.cause) {
+        message = `${message}: ${error.cause.message}`;
+      }
       this.sendToConnectionsByTag("app", appName, {
         type: "notification",
         payload: {
-          message: error.message,
+          message,
           type: "error"
         }
       });

package/lib/helper.js

@@ -47,10 +47,7 @@ var import_i18next = __toESM(require("i18next"));
 var import_koa_bodyparser = __toESM(require("koa-bodyparser"));
 var import_path = require("path");
 var import_perf_hooks = require("perf_hooks");
-var import_middlewares = require("./middlewares");
-var import_data_template = require("./middlewares/data-template");
 var import_data_wrapping = require("./middlewares/data-wrapping");
-var import_db2resource = require("./middlewares/db2resource");
 var import_i18n = require("./middlewares/i18n");
 function createI18n(options) {
   const instance = import_i18next.default.createInstance();
@@ -111,14 +108,7 @@ function registerMiddlewares(app, options) {
   if (options.dataWrapping !== false) {
     app.use((0, import_data_wrapping.dataWrapping)(), { tag: "dataWrapping", after: "i18n" });
   }
-  app.resourcer.use(import_middlewares.parseVariables, {
-    tag: "parseVariables",
-    after: "acl"
-  });
-  app.resourcer.use(import_data_template.dateTemplate, { tag: "dateTemplate", after: "acl" });
-  app.use(import_db2resource.db2resource, { tag: "db2resource", after: "dataWrapping" });
-  app.use(app.resourcer.restApiMiddleware({ skipIfDataSourceExists: true }), { tag: "restApi", after: "db2resource" });
-  app.use(app.dataSourceManager.middleware(), { tag: "dataSource", after: "restApi" });
+  app.use(app.dataSourceManager.middleware(), { tag: "dataSource", after: "dataWrapping" });
 }
 __name(registerMiddlewares, "registerMiddlewares");
 const createAppProxy = /* @__PURE__ */ __name((app) => {

package/lib/locale/locale.js

@@ -86,7 +86,7 @@ const _Locale = class _Locale {
   getResources(lang) {
     var _a;
     const resources = {};
-    const names = this.app.pm.getAliases();
+    const names = this.app.pm.getPlugins().keys();
     for (const name of names) {
       try {
         const p = this.app.pm.get(name);

package/lib/main-data-source.js

@@ -22,6 +22,8 @@ __export(main_data_source_exports, {
 });
 module.exports = __toCommonJS(main_data_source_exports);
 var import_data_source_manager = require("@nocobase/data-source-manager");
+var import_middlewares = require("./middlewares");
+var import_data_template = require("./middlewares/data-template");
 const _MainDataSource = class _MainDataSource extends import_data_source_manager.SequelizeDataSource {
   init(options = {}) {
     const { acl, resourceManager, database } = options;
@@ -35,6 +37,14 @@ const _MainDataSource = class _MainDataSource extends import_data_source_manager
         }
       }
     });
+    if (options.useACL !== false) {
+      this.resourceManager.use(this.acl.middleware(), { group: "acl", after: "auth" });
+    }
+    this.resourceManager.use(import_middlewares.parseVariables, {
+      group: "parseVariables",
+      after: "acl"
+    });
+    this.resourceManager.use(import_data_template.dateTemplate, { group: "dateTemplate", after: "acl" });
   }
 };
 __name(_MainDataSource, "MainDataSource");

package/lib/middlewares/data-wrapping.js

@@ -80,6 +80,7 @@ function dataWrapping() {
     if (ctx.body && ((_b = ctx.state.messages) == null ? void 0 : _b.length)) {
       ctx.body.messages = ctx.state.messages;
     }
+    ctx.dataWrapped = true;
   }, "dataWrapping");
 }
 __name(dataWrapping, "dataWrapping");

package/lib/middlewares/db2resource.js

@@ -24,10 +24,6 @@ __export(db2resource_exports, {
 module.exports = __toCommonJS(db2resource_exports);
 var import_resourcer = require("@nocobase/resourcer");
 async function db2resource(ctx, next) {
-  const dataSource = ctx.get("x-data-source");
-  if (dataSource) {
-    return next();
-  }
   const resourcer = ctx.resourcer;
   const database = ctx.db;
   const params = (0, import_resourcer.parseRequest)(
@@ -48,11 +44,8 @@ async function db2resource(ctx, next) {
     return next();
   }
   const splitResult = resourceName.split(".");
-  let collectionName = splitResult[0];
+  const collectionName = splitResult[0];
   const fieldName = splitResult[1];
-  if (collectionName.includes("@")) {
-    collectionName = collectionName.split("@")[1];
-  }
   if (!database.hasCollection(collectionName)) {
     return next();
   }

package/lib/middlewares/validate-filter-params.d.ts

@@ -0,0 +1 @@
+export default function validateFilterParams(ctx: any, next: any): Promise<void>;

package/lib/middlewares/validate-filter-params.js

@@ -0,0 +1,33 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var validate_filter_params_exports = {};
+__export(validate_filter_params_exports, {
+  default: () => validateFilterParams
+});
+module.exports = __toCommonJS(validate_filter_params_exports);
+var import_utils = require("@nocobase/utils");
+async function validateFilterParams(ctx, next) {
+  const { params } = ctx.action;
+  const guardedActions = ["update", "destroy"];
+  if (params.filter && !(0, import_utils.isValidFilter)(params.filter) && guardedActions.includes(params.actionName)) {
+    throw new Error(`Invalid filter: ${JSON.stringify(params.filter)}`);
+  }
+  await next();
+}
+__name(validateFilterParams, "validateFilterParams");

package/lib/plugin-manager/plugin-manager.d.ts

@@ -82,7 +82,7 @@ export declare class PluginManager {
     create(pluginName: string, options?: {
         forceRecreate?: boolean;
     }): Promise<void>;
-    add(plugin?: any, options?: any, insert?: boolean, isUpgrade?: boolean): Promise<void>;
+    add(plugin?: string | typeof Plugin, options?: any, insert?: boolean, isUpgrade?: boolean): Promise<void>;
     /**
      * @internal
      */
@@ -93,6 +93,7 @@ export declare class PluginManager {
     loadCommands(): Promise<void>;
     load(options?: any): Promise<void>;
     install(options?: InstallOptions): Promise<void>;
+    private sort;
     enable(name: string | string[]): Promise<void>;
     disable(name: string | string[]): Promise<void>;
     remove(name: string | string[], options?: {

package/lib/plugin-manager/plugin-manager.js

@@ -34,6 +34,7 @@ __export(plugin_manager_exports, {
   sleep: () => sleep
 });
 module.exports = __toCommonJS(plugin_manager_exports);
+var import_topo = __toESM(require("@hapi/topo"));
 var import_utils = require("@nocobase/utils");
 var import_plugin_symlink = require("@nocobase/utils/plugin-symlink");
 var import_execa = __toESM(require("execa"));
@@ -312,6 +313,9 @@ const _PluginManager = class _PluginManager {
     if (options.name) {
       this.pluginAliases.set(options.name, instance);
     }
+    if (options.packageName) {
+      this.pluginAliases.set(options.packageName, instance);
+    }
     if (insert && options.name) {
       await this.repository.updateOrCreate({
         values: {
@@ -443,8 +447,27 @@ const _PluginManager = class _PluginManager {
       }
     });
   }
+  sort(names) {
+    var _a, _b, _c;
+    const pluginNames = import_lodash.default.castArray(names);
+    if (pluginNames.length === 1) {
+      return pluginNames;
+    }
+    const sorter = new import_topo.default.Sorter();
+    for (const pluginName of pluginNames) {
+      const plugin = this.get(pluginName);
+      const peerDependencies = Object.keys(((_b = (_a = plugin.options) == null ? void 0 : _a.packageJson) == null ? void 0 : _b.peerDependencies) || {});
+      sorter.add(pluginName, { after: peerDependencies, group: ((_c = plugin.options) == null ? void 0 : _c.packageName) || pluginName });
+    }
+    return sorter.nodes;
+  }
   async enable(name) {
-    const pluginNames = import_lodash.default.castArray(name);
+    let pluginNames = name;
+    if (name === "*") {
+      const items = await this.repository.find();
+      pluginNames = items.map((item) => item.name);
+    }
+    pluginNames = this.sort(pluginNames);
     this.app.log.debug(`enabling plugin ${pluginNames.join(",")}`);
     this.app.setMaintainingMessage(`enabling plugin ${pluginNames.join(",")}`);
     const toBeUpdated = [];
@@ -457,9 +480,17 @@ const _PluginManager = class _PluginManager {
         continue;
       }
       await this.app.emitAsync("beforeEnablePlugin", pluginName);
-      await plugin.beforeEnable();
-      plugin.enabled = true;
-      toBeUpdated.push(pluginName);
+      try {
+        await plugin.beforeEnable();
+        plugin.enabled = true;
+        toBeUpdated.push(pluginName);
+      } catch (error) {
+        if (name === "*") {
+          this.app.log.error(error.message);
+        } else {
+          throw error;
+        }
+      }
     }
     if (toBeUpdated.length === 0) {
       return;
@@ -474,10 +505,10 @@ const _PluginManager = class _PluginManager {
     });
     try {
       await this.app.reload();
-      this.app.log.debug(`syncing database in enable plugin ${pluginNames.join(",")}...`);
-      this.app.setMaintainingMessage(`syncing database in enable plugin ${pluginNames.join(",")}...`);
+      this.app.log.debug(`syncing database in enable plugin ${toBeUpdated.join(",")}...`);
+      this.app.setMaintainingMessage(`syncing database in enable plugin ${toBeUpdated.join(",")}...`);
       await this.app.db.sync();
-      for (const pluginName of pluginNames) {
+      for (const pluginName of toBeUpdated) {
         const plugin = this.get(pluginName);
         if (!plugin.installed) {
           this.app.log.debug(`installing plugin ${pluginName}...`);
@@ -494,7 +525,7 @@ const _PluginManager = class _PluginManager {
           installed: true
         }
       });
-      for (const pluginName of pluginNames) {
+      for (const pluginName of toBeUpdated) {
         const plugin = this.get(pluginName);
         this.app.log.debug(`emit afterEnablePlugin event...`);
         await plugin.afterEnable();
@@ -758,7 +789,15 @@ const _PluginManager = class _PluginManager {
     } else {
       await this.upgradeByNpm(options);
     }
-    await this.app.upgrade();
+    const file = (0, import_path.resolve)(process.cwd(), "storage/app-upgrading");
+    await import_fs.default.promises.writeFile(file, "", "utf-8");
+    if (process.env.IS_DEV_CMD) {
+      await (0, import_helper.tsxRerunning)();
+    } else {
+      await (0, import_execa.default)("yarn", ["nocobase", "pm2-restart"], {
+        env: process.env
+      });
+    }
   }
   /**
    * @internal
@@ -815,7 +854,7 @@ const _PluginManager = class _PluginManager {
   async list(options = {}) {
     const { locale = "en-US", isPreset = false } = options;
     return Promise.all(
-      [...this.getAliases()].map((name) => {
+      [...this.getPlugins().keys()].map((name) => {
         const plugin = this.get(name);
         if (!isPreset && plugin.options.isPreset) {
           return;

package/lib/plugin-manager/utils.js

@@ -445,15 +445,23 @@ async function getExternalVersionFromSource(packageName) {
 __name(getExternalVersionFromSource, "getExternalVersionFromSource");
 async function getCompatible(packageName) {
   let externalVersion;
-  if (!process.env.IS_DEV_CMD) {
+  const hasSrc = import_fs_extra.default.existsSync(import_path.default.join((0, import_clientStaticUtils.getPackageDir)(packageName), "src"));
+  let hasError = false;
+  if (hasSrc) {
+    try {
+      externalVersion = await getExternalVersionFromSource(packageName);
+    } catch (error) {
+      console.log("getExternalVersionFromSource error:", error);
+      hasError = true;
+    }
+  }
+  if (hasError || !hasSrc) {
     const res = await getExternalVersionFromDistFile(packageName);
     if (!res) {
       return false;
     } else {
       externalVersion = res;
     }
-  } else {
-    externalVersion = await getExternalVersionFromSource(packageName);
   }
   return Object.keys(externalVersion).reduce((result, packageName2) => {
     const packageVersion = externalVersion[packageName2];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nocobase/server",
-    "version": "0.21.0-alpha.1",
+    "version": "0.21.0-alpha.10",
     "main": "lib/index.js",
     "types": "./lib/index.d.ts",
     "license": "Apache-2.0",
@@ -10,18 +10,18 @@
         "@koa/cors": "^3.1.0",
         "@koa/multer": "^3.0.2",
         "@koa/router": "^9.4.0",
-        "@nocobase/acl": "0.21.0-alpha.1",
-        "@nocobase/actions": "0.21.0-alpha.1",
-        "@nocobase/auth": "0.21.0-alpha.1",
-        "@nocobase/cache": "0.21.0-alpha.1",
-        "@nocobase/data-source-manager": "0.21.0-alpha.1",
-        "@nocobase/database": "0.21.0-alpha.1",
-        "@nocobase/evaluators": "0.21.0-alpha.1",
-        "@nocobase/logger": "0.21.0-alpha.1",
-        "@nocobase/resourcer": "0.21.0-alpha.1",
-        "@nocobase/sdk": "0.21.0-alpha.1",
-        "@nocobase/telemetry": "0.21.0-alpha.1",
-        "@nocobase/utils": "0.21.0-alpha.1",
+        "@nocobase/acl": "0.21.0-alpha.10",
+        "@nocobase/actions": "0.21.0-alpha.10",
+        "@nocobase/auth": "0.21.0-alpha.10",
+        "@nocobase/cache": "0.21.0-alpha.10",
+        "@nocobase/data-source-manager": "0.21.0-alpha.10",
+        "@nocobase/database": "0.21.0-alpha.10",
+        "@nocobase/evaluators": "0.21.0-alpha.10",
+        "@nocobase/logger": "0.21.0-alpha.10",
+        "@nocobase/resourcer": "0.21.0-alpha.10",
+        "@nocobase/sdk": "0.21.0-alpha.10",
+        "@nocobase/telemetry": "0.21.0-alpha.10",
+        "@nocobase/utils": "0.21.0-alpha.10",
         "@types/decompress": "4.2.4",
         "@types/ini": "^1.3.31",
         "@types/koa-send": "^4.1.3",
@@ -54,5 +54,5 @@
         "@types/serve-handler": "^6.1.1",
         "@types/ws": "^8.5.5"
     },
-    "gitHead": "afd2f3d1341b85ea9daa7b2667dd4ace1fafb7ff"
+    "gitHead": "98adf5ec996a4f359c6ca1c4a6ac837c43b6e268"
 }