@next-core/brick-kit 2.89.2 → 2.90.0

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 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)
 
 

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)) {
@@ -1445,10 +1512,7 @@
         rules: {
           noVar: true
         },
-        globalVariables: supply(precooked.attemptToVisitGlobals, {
-          // Functions can call other functions.
-          FN: storyboardFunctions
-        }),
+        globalVariables: supply(precooked.attemptToVisitGlobals, builtinSupply),
         hooks: collector && {
           beforeEvaluate: collector.beforeEvaluate,
           beforeCall: collector.beforeCall,
@@ -1473,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
@@ -1494,7 +1571,9 @@
     var {
       storyboardFunctions,
       registerStoryboardFunctions
-    } = StoryboardFunctionRegistryFactory();
+    } = StoryboardFunctionRegistryFactory({
+      widgetId
+    });
     widgetFunctionRegistry.set(widgetId, storyboardFunctions);
     registerStoryboardFunctions(functions);
   }
@@ -1665,7 +1744,7 @@
     }
 
     if (attemptToVisitGlobals.has("IMG")) {
-      globalVariables.IMG = imagesFactory(app);
+      globalVariables.IMG = imagesFactory(app.id, app.isBuildPush);
     }
 
     if (attemptToVisitGlobals.has("__WIDGET_IMG__")) {
@@ -1673,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")) {
@@ -2465,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);
@@ -6326,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;
@@ -8976,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);
         }
@@ -9049,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,
@@ -9063,7 +9149,7 @@
           });
 
           return function request() {
-            return _ref.apply(this, arguments);
+            return _ref2.apply(this, arguments);
           };
         }();
 
@@ -9305,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 {
@@ -9631,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) {