@modern-js/plugin-garfish 2.4.1-beta.0 → 2.5.0

package/dist/{js/modern → esm-node}/runtime/utils/apps.js

@@ -1,54 +1,3 @@
-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 { Fragment, jsx } from "react/jsx-runtime";
 import { useContext, useState, useEffect, useRef } from "react";
 import { RuntimeReactContext } from "@modern-js/runtime";
@@ -85,7 +34,9 @@ function getAppInstance(options, appInfo, manifest) {
     const location = (_f = (_e = context == null ? void 0 : context.router) == null ? void 0 : _e.useLocation) == null ? void 0 : _f.call(_e);
     let basename = (options == null ? void 0 : options.basename) || "/";
     if (matchs && matchs.length > 0) {
-      const matchItem = __spreadValues({}, matchs[matchs.length - 1]);
+      const matchItem = {
+        ...matchs[matchs.length - 1]
+      };
       for (const key in matchItem.params) {
         matchItem.pathname = matchItem.pathname.replace(
           new RegExp(`/${matchItem.params[key]}$`),
@@ -106,8 +57,9 @@ function getAppInstance(options, appInfo, manifest) {
       }
     }, [location]);
     useEffect(() => {
-      const _a2 = props, { setLoadingState } = _a2, userProps = __objRest(_a2, ["setLoadingState"]);
-      const loadAppOptions = __spreadProps(__spreadValues({}, appInfo), {
+      const { setLoadingState, ...userProps } = props;
+      const loadAppOptions = {
+        ...appInfo,
         insulationVariable: [
           ...appInfo.insulationVariable || [],
           "_SERVER_DATA"
@@ -115,7 +67,10 @@ function getAppInstance(options, appInfo, manifest) {
         domGetter: `#${domId}`,
         basename,
         cache: true,
-        props: __spreadValues(__spreadValues({}, appInfo.props), userProps),
+        props: {
+          ...appInfo.props,
+          ...userProps
+        },
         customLoader: (provider) => {
           const {
             render,
@@ -143,7 +98,7 @@ function getAppInstance(options, appInfo, manifest) {
             }
           };
         }
-      });
+      };
       setLoadingState({
         isLoading: true,
         error: null
@@ -151,51 +106,49 @@ function getAppInstance(options, appInfo, manifest) {
       logger(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
         loadAppOptions
       });
-      function renderApp() {
-        return __async(this, null, function* () {
-          try {
-            const appInstance = yield Garfish.loadApp(
-              appInfo.name,
-              loadAppOptions
+      async function renderApp() {
+        try {
+          const appInstance = await Garfish.loadApp(
+            appInfo.name,
+            loadAppOptions
+          );
+          if (!appInstance) {
+            throw new Error(
+              `MicroApp Garfish.loadApp "${appInfo.name}" result is null`
             );
-            if (!appInstance) {
-              throw new Error(
-                `MicroApp Garfish.loadApp "${appInfo.name}" result is null`
-              );
-            }
-            appRef.current = appInstance;
-            setLoadingState({
-              isLoading: false
+          }
+          appRef.current = appInstance;
+          setLoadingState({
+            isLoading: false
+          });
+          if (appInstance.mounted && appInstance.appInfo.cache) {
+            logger(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
+              appInfo: appInstance.appInfo,
+              appInstance
             });
-            if (appInstance.mounted && appInstance.appInfo.cache) {
-              logger(`MicroApp Garfish.loadApp "${appInfo.name}" show`, {
-                appInfo: appInstance.appInfo,
-                appInstance
-              });
-              yield appInstance == null ? void 0 : appInstance.show();
-            } else {
-              logger(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
-                appInfo: appInstance.appInfo,
-                appInstance
-              });
-              yield appInstance == null ? void 0 : appInstance.mount();
-            }
-          } catch (error) {
-            setLoadingState({
-              isLoading: true,
-              error
+            await (appInstance == null ? void 0 : appInstance.show());
+          } else {
+            logger(`MicroApp Garfish.loadApp "${appInfo.name}" mount`, {
+              appInfo: appInstance.appInfo,
+              appInstance
             });
+            await (appInstance == null ? void 0 : appInstance.mount());
           }
-        });
+        } catch (error) {
+          setLoadingState({
+            isLoading: true,
+            error
+          });
+        }
       }
       renderApp();
       return () => {
-        var _a3, _b2;
+        var _a2, _b2;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
             logger(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
-            (_a3 = appRef.current) == null ? void 0 : _a3.hide();
+            (_a2 = appRef.current) == null ? void 0 : _a2.hide();
           } else {
             logger(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
             (_b2 = appRef.current) == null ? void 0 : _b2.unmount();

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.4.1-beta.0",
+  "version": "2.5.0",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -33,26 +33,25 @@
       ]
     }
   },
-  "main": "./dist/js/node/cli/index.js",
-  "module": "./dist/js/treeshaking/runtime/index.js",
-  "jsnext:modern": "./dist/js/modern/cli/index.js",
+  "main": "./dist/cjs/cli/index.js",
+  "module": "./dist/esm/runtime/index.js",
   "exports": {
     "./types": "./type.d.ts",
     ".": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./cli": {
       "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
+      "default": "./dist/cjs/cli/index.js"
     },
     "./deps": {
       "jsnext:source": "./src/deps/index.ts",
-      "default": "./dist/js/treeshaking/deps/index.js"
+      "default": "./dist/esm/deps/index.js"
     },
     "./runtime": {
       "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/treeshaking/runtime/index.js"
+      "default": "./dist/esm/runtime/index.js"
     }
   },
   "dependencies": {
@@ -63,10 +62,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "2.4.1-beta.0"
+    "@modern-js/utils": "2.5.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.4.1-beta.0"
+    "@modern-js/runtime": "^2.5.0"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -88,13 +87,13 @@
     "react-router-dom": "^6.6.0",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/app-tools": "3.0.0-beta.0",
-    "@modern-js/core": "2.4.1-beta.0",
-    "@modern-js/runtime": "2.4.1-beta.0",
-    "@modern-js/plugin-router-v5": "2.4.1-beta.0",
-    "@modern-js/types": "2.4.0",
-    "@scripts/build": "2.4.0",
-    "@scripts/jest-config": "2.4.0"
+    "@modern-js/app-tools": "2.5.0",
+    "@modern-js/core": "2.5.0",
+    "@modern-js/runtime": "2.5.0",
+    "@modern-js/plugin-router-v5": "2.5.0",
+    "@modern-js/types": "2.5.0",
+    "@scripts/build": "2.5.0",
+    "@scripts/jest-config": "2.5.0"
   },
   "sideEffects": false,
   "modernConfig": {},

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

@@ -1,156 +0,0 @@
-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";
-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);
-    }
-    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);
-    }
-    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
-    });
-  });
-}
-var plugin_default = (config) => ({
-  name: "@modern-js/garfish-plugin",
-  setup: () => {
-    setExternal();
-    const _a = config, { manifest } = _a, options = __objRest(_a, ["manifest"]);
-    logger("createPlugin", config);
-    const promise = initOptions(manifest, options);
-    return {
-      hoc({ App }, next) {
-        class GetMicroFrontendApp extends React.Component {
-          constructor(props) {
-            super(props);
-            this.state = {
-              MApp: () => {
-                logger("MApp init Component Render");
-                return React.createElement("div");
-              },
-              apps: new Proxy(
-                {},
-                {
-                  get() {
-                    return () => React.createElement("div");
-                  }
-                }
-              ),
-              appInfoList: []
-            };
-            const load = () => __async(this, null, function* () {
-              GarfishInstance.setOptions(__spreadProps(__spreadValues({}, options), {
-                insulationVariable: [
-                  ...options.insulationVariable || [],
-                  "_SERVER_DATA"
-                ],
-                apps: []
-              }));
-              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 });
-              this.setState({
-                MApp,
-                apps,
-                appInfoList
-              });
-            });
-            load();
-          }
-          render() {
-            logger("GarfishProvider state", this.state);
-            return /* @__PURE__ */ jsx(GarfishProvider, {
-              value: this.state,
-              children: /* @__PURE__ */ jsx(App, __spreadValues({}, this.props))
-            });
-          }
-        }
-        return next({
-          App: hoistNonReactStatics(GetMicroFrontendApp, App)
-        });
-      }
-    };
-  }
-});
-export {
-  plugin_default as default
-};

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

@@ -1,50 +0,0 @@
-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";
-function useModuleApps() {
-  const { apps, MApp, appInfoList } = useContext(GarfishContext);
-  logger("call useModuleApps", __spreadValues({
-    MApp,
-    apps: appInfoList
-  }, apps));
-  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 Info;
-}
-function useModuleApp() {
-  const { MApp } = useContext(GarfishContext);
-  logger("call useModuleApps", MApp);
-  return MApp;
-}
-export {
-  useModuleApp,
-  useModuleApps
-};