@modern-js/plugin-garfish 1.3.0 → 1.4.1

package/dist/js/node/runtime/index.js

@@ -3,28 +3,41 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {};
+Object.defineProperty(exports, "Garfish", {
+  enumerable: true,
+  get: function () {
+    return _garfish.default;
+  }
+});
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
     return _plugin.default;
   }
 });
+Object.defineProperty(exports, "useMicroApps", {
+  enumerable: true,
+  get: function () {
+    return _useModuleApps.useMicroApps;
+  }
+});
+Object.defineProperty(exports, "useModuleApp", {
+  enumerable: true,
+  get: function () {
+    return _useModuleApps.useModuleApp;
+  }
+});
+Object.defineProperty(exports, "useModuleApps", {
+  enumerable: true,
+  get: function () {
+    return _useModuleApps.useModuleApps;
+  }
+});
 
 var _plugin = _interopRequireDefault(require("./plugin"));
 
 var _useModuleApps = require("./useModuleApps");
 
-Object.keys(_useModuleApps).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _useModuleApps[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _useModuleApps[key];
-    }
-  });
-});
+var _garfish = _interopRequireDefault(require("garfish"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/js/node/runtime/loadable.js

@@ -11,6 +11,8 @@ var _util = require("../util");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
+const _excluded = ["loadable"];
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -19,15 +21,16 @@ 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; }
+
 function Loadable(WrapComponent) {
-  return function (defaultLoadingComponent) {
+  return function (defaultLoadable) {
     return class LoadableComponent extends _react.default.Component {
       constructor(...args) {
         super(...args);
         this.state = {
-          LoadingComponent: defaultLoadingComponent,
-          timeout: 10000,
-          delay: 200,
           error: null,
           pastDelay: false,
           timedOut: false,
@@ -51,19 +54,16 @@ function Loadable(WrapComponent) {
       UNSAFE_componentWillMount() {
         this.mounted = true;
         const {
-          loadingConfig
+          loadable = defaultLoadable || {
+            delay: 200,
+            timeout: 10000,
+            loading: null
+          }
         } = this.props;
-
-        if (loadingConfig !== null && loadingConfig !== void 0 && loadingConfig.LoadingComponent) {
-          this.setStateWithMountCheck({
-            LoadingComponent: loadingConfig.LoadingComponent
-          });
-        }
-
         const {
           delay,
           timeout
-        } = this.state;
+        } = loadable;
 
         if (typeof delay === 'number') {
           if (delay === 0) {
@@ -102,7 +102,6 @@ function Loadable(WrapComponent) {
           return;
         }
 
-        (0, _util.logger)('Loadable state', this.state);
         this.setState(newState);
       }
 
@@ -112,17 +111,35 @@ function Loadable(WrapComponent) {
       }
 
       render() {
-        // eslint-disable-next-line @typescript-eslint/no-shadow
         const {
           isLoading,
           error,
           pastDelay,
-          timedOut,
-          LoadingComponent
+          timedOut
         } = this.state;
+
+        const _this$props = this.props,
+              {
+          loadable = defaultLoadable || {
+            delay: 200,
+            timeout: 10000,
+            loading: null
+          }
+        } = _this$props,
+              otherProps = _objectWithoutProperties(_this$props, _excluded);
+
+        const {
+          loading: LoadingComponent
+        } = loadable;
+        (0, _util.logger)('Loadable render state', {
+          state: this.state,
+          props: otherProps,
+          loadable,
+          defaultLoadable
+        });
         const showLoading = (isLoading || error) && LoadingComponent;
         return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-          children: [showLoading && LoadingComponent && /*#__PURE__*/(0, _jsxRuntime.jsx)(LoadingComponent, {
+          children: [showLoading && /*#__PURE__*/(0, _jsxRuntime.jsx)(LoadingComponent, {
             isLoading: isLoading,
             pastDelay: pastDelay,
             timedOut: timedOut,
@@ -133,7 +150,7 @@ function Loadable(WrapComponent) {
               display: showLoading ? 'none' : 'block'
             },
             setLoadingState: props => this.setStateWithMountCheck(props)
-          }, this.props))]
+          }, otherProps))]
         });
       }
 

package/dist/js/node/runtime/plugin.js

@@ -23,7 +23,7 @@ var _apps = require("./utils/apps");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["manifest", "LoadingComponent"];
+const _excluded = ["manifest"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -38,51 +38,53 @@ 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; }
 
 async function initOptions(manifest = {}, options) {
-  var _window, _window$modern_manife;
+  var _window, _window$modern_manife, _window2, _window2$modern_manif;
 
-  let apps = []; // use manifest modules
+  let apps = options.apps || []; // use manifest modules
 
   if (manifest !== null && manifest !== void 0 && manifest.modules) {
-    apps = manifest === null || manifest === void 0 ? void 0 : manifest.modules;
+    if ((manifest === null || manifest === void 0 ? void 0 : manifest.modules.length) > 0) {
+      apps = manifest === null || manifest === void 0 ? void 0 : manifest.modules;
+    }
+
     (0, _util.logger)('manifest modules', apps);
   } // get module list
 
 
   if (manifest !== null && manifest !== void 0 && manifest.getAppList) {
-    apps = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList());
+    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList());
+
+    if (getAppList.length > 0) {
+      apps = getAppList;
+    }
+
     (0, _util.logger)('getAppList modules', apps);
   } // get inject modules list
 
 
-  if ((_window = window) !== null && _window !== void 0 && (_window$modern_manife = _window.modern_manifest) !== null && _window$modern_manife !== void 0 && _window$modern_manife.modules) {
-    var _window2, _window2$modern_manif;
+  if ((_window = window) !== null && _window !== void 0 && (_window$modern_manife = _window.modern_manifest) !== null && _window$modern_manife !== void 0 && _window$modern_manife.modules && ((_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$modern_manif = _window2.modern_manifest) === null || _window2$modern_manif === void 0 ? void 0 : _window2$modern_manif.modules.length) > 0) {
+    var _window3, _window3$modern_manif;
 
-    apps = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$modern_manif = _window2.modern_manifest) === null || _window2$modern_manif === void 0 ? void 0 : _window2$modern_manif.modules;
+    apps = (_window3 = window) === null || _window3 === void 0 ? void 0 : (_window3$modern_manif = _window3.modern_manifest) === null || _window3$modern_manif === void 0 ? void 0 : _window3$modern_manif.modules;
     (0, _util.logger)('modern_manifest', apps);
   }
 
-  return _objectSpread({
+  return _objectSpread(_objectSpread({}, options), {}, {
     apps
-  }, options);
+  });
 }
 
-var _default = config => {
+const GarfishPlugin = config => {
   (0, _setExternal.default)();
 
   const {
-    manifest = {},
-    LoadingComponent
+    manifest
   } = config,
         options = _objectWithoutProperties(config, _excluded);
 
   (0, _util.logger)('createPlugin', {
     config
   });
-
-  if (!manifest.LoadingComponent && LoadingComponent) {
-    manifest.LoadingComponent = LoadingComponent;
-  }
-
   const promise = initOptions(manifest, options);
   return (0, _runtimeCore.createPlugin)(() => ({
     hoc({
@@ -150,4 +152,5 @@ var _default = config => {
   }));
 };
 
+var _default = GarfishPlugin;
 exports.default = _default;

package/dist/js/node/runtime/utils/MApp.js

@@ -29,9 +29,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 generateMApp(options, {
-  LoadingComponent
-}) {
+function generateMApp(options, manifest) {
   class MApp extends _react.default.Component {
     constructor(...args) {
       super(...args);
@@ -66,7 +64,7 @@ function generateMApp(options, {
         domGetter: `#${domId}`,
 
         beforeLoad(...args) {
-          // logger('MApp beforeLoad', args);
+          (0, _util.logger)('MApp beforeLoad', args);
           setLoadingState({
             isLoading: true,
             error: null
@@ -75,7 +73,7 @@ function generateMApp(options, {
         },
 
         beforeMount(...args) {
-          // logger('MApp beforeMount', args);
+          (0, _util.logger)('MApp beforeMount', args);
           setLoadingState({
             isLoading: false
           });
@@ -83,7 +81,7 @@ function generateMApp(options, {
         },
 
         errorLoadApp(error, ...args) {
-          // logger('MApp errorLoadApp', args);
+          (0, _util.logger)('MApp errorLoadApp', error, args);
           setLoadingState({
             error
           });
@@ -91,7 +89,7 @@ function generateMApp(options, {
         },
 
         errorMountApp(error, ...args) {
-          // logger('MApp errorMountApp', args);
+          (0, _util.logger)('MApp errorMountApp', error, args);
           setLoadingState({
             error
           });
@@ -99,7 +97,7 @@ function generateMApp(options, {
         },
 
         errorUnmountApp(error, ...args) {
-          // logger('MApp errorUnmountApp', args);
+          (0, _util.logger)('MApp errorUnmountApp', error, args);
           setLoadingState({
             error
           });
@@ -128,7 +126,6 @@ function generateMApp(options, {
     }
 
     render() {
-      (0, _util.logger)('MApp render status', this.state);
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         id: (0, _util.generateSubAppContainerKey)()
       });
@@ -136,5 +133,5 @@ function generateMApp(options, {
 
   }
 
-  return (0, _loadable.Loadable)(MApp)(LoadingComponent);
+  return (0, _loadable.Loadable)(MApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }

package/dist/js/node/runtime/utils/apps.js

@@ -33,10 +33,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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 getAppInstance(appInfo, manifest) {
-  const {
-    LoadingComponent
-  } = manifest;
+function getAppInstance(options, appInfo, manifest) {
   let locationHref = '';
 
   class MicroApp extends _react.default.Component {
@@ -61,9 +58,6 @@ function getAppInstance(appInfo, manifest) {
       const {
         domId
       } = this.state;
-      const {
-        options
-      } = _garfish.default;
 
       const loadAppOptions = _objectSpread(_objectSpread({}, appInfo), {}, {
         domGetter: `#${domId}`,
@@ -176,7 +170,7 @@ function getAppInstance(appInfo, manifest) {
 
   }
 
-  return (0, _loadable.Loadable)((0, _pluginRouter.withRouter)(MicroApp))(LoadingComponent);
+  return (0, _loadable.Loadable)((0, _pluginRouter.withRouter)(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
 
 function generateApps(options, manifest) {
@@ -184,7 +178,7 @@ function generateApps(options, manifest) {
 
   const apps = {};
   (_options$apps = options.apps) === null || _options$apps === void 0 ? void 0 : _options$apps.forEach(appInfo => {
-    const Component = getAppInstance(appInfo, manifest);
+    const Component = getAppInstance(options, appInfo, manifest);
     appInfo.Component = Component;
     apps[appInfo.name] = Component;
   });