@nocobase/plugin-multi-app-manager 0.20.0-alpha.13 → 0.20.0-alpha.15

package/dist/externalVersion.js

@@ -1,16 +1,16 @@
 module.exports = {
-  "@nocobase/client": "0.20.0-alpha.13",
+  "@nocobase/client": "0.20.0-alpha.15",
   "antd": "5.12.8",
   "react": "18.2.0",
   "@formily/react": "2.3.0",
   "antd-style": "3.6.1",
   "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "0.20.0-alpha.13",
-  "@nocobase/server": "0.20.0-alpha.13",
-  "async-mutex": "0.3.2",
+  "@nocobase/database": "0.20.0-alpha.15",
+  "@nocobase/server": "0.20.0-alpha.15",
   "lodash": "4.17.21",
   "mysql2": "2.3.3",
   "pg": "8.11.3",
+  "@nocobase/utils": "0.20.0-alpha.15",
   "@formily/shared": "2.3.0"
 };

package/dist/node_modules/mariadb/package.json

@@ -1 +1 @@
-{"name":"mariadb","version":"2.5.6","description":"fast mariadb/mysql connector.","main":"promise.js","types":"types/index.d.ts","directories":{"lib":"lib","test":"test"},"private":false,"scripts":{"test":"npm run test:types-prettier && npm run test:prettier && npm run test:types && npm run test:lint && npm run test:base","test:base":"mocha --no-parallel --timeout 5000 \"test/**/*.js\" ","test:lint":"eslint \"{lib,test}/**/*.js\" ","test:types":"eslint \"types/*.ts\" ","test:types-prettier":"prettier --write \"types/*.ts\"","test:prettier":"prettier --write \"{tools,lib,test,benchmarks}/**/*.js\"","coverage":"npm run coverage:test && npm run coverage:report","coverage:test":"nyc mocha --no-parallel --timeout 5000 \"test/**/*.js\"","coverage:report":"nyc report --reporter=text-lcov > coverage.lcov && codecov","benchmark":"node ./benchmarks/benchmarks.js","generate":"node ./tools/generate-mariadb.js"},"repository":{"type":"git","url":"git+https://github.com/mariadb-corporation/mariadb-connector-nodejs.git"},"keywords":["mariadb","mysql","client","driver","connector"],"files":["lib","types/index.d.ts","promise.js","callback.js"],"engines":{"node":">= 10.13"},"author":"Diego Dupin <diego.dupin@mariadb.com>","license":"LGPL-2.1-or-later","dependencies":{"@types/geojson":"^7946.0.8","@types/node":"^17.0.10","denque":"^2.0.1","iconv-lite":"^0.6.3","long":"^5.2.0","moment-timezone":"^0.5.34","please-upgrade-node":"^3.2.0"},"devDependencies":{"@typescript-eslint/eslint-plugin":"^5.10.0","@typescript-eslint/parser":"^5.10.0","benchmark":"^2.1.4","chai":"^4.3.4","codecov":"^3.8.2","chalk":"^4.1.2","dom-parser":"^0.1.6","error-stack-parser":"^2.0.6","eslint":"^8.7.0","eslint-config-prettier":"^8.3.0","eslint-plugin-markdown":"^2.2.1","eslint-plugin-prettier":"^4.0.0","mocha":"^9.2.0","mocha-lcov-reporter":"^1.3.0","nyc":"^15.1.0","prettier":"^2.5.1","typescript":"^4.5.5"},"bugs":{"url":"https://jira.mariadb.org/projects/CONJS/"},"homepage":"https://github.com/mariadb-corporation/mariadb-connector-nodejs#readme","_lastModified":"2024-03-17T15:45:25.135Z"}
+{"name":"mariadb","version":"2.5.6","description":"fast mariadb/mysql connector.","main":"promise.js","types":"types/index.d.ts","directories":{"lib":"lib","test":"test"},"private":false,"scripts":{"test":"npm run test:types-prettier && npm run test:prettier && npm run test:types && npm run test:lint && npm run test:base","test:base":"mocha --no-parallel --timeout 5000 \"test/**/*.js\" ","test:lint":"eslint \"{lib,test}/**/*.js\" ","test:types":"eslint \"types/*.ts\" ","test:types-prettier":"prettier --write \"types/*.ts\"","test:prettier":"prettier --write \"{tools,lib,test,benchmarks}/**/*.js\"","coverage":"npm run coverage:test && npm run coverage:report","coverage:test":"nyc mocha --no-parallel --timeout 5000 \"test/**/*.js\"","coverage:report":"nyc report --reporter=text-lcov > coverage.lcov && codecov","benchmark":"node ./benchmarks/benchmarks.js","generate":"node ./tools/generate-mariadb.js"},"repository":{"type":"git","url":"git+https://github.com/mariadb-corporation/mariadb-connector-nodejs.git"},"keywords":["mariadb","mysql","client","driver","connector"],"files":["lib","types/index.d.ts","promise.js","callback.js"],"engines":{"node":">= 10.13"},"author":"Diego Dupin <diego.dupin@mariadb.com>","license":"LGPL-2.1-or-later","dependencies":{"@types/geojson":"^7946.0.8","@types/node":"^17.0.10","denque":"^2.0.1","iconv-lite":"^0.6.3","long":"^5.2.0","moment-timezone":"^0.5.34","please-upgrade-node":"^3.2.0"},"devDependencies":{"@typescript-eslint/eslint-plugin":"^5.10.0","@typescript-eslint/parser":"^5.10.0","benchmark":"^2.1.4","chai":"^4.3.4","codecov":"^3.8.2","chalk":"^4.1.2","dom-parser":"^0.1.6","error-stack-parser":"^2.0.6","eslint":"^8.7.0","eslint-config-prettier":"^8.3.0","eslint-plugin-markdown":"^2.2.1","eslint-plugin-prettier":"^4.0.0","mocha":"^9.2.0","mocha-lcov-reporter":"^1.3.0","nyc":"^15.1.0","prettier":"^2.5.1","typescript":"^4.5.5"},"bugs":{"url":"https://jira.mariadb.org/projects/CONJS/"},"homepage":"https://github.com/mariadb-corporation/mariadb-connector-nodejs#readme","_lastModified":"2024-03-20T06:56:40.623Z"}

