@modern-js/plugin-garfish 2.0.0-beta.5 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,80 @@
 # @modern-js/plugin-garfish
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- df7ee2d: feat: runtime user config types extends
+  feat: runtime 用户配置类型扩展
+
+### Patch Changes
+
+- 6604f1b8b3: feat: support router basename
+  feat: router 插件支持设置 basename
+- 21d2ddb59c: feat: support async export provider for module federation
+  支持模块联邦场景异步导出 provider
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- 2344eb26ed: fix: loadApp when dom is mount
+  修复 dom 未渲染时挂载子应用行为
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a11fcf8b50]
+- Updated dependencies [a93159440e]
+- Updated dependencies [e7ce0636d1]
+- Updated dependencies [b18fa8f3ed]
+- Updated dependencies [7879e8f711]
+- Updated dependencies [50d4675e5b]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [6604f1b8b3]
+- Updated dependencies [6aca875011]
+- Updated dependencies [fda836fe8a]
+- Updated dependencies [d6bc321747]
+- Updated dependencies [3e57f2bd58]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [c5798d284f]
+- Updated dependencies [fbf5eed5aa]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [a7c68832b3]
+- Updated dependencies [425e57092d]
+- Updated dependencies [e4357f1856]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [4369648ae2]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [df7ee2d]
+- Updated dependencies [92c0994468]
+- Updated dependencies [2cc2eb35ba]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [60d5378632]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [21d7521]
+- Updated dependencies [9144c21d27]
+- Updated dependencies [b710adb843]
+- Updated dependencies [18aaf42249]
+- Updated dependencies [34702d5d47]
+- Updated dependencies [fcace5b5b9]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/runtime@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+
 ## 2.0.0-beta.4
 
 ### Major Changes

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

@@ -140,7 +140,7 @@ var plugin_default = (config) => ({
             logger("GarfishProvider state", this.state);
             return /* @__PURE__ */ jsx(GarfishProvider, {
               value: this.state,
-              children: /* @__PURE__ */ jsx(App, __spreadValues({}, this.props))
+              children: /* @__PURE__ */ jsx(App, __spreadValues(__spreadValues({}, this.props), this.state))
             });
           }
         }

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

@@ -50,160 +50,147 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import { Fragment, jsx } from "react/jsx-runtime";
-import { useContext, useState, useEffect, useRef } from "react";
-import { RuntimeReactContext } from "@modern-js/runtime";
+import path from "path";
+import React from "react";
 import Garfish from "garfish";
