@next-core/brick-kit 2.141.2 → 2.142.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.142.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.141.2...@next-core/brick-kit@2.142.0) (2022-09-20)
+
+
+### Features
+
+* standalone app not need to request i18n ([8f62e8b](https://github.com/easyops-cn/next-core/commit/8f62e8b78e3327817009cbfcf5154636041614f1))
+
+
+
+
+
 ## [2.141.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.141.1...@next-core/brick-kit@2.141.2) (2022-09-19)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -3130,7 +3130,7 @@
         return menuCache.get(menuId);
       }
 
-      var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
+      var menuList = window.STANDALONE_MICRO_APPS ? yield kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
         page: 1,
         page_size: 200,
         fields: {
@@ -3449,17 +3449,10 @@
 
     if (overrideAppId !== context.app.id && attemptToVisit(data, ["APP", "I18N"])) {
       var storyboard = kernel.bootstrapData.storyboards.find(story => story.app.id === overrideAppId);
-      /* istanbul ignore else: non-productive case */
-
-      if (storyboard) {
-        newContext = _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
-          overrideApp: storyboard.app,
-          appendI18nNamespace: data[symbolMenuI18nNamespace]
-        });
-      } else {
-        // eslint-disable-next-line no-console
-        console.error("The app which injects menu was not found:", overrideAppId);
-      }
+      newContext = _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
+        overrideApp: storyboard === null || storyboard === void 0 ? void 0 : storyboard.app,
+        appendI18nNamespace: data[symbolMenuI18nNamespace]
+      });
     }
 
     return computeRealValue(data, newContext, true, {
@@ -9319,8 +9312,7 @@
         var filteredStoryboards = appIds.map(appId => _this7.bootstrapData.storyboards.find(story => story.app.id === appId)).filter(story => story && !story.$$fulfilled && !story.$$i18nFulfilled);
 
         if (window.STANDALONE_MICRO_APPS) {
-          // Fallback to fullfil whole storyboard for standalone micro-apps.
-          yield Promise.all(filteredStoryboards.map(story => _this7.fulfilStoryboard(story)));
+          // standalone micros-apps not need to request i18n
           return;
         } // Do not fulfil i18n if the app is doing a whole fulfilling.
 
@@ -9772,21 +9764,63 @@
     }
 
     getStandaloneMenus(menuId, isPreFetch) {
-      var _currentStoryboard$me, _currentStoryboard$me2;
-
-      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 => {
-        var _menu$app;
-
-        return _objectSpread__default["default"](_objectSpread__default["default"]({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
-          app: [{
-            appId: currentAppId
-          }]
+      var _this11 = this;
+
+      return _asyncToGenerator__default["default"](function* () {
+        var _currentStoryboard$me, _currentStoryboard$me2;
+
+        var app = isPreFetch ? _this11.nextApp : _this11.currentApp;
+        var currentAppId = app.id;
+
+        var currentStoryboard = _this11.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) : [];
+        var filterMenus = menus.filter(menu => menu.menuId === menuId).map(menu => {
+          var _menu$app;
+
+          return _objectSpread__default["default"](_objectSpread__default["default"]({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
+            app: [{
+              appId: currentAppId
+            }]
+          });
         });
-      });
+
+        if (!filterMenus.length) {
+          var _ref5, _yield$InstanceApi_po;
+
+          filterMenus = (_ref5 = (_yield$InstanceApi_po = yield InstanceApi_postSearch("STANDALONE_MENU@EASYOPS", {
+            page: 1,
+            page_size: 200,
+            fields: {
+              menuId: true,
+              title: true,
+              icon: true,
+              link: true,
+              titleDataSource: true,
+              defaultCollapsed: true,
+              defaultCollapsedBreakpoint: true,
+              type: true,
+              injectMenuGroupId: true,
+              dynamicItems: true,
+              itemsResolve: true,
+              items: true,
+              i18n: true,
+              "items.children": true,
+              "app.appId": true
+            },
+            query: {
+              menuId: {
+                $eq: menuId
+              },
+              "app.isActiveVersion": {
+                $eq: true
+              }
+            }
+          })) === null || _yield$InstanceApi_po === void 0 ? void 0 : _yield$InstanceApi_po.list) !== null && _ref5 !== void 0 ? _ref5 : [];
+        }
+
+        return filterMenus;
+      })();
     }
 
     getOriginFaviconHref() {
@@ -9794,22 +9828,22 @@
     }
 
     getProviderBrick(provider) {
-      var _this11 = this;
+      var _this12 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         if (isCustomApiProvider(provider)) {
           provider = CUSTOM_API_PROVIDER;
         }
 
-        if (_this11.providerRepository.has(provider)) {
-          return _this11.providerRepository.get(provider);
+        if (_this12.providerRepository.has(provider)) {
+          return _this12.providerRepository.get(provider);
         }
 
         if (provider === CUSTOM_API_PROVIDER && !customElements.get(provider)) {
           registerCustomApi();
         }
 
-        yield _this11.loadDynamicBricks([provider]);
+        yield _this12.loadDynamicBricks([provider]);
 
         if (!customElements.get(provider)) {
           throw new Error("Provider not defined: \"".concat(provider, "\"."));
@@ -9817,7 +9851,7 @@
 
         var brick = document.createElement(provider);
 
-        _this11.providerRepository.set(provider, brick);
+        _this12.providerRepository.set(provider, brick);
 
         return brick;
       })();