@nocobase/server 0.9.2-alpha.4 → 0.9.4-alpha.1

package/lib/app-manager.d.ts

@@ -6,6 +6,8 @@ declare type AppSelector = (req: IncomingMessage) => AppSelectorReturn | Promise
 export declare class AppManager {
     applications: Map<string, Application>;
     app: Application;
+    runningMode: 'single' | 'multiple';
+    singleAppName: string | null;
     constructor(app: Application);
     bindMainApplication(mainApp: Application): void;
     appSelector: AppSelector;

package/lib/app-manager.js

@@ -22,6 +22,8 @@ class AppManager {
     var _this = this;
     this.applications = new Map();
     this.app = void 0;
+    this.runningMode = 'multiple';
+    this.singleAppName = null;
     this.appSelector = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (req) {
         return _this.app;
@@ -31,6 +33,11 @@ class AppManager {
       };
     }();
     this.bindMainApplication(app);
+    // if STARTUP_SUBAPP is set, run in single mode
+    if (process.env.STARTUP_SUBAPP) {
+      this.singleAppName = process.env.STARTUP_SUBAPP;
+      this.runningMode = 'single';
+    }
   }
   bindMainApplication(mainApp) {
     var _this2 = this;
@@ -101,7 +108,12 @@ class AppManager {
     return /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator(function* (req, res) {
         const appManager = _this5.app.appManager;
-        let handleApp = (yield appManager.appSelector(req)) || appManager.app;
+        let handleApp;
+        if (_this5.runningMode === 'single') {
+          handleApp = _this5.singleAppName;
+        } else {
+          handleApp = (yield appManager.appSelector(req)) || appManager.app;
+        }
         if (typeof handleApp === 'string') {
           handleApp = yield appManager.getApplication(handleApp);
           if (!handleApp) {

package/lib/middlewares/data-template.js

@@ -96,7 +96,7 @@ const traverseJSON = (data, options) => {
     include = _options$include === void 0 ? [] : _options$include;
   const map = parseInclude(include);
   const result = {};
-  for (var _i = 0, _Object$keys = Object.keys(data); _i < _Object$keys.length; _i++) {
+  for (var _i = 0, _Object$keys = Object.keys(data || {}); _i < _Object$keys.length; _i++) {
     const key = _Object$keys[_i];
     const subInclude = map[key];
     if (include.length > 0 && !subInclude) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/server",
-  "version": "0.9.2-alpha.4",
+  "version": "0.9.4-alpha.1",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
@@ -8,12 +8,12 @@
     "@hapi/topo": "^6.0.0",
     "@koa/cors": "^3.1.0",
     "@koa/router": "^9.4.0",
-    "@nocobase/acl": "0.9.2-alpha.4",
-    "@nocobase/actions": "0.9.2-alpha.4",
-    "@nocobase/database": "0.9.2-alpha.4",
-    "@nocobase/logger": "0.9.2-alpha.4",
-    "@nocobase/resourcer": "0.9.2-alpha.4",
-    "@nocobase/utils": "0.9.2-alpha.4",
+    "@nocobase/acl": "0.9.4-alpha.1",
+    "@nocobase/actions": "0.9.4-alpha.1",
+    "@nocobase/database": "0.9.4-alpha.1",
+    "@nocobase/logger": "0.9.4-alpha.1",
+    "@nocobase/resourcer": "0.9.4-alpha.1",
+    "@nocobase/utils": "0.9.4-alpha.1",
     "chalk": "^4.1.1",
     "commander": "^9.2.0",
     "find-package-json": "^1.2.0",
@@ -29,5 +29,5 @@
   "devDependencies": {
     "@types/semver": "^7.3.9"
   },
-  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
+  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
 }