@modern-js/plugin-garfish 2.68.13-alpha.2 → 2.68.13-alpha.3

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

@@ -29,8 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var apps_exports = {};
 __export(apps_exports, {
   generateApps: () => generateApps,
-  pathJoin: () => pathJoin,
-  useMicroAppMountStatus: () => useMicroAppMountStatus
+  pathJoin: () => pathJoin
 });
 module.exports = __toCommonJS(apps_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -39,13 +38,6 @@ var import_garfish = __toESM(require("garfish"));
 var import_react = require("react");
 var import_util = require("../../util");
 var import_loadable = require("../loadable");
-const MicroAppMountContext = /* @__PURE__ */ (0, import_react.createContext)({
-  isMounted: true
-});
-const useMicroAppMountStatus = () => {
-  const { isMounted } = (0, import_react.useContext)(MicroAppMountContext);
-  return isMounted;
-};
 function pathJoin(...args) {
   const res = args.reduce((res2, path) => {
     let nPath = path;
@@ -72,9 +64,6 @@ function getAppInstance(options, appInfo, manifest) {
     const [{ component: SubModuleComponent }, setSubModuleComponent] = (0, import_react.useState)({
       component: null
     });
-    const destroyRef = (0, import_react.useRef)(null);
-    const isMountedRef = (0, import_react.useRef)(true);
-    const abortControllerRef = (0, import_react.useRef)(null);
     const context = (0, import_react.useContext)(import_runtime.RuntimeReactContext);
     var _props_useRouteMatch;
     const useRouteMatch = (_props_useRouteMatch = props.useRouteMatch) !== null && _props_useRouteMatch !== void 0 ? _props_useRouteMatch : context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : _context_router.useRouteMatch;
@@ -138,13 +127,6 @@ or directly pass the "basename":
     ]);
     (0, import_react.useEffect)(() => {
       const { setLoadingState, ...userProps } = props;
-      abortControllerRef.current = new AbortController();
-      const safeSetLoadingState = (state) => {
-        var _abortControllerRef_current;
-        if (isMountedRef.current && !((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted)) {
-          setLoadingState(state);
-        }
-      };
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -162,34 +144,12 @@ or directly pass the "basename":
           const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
           const SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
           const componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
-          if (destroy) {
-            destroyRef.current = () => {
-              const dom = document.getElementById(domId);
-              if (dom) {
-                const destroyProps = {
-                  dom,
-                  basename,
-                  appName: appInfo.name,
-                  appRenderInfo: {},
-                  props: {
-                    ...appInfo.props,
-                    ...userProps
-                  }
-                };
-                destroy.apply(provider, [
-                  destroyProps
-                ]);
-              }
-            };
-          }
           return {
             mount: (...props2) => {
               if (componetRenderMode && SubComponent) {
-                if (isMountedRef.current) {
-                  setSubModuleComponent({
-                    component: SubComponent
-                  });
-                }
+                setSubModuleComponent({
+                  component: SubComponent
+                });
                 return void 0;
               } else {
                 (0, import_util.logger)("MicroApp customer render", props2);
@@ -206,7 +166,7 @@ or directly pass the "basename":
           };
         }
       };
-      safeSetLoadingState({
+      setLoadingState({
         isLoading: true,
         error: null
       });
@@ -215,19 +175,12 @@ or directly pass the "basename":
       });
       async function renderApp() {
         try {
-          var _abortControllerRef_current, _abortControllerRef_current1;
-          if ((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted) {
-            return;
-          }
           const appInstance = await import_garfish.default.loadApp(appInfo.name, loadAppOptions);
-          if ((_abortControllerRef_current1 = abortControllerRef.current) === null || _abortControllerRef_current1 === void 0 ? void 0 : _abortControllerRef_current1.signal.aborted) {
-            return;
-          }
           if (!appInstance) {
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          safeSetLoadingState({
+          setLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -244,21 +197,14 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          var _abortControllerRef_current2;
-          if (!((_abortControllerRef_current2 = abortControllerRef.current) === null || _abortControllerRef_current2 === void 0 ? void 0 : _abortControllerRef_current2.signal.aborted)) {
-            safeSetLoadingState({
-              isLoading: true,
-              error
-            });
-          }
+          setLoadingState({
+            isLoading: true,
+            error
+          });
         }
       }
       renderApp();
       return () => {
-        isMountedRef.current = false;
-        if (abortControllerRef.current) {
-          abortControllerRef.current.abort();
-        }
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
@@ -273,40 +219,12 @@ or directly pass the "basename":
         }
       };
     }, []);
-    (0, import_react.useEffect)(() => {
-      return () => {
-        if (SubModuleComponent && destroyRef.current && isMountedRef.current) {
-          (0, import_util.logger)("MicroApp SubModuleComponent cleanup");
-          try {
-            destroyRef.current();
-          } catch (error) {
-            (0, import_util.logger)("Error during SubModuleComponent cleanup:", error);
-          }
-        }
-      };
-    }, [
-      SubModuleComponent
-    ]);
-    const SafeSubModuleComponent = (0, import_react.useCallback)(() => {
-      if (!SubModuleComponent || !isMountedRef.current) {
-        return null;
-      }
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(MicroAppMountContext.Provider, {
-        value: {
-          isMounted: isMountedRef.current
-        },
-        children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {
-          ...props
-        })
-      });
-    }, [
-      SubModuleComponent,
-      props
-    ]);
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
       children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
         id: domId,
-        children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SafeSubModuleComponent, {})
+        children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SubModuleComponent, {
+          ...props
+        })
       })
     });
   }
