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

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

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var apps_exports = {};
 __export(apps_exports, {
   generateApps: () => generateApps,
-  pathJoin: () => pathJoin
+  pathJoin: () => pathJoin,
+  useMicroAppMountStatus: () => useMicroAppMountStatus
 });
 module.exports = __toCommonJS(apps_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -38,6 +39,13 @@ 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;
@@ -66,6 +74,7 @@ function getAppInstance(options, appInfo, manifest) {
     });
     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;
@@ -129,8 +138,10 @@ or directly pass the "basename":
     ]);
     (0, import_react.useEffect)(() => {
       const { setLoadingState, ...userProps } = props;
+      abortControllerRef.current = new AbortController();
       const safeSetLoadingState = (state) => {
-        if (isMountedRef.current) {
+        var _abortControllerRef_current;
+        if (isMountedRef.current && !((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted)) {
           setLoadingState(state);
         }
       };
@@ -174,9 +185,11 @@ or directly pass the "basename":
           return {
             mount: (...props2) => {
               if (componetRenderMode && SubComponent) {
-                setSubModuleComponent({
-                  component: SubComponent
-                });
+                if (isMountedRef.current) {
+                  setSubModuleComponent({
+                    component: SubComponent
+                  });
+                }
                 return void 0;
               } else {
                 (0, import_util.logger)("MicroApp customer render", props2);
@@ -202,7 +215,14 @@ 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`);
           }
@@ -224,15 +244,21 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          safeSetLoadingState({
-            isLoading: true,
-            error
-          });
+          var _abortControllerRef_current2;
+          if (!((_abortControllerRef_current2 = abortControllerRef.current) === null || _abortControllerRef_current2 === void 0 ? void 0 : _abortControllerRef_current2.signal.aborted)) {
+            safeSetLoadingState({
+              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) {
@@ -261,12 +287,26 @@ or directly pass the "basename":
     }, [
       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)(SubModuleComponent, {
-          ...props
-        })
+        children: SubModuleComponent && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(SafeSubModuleComponent, {})
       })
     });
   }
@@ -288,5 +328,6 @@ function generateApps(options, manifest) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   generateApps,
-  pathJoin
+  pathJoin,
+  useMicroAppMountStatus
 });

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

@@ -8,9 +8,16 @@ 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 { useContext, useEffect, useRef, useState } from "react";
+import { createContext, useCallback, 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];
@@ -42,6 +49,7 @@ function getAppInstance(options, appInfo, manifest) {
     }), 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;
@@ -108,8 +116,10 @@ or directly pass the "basename":
       var setLoadingState = props.setLoadingState, userProps = _object_without_properties(props, [
         "setLoadingState"
       ]);
+      abortControllerRef.current = new AbortController();
       var safeSetLoadingState = function(state) {
-        if (isMountedRef.current) {
+        var _abortControllerRef_current;
+        if (isMountedRef.current && !((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted)) {
           setLoadingState(state);
         }
       };
@@ -149,9 +159,11 @@ or directly pass the "basename":
                 _$props[_key] = arguments[_key];
               }
               if (componetRenderMode && SubComponent) {
-                setSubModuleComponent({
-                  component: SubComponent
-                });
+                if (isMountedRef.current) {
+                  setSubModuleComponent({
+                    component: SubComponent
+                  });
+                }
                 return void 0;
               } else {
                 logger("MicroApp customer render", _$props);
@@ -180,7 +192,7 @@ or directly pass the "basename":
       });
       function _renderApp() {
         _renderApp = _async_to_generator(function() {
-          var appInstance, error;
+          var _abortControllerRef_current, _abortControllerRef_current1, appInstance, error, _abortControllerRef_current2;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
@@ -190,12 +202,22 @@ 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'));
                 }
@@ -241,10 +263,12 @@ or directly pass the "basename":
                 ];
               case 6:
                 error = _state.sent();
-                safeSetLoadingState({
-                  isLoading: true,
-                  error
-                });
+                if (!((_abortControllerRef_current2 = abortControllerRef.current) === null || _abortControllerRef_current2 === void 0 ? void 0 : _abortControllerRef_current2.signal.aborted)) {
+                  safeSetLoadingState({
+                    isLoading: true,
+                    error
+                  });
+                }
                 return [
                   3,
                   7
@@ -261,6 +285,9 @@ 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) {
@@ -289,10 +316,24 @@ or directly pass the "basename":
     }, [
       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(SubModuleComponent, _object_spread({}, props))
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SafeSubModuleComponent, {})
       })
     });
   }
@@ -313,5 +354,6 @@ function generateApps(options, manifest) {
 }
 export {
   generateApps,
-  pathJoin
+  pathJoin,
+  useMicroAppMountStatus
 };

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

@@ -1,9 +1,16 @@
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { RuntimeReactContext } from "@meta/runtime";
 import Garfish from "garfish";
-import { useContext, useEffect, useRef, useState } from "react";
+import { createContext, useCallback, 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;
@@ -32,6 +39,7 @@ function getAppInstance(options, appInfo, manifest) {
     });
     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;
@@ -95,8 +103,10 @@ or directly pass the "basename":
     ]);
     useEffect(() => {
       const { setLoadingState, ...userProps } = props;
+      abortControllerRef.current = new AbortController();
       const safeSetLoadingState = (state) => {
-        if (isMountedRef.current) {
+        var _abortControllerRef_current;
+        if (isMountedRef.current && !((_abortControllerRef_current = abortControllerRef.current) === null || _abortControllerRef_current === void 0 ? void 0 : _abortControllerRef_current.signal.aborted)) {
           setLoadingState(state);
         }
       };
@@ -140,9 +150,11 @@ or directly pass the "basename":
           return {
             mount: (...props2) => {
               if (componetRenderMode && SubComponent) {
-                setSubModuleComponent({
-                  component: SubComponent
-                });
+                if (isMountedRef.current) {
+                  setSubModuleComponent({
+                    component: SubComponent
+                  });
+                }
                 return void 0;
               } else {
                 logger("MicroApp customer render", props2);
@@ -168,7 +180,14 @@ 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`);
           }
@@ -190,15 +209,21 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          safeSetLoadingState({
-            isLoading: true,
-            error
-          });
+          var _abortControllerRef_current2;
+          if (!((_abortControllerRef_current2 = abortControllerRef.current) === null || _abortControllerRef_current2 === void 0 ? void 0 : _abortControllerRef_current2.signal.aborted)) {
+            safeSetLoadingState({
+              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) {
@@ -227,12 +252,26 @@ or directly pass the "basename":
     }, [
       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(SubModuleComponent, {
-          ...props
-        })
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SafeSubModuleComponent, {})
       })
     });
   }
@@ -253,5 +292,6 @@ function generateApps(options, manifest) {
 }
 export {
   generateApps,
-  pathJoin
+  pathJoin,
+  useMicroAppMountStatus
 };

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

@@ -5,6 +5,7 @@ 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.1",
+  "version": "2.68.13-alpha.2",
   "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/plugin-v2": "2.68.12",
     "@modern-js/runtime-utils": "2.68.12",
+    "@modern-js/plugin-v2": "2.68.12",
     "@modern-js/utils": "2.68.12"
   },
   "peerDependencies": {
@@ -93,13 +93,13 @@
     "react-dom": "^18.3.1",
     "react-router-dom": "6.27.0",
     "typescript": "^5",
-    "@modern-js/runtime": "2.68.12",
-    "@scripts/build": "2.66.0",
-    "@modern-js/types": "2.68.12",
     "@modern-js/app-tools": "2.68.12",
-    "@scripts/jest-config": "2.66.0",
+    "@scripts/build": "2.66.0",
+    "@modern-js/core": "2.68.12",
     "@modern-js/plugin-router-v5": "2.68.12",
-    "@modern-js/core": "2.68.12"
+    "@modern-js/types": "2.68.12",
+    "@modern-js/runtime": "2.68.12",
+    "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {