@next-core/brick-kit 2.189.0 → 2.191.0

package/dist/index.esm.js

@@ -5850,9 +5850,10 @@ function startPoll(task, _ref, pollOptions, context) {
         if (!shouldStop) {
           var _computeRealValue2;
           var _result = yield task();
+          var expectPollStopImmediatelyResult = (_computeRealValue2 = computeRealValue(expectPollStopImmediately, context)) === null || _computeRealValue2 === void 0 ? void 0 : _computeRealValue2();
           // Stop polling immediately when the expectation is match or a different router
           // is rendering after the task processed.
-          shouldStop = ((_computeRealValue2 = computeRealValue(expectPollStopImmediately, context)) === null || _computeRealValue2 === void 0 ? void 0 : _computeRealValue2()) || currentRenderId !== _internalApiGetRouterRenderId();
+          shouldStop = expectPollStopImmediatelyResult || currentRenderId !== _internalApiGetRouterRenderId();
           if (!shouldStop) {
             var _computeRealValue3;
             progress === null || progress === void 0 ? void 0 : progress(_result);
@@ -5866,13 +5867,18 @@ function startPoll(task, _ref, pollOptions, context) {
             } else {
               delayedPoll(interval !== null && interval !== void 0 ? interval : 3000);
             }
+          } else if (expectPollStopImmediatelyResult) {
+            finallyCallback === null || finallyCallback === void 0 ? void 0 : finallyCallback();
           }
+        } else {
+          finallyCallback === null || finallyCallback === void 0 ? void 0 : finallyCallback();
         }
       } catch (e) {
         var _computeRealValue4;
+        var _expectPollStopImmediatelyResult = (_computeRealValue4 = computeRealValue(expectPollStopImmediately, context)) === null || _computeRealValue4 === void 0 ? void 0 : _computeRealValue4();
         // Stop polling immediately when the expectation is match or a different router
         // is rendering after the task processed.
-        shouldStop = ((_computeRealValue4 = computeRealValue(expectPollStopImmediately, context)) === null || _computeRealValue4 === void 0 ? void 0 : _computeRealValue4()) || currentRenderId !== _internalApiGetRouterRenderId();
+        shouldStop = _expectPollStopImmediatelyResult || currentRenderId !== _internalApiGetRouterRenderId();
         if (!shouldStop) {
           error === null || error === void 0 ? void 0 : error(e);
           if (continueOnError) {
@@ -5880,6 +5886,8 @@ function startPoll(task, _ref, pollOptions, context) {
           } else {
             finallyCallback === null || finallyCallback === void 0 ? void 0 : finallyCallback();
           }
+        } else if (_expectPollStopImmediatelyResult) {
+          finallyCallback === null || finallyCallback === void 0 ? void 0 : finallyCallback();
         }
       } finally {
         // Manually dispatch an event of `request.end` when the polling is stopped immediately.
@@ -7048,25 +7056,6 @@ function processBootstrapResponse(bootstrapResponse) {
     var app = storyboard.app;
     if (app) {
       app.config = deepFreeze(merge({}, app.defaultConfig, app.userConfig));
-      if (app.locales) {
-        (function () {
-          // Prefix to avoid conflict between brick package's i18n namespace.
-          var ns = "$tmp-".concat(app.id);
-          // Support any languages in `app.locales`.
-          Object.entries(app.locales).forEach(_ref => {
-            var [lang, resources] = _ref;
-            i18next.addResourceBundle(lang, ns, resources);
-          });
-          // Use `app.name` as the fallback `app.localeName`.
-          app.localeName = i18next.getFixedT(null, ns)("name", app.name);
-          // Remove the temporary i18n resource bundles.
-          Object.keys(app.locales).forEach(lang => {
-            i18next.removeResourceBundle(lang, ns);
-          });
-        })();
-      } else {
-        app.localeName = app.name;
-      }
     }
   }
   if (bootstrapResponse.settings) {
@@ -11818,6 +11807,28 @@ function setWatermark() {
   }
 }
 
+function setAppLocales(app) {
+  var _locales, _app$config, _app$config$settings;
+  var locales = (_locales = (_app$config = app.config) === null || _app$config === void 0 ? void 0 : (_app$config$settings = _app$config.settings) === null || _app$config$settings === void 0 ? void 0 : _app$config$settings.locales) !== null && _locales !== void 0 ? _locales : app.locales;
+  if (locales) {
+    // Prefix to avoid conflict between brick package's i18n namespace.
+    var ns = "$tmp-".concat(app.id);
+    // Support any languages in `app.locales`.
+    Object.entries(locales).forEach(_ref => {
+      var [lang, resources] = _ref;
+      i18next.addResourceBundle(lang, ns, resources);
+    });
+    // Use `app.name` as the fallback `app.localeName`.
+    app.localeName = i18next.getFixedT(null, ns)("name", app.name);
+    // Remove the temporary i18n resource bundles.
+    Object.keys(locales).forEach(lang => {
+      i18next.removeResourceBundle(lang, ns);
+    });
+  } else {
+    app.localeName = app.name;
+  }
+}
+
 class Router {
   constructor(kernel) {
     _defineProperty$1(this, "defaultCollapsed", false);
@@ -11997,6 +12008,7 @@ class Router {
       if (storyboard) {
         var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
         yield _this3.kernel.fulfilStoryboard(storyboard);
+        setAppLocales(storyboard.app);
         _this3.kernel.nextApp = storyboard.app;
         setWatermark();
         removeDeadConditions(storyboard, {