@modern-js/plugin-garfish 1.3.0 → 1.3.1

package/dist/js/treeshaking/cli/index.js

@@ -1,5 +1,3 @@
-var _excluded = ["validateSchema", "externals", "componentKey"];
-
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -8,10 +6,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import path from 'path';
 import { createRuntimeExportsUtils, getEntryOptions, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { createPlugin, useAppContext, useResolvedConfigContext } from '@modern-js/core';
@@ -42,230 +36,220 @@ function setRuntimeConfig(config, key, value) {
   }
 }
 
-export var initializer = function initializer(_ref) {
-  var validateSchema = _ref.validateSchema,
-      externals = _ref.externals,
-      componentKey = _ref.componentKey,
-      otherLifeCycle = _objectWithoutProperties(_ref, _excluded);
-
-  return function () {
-    var configMap = new Map();
-    var pluginsExportsUtils;
-    var runtimeExportsUtils;
-    return _objectSpread({
-      resolvedConfig: function resolvedConfig(config) {
-        var resolved = config.resolved;
-
-        var _getRuntimeConfig = getRuntimeConfig(resolved),
-            masterApp = _getRuntimeConfig.masterApp,
-            router = _getRuntimeConfig.router;
-
-        var nConfig = {
-          resolved: _objectSpread({}, resolved)
-        };
-
-        if (masterApp) {
-          // basename does not exist use router's basename
-          setRuntimeConfig(nConfig.resolved, 'masterApp', Object.assign(_typeof(masterApp) === 'object' ? _objectSpread({}, masterApp) : {}, {
-            basename: (router === null || router === void 0 ? void 0 : router.basename) || '/'
-          }));
-        }
+var externals = {
+  'react-dom': 'react-dom',
+  react: 'react'
+};
+export default createPlugin(function () {
+  var configMap = new Map();
+  var pluginsExportsUtils;
+  var runtimeExportsUtils;
+  return {
+    resolvedConfig: function resolvedConfig(config) {
+      var resolved = config.resolved;
+
+      var _getRuntimeConfig = getRuntimeConfig(resolved),
+          masterApp = _getRuntimeConfig.masterApp,
+          router = _getRuntimeConfig.router;
+
+      var nConfig = {
+        resolved: _objectSpread({}, resolved)
+      };
+
+      if (masterApp) {
+        // basename does not exist use router's basename
+        setRuntimeConfig(nConfig.resolved, 'masterApp', Object.assign(_typeof(masterApp) === 'object' ? _objectSpread({}, masterApp) : {}, {
+          basename: (router === null || router === void 0 ? void 0 : router.basename) || '/'
+        }));
+      }
 
-        logger("resolvedConfig", {
-          runtime: nConfig.resolved.runtime,
-          deploy: nConfig.resolved.deploy,
-          server: nConfig.resolved.server
-        });
-        return nConfig;
-      },
-      config: function config() {
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        var config = useAppContext();
-        pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'plugins');
-        runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'index');
-        return {
-          source: {
-            alias: {
-              '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
-            }
-          },
-          tools: {
-            webpack: function webpack(webpackConfig, _ref2) {
-              var _resolvedConfig$deplo;
+      logger("resolvedConfig", {
+        runtime: nConfig.resolved.runtime,
+        deploy: nConfig.resolved.deploy,
+        server: nConfig.resolved.server
+      });
+      return nConfig;
+    },
+    config: function config() {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      var config = useAppContext();
+      pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'plugins');
+      runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, 'index');
+      return {
+        source: {
+          alias: {
+            '@modern-js/runtime/plugins': pluginsExportsUtils.getPath()
+          }
+        },
+        tools: {
+          webpack: function webpack(webpackConfig, _ref) {
+            var _resolvedConfig$deplo, _resolveWebpackConfig;
 
-              var chain = _ref2.chain,
-                  _webpack = _ref2.webpack;
-              var env = process.env.NODE_ENV; // eslint-disable-next-line react-hooks/rules-of-hooks
+            var chain = _ref.chain,
+                _webpack = _ref.webpack;
+            var env = process.env.NODE_ENV; // eslint-disable-next-line react-hooks/rules-of-hooks
 
-              var resolvedConfig = useResolvedConfigContext();
+            var resolvedConfig = useResolvedConfigContext();
 
-              if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo = resolvedConfig.deploy) !== null && _resolvedConfig$deplo !== void 0 && _resolvedConfig$deplo.microFrontend) {
-                var _resolvedConfig$deplo2, _resolvedConfig$deplo3;
+            if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo = resolvedConfig.deploy) !== null && _resolvedConfig$deplo !== void 0 && _resolvedConfig$deplo.microFrontend) {
+              var _resolvedConfig$deplo2, _resolvedConfig$deplo3;
 
-                chain.output.libraryTarget('umd');
+              chain.output.libraryTarget('umd');
 
-                if (resolvedConfig.server.port) {
-                  chain.output.publicPath(env === 'development' ? "//localhost:".concat(resolvedConfig.server.port, "/") : webpackConfig.output.publicPath);
-                } // add comments avoid sourcemap abnormal
+              if (resolvedConfig.server.port) {
+                chain.output.publicPath(env === 'development' ? "//localhost:".concat(resolvedConfig.server.port, "/") : webpackConfig.output.publicPath);
+              } // add comments avoid sourcemap abnormal
 
 
-                chain.plugin('banner').use(_webpack.BannerPlugin, [{
-                  banner: 'Micro front-end'
-                }]);
+              chain.plugin('banner').use(_webpack.BannerPlugin, [{
+                banner: 'Micro front-end'
+              }]);
 
-                var _ref3 = _typeof(resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo2 = resolvedConfig.deploy) === null || _resolvedConfig$deplo2 === void 0 ? void 0 : _resolvedConfig$deplo2.microFrontend) === 'object' ? resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo3 = resolvedConfig.deploy) === null || _resolvedConfig$deplo3 === void 0 ? void 0 : _resolvedConfig$deplo3.microFrontend : {},
-                    _ref3$enableHtmlEntry = _ref3.enableHtmlEntry,
-                    enableHtmlEntry = _ref3$enableHtmlEntry === void 0 ? true : _ref3$enableHtmlEntry,
-                    _ref3$externalBasicLi = _ref3.externalBasicLibrary,
-                    externalBasicLibrary = _ref3$externalBasicLi === void 0 ? true : _ref3$externalBasicLi; // external
+              var _ref2 = _typeof(resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo2 = resolvedConfig.deploy) === null || _resolvedConfig$deplo2 === void 0 ? void 0 : _resolvedConfig$deplo2.microFrontend) === 'object' ? resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$deplo3 = resolvedConfig.deploy) === null || _resolvedConfig$deplo3 === void 0 ? void 0 : _resolvedConfig$deplo3.microFrontend : {},
+                  _ref2$enableHtmlEntry = _ref2.enableHtmlEntry,
+                  enableHtmlEntry = _ref2$enableHtmlEntry === void 0 ? true : _ref2$enableHtmlEntry,
+                  _ref2$externalBasicLi = _ref2.externalBasicLibrary,
+                  externalBasicLibrary = _ref2$externalBasicLi === void 0 ? true : _ref2$externalBasicLi; // external
 
 
-                if (externalBasicLibrary) {
-                  chain.externals(externals);
-                } // use html mode
+              if (externalBasicLibrary) {
+                chain.externals(externals);
+              } // use html mode
 
 
-                if (!enableHtmlEntry) {
-                  chain.output.filename('index.js');
-                  chain.plugins["delete"]('html-main');
-                  chain.optimization.runtimeChunk(false);
-                  chain.optimization.splitChunks({
-                    chunks: 'async'
-                  });
-                }
+              if (!enableHtmlEntry) {
+                chain.output.filename('index.js');
+                chain.plugins["delete"]('html-main');
+                chain.optimization.runtimeChunk(false);
+                chain.optimization.splitChunks({
+                  chunks: 'async'
+                });
               }
-
-              var resolveWebpackConfig = chain.toConfig();
-              logger('webpackConfig', {
-                output: resolveWebpackConfig.output,
-                externals: resolveWebpackConfig.externals,
-                env: env
-              });
             }
+
+            var resolveWebpackConfig = chain.toConfig();
+            logger('webpackConfig', {
+              output: resolveWebpackConfig.output,
+              externals: resolveWebpackConfig.externals,
+              env: env,
+              alias: (_resolveWebpackConfig = resolveWebpackConfig.resolve) === null || _resolveWebpackConfig === void 0 ? void 0 : _resolveWebpackConfig.alias
+            });
           }
-        };
-      },
-      addRuntimeExports: function addRuntimeExports() {
-        var mfPackage = path.resolve(__dirname, '../../../../');
-        var addExportStatement = "export { default as garfish } from '".concat(mfPackage, "'");
-        logger('exportStatement', addExportStatement);
-        pluginsExportsUtils.addExport(addExportStatement);
-        runtimeExportsUtils.addExport("export * from '".concat(mfPackage, "'"));
-      },
-      validateSchema: validateSchema,
-      modifyEntryImports: function modifyEntryImports(_ref4) {
-        var entrypoint = _ref4.entrypoint,
-            imports = _ref4.imports;
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        var resolvedConfig = useResolvedConfigContext(); // support legacy config
-
-        var _getRuntimeConfig2 = getRuntimeConfig(resolvedConfig),
-            masterApp = _getRuntimeConfig2.masterApp; // eslint-disable-next-line react-hooks/rules-of-hooks
-
-
-        var _useAppContext = useAppContext(),
-            packageName = _useAppContext.packageName;
-
-        var masterAppConfig = getEntryOptions(entrypoint.entryName, masterApp, resolvedConfig.runtimeByEntries, packageName);
-        configMap.set(entrypoint.entryName, masterAppConfig);
-
-        if (masterAppConfig) {
-          imports.push({
-            value: '@modern-js/runtime/plugins',
-            specifiers: [{
-              imported: 'garfish'
-            }]
-          });
         }
-
+      };
+    },
+    addRuntimeExports: function addRuntimeExports() {
+      var mfPackage = path.resolve(__dirname, '../../../../');
+      var addExportStatement = "export { default as garfish } from '".concat(mfPackage, "'");
+      logger('exportStatement', addExportStatement);
+      pluginsExportsUtils.addExport(addExportStatement);
+      runtimeExportsUtils.addExport("export * from '".concat(mfPackage, "'"));
+    },
+    validateSchema: function validateSchema() {
+      return PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
+    },
+    modifyEntryImports: function modifyEntryImports(_ref3) {
+      var entrypoint = _ref3.entrypoint,
+          imports = _ref3.imports;
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      var resolvedConfig = useResolvedConfigContext(); // support legacy config
+
+      var _getRuntimeConfig2 = getRuntimeConfig(resolvedConfig),
+          masterApp = _getRuntimeConfig2.masterApp; // eslint-disable-next-line react-hooks/rules-of-hooks
+
+
+      var _useAppContext = useAppContext(),
+          packageName = _useAppContext.packageName;
+
+      var masterAppConfig = getEntryOptions(entrypoint.entryName, masterApp, resolvedConfig.runtimeByEntries, packageName);
+      configMap.set(entrypoint.entryName, masterAppConfig);
+
+      if (masterAppConfig) {
         imports.push({
-          value: 'react-dom',
+          value: '@modern-js/runtime/plugins',
           specifiers: [{
-            imported: 'unmountComponentAtNode'
-          }, {
-            imported: 'createPortal'
+            imported: 'garfish'
           }]
         });
-        return {
-          imports: imports,
-          entrypoint: entrypoint
-        };
-      },
-      modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(_ref5) {
-        var entrypoint = _ref5.entrypoint,
-            plugins = _ref5.plugins;
-        var masterAppConfig = configMap.get(entrypoint.entryName);
-
-        if (masterAppConfig) {
-          logger('garfishPlugin options', masterAppConfig);
-          plugins.push({
-            name: 'garfish',
-            args: 'masterApp',
-            options: JSON.stringify(masterAppConfig)
-          });
-        }
+      }
 
-        return {
-          entrypoint: entrypoint,
-          plugins: plugins
-        };
-      },
-      modifyEntryRenderFunction: function modifyEntryRenderFunction(_ref6) {
-        var _config$deploy;
-
-        var entrypoint = _ref6.entrypoint,
-            code = _ref6.code;
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        var config = useResolvedConfigContext();
-
-        if (!(config !== null && config !== void 0 && (_config$deploy = config.deploy) !== null && _config$deploy !== void 0 && _config$deploy.microFrontend)) {
-          return {
-            entrypoint: entrypoint,
-            code: code
-          };
-        }
+      imports.push({
+        value: 'react-dom',
+        specifiers: [{
+          imported: 'unmountComponentAtNode'
+        }, {
+          imported: 'createPortal'
+        }]
+      });
+      return {
+        imports: imports,
+        entrypoint: entrypoint
+      };
+    },
+    modifyEntryRuntimePlugins: function modifyEntryRuntimePlugins(_ref4) {
+      var entrypoint = _ref4.entrypoint,
+          plugins = _ref4.plugins;
+      var masterAppConfig = configMap.get(entrypoint.entryName);
+
+      if (masterAppConfig) {
+        logger('garfishPlugin options', masterAppConfig);
+        plugins.push({
+          name: 'garfish',
+          args: 'masterApp',
+          options: JSON.stringify(masterAppConfig)
+        });
+      }
+
+      return {
+        entrypoint: entrypoint,
+        plugins: plugins
+      };
+    },
+    modifyEntryRenderFunction: function modifyEntryRenderFunction(_ref5) {
+      var _config$deploy;
+
+      var entrypoint = _ref5.entrypoint,
+          code = _ref5.code;
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      var config = useResolvedConfigContext();
 
-        var nCode = makeRenderFunction(code);
-        logger('makeRenderFunction', nCode);
+      if (!(config !== null && config !== void 0 && (_config$deploy = config.deploy) !== null && _config$deploy !== void 0 && _config$deploy.microFrontend)) {
         return {
           entrypoint: entrypoint,
-          code: nCode
+          code: code
         };
-      },
-      modifyEntryExport: function modifyEntryExport(_ref7) {
-        var _resolvedConfig$deplo4;
-
-        var entrypoint = _ref7.entrypoint,
-            exportStatement = _ref7.exportStatement;
-        // eslint-disable-next-line react-hooks/rules-of-hooks
-        var resolvedConfig = useResolvedConfigContext();
-
-        if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo4 = resolvedConfig.deploy) !== null && _resolvedConfig$deplo4 !== void 0 && _resolvedConfig$deplo4.microFrontend) {
-          var exportStatementCode = makeProvider(componentKey);
-          logger('exportStatement', exportStatementCode);
-          return {
-            entrypoint: entrypoint,
-            exportStatement: exportStatementCode
-          };
-        }
+      }
 
