@next-core/brick-kit 2.88.1 → 2.90.0

package/CHANGELOG.md

@@ -3,6 +3,62 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.90.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.89.2...@next-core/brick-kit@2.90.0) (2021-11-26)
+
+
+### Bug Fixes
+
+* fix a regression of caching resolves ([e9cd56d](https://github.com/easyops-cn/next-core/commit/e9cd56d882d0a13ee1cb13c4ed752a15f2c15bfd))
+
+
+### Features
+
+* support i18n in storyboard functions ([5891932](https://github.com/easyops-cn/next-core/commit/589193250f22735b20e93d32c807896f4ae0932b))
+* support i18n in widgets ([6020545](https://github.com/easyops-cn/next-core/commit/60205457fedbc7c000bb60b1e97729e3151be33d))
+* support img in widgets ([f19ad53](https://github.com/easyops-cn/next-core/commit/f19ad5329b95c71e612f4be0ffa57b5a3d9ec570))
+
+
+
+
+
+## [2.89.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.89.1...@next-core/brick-kit@2.89.2) (2021-11-25)
+
+
+### Bug Fixes
+
+* get stroyboard v2 ([602d086](https://github.com/easyops-cn/next-core/commit/602d0860fc6c7c9e5ffc116ff023addb0f57efe1))
+
+
+
+
+
+## [2.89.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.89.0...@next-core/brick-kit@2.89.1) (2021-11-25)
+
+
+### Bug Fixes
+
+* bootsrtrap 增加开关控制 ([360b913](https://github.com/easyops-cn/next-core/commit/360b913f324f10ac79b1d637ec598583a89a61da))
+
+
+
+
+
+# [2.89.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.88.1...@next-core/brick-kit@2.89.0) (2021-11-25)
+
+
+### Bug Fixes
+
+* refine storyboard function ([90c42c1](https://github.com/easyops-cn/next-core/commit/90c42c1f49a7d7e8297d424bd02a3957787fb8e3))
+
+
+### Features
+
+* use global noCurrentApp as default ([4e18163](https://github.com/easyops-cn/next-core/commit/4e18163eeefa24cb022cb9b936746c9e7ad80e70))
+
+
+
+
+
 ## [2.88.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.88.0...@next-core/brick-kit@2.88.1) (2021-11-25)
 
 

package/dist/index.bundle.js

@@ -685,12 +685,12 @@
     };
   }
 
-  function imagesFactory(app) {
+  function imagesFactory(appId, isBuildPush) {
     return {
       get(name) {
         var _window$PUBLIC_ROOT;
 
-        return app.isBuildPush ? "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/".concat(name) : "".concat((_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "", "micro-apps/").concat(app.id, "/images/").concat(name);
+        return isBuildPush ? "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/".concat(name) : "".concat((_window$PUBLIC_ROOT = window.PUBLIC_ROOT) !== null && _window$PUBLIC_ROOT !== void 0 ? _window$PUBLIC_ROOT : "", "micro-apps/").concat(appId, "/images/").concat(name);
       }
 
     };
@@ -1389,11 +1389,55 @@
     }
   }
 
+  var locale$7 = {
+    [K.REQUEST_FAILED]: "Request Failed",
+    [K.MODAL_OK]: "Ok",
+    [K.MODAL_CANCEL]: "Cancel",
+    [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
+    [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
+    [K.NETWORK_ERROR]: "Network error, please check your network."
+  };
+  var en = locale$7;
+
+  var locale$6 = {
+    [K.REQUEST_FAILED]: "请求失败",
+    [K.MODAL_OK]: "确认",
+    [K.MODAL_CANCEL]: "取消",
+    [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
+    [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
+    [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
+  };
+  var zh = locale$6;
+
+  /** @internal */
+
+  var initI18n = () => {
+    i18next__default["default"].addResourceBundle("en", NS_BRICK_KIT, en);
+    i18next__default["default"].addResourceBundle("zh", NS_BRICK_KIT, zh);
+  };
+  /** @internal */
+
+  function getI18nNamespace(type, id) {
+    return "$".concat(type, "-").concat(id);
+  }
+
+  function registerWidgetI18n(widgetId, i18n) {
+    var ns = getI18nNamespace("widget", widgetId);
+    Object.entries(i18n).forEach(_ref => {
+      var [lang, resources] = _ref;
+      i18next__default["default"].addResourceBundle(lang, ns, resources);
+    });
+  }
+  function widgetI18nFactory(widgetId) {
+    return i18next.getFixedT(null, getI18nNamespace("widget", widgetId));
+  }
+
   /** @internal */
 
   /** @internal */
   function StoryboardFunctionRegistryFactory() {
     var {
+      widgetId,
       collectCoverage
     } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var registeredFunctions = new Map(); // Use `Proxy` with a frozen target, to make a readonly function registry.
@@ -1405,7 +1449,30 @@
 
     });
 
-    function registerStoryboardFunctions(functions) {
+    var builtinSupply = _objectSpread__default["default"]({
+      // Functions can call other functions.
+      FN: storyboardFunctions
+    }, collectCoverage ? {
+      // Fake builtin methods for tests.
+      I18N: lodash.identity,
+      I18N_TEXT: fakeI18nText,
+      IMG: fakeImageFactory()
+    } : widgetId ? {
+      I18N: widgetI18nFactory(widgetId),
+      I18N_TEXT: i18nText,
+      IMG: widgetImagesFactory(widgetId)
+    } : {
+      I18N_TEXT: i18nText
+    });
+
+    function registerStoryboardFunctions(functions, app) {
+      if (app) {
+        Object.assign(builtinSupply, {
+          I18N: i18next.getFixedT(null, getI18nNamespace("app", app.id)),
+          IMG: imagesFactory(app.id, app.isBuildPush)
+        });
+      }
+
       registeredFunctions.clear();
 
       if (Array.isArray(functions)) {
@@ -1419,8 +1486,6 @@
     }
 
     function getStoryboardFunction(name) {
-      var _collector, _collector2, _collector3, _collector4;
-
       var fn = registeredFunctions.get(name);
 
       if (!fn) {
@@ -1439,22 +1504,19 @@
 
       var precooked = brickUtils.precookFunction(fn.source, {
         typescript: fn.typescript,
-        hooks: {
-          beforeVisit: (_collector = collector) === null || _collector === void 0 ? void 0 : _collector.beforeVisit
+        hooks: collector && {
+          beforeVisit: collector.beforeVisit
         }
       });
       fn.cooked = brickUtils.cook(precooked.function, fn.source, {
         rules: {
           noVar: true
         },
-        globalVariables: supply(precooked.attemptToVisitGlobals, {
-          // Functions can call other functions.
-          FN: storyboardFunctions
-        }),
-        hooks: {
-          beforeEvaluate: (_collector2 = collector) === null || _collector2 === void 0 ? void 0 : _collector2.beforeEvaluate,
-          beforeCall: (_collector3 = collector) === null || _collector3 === void 0 ? void 0 : _collector3.beforeCall,
-          beforeBranch: (_collector4 = collector) === null || _collector4 === void 0 ? void 0 : _collector4.beforeBranch
+        globalVariables: supply(precooked.attemptToVisitGlobals, builtinSupply),
+        hooks: collector && {
+          beforeEvaluate: collector.beforeEvaluate,
+          beforeCall: collector.beforeCall,
+          beforeBranch: collector.beforeBranch
         }
       });
       fn.processed = true;
@@ -1475,6 +1537,19 @@
     };
   }
 
+  function fakeI18nText(data) {
+    return data === null || data === void 0 ? void 0 : data.en;
+  }
+
+  function fakeImageFactory() {
+    return {
+      get(name) {
+        return "mock/images/".concat(name);
+      }
+
+    };
+  }
+
   var {
     storyboardFunctions,
     registerStoryboardFunctions
@@ -1496,7 +1571,9 @@
     var {
       storyboardFunctions,
       registerStoryboardFunctions
-    } = StoryboardFunctionRegistryFactory();
+    } = StoryboardFunctionRegistryFactory({
+      widgetId
+    });
     widgetFunctionRegistry.set(widgetId, storyboardFunctions);
     registerStoryboardFunctions(functions);
   }
@@ -1667,7 +1744,7 @@
     }
 
     if (attemptToVisitGlobals.has("IMG")) {
-      globalVariables.IMG = imagesFactory(app);
+      globalVariables.IMG = imagesFactory(app.id, app.isBuildPush);
     }
 
     if (attemptToVisitGlobals.has("__WIDGET_IMG__")) {
@@ -1675,7 +1752,11 @@
     }
 
     if (attemptToVisitGlobals.has("I18N")) {
-      globalVariables.I18N = i18next__default["default"].getFixedT(null, "$app-".concat(app.id));
+      globalVariables.I18N = i18next__default["default"].getFixedT(null, getI18nNamespace("app", app.id));
+    }
+
+    if (attemptToVisitGlobals.has("__WIDGET_I18N__")) {
+      globalVariables.__WIDGET_I18N__ = widgetI18nFactory;
     }
 
     if (attemptToVisitGlobals.has("I18N_TEXT")) {
@@ -2467,6 +2548,8 @@
 
       _defineProperty__default["default"](this, "registerWidgetFunctions", registerWidgetFunctions);
 
+      _defineProperty__default["default"](this, "registerWidgetI18n", registerWidgetI18n);
+
       _defineProperty__default["default"](this, "getBasePath", getBasePath);
 
       _defineProperty__default["default"](this, "getCurrentTheme", getCurrentTheme);
@@ -4771,6 +4854,26 @@
       return _ref.apply(this, arguments);
     };
   }();
+  /**
+   * @description 获取app storyboard初始化信息
+   * @endpoint GET /api/auth/v2/bootstrap/:appId
+   */
+
+
+  var BootstrapV2Api_getAppStoryboardV2 = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (appId, params, options) {
+      return (
+        /**! @contract easyops.api.api_gateway.bootstrap_v2.GetAppStoryboardV2@1.0.0 */
+        (yield brickHttp.http.get("api/auth/v2/bootstrap/".concat(appId), _objectSpread__default["default"](_objectSpread__default["default"]({}, options), {}, {
+          params
+        }))).data
+      );
+    });
+
+    return function BootstrapV2Api_getAppStoryboardV2(_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   /**
    * @description 通过defaultOrg查找单个契约信息
    * @endpoint POST /api/contract/single_search
@@ -5784,6 +5887,18 @@
     };
   }();
 
+  var bootstrap = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator$1(function* (params, options) {
+      return (yield brickHttp.http.get("api/auth/bootstrap", _objectSpread2(_objectSpread2({}, options), {}, {
+        params
+      }))).data;
+    });
+
+    return function bootstrap(_x4, _x5) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
   var getAppStoryboard = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator$1(function* (appId, params, options) {
       return (yield brickHttp.http.get("api/auth/bootstrap/".concat(appId), _objectSpread2(_objectSpread2({}, options), {}, {
@@ -6221,12 +6336,17 @@
       var _this3 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var data = yield window.STANDALONE_MICRO_APPS ? standaloneBootstrap() : BootstrapV2Api_bootstrapV2(_objectSpread__default["default"]({
+        // Todo(jojiang): 等 boostrap V2 接口测试通过后移除 V1 版本的兼容
+        var data = yield window.STANDALONE_MICRO_APPS ? standaloneBootstrap() : localStorage.getItem("__$$use-bootstrap-v2-provider$$__") ? BootstrapV2Api_bootstrapV2(_objectSpread__default["default"]({
           appFields: "defaultConfig,userConfig,locales,name,homepage,id,currentVersion,installStatus,internal,status",
           ignoreTemplateFields: "templates",
           ignoreBrickFields: "bricks,processors,providers,editors"
         }, params), {
           interceptorParams
+        }) : bootstrap(_objectSpread__default["default"]({
+          brief: true
+        }, params), {
+          interceptorParams
         });
 
         var bootstrapResponse = _objectSpread__default["default"]({
@@ -6273,11 +6393,12 @@
             $$fulfilled: true
           });
         } else {
+          /* istanbul ignore next */
           var {
             routes,
             meta,
             app
-          } = yield getAppStoryboard(storyboard.app.id);
+          } = yield localStorage.getItem("__$$use-bootstrap-v2-provider$$__") ? BootstrapV2Api_getAppStoryboardV2(storyboard.app.id, {}) : getAppStoryboard(storyboard.app.id);
           Object.assign(storyboard, {
             routes,
             meta,
@@ -6290,7 +6411,7 @@
 
         if ((_storyboard$meta = storyboard.meta) !== null && _storyboard$meta !== void 0 && _storyboard$meta.i18n) {
           // Prefix to avoid conflict between brick package's i18n namespace.
-          var i18nNamespace = "$app-".concat(storyboard.app.id); // Support any language in `meta.i18n`.
+          var i18nNamespace = getI18nNamespace("app", storyboard.app.id); // Support any language in `meta.i18n`.
 
           Object.entries(storyboard.meta.i18n).forEach(_ref => {
             var [lang, resources] = _ref;
@@ -8940,12 +9061,13 @@
         } else {
           var actualArgs = args ? ref ? args // `args` are already computed for `defineResolves`
           : context ? computeRealValue(args, context, true) : args : providerBrick.args || [];
+          promise = _asyncToGenerator__default["default"](function* () {
+            if (useProvider) {
+              actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
+            }
 
-          if (useProvider) {
-            actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
-          }
-
-          promise = providerBrick[method](...actualArgs);
+            return providerBrick[method](...actualArgs);
+          })();
 
           _this2.cache.set(cacheKey, promise);
         }
@@ -9013,7 +9135,7 @@
 
       var _loop = function (providerBrick, interval) {
         var request = /*#__PURE__*/function () {
-          var _ref = _asyncToGenerator__default["default"](function* () {
+          var _ref2 = _asyncToGenerator__default["default"](function* () {
             yield providerBrick.$refresh({
               ignoreErrors: interval.ignoreErrors,
               throwErrors: true,
@@ -9027,7 +9149,7 @@
           });
 
           return function request() {
-            return _ref.apply(this, arguments);
+            return _ref2.apply(this, arguments);
           };
         }();
 
@@ -9269,7 +9391,7 @@
 
           _this3.kernel.registerCustomTemplatesInStoryboard(storyboard);
 
-          registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions);
+          registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions, storyboard.app);
         }
 
         var {
@@ -9292,6 +9414,8 @@
         };
 
         if (storyboard) {
+          var _currentApp$breadcrum, _currentApp$breadcrum2;
+
           if (appChanged && currentApp.id && isLoggedIn()) {
             var usedCustomApis = brickUtils.mapCustomApisToNameAndNamespace(brickUtils.scanCustomApisInStoryboard(storyboard));
 
@@ -9308,7 +9432,7 @@
             appBar: {
               breadcrumb: [],
               documentId: null,
-              noCurrentApp: false
+              noCurrentApp: (_currentApp$breadcrum = (_currentApp$breadcrum2 = currentApp.breadcrumb) === null || _currentApp$breadcrum2 === void 0 ? void 0 : _currentApp$breadcrum2.noCurrentApp) !== null && _currentApp$breadcrum !== void 0 ? _currentApp$breadcrum : false
             },
             flags: {
               redirect: undefined,
@@ -9593,33 +9717,6 @@
     return runtime;
   }
 
-  var locale$7 = {
-    [K.REQUEST_FAILED]: "Request Failed",
-    [K.MODAL_OK]: "Ok",
-    [K.MODAL_CANCEL]: "Cancel",
-    [K.SOMETHING_WENT_WRONG]: "Something went wrong!",
-    [K.LOGIN_TIMEOUT_MESSAGE]: "You haven't logged in or your login session has expired. Login right now?",
-    [K.NETWORK_ERROR]: "Network error, please check your network."
-  };
-  var en = locale$7;
-
-  var locale$6 = {
-    [K.REQUEST_FAILED]: "请求失败",
-    [K.MODAL_OK]: "确认",
-    [K.MODAL_CANCEL]: "取消",
-    [K.SOMETHING_WENT_WRONG]: "出现了一些问题！",
-    [K.LOGIN_TIMEOUT_MESSAGE]: "您还未登录或登录信息已过期，现在重新登录？",
-    [K.NETWORK_ERROR]: "网络错误，请检查您的网络连接。"
-  };
-  var zh = locale$6;
-
-  /** @internal */
-
-  var initI18n = () => {
-    i18next__default["default"].addResourceBundle("en", NS_BRICK_KIT, en);
-    i18next__default["default"].addResourceBundle("zh", NS_BRICK_KIT, zh);
-  };
-
   // Ref https://reactjs.org/docs/error-boundaries.html
   class LegacyErrorBoundary extends React__default["default"].Component {
     constructor(props) {