@modern-js/plugin-garfish 1.3.0 → 1.4.1

package/dist/js/modern/runtime/loadable.js

@@ -1,9 +1,15 @@
+const _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; }
+
 // logical reference to https://github.com/jamiebuilds/react-loadable/blob/6201c5837b212d6244c57f3748f2b1375096beeb/src/index.js
 import React from 'react';
 import { logger } from "../util";
@@ -11,14 +17,11 @@ 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 class LoadableComponent extends React.Component {
       constructor(...args) {
         super(...args);
         this.state = {
-          LoadingComponent: defaultLoadingComponent,
-          timeout: 10000,
-          delay: 200,
           error: null,
           pastDelay: false,
           timedOut: false,
@@ -42,19 +45,16 @@ export 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) {
@@ -93,7 +93,6 @@ export function Loadable(WrapComponent) {
           return;
         }
 
-        logger('Loadable state', this.state);
         this.setState(newState);
       }
 
@@ -103,17 +102,35 @@ export 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;
+        logger('Loadable render state', {
+          state: this.state,
+          props: otherProps,
+          loadable,
+          defaultLoadable
+        });
         const 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,
@@ -124,7 +141,7 @@ export function Loadable(WrapComponent) {
               display: showLoading ? 'none' : 'block'
             },
             setLoadingState: props => this.setStateWithMountCheck(props)
-          }, this.props))]
+          }, otherProps))]
         });
       }
 

package/dist/js/modern/runtime/plugin.js

@@ -1,4 +1,4 @@
-const _excluded = ["manifest", "LoadingComponent"];
+const _excluded = ["manifest"];
 
 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; }
 
@@ -10,6 +10,7 @@ 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; }
 
+// eslint-disable-next-line filenames/match-exported
 import { createPlugin } from '@modern-js/runtime-core';
 import React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
@@ -21,51 +22,53 @@ import { generateApps } from "./utils/apps";
 import { jsx as _jsx } from "react/jsx-runtime";
 
 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;
+    }
+
     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;
+    }
+
     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;
     logger('modern_manifest', apps);
   }
 
-  return _objectSpread({
+  return _objectSpread(_objectSpread({}, options), {}, {
     apps
-  }, options);
+  });
 }
 
-export default (config => {
+const GarfishPlugin = config => {
   setExternal();
 
   const {
-    manifest = {},
-    LoadingComponent
+    manifest
   } = config,
         options = _objectWithoutProperties(config, _excluded);
 
   logger('createPlugin', {
     config
   });
-
-  if (!manifest.LoadingComponent && LoadingComponent) {
-    manifest.LoadingComponent = LoadingComponent;
-  }
-
   const promise = initOptions(manifest, options);
   return createPlugin(() => ({
     hoc({
@@ -131,4 +134,6 @@ export default (config => {
     }
 
   }));
-});
+};
+
+export default GarfishPlugin;

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

@@ -16,9 +16,7 @@ import Garfish from 'garfish';
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function generateMApp(options, {
-  LoadingComponent
-}) {
+export function generateMApp(options, manifest) {
   class MApp extends React.Component {
     constructor(...args) {
       super(...args);
@@ -53,7 +51,7 @@ export function generateMApp(options, {
         domGetter: `#${domId}`,
 
         beforeLoad(...args) {
-          // logger('MApp beforeLoad', args);
+          logger('MApp beforeLoad', args);
           setLoadingState({
             isLoading: true,
             error: null
@@ -62,7 +60,7 @@ export function generateMApp(options, {
         },
 
         beforeMount(...args) {
-          // logger('MApp beforeMount', args);
+          logger('MApp beforeMount', args);
           setLoadingState({
             isLoading: false
           });
@@ -70,7 +68,7 @@ export function generateMApp(options, {
         },
 
         errorLoadApp(error, ...args) {
-          // logger('MApp errorLoadApp', args);
+          logger('MApp errorLoadApp', error, args);
           setLoadingState({
             error
           });
@@ -78,7 +76,7 @@ export function generateMApp(options, {
         },
 
         errorMountApp(error, ...args) {
-          // logger('MApp errorMountApp', args);
+          logger('MApp errorMountApp', error, args);
           setLoadingState({
             error
           });
@@ -86,7 +84,7 @@ export function generateMApp(options, {
         },
 
         errorUnmountApp(error, ...args) {
-          // logger('MApp errorUnmountApp', args);
+          logger('MApp errorUnmountApp', error, args);
           setLoadingState({
             error
           });
@@ -114,7 +112,6 @@ export function generateMApp(options, {
     }
 
     render() {
-      logger('MApp render status', this.state);
       return /*#__PURE__*/_jsx("div", {
         id: generateSubAppContainerKey()
       });
@@ -122,5 +119,5 @@ export function generateMApp(options, {
 
   }
 
-  return Loadable(MApp)(LoadingComponent);
+  return Loadable(MApp)(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }

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

@@ -27,10 +27,7 @@ import { Loadable } from "../loadable"; // type Provider = {
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 
-function getAppInstance(appInfo, manifest) {
-  const {
-    LoadingComponent
-  } = manifest;
+function getAppInstance(options, appInfo, manifest) {
   let locationHref = '';
 
   class MicroApp extends React.Component {
@@ -55,9 +52,6 @@ function getAppInstance(appInfo, manifest) {
       const {
         domId
       } = this.state;
-      const {
-        options
-      } = Garfish;
 
       const loadAppOptions = _objectSpread(_objectSpread({}, appInfo), {}, {
         domGetter: `#${domId}`,
@@ -170,7 +164,7 @@ function getAppInstance(appInfo, manifest) {
 
   }
 
-  return Loadable(withRouter(MicroApp))(LoadingComponent);
+  return Loadable(withRouter(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
 
 export function generateApps(options, manifest) {
@@ -178,7 +172,7 @@ export 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;
   });