@next-core/brick-kit 2.127.2 → 2.128.1

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.128.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.128.0...@next-core/brick-kit@2.128.1) (2022-08-19)
+
+
+### Bug Fixes
+
+* fix menu prefetch in standalone apps ([e96b0cf](https://github.com/easyops-cn/next-core/commit/e96b0cfbe973a285ec6f8b5ceb2d8a3e638210bb))
+* support setting standalone app root ([8e0d3e4](https://github.com/easyops-cn/next-core/commit/8e0d3e49c2c2b93f2b05de4a857c6c6724f27b82))
+
+
+
+
+
+# [2.128.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.127.3...@next-core/brick-kit@2.128.0) (2022-08-18)
+
+
+### Features
+
+* **brick-kit:** support location.host and location.hostname ([0548c9f](https://github.com/easyops-cn/next-core/commit/0548c9fab28e58e4194bfedea44c92a39f0c27e2))
+
+
+
+
+
+## [2.127.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.127.2...@next-core/brick-kit@2.127.3) (2022-08-17)
+
+
+### Bug Fixes
+
+* **devtools:** emit messages only if applicable ([e0b1edc](https://github.com/easyops-cn/next-core/commit/e0b1edc2182472591728ddc0f874cd8b5c8565fc))
+
+
+
+
+
 ## [2.127.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.127.1...@next-core/brick-kit@2.127.2) (2022-08-11)
 
 

package/dist/index.bundle.js

@@ -1133,12 +1133,17 @@
   var MESSAGE_SOURCE_PANEL = "brick-next-devtools-panel";
   var EVALUATION_EDIT = "devtools-evaluation-edit";
   var TRANSFORMATION_EDIT = "devtools-transformation-edit";
-
+  var FRAME_ACTIVE_CHANGE = "devtools-frame-active-change";
+  var PANEL_CHANGE = "devtools-panel-change";
+  var frameIsActive = true;
+  var selectedPanel;
   /* istanbul ignore next */
+
   function devtoolsHookEmit(type, payload) {
     var devtools = getDevHook();
 
-    if (!devtools) {
+    if (!devtools || !(type === "evaluation" ? frameIsActive && (!selectedPanel || selectedPanel === "Evaluations") : type === "transformation" ? frameIsActive && (!selectedPanel || selectedPanel === "Transformations") : true)) {
+      // Ignore messages if current devtools panel is not relevant.
       return;
     }
 
@@ -1158,41 +1163,78 @@
       setTimeout(emit, 0);
     }
   }
+  function listenDevtoolsEagerly() {
+    window.addEventListener("message", _ref => {
+      var {
+        data
+      } = _ref;
+
+      if ((data === null || data === void 0 ? void 0 : data.source) !== MESSAGE_SOURCE_PANEL) {
+        return;
+      }
+
+      var payload = data.payload;
+
+      switch (payload === null || payload === void 0 ? void 0 : payload.type) {
+        case FRAME_ACTIVE_CHANGE:
+          {
+            frameIsActive = payload.active;
+            break;
+          }
+
+        case PANEL_CHANGE:
+          {
+            selectedPanel = payload.panel;
+            break;
+          }
+      }
+    });
+  }
   function listenDevtools() {
-    window.addEventListener("message", event => {
-      var _event$data;
+    window.addEventListener("message", _ref2 => {
+      var {
+        data
+      } = _ref2;
 
-      if (((_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.source) !== MESSAGE_SOURCE_PANEL) {
+      if ((data === null || data === void 0 ? void 0 : data.source) !== MESSAGE_SOURCE_PANEL) {
         return;
       }
 
-      var payload = event.data.payload;
+      var payload = data.payload;
 
-      if ((payload === null || payload === void 0 ? void 0 : payload.type) === EVALUATION_EDIT) {
-        var {
-          raw,
-          context,
-          id
-        } = payload;
-        evaluate(raw, {
-          data: context.data,
-          event: restoreDehydrated(context.event)
-        }, {
-          isReEvaluation: true,
-          evaluationId: id
-        });
-      } else if ((payload === null || payload === void 0 ? void 0 : payload.type) === TRANSFORMATION_EDIT) {
-        var {
-          data,
-          transform,
-          id: _id,
-          options: {
-            from,
-            mapArray,
-            allowInject
+      switch (payload === null || payload === void 0 ? void 0 : payload.type) {
+        case EVALUATION_EDIT:
+          {
+            var {
+              raw,
+              context,
+              id
+            } = payload;
+            evaluate(raw, {
+              data: context.data,
+              event: restoreDehydrated(context.event)
+            }, {
+              isReEvaluation: true,
+              evaluationId: id
+            });
+            break;
+          }
+
+        case TRANSFORMATION_EDIT:
+          {
+            var {
+              data: _data,
+              transform,
+              id: _id,
+              options: {
+                from,
+                mapArray,
+                allowInject
+              }
+            } = payload;
+            reTransformForDevtools(_id, _data, transform, from, mapArray, allowInject);
+            break;
           }
-        } = payload;
-        reTransformForDevtools(_id, data, transform, from, mapArray, allowInject);
       }
     });
   }
@@ -1593,10 +1635,14 @@
       case "location":
         return collectCoverage ? {
           href: "http://localhost:3000/functions/test",
-          origin: "http://localhost:3000"
+          origin: "http://localhost:3000",
+          host: "localhost:3000",
+          hostname: "localhost"
         } : {
           href: location.href,
-          origin: location.origin
+          origin: location.origin,
+          host: location.host,
+          hostname: location.hostname
         };
     }
   }
@@ -2965,30 +3011,30 @@
     return _constructMenu.apply(this, arguments);
   }
 
-  function constructMenuByMenusList(_x4, _x5, _x6) {
-    return _constructMenuByMenusList.apply(this, arguments);
+  function preConstructMenus(_x4, _x5, _x6) {
+    return _preConstructMenus.apply(this, arguments);
   }
 
-  function _constructMenuByMenusList() {
-    _constructMenuByMenusList = _asyncToGenerator__default["default"](function* (menus, context, kernel) {
-      var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel)));
+  function _preConstructMenus() {
+    _preConstructMenus = _asyncToGenerator__default["default"](function* (menus, context, kernel) {
+      var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel, undefined, true)));
       data.forEach((item, index) => processMenuCache.set(menus[index], item));
     });
-    return _constructMenuByMenusList.apply(this, arguments);
+    return _preConstructMenus.apply(this, arguments);
   }
 
   var getMenu = menuId => processMenuCache.get(menuId);
-  function fetchMenuById(_x7, _x8) {
+  function fetchMenuById(_x7, _x8, _x9) {
     return _fetchMenuById.apply(this, arguments);
   }
 
   function _fetchMenuById() {
-    _fetchMenuById = _asyncToGenerator__default["default"](function* (menuId, kernel) {
+    _fetchMenuById = _asyncToGenerator__default["default"](function* (menuId, kernel, isPreFetch) {
       if (menuCache.has(menuId)) {
         return menuCache.get(menuId);
       }
 
-      var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
+      var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
         page: 1,
         page_size: 200,
         fields: {
@@ -3084,7 +3130,7 @@
     });
   }
 
-  function loadDynamicMenuItems(_x9) {
+  function loadDynamicMenuItems(_x10) {
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
@@ -3102,13 +3148,13 @@
     return _loadDynamicMenuItems.apply(this, arguments);
   }
 
-  function processMenu(_x10, _x11, _x12, _x13) {
+  function processMenu(_x11, _x12, _x13, _x14, _x15) {
     return _processMenu.apply(this, arguments);
   }
 
   function _processMenu() {
-    _processMenu = _asyncToGenerator__default["default"](function* (menuId, context, kernel, hasSubMenu) {
-      var _yield$fetchMenuById = yield fetchMenuById(menuId, kernel),
+    _processMenu = _asyncToGenerator__default["default"](function* (menuId, context, kernel, hasSubMenu, isPreFetch) {
+      var _yield$fetchMenuById = yield fetchMenuById(menuId, kernel, isPreFetch),
           {
         items,
         app
@@ -3161,19 +3207,19 @@
         });
       });
 
-      return function (_x14) {
+      return function (_x16) {
         return _ref2.apply(this, arguments);
       };
     }()));
   }
 
-  function processMenuTitle(_x15) {
+  function processMenuTitle(_x17) {
     return _processMenuTitle.apply(this, arguments);
   }
 
   function _processMenuTitle() {
     _processMenuTitle = _asyncToGenerator__default["default"](function* (menuData) {
-      if (menuData.title || !menuData.titleDataSource) {
+      if (menuData.title || _.isEmpty(menuData.titleDataSource)) {
         return menuData.title;
       }
 
@@ -3262,7 +3308,7 @@
     return false;
   }
 
-  function computeRealValueWithOverrideApp(_x16, _x17, _x18, _x19) {
+  function computeRealValueWithOverrideApp(_x18, _x19, _x20, _x21) {
     return _computeRealValueWithOverrideApp.apply(this, arguments);
   }
 
@@ -8791,6 +8837,7 @@
       return _asyncToGenerator__default["default"](function* () {
         var _this2$bootstrapData$, _this2$bootstrapData$2;
 
+        listenDevtoolsEagerly();
         _this2.mountPoints = mountPoints;
         yield Promise.all([_this2.loadCheckLogin(), _this2.loadMicroApps()]);
 
@@ -9474,10 +9521,11 @@
       return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s = _this$bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : _this$bootstrapData$s.featureFlags);
     }
 
-    getStandaloneMenus(menuId) {
+    getStandaloneMenus(menuId, isPreFetch) {
       var _currentStoryboard$me, _currentStoryboard$me2;
 
-      var currentAppId = this.currentApp.id;
+      var app = isPreFetch ? this.nextApp : this.currentApp;
+      var currentAppId = app.id;
       var currentStoryboard = this.bootstrapData.storyboards.find(storyboard => storyboard.app.id === currentAppId);
       var menus = (_currentStoryboard$me = currentStoryboard.meta) !== null && _currentStoryboard$me !== void 0 && _currentStoryboard$me.injectMenus ? _.cloneDeep(currentStoryboard.meta.injectMenus) : (_currentStoryboard$me2 = currentStoryboard.meta) !== null && _currentStoryboard$me2 !== void 0 && _currentStoryboard$me2.menus ? _.cloneDeep(currentStoryboard.meta.menus) : [];
       return menus.filter(menu => menu.menuId === menuId).map(menu => {
@@ -10908,7 +10956,7 @@
         var useMenus = brickUtils.scanAppGetMenuInAny(data);
 
         if (useMenus.length) {
-          yield constructMenuByMenusList(useMenus, _this7.getCurrentContext(), _this7.kernel);
+          yield preConstructMenus(useMenus, _this7.getCurrentContext(), _this7.kernel);
         }
       })();
     }