@next-core/brick-kit 2.117.3 → 2.117.6

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _asyncToGenerator$4 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, useContext, createContext, useReducer, useCallback } from 'react';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, scanRouteAliasInStoryboard, loadScript, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, getDllAndDepsByResource, matchPath, scanAppGetMenuInAny, asyncProcessBrick, restoreDynamicTemplates, mapCustomApisToNameAndNamespace, scanCustomApisInStoryboard } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, loadScript, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, matchPath, scanAppGetMenuInAny, asyncProcessBrick, restoreDynamicTemplates, mapCustomApisToNameAndNamespace, scanCustomApisInStoryboard } from '@next-core/brick-utils';
 import lodash, { set, get, difference, identity, uniqueId, cloneDeep, isNil, sortBy, merge, pick, orderBy, omit, clamp, isEmpty, noop, isObject as isObject$1, isString } from 'lodash';
 import { http, HttpResponseError, HttpFetchError } from '@next-core/brick-http';
 import moment from 'moment';
@@ -7754,6 +7754,8 @@ function applyColorTheme(options) {
 
 class Kernel {
   constructor() {
+    var _this = this;
+
     _defineProperty$1(this, "mountPoints", void 0);
 
     _defineProperty$1(this, "bootstrapData", void 0);
@@ -7795,36 +7797,111 @@ class Kernel {
     _defineProperty$1(this, "loadUsersStarted", false);
 
     _defineProperty$1(this, "loadMagicBrickConfigStarted", false);
+
+    _defineProperty$1(this, "_loadDepsOfStoryboard", /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator$4(function* (storyboard) {
+        var {
+          brickPackages,
+          templatePackages
+        } = _this.bootstrapData;
+
+        if (storyboard.dependsAll) {
+          var dllPath = window.DLL_PATH || {};
+          yield loadScriptOfDll(Object.values(dllPath));
+          yield loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)));
+          yield loadAllLazyBricks();
+        } else {
+          // 先加载模板
+          var templateDeps = getTemplateDepsOfStoryboard(storyboard, templatePackages);
+          yield loadScriptOfBricksOrTemplates(templateDeps); // 加载模板后才能加工得到最终的构件表
+
+          var {
+            dll,
+            deps,
+            bricks
+          } = getDllAndDepsOfStoryboard(yield asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
+            ignoreBricksInUnusedCustomTemplates: true
+          });
+          yield loadScriptOfDll(dll);
+          yield loadScriptOfBricksOrTemplates(deps);
+          yield loadLazyBricks(bricks);
+        }
+      });
+
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty$1(this, "_loadDynamicBricks", /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator$4(function* (bricks, processors) {
+        var filteredBricks = bricks.filter( // Only try to load undefined custom elements.
+        item => !customElements.get(item)); // Try to load deps for dynamic added bricks.
+
+        var {
+          dll,
+          deps
+        } = getDllAndDepsByResource({
+          bricks: filteredBricks,
+          processors
+        }, _this.bootstrapData.brickPackages);
+        yield loadScriptOfDll(dll);
+        yield loadScriptOfBricksOrTemplates(deps);
+        yield loadLazyBricks(filteredBricks);
+      });
+
+      return function (_x2, _x3) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
+
+    _defineProperty$1(this, "_loadEditorBricks", /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator$4(function* (editorBricks) {
+        var {
+          dll,
+          deps
+        } = getDllAndDepsByResource({
+          editorBricks: editorBricks.filter( // Only try to load undefined custom elements.
+          item => !customElements.get(item))
+        }, _this.bootstrapData.brickPackages);
+        yield loadScriptOfDll(dll);
+        yield loadScriptOfBricksOrTemplates(deps);
+      });
+
+      return function (_x4) {
+        return _ref3.apply(this, arguments);
+      };
+    }());
   }
 
   bootstrap(mountPoints) {
-    var _this = this;
+    var _this2 = this;
 
     return _asyncToGenerator$4(function* () {
-      var _this$bootstrapData$s, _this$bootstrapData$s2;
+      var _this2$bootstrapData$, _this2$bootstrapData$2;
 
-      _this.mountPoints = mountPoints;
-      yield Promise.all([_this.loadCheckLogin(), _this.loadMicroApps()]);
+      _this2.mountPoints = mountPoints;
+      yield Promise.all([_this2.loadCheckLogin(), _this2.loadMicroApps()]);
 
-      if (_this.bootstrapData.storyboards.length === 0) {
+      if (_this2.bootstrapData.storyboards.length === 0) {
         throw new Error("No storyboard were found.");
       }
 
-      generateColorTheme((_this$bootstrapData$s = _this.bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : (_this$bootstrapData$s2 = _this$bootstrapData$s.misc) === null || _this$bootstrapData$s2 === void 0 ? void 0 : _this$bootstrapData$s2.theme);
+      generateColorTheme((_this2$bootstrapData$ = _this2.bootstrapData.settings) === null || _this2$bootstrapData$ === void 0 ? void 0 : (_this2$bootstrapData$2 = _this2$bootstrapData$.misc) === null || _this2$bootstrapData$2 === void 0 ? void 0 : _this2$bootstrapData$2.theme);
 
       if (isLoggedIn()) {
-        _this.loadSharedData();
+        _this2.loadSharedData();
       }
 
-      _this.menuBar = new MenuBar(_this, "menuBar");
-      _this.appBar = new AppBar(_this, "appBar");
-      _this.loadingBar = new BaseBar(_this, "loadingBar");
-      _this.router = new Router(_this);
+      _this2.menuBar = new MenuBar(_this2, "menuBar");
+      _this2.appBar = new AppBar(_this2, "appBar");
+      _this2.loadingBar = new BaseBar(_this2, "loadingBar");
+      _this2.router = new Router(_this2);
       initAnalytics();
-      yield _this.router.bootstrap();
+      yield _this2.router.bootstrap();
 
       if (!window.STANDALONE_MICRO_APPS) {
-        _this.legacyAuthGuard();
+        _this2.legacyAuthGuard();
       }
 
       listenDevtools();
@@ -7832,7 +7909,7 @@ class Kernel {
   }
 
   layoutBootstrap(layout) {
-    var _this2 = this;
+    var _this3 = this;
 
     return _asyncToGenerator$4(function* () {
       var supportedLayouts = ["console", "business"];
@@ -7841,12 +7918,12 @@ class Kernel {
         throw new Error("Unknown layout: ".concat(layout));
       }
 
-      _this2.currentLayout = layout;
-      _this2.presetBricks = layout === "business" ? {
+      _this3.currentLayout = layout;
+      _this3.presetBricks = layout === "business" ? {
         loadingBar: "business-website.loading-bar",
         pageNotFound: "business-website.page-not-found",
         pageError: "business-website.page-error"
-      } : _objectSpread(_objectSpread({}, _this2.bootstrapData.navbar), {}, {
+      } : _objectSpread(_objectSpread({}, _this3.bootstrapData.navbar), {}, {
         pageNotFound: "basic-bricks.page-not-found",
         pageError: "basic-bricks.page-error"
       });
@@ -7859,9 +7936,9 @@ class Kernel {
         }
       }
 
-      yield Promise.all([_this2.menuBar.bootstrap(_this2.presetBricks.menuBar, {
+      yield Promise.all([_this3.menuBar.bootstrap(_this3.presetBricks.menuBar, {
         testid: "brick-next-menu-bar"
-      }), _this2.appBar.bootstrap(_this2.presetBricks.appBar), _this2.loadingBar.bootstrap(_this2.presetBricks.loadingBar)]);
+      }), _this3.appBar.bootstrap(_this3.presetBricks.appBar), _this3.loadingBar.bootstrap(_this3.presetBricks.loadingBar)]);
     })();
   }
 
@@ -7898,7 +7975,7 @@ class Kernel {
   }
 
   loadMicroApps(params, interceptorParams) {
-    var _this3 = this;
+    var _this4 = this;
 
     return _asyncToGenerator$4(function* () {
       var data = yield window.STANDALONE_MICRO_APPS ? standaloneBootstrap() : BootstrapV2Api_bootstrapV2(_objectSpread({
@@ -7915,7 +7992,7 @@ class Kernel {
 
 
       processBootstrapResponse(bootstrapResponse);
-      _this3.bootstrapData = _objectSpread(_objectSpread({}, bootstrapResponse), {}, {
+      _this4.bootstrapData = _objectSpread(_objectSpread({}, bootstrapResponse), {}, {
         microApps: bootstrapResponse.storyboards.map(storyboard => storyboard.app).filter(Boolean)
       });
     })();
@@ -7929,7 +8006,7 @@ class Kernel {
   }
 
   fulfilStoryboard(storyboard) {
-    var _this4 = this;
+    var _this5 = this;
 
     return _asyncToGenerator$4(function* () {
       if (storyboard.$$fulfilled) {
@@ -7937,7 +8014,7 @@ class Kernel {
       }
 
       if (!storyboard.$$fulfilling) {
-        storyboard.$$fulfilling = _this4.doFulfilStoryboard(storyboard);
+        storyboard.$$fulfilling = _this5.doFulfilStoryboard(storyboard);
       }
 
       return storyboard.$$fulfilling;
@@ -7945,7 +8022,7 @@ class Kernel {
   }
 
   doFulfilStoryboard(storyboard) {
-    var _this5 = this;
+    var _this6 = this;
 
     return _asyncToGenerator$4(function* () {
       if (window.STANDALONE_MICRO_APPS) {
@@ -7966,7 +8043,7 @@ class Kernel {
         });
       }
 
-      _this5.postProcessStoryboard(storyboard);
+      _this6.postProcessStoryboard(storyboard);
     })();
   }
 
@@ -7979,8 +8056,8 @@ class Kernel {
       // Prefix to avoid conflict between brick package's i18n namespace.
       var i18nNamespace = getI18nNamespace("app", storyboard.app.id); // Support any language in `meta.i18n`.
 
-      Object.entries(storyboard.meta.i18n).forEach(_ref => {
-        var [lang, resources] = _ref;
+      Object.entries(storyboard.meta.i18n).forEach(_ref4 => {
+        var [lang, resources] = _ref4;
         i18next.addResourceBundle(lang, i18nNamespace, resources);
       });
     }
@@ -8007,7 +8084,9 @@ class Kernel {
       path: previewPath,
       bricks: [_objectSpread({
         brick: templateId
-      }, pick(settings, "properties"))]
+      }, pick(settings, "properties"))],
+      menu: false,
+      exact: true
     };
 
     if (previewRouteIndex === -1) {
@@ -8018,34 +8097,30 @@ class Kernel {
   }
 
   loadDepsOfStoryboard(storyboard) {
-    var _this6 = this;
+    return this.gracefullyLoadDeps(this._loadDepsOfStoryboard, storyboard);
+  }
+
+  gracefullyLoadDeps(fn) {
+    var _arguments = arguments,
+        _this7 = this;
 
     return _asyncToGenerator$4(function* () {
-      var {
-        brickPackages,
-        templatePackages
-      } = _this6.bootstrapData;
-
-      if (storyboard.dependsAll) {
-        var dllPath = window.DLL_PATH || {};
-        yield loadScriptOfDll(Object.values(dllPath));
-        yield loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)));
-        yield loadAllLazyBricks();
-      } else {
-        // 先加载模板
-        var templateDeps = getTemplateDepsOfStoryboard(storyboard, templatePackages);
-        yield loadScriptOfBricksOrTemplates(templateDeps); // 加载模板后才能加工得到最终的构件表
+      for (var _len = _arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+        args[_key - 1] = _arguments[_key];
+      }
 
-        var {
-          dll,
-          deps,
-          bricks
-        } = getDllAndDepsOfStoryboard(yield asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
-          ignoreBricksInUnusedCustomTemplates: true
-        });
-        yield loadScriptOfDll(dll);
-        yield loadScriptOfBricksOrTemplates(deps);
-        yield loadLazyBricks(bricks);
+      try {
+        yield fn(...args);
+      } catch (e) {
+        if (e instanceof Event && e.target instanceof HTMLScriptElement) {
+          // The scripts maybe stale when a user stays in page while upgrades been applied.
+          // So we force reloading again automatically.
+          // NOTE: reload only once to avoid a infinite loop.
+          yield _this7.reloadMicroApps();
+          yield fn(...args);
+        } else {
+          throw e;
+        }
       }
     })();
   }
@@ -8090,7 +8165,7 @@ class Kernel {
   }
 
   loadDynamicBricksInBrickConf(brickConf) {
-    var _this7 = this;
+    var _this8 = this;
 
     return _asyncToGenerator$4(function* () {
       // Notice: `brickConf` contains runtime data,
@@ -8098,44 +8173,16 @@ class Kernel {
       // which could cause stack overflow while traversing.
       var bricks = scanBricksInBrickConf(brickConf);
       var processors = scanProcessorsInAny(brickConf);
-      yield _this7.loadDynamicBricks(bricks, processors);
+      yield _this8.loadDynamicBricks(bricks, processors);
     })();
   }
 
   loadDynamicBricks(bricks, processors) {
-    var _this8 = this;
-
-    return _asyncToGenerator$4(function* () {
-      var filteredBricks = bricks.filter( // Only try to load undefined custom elements.
-      item => !customElements.get(item)); // Try to load deps for dynamic added bricks.
-
-      var {
-        dll,
-        deps
-      } = getDllAndDepsByResource({
-        bricks: filteredBricks,
-        processors
-      }, _this8.bootstrapData.brickPackages);
-      yield loadScriptOfDll(dll);
-      yield loadScriptOfBricksOrTemplates(deps);
-      yield loadLazyBricks(filteredBricks);
-    })();
+    return this.gracefullyLoadDeps(this._loadDynamicBricks, bricks, processors);
   }
 
   loadEditorBricks(editorBricks) {
-    var _this9 = this;
-
-    return _asyncToGenerator$4(function* () {
-      var {
-        dll,
-        deps
-      } = getDllAndDepsByResource({
-        editorBricks: editorBricks.filter( // Only try to load undefined custom elements.
-        item => !customElements.get(item))
-      }, _this9.bootstrapData.brickPackages);
-      yield loadScriptOfDll(dll);
-      yield loadScriptOfBricksOrTemplates(deps);
-    })();
+    return this.gracefullyLoadDeps(this._loadEditorBricks, editorBricks);
   }
 
   firstRendered() {
@@ -8236,10 +8283,10 @@ class Kernel {
   }
 
   getMicroAppApiOrchestrationMapAsync() {
-    var _this10 = this;
+    var _this9 = this;
 
     return _asyncToGenerator$4(function* () {
-      return yield _this10.allMicroAppApiOrchestrationPromise;
+      return yield _this9.allMicroAppApiOrchestrationPromise;
     })();
   }
 
@@ -8331,14 +8378,14 @@ class Kernel {
   }
 
   getRelatedAppsAsync(appId) {
-    var _this11 = this;
+    var _this10 = this;
 
     return _asyncToGenerator$4(function* () {
       if (!appId) {
         return [];
       }
 
-      var allRelatedApps = yield _this11.allRelatedAppsPromise;
+      var allRelatedApps = yield _this10.allRelatedAppsPromise;
       var thisApp = allRelatedApps.find(item => item.microAppId === appId);
 
       if (!thisApp) {
@@ -8350,38 +8397,38 @@ class Kernel {
   }
 
   updateWorkspaceStack() {
-    var _this12 = this;
+    var _this11 = this;
 
     return _asyncToGenerator$4(function* () {
-      if (_this12.currentApp && _this12.currentApp.id) {
+      if (_this11.currentApp && _this11.currentApp.id) {
         var workspace = {
-          appId: _this12.currentApp.id,
-          appName: _this12.currentApp.name,
-          appLocaleName: _this12.currentApp.localeName,
-          url: _this12.currentUrl
+          appId: _this11.currentApp.id,
+          appName: _this11.currentApp.name,
+          appLocaleName: _this11.currentApp.localeName,
+          url: _this11.currentUrl
         };
 
-        if (_this12.workspaceStack.length > 0) {
-          var previousWorkspace = _this12.workspaceStack[_this12.workspaceStack.length - 1];
+        if (_this11.workspaceStack.length > 0) {
+          var previousWorkspace = _this11.workspaceStack[_this11.workspaceStack.length - 1];
 
-          var _relatedApps = yield _this12.getRelatedAppsAsync(previousWorkspace.appId);
+          var _relatedApps = yield _this11.getRelatedAppsAsync(previousWorkspace.appId);
 
-          if (_relatedApps.some(item => item.microAppId === _this12.currentApp.id)) {
+          if (_relatedApps.some(item => item.microAppId === _this11.currentApp.id)) {
             Object.assign(previousWorkspace, workspace);
             return;
           }
         }
 
-        var relatedApps = yield _this12.getRelatedAppsAsync(_this12.currentApp.id);
+        var relatedApps = yield _this11.getRelatedAppsAsync(_this11.currentApp.id);
 
         if (relatedApps.length > 0) {
-          _this12.workspaceStack.push(workspace);
+          _this11.workspaceStack.push(workspace);
 
           return;
         }
       }
 
-      _this12.workspaceStack = [];
+      _this11.workspaceStack = [];
     })();
   }
 
@@ -8404,9 +8451,9 @@ class Kernel {
   }
 
   getFeatureFlags() {
-    var _this$bootstrapData, _this$bootstrapData$s3;
+    var _this$bootstrapData, _this$bootstrapData$s;
 
-    return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s3 = _this$bootstrapData.settings) === null || _this$bootstrapData$s3 === void 0 ? void 0 : _this$bootstrapData$s3.featureFlags);
+    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) {
@@ -8422,22 +8469,22 @@ class Kernel {
   }
 
   getProviderBrick(provider) {
-    var _this13 = this;
+    var _this12 = this;
 
     return _asyncToGenerator$4(function* () {
       if (isCustomApiProvider(provider)) {
         provider = CUSTOM_API_PROVIDER;
       }
 
-      if (_this13.providerRepository.has(provider)) {
-        return _this13.providerRepository.get(provider);
+      if (_this12.providerRepository.has(provider)) {
+        return _this12.providerRepository.get(provider);
       }
 
       if (provider === CUSTOM_API_PROVIDER && !customElements.get(provider)) {
         registerCustomApi();
       }
 
-      yield _this13.loadDynamicBricks([provider]);
+      yield _this12.loadDynamicBricks([provider]);
 
       if (!customElements.get(provider)) {
         throw new Error("Provider not defined: \"".concat(provider, "\"."));
@@ -8445,7 +8492,7 @@ class Kernel {
 
       var brick = document.createElement(provider);
 
-      _this13.providerRepository.set(provider, brick);
+      _this12.providerRepository.set(provider, brick);
 
       return brick;
     })();
@@ -8454,7 +8501,7 @@ class Kernel {
 } // Since `@next-dll/editor-bricks-helper` depends on `@next-dll/react-dnd`,
 // always load react-dnd before loading editor-bricks-helper.
 
-function loadScriptOfDll(_x) {
+function loadScriptOfDll(_x5) {
   return _loadScriptOfDll.apply(this, arguments);
 }
 
@@ -8629,7 +8676,8 @@ function getRuntimeMisc() {
       misc.isInIframe = true;
 
       try {
-        misc.isInIframeOfLegacyConsole = window.origin === window.parent.origin;
+        // Handle when previewing in visual builder by iframe.
+        misc.isInIframeOfLegacyConsole = window.origin === window.parent.origin && getBasePath() === "/next/" && !window.parent.location.pathname.startsWith("/next/");
       } catch (e) {// do nothing
       }
     }
@@ -9231,6 +9279,8 @@ class LocationContext {
       }
 
       if (expandedBrickConf.bg) {
+        // A bg brick has no slotId.
+        brick.slotId = undefined;
         appendBrick(brick, _this6.kernel.mountPoints.bg);
       } else {
         if (expandedBrickConf.portal) {
@@ -10168,7 +10218,9 @@ class Router {
             path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
             bricks: [{
               brick: "span"
-            }]
+            }],
+            menu: false,
+            exact: true
           }), undefined, mountRoutesResult);
         } catch (error) {
           // eslint-disable-next-line no-console
@@ -13620,26 +13672,32 @@ function useProvider() {
   var response = useRef();
   var data = useRef(defaults.data);
   var forceUpdate = useReducer(() => ({}), [])[1];
-  var doFetch = useCallback( /*#__PURE__*/_asyncToGenerator$4(function* () {
-    try {
-      error.current = undefined;
-      if (!suspense) setLoading(true);
+  var doFetch = useCallback( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator$4(function* (provider) {
+      try {
+        error.current = undefined;
+        if (!suspense) setLoading(true);
+
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = arguments[_key];
+        }
 
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
+        var newRes = yield fetch(provider, ...args);
+        response.current = newRes;
+        data.current = transform(data.current, newRes);
+      } catch (e) {
+        error.current = e;
       }
 
-      var newRes = yield fetch(provider, ...args);
-      response.current = newRes;
-      data.current = transform(data.current, newRes);
-    } catch (e) {
-      error.current = e;
-    }
+      if (!suspense) setLoading(false);
+      if (error.current) onError(error.current);
+      return data.current;
+    });
 
-    if (!suspense) setLoading(false);
-    if (error.current) onError(error.current);
-    return data.current;
-  }), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError]);
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }(), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError]);
   var makeFetch = useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator$4(function* (providerOrBody, args) {
       var providerStr = provider;
@@ -13659,7 +13717,7 @@ function useProvider() {
 
       if (suspense) {
         return _asyncToGenerator$4(function* () {
-          suspender.current = doFetch(...actualArgs).then(newData => {
+          suspender.current = doFetch(providerStr, ...actualArgs).then(newData => {
             suspenseStatus.current = "success";
             return newData;
           }, error => {
@@ -13672,10 +13730,10 @@ function useProvider() {
         })();
       }
 
-      return doFetch(...actualArgs);
+      return doFetch(providerStr, ...actualArgs);
     });
 
-    return function (_x, _x2) {
+    return function (_x2, _x3) {
       return _ref2.apply(this, arguments);
     };
   }(), [doFetch]);