+      var nCode = makeRenderFunction(code);
+      logger('makeRenderFunction', nCode);
+      return {
+        entrypoint: entrypoint,
+        code: nCode
+      };
+    },
+    modifyEntryExport: function modifyEntryExport(_ref6) {
+      var _resolvedConfig$deplo4;
+
+      var entrypoint = _ref6.entrypoint,
+          exportStatement = _ref6.exportStatement;
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      var resolvedConfig = useResolvedConfigContext();
+
+      if (resolvedConfig !== null && resolvedConfig !== void 0 && (_resolvedConfig$deplo4 = resolvedConfig.deploy) !== null && _resolvedConfig$deplo4 !== void 0 && _resolvedConfig$deplo4.microFrontend) {
+        var exportStatementCode = makeProvider();
+        logger('exportStatement', exportStatementCode);
         return {
           entrypoint: entrypoint,
-          exportStatement: exportStatement
+          exportStatement: exportStatementCode
         };
       }
-    }, otherLifeCycle);
+
+      return {
+        entrypoint: entrypoint,
+        exportStatement: exportStatement
+      };
+    }
   };
-};
-export default createPlugin(initializer({
-  validateSchema: function validateSchema() {
-    return PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
-  },
-  externals: {
-    'react-dom': 'react-dom',
-    react: 'react'
-  },
-  componentKey: 'dynamicComponent'
-}), {
+}, {
   name: '@modern-js/plugin-garfish'
 });