package/dist/server/models/application.js

@@ -22,13 +22,14 @@ __export(application_exports, {
 module.exports = __toCommonJS(application_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
+var import_utils = require("@nocobase/utils");
 class ApplicationModel extends import_database.Model {
   registerToSupervisor(mainApp, options) {
     const appName = this.get("name");
-    const appOptions = this.get("options") || {};
+    const appModelOptions = this.get("options") || {};
+    const appOptions = options.appOptionsFactory(appName, mainApp);
     const subAppOptions = {
-      ...options.appOptionsFactory(appName, mainApp),
-      ...appOptions,
+      ...(0, import_utils.merge)(appOptions, appModelOptions),
       name: appName
     };
     return new import_server.Application(subAppOptions);

package/dist/server/server.d.ts

@@ -9,7 +9,6 @@ export declare class PluginMultiAppManager extends Plugin {
     appDbCreator: AppDbCreator;
     appOptionsFactory: AppOptionsFactory;
     subAppUpgradeHandler: SubAppUpgradeHandler;
-    private beforeGetApplicationMutex;
     static getDatabaseConfig(app: Application): IDatabaseOptions;
     setSubAppUpgradeHandler(handler: SubAppUpgradeHandler): void;
     setAppOptionsFactory(factory: AppOptionsFactory): void;

package/dist/server/server.js

@@ -32,7 +32,6 @@ __export(server_exports, {
 module.exports = __toCommonJS(server_exports);
 var import_database = require("@nocobase/database");
 var import_server = require("@nocobase/server");
-var import_async_mutex = require("async-mutex");
 var import_lodash = __toESM(require("lodash"));
 var import_path = __toESM(require("path"));
 var import_server2 = require("../server");
@@ -129,7 +128,6 @@ class PluginMultiAppManager extends import_server.Plugin {
   appDbCreator = defaultDbCreator;
   appOptionsFactory = defaultAppOptionsFactory;
   subAppUpgradeHandler = defaultSubAppUpgradeHandle;
-  beforeGetApplicationMutex = new import_async_mutex.Mutex();
   static getDatabaseConfig(app) {
     let oldConfig = app.options.database instanceof import_database.Database ? app.options.database.options : app.options.database;
     if (!oldConfig && app.db) {

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "0.20.0-alpha.13",
+  "version": "0.20.0-alpha.15",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",
@@ -28,7 +28,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "4c3ff74d14c8726759b65730eba0b15798ba6879",
+  "gitHead": "ec192dcfe2dadda913e2d4c67b3706d78d5d3b9c",
   "keywords": [
     "system"
   ]