@modern-js/plugin-garfish 2.0.0-beta.3 → 2.0.0-beta.4

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

@@ -1,64 +1,76 @@
-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 { useState, useEffect, useCallback } from 'react';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+import { useState, useEffect, useCallback } from "react";
 import { logger } from "../util";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 const DEFAULT_LOADABLE = {
   delay: 200,
-  timeout: 10000,
+  timeout: 1e4,
   loading: null
 };
-export function Loadable(WrapComponent) {
-  return function (defaultLoadable) {
+function Loadable(WrapComponent) {
+  return function(defaultLoadable) {
     return function Lodable(props) {
-      var _props$loadable;
-      const {
-          loadable = defaultLoadable !== null && defaultLoadable !== void 0 ? defaultLoadable : DEFAULT_LOADABLE
-        } = props,
-        otherProps = _objectWithoutProperties(props, _excluded);
+      var _b;
+      const _a = props, { loadable = defaultLoadable != null ? defaultLoadable : DEFAULT_LOADABLE } = _a, otherProps = __objRest(_a, ["loadable"]);
       let delayTimer = null;
       let timeoutTimer = null;
       const [state, setState] = useState(() => {
-        const {
-          delay,
-          timeout
-        } = loadable;
+        const { delay, timeout } = loadable;
         const initState = {
           error: null,
           pastDelay: false,
           timedOut: false,
           isLoading: false
         };
-        if (typeof delay === 'number') {
+        if (typeof delay === "number") {
           if (delay === 0) {
             initState.pastDelay = true;
           } else {
             delayTimer = setTimeout(() => {
-              setStateWithMountCheck({
-                pastDelay: true
-              });
+              setStateWithMountCheck({ pastDelay: true });
             }, delay);
           }
         }
-        if (typeof timeout === 'number') {
+        if (typeof timeout === "number") {
           timeoutTimer = setTimeout(() => {
-            setStateWithMountCheck({
-              timedOut: true
-            });
+            setStateWithMountCheck({ timedOut: true });
           }, timeout);
         }
         return initState;
       });
-      const LoadingComponent = (_props$loadable = props.loadable) === null || _props$loadable === void 0 ? void 0 : _props$loadable.loading;
+      const LoadingComponent = (_b = props.loadable) == null ? void 0 : _b.loading;
       useEffect(() => {
-        logger('Loadable render state', {
+        logger("Loadable render state", {
           state,
           props: otherProps,
           loadable,
@@ -80,36 +92,42 @@ export function Loadable(WrapComponent) {
         };
       }, []);
       const retry = useCallback(() => {
-        setState(_objectSpread(_objectSpread({}, state), {}, {
+        setState(__spreadProps(__spreadValues({}, state), {
           error: null,
           isLoading: true,
           timedOut: false
         }));
       }, [state]);
-      const setStateWithMountCheck = useCallback(newState => {
-        setState(state => _objectSpread(_objectSpread({}, state), newState));
-      }, [state]);
+      const setStateWithMountCheck = useCallback(
+        (newState) => {
+          setState((state2) => __spreadValues(__spreadValues({}, state2), newState));
+        },
+        [state]
+      );
       const showLoading = (state.isLoading || state.error) && LoadingComponent;
-      return /*#__PURE__*/_jsxs(_Fragment, {
-        children: [showLoading && /*#__PURE__*/_jsx(LoadingComponent, {
-          isLoading: state.isLoading,
-          pastDelay: state.pastDelay,
-          timedOut: state.timedOut,
-          error: state === null || state === void 0 ? void 0 : state.error,
-          retry: retry
-        }), /*#__PURE__*/_jsx(WrapComponent, _objectSpread({
-          style: {
-            display: showLoading ? 'none' : 'block'
-          },
-          setLoadingState: props => {
-            // loading is not provided and there is a rendering exception
-            if (props.error && !LoadingComponent) {
-              throw props.error;
+      return /* @__PURE__ */ jsxs(Fragment, {
+        children: [
+          showLoading && /* @__PURE__ */ jsx(LoadingComponent, {
+            isLoading: state.isLoading,
+            pastDelay: state.pastDelay,
+            timedOut: state.timedOut,
+            error: state == null ? void 0 : state.error,
+            retry
+          }),
+          /* @__PURE__ */ jsx(WrapComponent, __spreadValues({
+            style: { display: showLoading ? "none" : "block" },
+            setLoadingState: (props2) => {
+              if (props2.error && !LoadingComponent) {
+                throw props2.error;
+              }
+              setStateWithMountCheck(props2);
             }
-            setStateWithMountCheck(props);
-          }
-        }, otherProps))]
+          }, otherProps))
+        ]
       });
     };
   };
-}
+}
+export {
+  Loadable
+};

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

@@ -1,114 +1,146 @@
-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; }
-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 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; }
-import GarfishInstance from 'garfish';
-import React from 'react';
-import hoistNonReactStatics from 'hoist-non-react-statics';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { jsx } from "react/jsx-runtime";
+import GarfishInstance from "garfish";
+import React from "react";
+import hoistNonReactStatics from "hoist-non-react-statics";
 import { logger } from "../util";
 import { GarfishProvider } from "./utils/Context";
 import setExternal from "./utils/setExternal";
 import { generateMApp } from "./utils/MApp";
 import { generateApps } from "./utils/apps";
-import { jsx as _jsx } from "react/jsx-runtime";
-async function initOptions(manifest = {}, options) {
-  var _window, _window$modern_manife, _window2, _window2$modern_manif;
-  let apps = options.apps || [];
-
-  // use manifest modules
-  if (manifest !== null && manifest !== 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;
+function initOptions() {
+  return __async(this, arguments, function* (manifest = {}, options) {
+    var _a, _b, _c;
+    let apps = options.apps || [];
+    if (manifest == null ? void 0 : manifest.modules) {
+      if ((manifest == null ? void 0 : manifest.modules.length) > 0) {
+        apps = manifest == null ? void 0 : manifest.modules;
+      }
+      logger("manifest modules", apps);
     }
-    logger('manifest modules', apps);
-  }
-
-  // get module list
-  if (manifest !== null && manifest !== void 0 && manifest.getAppList) {
-    const getAppList = await (manifest === null || manifest === void 0 ? void 0 : manifest.getAppList(manifest));
-    if (getAppList.length > 0) {
-      apps = getAppList;
+    if (manifest == null ? void 0 : manifest.getAppList) {
+      const getAppList = yield manifest == null ? void 0 : manifest.getAppList(manifest);
+      if (getAppList.length > 0) {
+        apps = getAppList;
+      }
+      logger("getAppList modules", apps);
     }
-    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 && ((_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 = (_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(_objectSpread({}, options), {}, {
-    apps
+    if (((_a = window == null ? void 0 : window.modern_manifest) == null ? void 0 : _a.modules) && ((_b = window == null ? void 0 : window.modern_manifest) == null ? void 0 : _b.modules.length) > 0) {
+      apps = (_c = window == null ? void 0 : window.modern_manifest) == null ? void 0 : _c.modules;
+      logger("modern_manifest", apps);
+    }
+    return __spreadProps(__spreadValues({}, options), {
+      apps
+    });
   });
 }
-
-// export default GarfishPlugin;
-export default (config => ({
-  name: '@modern-js/garfish-plugin',
+var plugin_default = (config) => ({
+  name: "@modern-js/garfish-plugin",
   setup: () => {
     setExternal();
-    const {
-        manifest
-      } = config,
-      options = _objectWithoutProperties(config, _excluded);
-    logger('createPlugin', config);
+    const _a = config, { manifest } = _a, options = __objRest(_a, ["manifest"]);
+    logger("createPlugin", config);
     const promise = initOptions(manifest, options);
     return {
-      hoc({
-        App
-      }, next) {
+      hoc({ App }, next) {
         class GetMicroFrontendApp extends React.Component {
           constructor(props) {
             super(props);
-            _defineProperty(this, "state", {
+            this.state = {
               MApp: () => {
-                logger('MApp init Component Render');
-                return /*#__PURE__*/React.createElement('div');
+                logger("MApp init Component Render");
+                return React.createElement("div");
               },
-              apps: new Proxy({}, {
-                get() {
-                  return () => /*#__PURE__*/React.createElement('div');
+              apps: new Proxy(
+                {},
+                {
+                  get() {
+                    return () => React.createElement("div");
+                  }
                 }
-              }),
+              ),
               appInfoList: []
-            });
-            const load = async () => {
-              GarfishInstance.setOptions(_objectSpread(_objectSpread({}, options), {}, {
-                insulationVariable: [...(options.insulationVariable || []), '_SERVER_DATA'],
+            };
+            const load = () => __async(this, null, function* () {
+              GarfishInstance.setOptions(__spreadProps(__spreadValues({}, options), {
+                insulationVariable: [
+                  ...options.insulationVariable || [],
+                  "_SERVER_DATA"
+                ],
                 apps: []
               }));
-              const GarfishConfig = await promise;
-              const {
-                appInfoList,
-                apps
-              } = generateApps(GarfishConfig, manifest);
+              const GarfishConfig = yield promise;
+              const { appInfoList, apps } = generateApps(
+                GarfishConfig,
+                manifest
+              );
               GarfishInstance.registerApp(appInfoList);
               const MApp = generateMApp(GarfishConfig, manifest);
-              logger('initOptions result', {
-                manifest,
-                GarfishConfig
-              });
-              logger('generateApps', {
-                MApp,
-                apps,
-                appInfoList
-              });
+              logger("initOptions result", { manifest, GarfishConfig });
+              logger("generateApps", { MApp, apps, appInfoList });
               this.setState({
                 MApp,
                 apps,
                 appInfoList
               });
-            };
+            });
             load();
           }
           render() {
-            logger('GarfishProvider state', this.state);
-            return /*#__PURE__*/_jsx(GarfishProvider, {
+            logger("GarfishProvider state", this.state);
+            return /* @__PURE__ */ jsx(GarfishProvider, {
               value: this.state,
-              children: /*#__PURE__*/_jsx(App, _objectSpread(_objectSpread({}, this.props), this.state))
+              children: /* @__PURE__ */ jsx(App, __spreadValues(__spreadValues({}, this.props), this.state))
             });
           }
         }
@@ -118,4 +150,7 @@ export default (config => ({
       }
     };
   }
-}));
+});
+export {
+  plugin_default as default
+};

package/dist/js/modern/runtime/useModuleApps.js

@@ -1,36 +1,50 @@
-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; }
-import React, { useContext } from 'react';
+var __defProp = Object.defineProperty;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+import React, { useContext } from "react";
 import { logger } from "../util";
 import { GarfishContext } from "./utils/Context";
-export function useModuleApps() {
-  const {
-    apps,
-    MApp,
-    appInfoList
-  } = useContext(GarfishContext);
-  logger('call useModuleApps', _objectSpread({
+function useModuleApps() {
+  const { apps, MApp, appInfoList } = useContext(GarfishContext);
+  logger("call useModuleApps", __spreadValues({
     MApp,
     apps: appInfoList
   }, apps));
-  const Info = new Proxy(_objectSpread({
-    MApp,
-    apps: appInfoList
-  }, apps), {
-    get(target, p, receiver) {
-      if (typeof p === 'string' && p in target) {
-        return Reflect.get(target, p, receiver);
+  const Info = new Proxy(
+    __spreadValues({
+      MApp,
+      apps: appInfoList
+    }, apps),
+    {
+      get(target, p, receiver) {
+        if (typeof p === "string" && p in target) {
+          return Reflect.get(target, p, receiver);
+        }
+        return () => React.createElement("div");
       }
-      return () => /*#__PURE__*/React.createElement('div');
     }
-  });
+  );
   return Info;
 }
-export function useModuleApp() {
-  const {
-    MApp
-  } = useContext(GarfishContext);
-  logger('call useModuleApps', MApp);
+function useModuleApp() {
+  const { MApp } = useContext(GarfishContext);
+  logger("call useModuleApps", MApp);
   return MApp;
-}
+}
+export {
+  useModuleApp,
+  useModuleApps
+};

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

@@ -1,4 +1,7 @@
-import React from 'react';
-const GarfishContext = /*#__PURE__*/React.createContext(null);
+import React from "react";
+const GarfishContext = React.createContext(null);
 const GarfishProvider = GarfishContext.Provider;
-export { GarfishContext, GarfishProvider };
+export {
+  GarfishContext,
+  GarfishProvider
+};