package/dist/js/treeshaking/cli/utils.js

@@ -1,5 +1,5 @@
-export var makeProvider = function makeProvider(componentKey) {
-  return "\n  export const provider = function ({basename, dom, ...props}) {\n    return {\n      render({basename, dom}) {\n        const SubApp = render(props, basename);\n        const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n        bootstrap(SubApp, node);\n      },\n      destroy({ dom }) {\n        const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n        if (node) {\n          unmountComponentAtNode(node);\n        }\n      },\n      SubModuleComponent: (props) => {\n        const SubApp = render(props, basename);\n\n        return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n      },\n      ".concat(componentKey, ": () => {\n        const SubApp = render(props, basename);\n\n        return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n      }\n    }\n  };\n  if (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n    __GARFISH_EXPORTS__.provider = provider;\n  }\n");
+export var makeProvider = function makeProvider() {
+  return "\n  export const provider = function ({basename, dom, ...props}) {\n    return {\n      render({basename, dom}) {\n        const SubApp = render(props, basename);\n        const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n        bootstrap(SubApp, node);\n      },\n      destroy({ dom }) {\n        const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n        if (node) {\n          unmountComponentAtNode(node);\n        }\n      },\n      SubModuleComponent: (props) => {\n        const SubApp = render(props, basename);\n\n        return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n      }\n    }\n  };\n  if (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n    __GARFISH_EXPORTS__.provider = provider;\n  }\n";
 };
 export var makeRenderFunction = function makeRenderFunction(code) {
   return code.replace('IS_BROWSER', "\n        IS_BROWSER &&\n        typeof __GARFISH_EXPORTS__ === 'undefined'\n      ").replace('(App)', '(() => <App {...(arguments[0] || {})} />)').replace('"basename":"/"', '"basename":arguments[1] || "/"');

package/dist/js/treeshaking/index.js

@@ -1 +1,2 @@
-export { default } from "./cli";
+export { default } from "./runtime";
+export * from "./runtime";

package/dist/js/treeshaking/runtime/index.js

@@ -1,2 +1,3 @@
 export { default } from "./plugin";
-export * from "./useModuleApps";
+export { useModuleApps, useMicroApps, useModuleApp } from "./useModuleApps";
+export { default as Garfish } from 'garfish';

package/dist/js/treeshaking/runtime/loadable.js

@@ -1,11 +1,17 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
+var _excluded = ["loadable"];
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -33,7 +39,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export function Loadable(WrapComponent) {
-  return function (defaultLoadingComponent) {
+  return function (defaultLoadable) {
     return /*#__PURE__*/function (_React$Component) {
       _inherits(LoadableComponent, _React$Component);
 
@@ -50,9 +56,6 @@ export function Loadable(WrapComponent) {
 
         _this = _super.call.apply(_super, [this].concat(args));
         _this.state = {
-          LoadingComponent: defaultLoadingComponent,
-          timeout: 10000,
-          delay: 200,
           error: null,
           pastDelay: false,
           timedOut: false,
@@ -82,17 +85,14 @@ export function Loadable(WrapComponent) {
           var _this2 = this;
 
           this.mounted = true;
-          var loadingConfig = this.props.loadingConfig;
-
-          if (loadingConfig !== null && loadingConfig !== void 0 && loadingConfig.LoadingComponent) {
-            this.setStateWithMountCheck({
-              LoadingComponent: loadingConfig.LoadingComponent
-            });
-          }
-
-          var _this$state = this.state,
-              delay = _this$state.delay,
-              timeout = _this$state.timeout;
+          var _this$props$loadable = this.props.loadable,
+              loadable = _this$props$loadable === void 0 ? defaultLoadable || {
+            delay: 200,
+            timeout: 10000,
+            loading: null
+          } : _this$props$loadable;
+          var delay = loadable.delay,
+              timeout = loadable.timeout;
 
           if (typeof delay === 'number') {
             if (delay === 0) {
@@ -133,7 +133,6 @@ export function Loadable(WrapComponent) {
             return;
           }
 
-          logger('Loadable state', this.state);
           this.setState(newState);
         }
       }, {
@@ -147,16 +146,31 @@ export function Loadable(WrapComponent) {
         value: function render() {
           var _this3 = this;
 
-          // eslint-disable-next-line @typescript-eslint/no-shadow
-          var _this$state2 = this.state,
-              isLoading = _this$state2.isLoading,
-              error = _this$state2.error,
-              pastDelay = _this$state2.pastDelay,
-              timedOut = _this$state2.timedOut,
-              LoadingComponent = _this$state2.LoadingComponent;
+          var _this$state = this.state,
+              isLoading = _this$state.isLoading,
+              error = _this$state.error,
+              pastDelay = _this$state.pastDelay,
+              timedOut = _this$state.timedOut;
+
+          var _this$props = this.props,
+              _this$props$loadable2 = _this$props.loadable,
+              loadable = _this$props$loadable2 === void 0 ? defaultLoadable || {
+            delay: 200,
+            timeout: 10000,
+            loading: null
+          } : _this$props$loadable2,
+              otherProps = _objectWithoutProperties(_this$props, _excluded);
+
+          var LoadingComponent = loadable.loading;
+          logger('Loadable render state', {
+            state: this.state,
+            props: otherProps,
+            loadable: loadable,
+            defaultLoadable: defaultLoadable
+          });
           var showLoading = (isLoading || error) && LoadingComponent;
           return /*#__PURE__*/_jsxs(_Fragment, {
-            children: [showLoading && LoadingComponent && /*#__PURE__*/_jsx(LoadingComponent, {
+            children: [showLoading && /*#__PURE__*/_jsx(LoadingComponent, {
               isLoading: isLoading,
               pastDelay: pastDelay,
               timedOut: timedOut,
@@ -169,7 +183,7 @@ export function Loadable(WrapComponent) {
               setLoadingState: function setLoadingState(props) {
                 return _this3.setStateWithMountCheck(props);
               }
-            }, this.props))]
+            }, otherProps))]
           });
         }
       }]);