+import { withRouter } from "@modern-js/plugin-router-v5/runtime";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
-function pathJoin(...args) {
-  const res = args.reduce((res2, path) => {
-    let nPath = path;
-    if (!nPath || typeof nPath !== "string") {
-      return res2;
-    }
-    if (nPath[0] !== "/") {
-      nPath = `/${nPath}`;
-    }
-    const lastIndex = path.length - 1;
-    if (nPath[lastIndex] === "/") {
-      nPath = nPath.substring(0, lastIndex);
-    }
-    return res2 + nPath;
-  }, "");
-  return res || "/";
-}
 function getAppInstance(options, appInfo, manifest) {
   let locationHref = "";
-  function MicroApp(props) {
-    var _a, _b, _c, _d, _e, _f;
-    const appRef = useRef(null);
-    const domId = generateSubAppContainerKey(appInfo);
-    const [SubModuleComponent, setSubModuleComponent] = useState();
-    const context = useContext(RuntimeReactContext);
-    const match = (_b = (_a = context == null ? void 0 : context.router) == null ? void 0 : _a.useRouteMatch) == null ? void 0 : _b.call(_a);
-    const matchs = (_d = (_c = context == null ? void 0 : context.router) == null ? void 0 : _c.useMatches) == null ? void 0 : _d.call(_c);
-    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) {
-      basename = pathJoin(basename, matchs[matchs.length - 1].pathname || "/");
-    } else if (match) {
-      basename = pathJoin(basename, (match == null ? void 0 : match.path) || "/");
+  class MicroApp extends React.Component {
+    constructor() {
+      super(...arguments);
+      this.state = {
+        appInstance: null,
+        domId: generateSubAppContainerKey(appInfo),
+        SubModuleComponent: void 0
+      };
+      this.unregisterHistoryListener = () => {
+      };
     }
-    useEffect(() => {
-      if (location && locationHref !== location.pathname) {
-        locationHref = location.pathname;
-        const popStateEvent = new PopStateEvent("popstate");
-        popStateEvent.garfish = true;
-        dispatchEvent(popStateEvent);
-        logger(`MicroApp Garfish.loadApp popstate`);
-      }
-    }, [location]);
-    useEffect(() => {
-      const _a2 = props, { setLoadingState } = _a2, userProps = __objRest(_a2, ["setLoadingState"]);
-      const loadAppOptions = __spreadProps(__spreadValues({}, appInfo), {
-        insulationVariable: [
-          ...appInfo.insulationVariable || [],
-          "_SERVER_DATA"
-        ],
-        domGetter: `#${domId}`,
-        basename,
-        cache: true,
-        props: __spreadValues(__spreadValues({}, appInfo.props), userProps),
-        customLoader: (provider) => {
-          const {
-            render,
-            destroy,
-            SubModuleComponent: SubModuleComponent2,
-            jupiter_submodule_app_key
-          } = provider;
-          const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent2 || jupiter_submodule_app_key);
-          return {
-            mount: (...props2) => {
-              if (componetRenderMode) {
-                setSubModuleComponent(SubModuleComponent2);
-                return void 0;
-              } else {
-                logger("MicroApp customer render", props2);
-                return render == null ? void 0 : render.apply(provider, props2);
-              }
-            },
-            unmount(...props2) {
-              if (componetRenderMode) {
-                return void 0;
+    componentDidMount() {
+      return __async(this, null, function* () {
+        const _a = this.props, { match, history, setLoadingState } = _a, userProps = __objRest(_a, ["match", "history", "setLoadingState"]);
+        const { domId } = this.state;
+        const loadAppOptions = __spreadProps(__spreadValues({}, appInfo), {
+          insulationVariable: [
+            ...appInfo.insulationVariable || [],
+            "_SERVER_DATA"
+          ],
+          domGetter: `#${domId}`,
+          basename: path.join((options == null ? void 0 : options.basename) || "/", (match == null ? void 0 : match.path) || "/"),
+          cache: true,
+          props: __spreadValues(__spreadValues({}, appInfo.props), userProps),
+          customLoader: (provider) => {
+            const {
+              render,
+              destroy,
+              SubModuleComponent,
+              jupiter_submodule_app_key
+            } = provider;
+            const componetRenderMode = (manifest == null ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
+            return {
+              mount: (...props) => {
+                if (componetRenderMode) {
+                  this.setState({
+                    SubModuleComponent: SubModuleComponent != null ? SubModuleComponent : jupiter_submodule_app_key
+                  });
+                  return void 0;
+                } else {
+                  logger("MicroApp customer render", props);
+                  return render == null ? void 0 : render.apply(provider, props);
+                }
+              },
+              unmount(...props) {
+                if (componetRenderMode) {
+                  return void 0;
+                }
+                logger("MicroApp customer destroy", props);
+                return destroy == null ? void 0 : destroy.apply(provider, props);
               }
-              logger("MicroApp customer destroy", props2);
-              return destroy == null ? void 0 : destroy.apply(provider, props2);
-            }
-          };
-        }
-      });
-      setLoadingState({
-        isLoading: true,
-        error: null
-      });
-      logger(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
-        loadAppOptions
-      });
-      function renderApp() {
-        return __async(this, null, function* () {
-          try {
-            const appInstance = yield Garfish.loadApp(
-              appInfo.name,
-              loadAppOptions
+            };
+          }
+        });
+        setLoadingState({
+          isLoading: true,
+          error: null
+        });
+        logger(`MicroApp Garfish.loadApp "${appInfo.name}"`, {
+          loadAppOptions
+        });
+        try {
+          const appInstance = yield 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
+          }
+          this.setState({
+            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
+            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();
           }
-        });
-      }
-      renderApp();
-      return () => {
-        var _a3, _b2;
-        if (appRef.current) {
-          const { appInfo: appInfo2 } = appRef.current;
+          this.unregisterHistoryListener = history == null ? void 0 : history.listen(() => {
+            if (locationHref !== history.location.pathname) {
+              locationHref = history.location.pathname;
+              const popStateEvent = new PopStateEvent("popstate");
+              dispatchEvent(popStateEvent);
+              logger(`MicroApp Garfish.loadApp popstate`);
+            }
+          });
+        } catch (error) {
+          setLoadingState({
+            isLoading: true,
+            error
+          });
+        }
+      });
+    }
+    componentWillUnmount() {
+      return __async(this, null, function* () {
+        var _a;
+        const { appInstance } = this.state;
+        (_a = this.unregisterHistoryListener) == null ? void 0 : _a.call(this);
+        if (appInstance) {
+          const { appInfo: appInfo2 } = appInstance;
           if (appInfo2.cache) {
             logger(`MicroApp Garfish.loadApp "${appInfo2.name}" hide`);
-            (_a3 = appRef.current) == null ? void 0 : _a3.hide();
+            appInstance == null ? void 0 : appInstance.hide();
           } else {
             logger(`MicroApp Garfish.loadApp "${appInfo2.name}" unmount`);
-            (_b2 = appRef.current) == null ? void 0 : _b2.unmount();
+            appInstance == null ? void 0 : appInstance.unmount();
           }
         }
-      };
-    }, []);
-    return /* @__PURE__ */ jsx(Fragment, {
-      children: /* @__PURE__ */ jsx("div", {
-        id: domId,
-        children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {})
-      })
-    });
+      });
+    }
+    render() {
+      const { domId, SubModuleComponent } = this.state;
+      return /* @__PURE__ */ jsx(Fragment, {
+        children: /* @__PURE__ */ jsx("div", {
+          id: domId,
+          children: SubModuleComponent && /* @__PURE__ */ jsx(SubModuleComponent, {})
+        })
+      });
+    }
   }
-  return Loadable(MicroApp)(manifest == null ? void 0 : manifest.loadable);
+  return Loadable(withRouter(MicroApp))(
+    manifest == null ? void 0 : manifest.loadable
+  );
 }
 function generateApps(options, manifest) {
   var _a;
@@ -216,6 +203,5 @@ function generateApps(options, manifest) {
   return { apps, appInfoList: options.apps || [] };
 }
 export {
-  generateApps,
-  pathJoin
+  generateApps
 };

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

@@ -166,7 +166,7 @@ var plugin_default = (config) => ({
             (0, import_util.logger)("GarfishProvider state", this.state);
             return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_Context.GarfishProvider, {
               value: this.state,
-              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues({}, this.props))
+              children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, __spreadValues(__spreadValues({}, this.props), this.state))
             });
           }
         }