@@ -328,6 +246,5 @@ function generateApps(options, manifest) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateApps,
-  pathJoin,
-  useMicroAppMountStatus
+  pathJoin
 });

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

@@ -8,16 +8,9 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { RuntimeReactContext } from "@meta/runtime";
 import Garfish from "garfish";
-import { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
 import { generateSubAppContainerKey, logger } from "../../util";
 import { Loadable } from "../loadable";
-var MicroAppMountContext = /* @__PURE__ */ createContext({
-  isMounted: true
-});
-var useMicroAppMountStatus = function() {
-  var isMounted = useContext(MicroAppMountContext).isMounted;
-  return isMounted;
-};
 function pathJoin() {
   for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
     args[_key] = arguments[_key];
@@ -47,9 +40,6 @@ function getAppInstance(options, appInfo, manifest) {
     var _useState = _sliced_to_array(useState({
       component: null
     }), 2), _useState_ = _useState[0], SubModuleComponent = _useState_.component, setSubModuleComponent = _useState[1];
-    var destroyRef = useRef(null);
-    var isMountedRef = useRef(true);
-    var abortControllerRef = useRef(null);
     var context = useContext(RuntimeReactContext);
     var _props_useRouteMatch;
     var useRouteMatch = (_props_useRouteMatch = props.useRouteMatch) !== null && _props_useRouteMatch !== void 0 ? _props_useRouteMatch : context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : _context_router.useRouteMatch;
@@ -116,13 +106,6 @@ or directly pass the "basename":
       var setLoadingState = props.setLoadingState, userProps = _object_without_properties(props, [
         "setLoadingState"
       ]);
-      abortControllerRef.current = new AbortController();
-      var safeSetLoadingState = function(state) {
-        var _abortControllerRef_current;
-        if (isMountedRef.current && !((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted)) {
-          setLoadingState(state);
-        }
-      };
       var loadAppOptions = _object_spread_props(_object_spread({
         cache: true,
         insulationVariable: _to_consumable_array(appInfo.insulationVariable || []).concat([
@@ -136,34 +119,15 @@ or directly pass the "basename":
           var render = provider.render, destroy = provider.destroy, SubModuleComponent2 = provider.SubModuleComponent, jupiter_submodule_app_key = provider.jupiter_submodule_app_key;
           var SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
           var componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
-          if (destroy) {
-            destroyRef.current = function() {
-              var dom = document.getElementById(domId);
-              if (dom) {
-                var destroyProps = {
-                  dom,
-                  basename,
-                  appName: appInfo.name,
-                  appRenderInfo: {},
-                  props: _object_spread({}, appInfo.props, userProps)
-                };
-                destroy.apply(provider, [
-                  destroyProps
-                ]);
-              }
-            };
-          }
           return {
             mount: function() {
               for (var _len = arguments.length, _$props = new Array(_len), _key = 0; _key < _len; _key++) {
                 _$props[_key] = arguments[_key];
               }
               if (componetRenderMode && SubComponent) {
-                if (isMountedRef.current) {
-                  setSubModuleComponent({
-                    component: SubComponent
-                  });
-                }
+                setSubModuleComponent({
+                  component: SubComponent
+                });
                 return void 0;
               } else {
                 logger("MicroApp customer render", _$props);
@@ -183,7 +147,7 @@ or directly pass the "basename":
           };
         }
       });
-      safeSetLoadingState({
+      setLoadingState({
         isLoading: true,
         error: null
       });
@@ -192,7 +156,7 @@ or directly pass the "basename":
       });
       function _renderApp() {
         _renderApp = _async_to_generator(function() {
-          var _abortControllerRef_current, _abortControllerRef_current1, appInstance, error, _abortControllerRef_current2;
+          var appInstance, error;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
@@ -202,27 +166,17 @@ or directly pass the "basename":
                   ,
                   7
                 ]);
-                if ((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted) {
-                  return [
-                    2
-                  ];
-                }
                 return [
                   4,
                   Garfish.loadApp(appInfo.name, loadAppOptions)
                 ];
               case 1:
                 appInstance = _state.sent();
-                if ((_abortControllerRef_current1 = abortControllerRef.current) === null || _abortControllerRef_current1 === void 0 ? void 0 : _abortControllerRef_current1.signal.aborted) {
-                  return [
-                    2
-                  ];
-                }
                 if (!appInstance) {
                   throw new Error('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" result is null'));
                 }
                 appRef.current = appInstance;
-                safeSetLoadingState({
+                setLoadingState({
                   isLoading: false
                 });
                 if (!(appInstance.mounted && appInstance.appInfo.cache))
@@ -263,12 +217,10 @@ or directly pass the "basename":
                 ];
               case 6:
                 error = _state.sent();
-                if (!((_abortControllerRef_current2 = abortControllerRef.current) === null || _abortControllerRef_current2 === void 0 ? void 0 : _abortControllerRef_current2.signal.aborted)) {
-                  safeSetLoadingState({
-                    isLoading: true,
-                    error
-                  });
-                }
+                setLoadingState({
+                  isLoading: true,
+                  error
+                });
                 return [
                   3,
                   7
@@ -284,10 +236,6 @@ or directly pass the "basename":
       }
       renderApp();
       return function() {
-        isMountedRef.current = false;
-        if (abortControllerRef.current) {
-          abortControllerRef.current.abort();
-        }
         if (appRef.current) {
           var _$appInfo = appRef.current.appInfo;
           if (_$appInfo.cache) {
@@ -302,38 +250,10 @@ or directly pass the "basename":
         }
       };
     }, []);
-    useEffect(function() {
-      return function() {
-        if (SubModuleComponent && destroyRef.current && isMountedRef.current) {
-          logger("MicroApp SubModuleComponent cleanup");
-          try {
-            destroyRef.current();
-          } catch (error) {
-            logger("Error during SubModuleComponent cleanup:", error);
-          }
-        }
-      };
-    }, [
-      SubModuleComponent
-    ]);
-    var SafeSubModuleComponent = useCallback(function() {
-      if (!SubModuleComponent || !isMountedRef.current) {
-        return null;
-      }
-      return /* @__PURE__ */ _jsx(MicroAppMountContext.Provider, {
-        value: {
-          isMounted: isMountedRef.current
-        },
-        children: /* @__PURE__ */ _jsx(SubModuleComponent, _object_spread({}, props))
-      });
-    }, [
-      SubModuleComponent,
-      props
-    ]);
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsx("div", {
         id: domId,
-        children: SubModuleComponent && /* @__PURE__ */ _jsx(SafeSubModuleComponent, {})
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, _object_spread({}, props))
       })
     });
   }
@@ -354,6 +274,5 @@ function generateApps(options, manifest) {
 }
 export {
   generateApps,
-  pathJoin,
-  useMicroAppMountStatus
+  pathJoin
 };

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

@@ -1,16 +1,9 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { RuntimeReactContext } from "@meta/runtime";
 import Garfish from "garfish";
-import { createContext, useCallback, useContext, useEffect, useRef, useState } from "react";
+import { useContext, useEffect, useRef, useState } from "react";
 import { generateSubAppContainerKey, logger } from "../../util";
 import { Loadable } from "../loadable";
-const MicroAppMountContext = /* @__PURE__ */ createContext({
-  isMounted: true
-});
-const useMicroAppMountStatus = () => {
-  const { isMounted } = useContext(MicroAppMountContext);
-  return isMounted;
-};
 function pathJoin(...args) {
   const res = args.reduce((res2, path) => {
     let nPath = path;
@@ -37,9 +30,6 @@ function getAppInstance(options, appInfo, manifest) {
     const [{ component: SubModuleComponent }, setSubModuleComponent] = useState({
       component: null
     });
-    const destroyRef = useRef(null);
-    const isMountedRef = useRef(true);
-    const abortControllerRef = useRef(null);
     const context = useContext(RuntimeReactContext);
     var _props_useRouteMatch;
     const useRouteMatch = (_props_useRouteMatch = props.useRouteMatch) !== null && _props_useRouteMatch !== void 0 ? _props_useRouteMatch : context === null || context === void 0 ? void 0 : (_context_router = context.router) === null || _context_router === void 0 ? void 0 : _context_router.useRouteMatch;
@@ -103,13 +93,6 @@ or directly pass the "basename":
     ]);
     useEffect(() => {
       const { setLoadingState, ...userProps } = props;
-      abortControllerRef.current = new AbortController();
-      const safeSetLoadingState = (state) => {
-        var _abortControllerRef_current;
-        if (isMountedRef.current && !((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted)) {
-          setLoadingState(state);
-        }
-      };
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -127,34 +110,12 @@ or directly pass the "basename":
           const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
           const SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
           const componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
-          if (destroy) {
-            destroyRef.current = () => {
-              const dom = document.getElementById(domId);
-              if (dom) {
-                const destroyProps = {
-                  dom,
-                  basename,
-                  appName: appInfo.name,
-                  appRenderInfo: {},
-                  props: {
-                    ...appInfo.props,
-                    ...userProps
-                  }
-                };
-                destroy.apply(provider, [
-                  destroyProps
-                ]);
-              }
-            };
-          }
           return {
             mount: (...props2) => {
               if (componetRenderMode && SubComponent) {
-                if (isMountedRef.current) {
-                  setSubModuleComponent({
-                    component: SubComponent
-                  });
-                }
+                setSubModuleComponent({
+                  component: SubComponent
+                });
                 return void 0;
               } else {
                 logger("MicroApp customer render", props2);
@@ -171,7 +132,7 @@ or directly pass the "basename":
           };
         }
       };
-      safeSetLoadingState({
+      setLoadingState({
         isLoading: true,
         error: null
       });
@@ -180,19 +141,12 @@ or directly pass the "basename":
       });
       async function renderApp() {
         try {
-          var _abortControllerRef_current, _abortControllerRef_current1;
-          if ((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted) {
-            return;
-          }
           const appInstance = await Garfish.loadApp(appInfo.name, loadAppOptions);
-          if ((_abortControllerRef_current1 = abortControllerRef.current) === null || _abortControllerRef_current1 === void 0 ? void 0 : _abortControllerRef_current1.signal.aborted) {
-            return;
-          }
           if (!appInstance) {
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          safeSetLoadingState({
+          setLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -209,21 +163,14 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          var _abortControllerRef_current2;
-          if (!((_abortControllerRef_current2 = abortControllerRef.current) === null || _abortControllerRef_current2 === void 0 ? void 0 : _abortControllerRef_current2.signal.aborted)) {
-            safeSetLoadingState({
-              isLoading: true,
-              error
-            });
-          }
+          setLoadingState({
+            isLoading: true,
+            error
+          });
         }
       }
       renderApp();
       return () => {
-        isMountedRef.current = false;
-        if (abortControllerRef.current) {
-          abortControllerRef.current.abort();
-        }
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
@@ -238,40 +185,12 @@ or directly pass the "basename":
         }
       };
     }, []);
-    useEffect(() => {
-      return () => {
-        if (SubModuleComponent && destroyRef.current && isMountedRef.current) {
-          logger("MicroApp SubModuleComponent cleanup");
-          try {
-            destroyRef.current();
-          } catch (error) {
-            logger("Error during SubModuleComponent cleanup:", error);
-          }
-        }
-      };
-    }, [
-      SubModuleComponent
-    ]);
-    const SafeSubModuleComponent = useCallback(() => {
-      if (!SubModuleComponent || !isMountedRef.current) {
-        return null;
-      }
-      return /* @__PURE__ */ _jsx(MicroAppMountContext.Provider, {
-        value: {
-          isMounted: isMountedRef.current
-        },
-        children: /* @__PURE__ */ _jsx(SubModuleComponent, {
-          ...props
-        })
-      });
-    }, [
-      SubModuleComponent,
-      props
-    ]);
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsx("div", {
         id: domId,
-        children: SubModuleComponent && /* @__PURE__ */ _jsx(SafeSubModuleComponent, {})
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {
+          ...props
+        })
       })
     });
   }
@@ -292,6 +211,5 @@ function generateApps(options, manifest) {
 }
 export {
   generateApps,
-  pathJoin,
-  useMicroAppMountStatus
+  pathJoin
 };

package/dist/types/runtime/utils/apps.d.ts

@@ -5,7 +5,6 @@ export interface Provider extends interfaces.Provider {
     SubModuleComponent?: React.ComponentType<any>;
     jupiter_submodule_app_key?: React.ComponentType<any>;
 }
-export declare const useMicroAppMountStatus: () => boolean;
 export interface AppMap {
     [key: string]: React.FC<MicroComponentProps>;
 }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.13-alpha.2",
+  "version": "2.68.13-alpha.3",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -69,8 +69,8 @@
     "debug": "4.3.7",
     "garfish": "^1.8.1",
     "react-loadable": "^5.5.0",
-    "@modern-js/runtime-utils": "2.68.12",
     "@modern-js/plugin-v2": "2.68.12",
+    "@modern-js/runtime-utils": "2.68.12",
     "@modern-js/utils": "2.68.12"
   },
   "peerDependencies": {
@@ -94,12 +94,12 @@
     "react-router-dom": "6.27.0",
     "typescript": "^5",
     "@modern-js/app-tools": "2.68.12",
-    "@scripts/build": "2.66.0",
     "@modern-js/core": "2.68.12",
-    "@modern-js/plugin-router-v5": "2.68.12",
-    "@modern-js/types": "2.68.12",
     "@modern-js/runtime": "2.68.12",
-    "@scripts/jest-config": "2.66.0"
+    "@modern-js/types": "2.68.12",
+    "@scripts/build": "2.66.0",
+    "@scripts/jest-config": "2.66.0",
+    "@modern-js/plugin-router-v5": "2.68.12"
   },
   "sideEffects": false,
   "publishConfig": {