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

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

@@ -65,6 +65,7 @@ function getAppInstance(options, appInfo, manifest) {
       component: null
     });
     const destroyRef = (0, import_react.useRef)(null);
+    const isMountedRef = (0, import_react.useRef)(true);
     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;
@@ -128,6 +129,11 @@ or directly pass the "basename":
     ]);
     (0, import_react.useEffect)(() => {
       const { setLoadingState, ...userProps } = props;
+      const safeSetLoadingState = (state) => {
+        if (isMountedRef.current) {
+          setLoadingState(state);
+        }
+      };
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -187,7 +193,7 @@ or directly pass the "basename":
           };
         }
       };
-      setLoadingState({
+      safeSetLoadingState({
         isLoading: true,
         error: null
       });
@@ -201,7 +207,7 @@ or directly pass the "basename":
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          setLoadingState({
+          safeSetLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -218,7 +224,7 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          setLoadingState({
+          safeSetLoadingState({
             isLoading: true,
             error
           });
@@ -226,6 +232,7 @@ or directly pass the "basename":
       }
       renderApp();
       return () => {
+        isMountedRef.current = false;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
@@ -242,7 +249,7 @@ or directly pass the "basename":
     }, []);
     (0, import_react.useEffect)(() => {
       return () => {
-        if (SubModuleComponent && destroyRef.current) {
+        if (SubModuleComponent && destroyRef.current && isMountedRef.current) {
           (0, import_util.logger)("MicroApp SubModuleComponent cleanup");
           try {
             destroyRef.current();

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

@@ -41,6 +41,7 @@ function getAppInstance(options, appInfo, manifest) {
       component: null
     }), 2), _useState_ = _useState[0], SubModuleComponent = _useState_.component, setSubModuleComponent = _useState[1];
     var destroyRef = useRef(null);
+    var isMountedRef = useRef(true);
     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;
@@ -107,6 +108,11 @@ or directly pass the "basename":
       var setLoadingState = props.setLoadingState, userProps = _object_without_properties(props, [
         "setLoadingState"
       ]);
+      var safeSetLoadingState = function(state) {
+        if (isMountedRef.current) {
+          setLoadingState(state);
+        }
+      };
       var loadAppOptions = _object_spread_props(_object_spread({
         cache: true,
         insulationVariable: _to_consumable_array(appInfo.insulationVariable || []).concat([
@@ -165,7 +171,7 @@ or directly pass the "basename":
           };
         }
       });
-      setLoadingState({
+      safeSetLoadingState({
         isLoading: true,
         error: null
       });
@@ -194,7 +200,7 @@ or directly pass the "basename":
                   throw new Error('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" result is null'));
                 }
                 appRef.current = appInstance;
-                setLoadingState({
+                safeSetLoadingState({
                   isLoading: false
                 });
                 if (!(appInstance.mounted && appInstance.appInfo.cache))
@@ -235,7 +241,7 @@ or directly pass the "basename":
                 ];
               case 6:
                 error = _state.sent();
-                setLoadingState({
+                safeSetLoadingState({
                   isLoading: true,
                   error
                 });
@@ -254,6 +260,7 @@ or directly pass the "basename":
       }
       renderApp();
       return function() {
+        isMountedRef.current = false;
         if (appRef.current) {
           var _$appInfo = appRef.current.appInfo;
           if (_$appInfo.cache) {
@@ -270,7 +277,7 @@ or directly pass the "basename":
     }, []);
     useEffect(function() {
       return function() {
-        if (SubModuleComponent && destroyRef.current) {
+        if (SubModuleComponent && destroyRef.current && isMountedRef.current) {
           logger("MicroApp SubModuleComponent cleanup");
           try {
             destroyRef.current();

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

@@ -31,6 +31,7 @@ function getAppInstance(options, appInfo, manifest) {
       component: null
     });
     const destroyRef = useRef(null);
+    const isMountedRef = useRef(true);
     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;
@@ -94,6 +95,11 @@ or directly pass the "basename":
     ]);
     useEffect(() => {
       const { setLoadingState, ...userProps } = props;
+      const safeSetLoadingState = (state) => {
+        if (isMountedRef.current) {
+          setLoadingState(state);
+        }
+      };
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -153,7 +159,7 @@ or directly pass the "basename":
           };
         }
       };
-      setLoadingState({
+      safeSetLoadingState({
         isLoading: true,
         error: null
       });
@@ -167,7 +173,7 @@ or directly pass the "basename":
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          setLoadingState({
+          safeSetLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -184,7 +190,7 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          setLoadingState({
+          safeSetLoadingState({
             isLoading: true,
             error
           });
@@ -192,6 +198,7 @@ or directly pass the "basename":
       }
       renderApp();
       return () => {
+        isMountedRef.current = false;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
@@ -208,7 +215,7 @@ or directly pass the "basename":
     }, []);
     useEffect(() => {
       return () => {
-        if (SubModuleComponent && destroyRef.current) {
+        if (SubModuleComponent && destroyRef.current && isMountedRef.current) {
           logger("MicroApp SubModuleComponent cleanup");
           try {
             destroyRef.current();

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.13-alpha.0",
+  "version": "2.68.13-alpha.1",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -93,13 +93,13 @@
     "react-dom": "^18.3.1",
     "react-router-dom": "6.27.0",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.68.12",
-    "@modern-js/core": "2.68.12",
-    "@scripts/build": "2.66.0",
-    "@modern-js/plugin-router-v5": "2.68.12",
     "@modern-js/runtime": "2.68.12",
+    "@scripts/build": "2.66.0",
     "@modern-js/types": "2.68.12",
-    "@scripts/jest-config": "2.66.0"
+    "@modern-js/app-tools": "2.68.12",
+    "@scripts/jest-config": "2.66.0",
+    "@modern-js/plugin-router-v5": "2.68.12",
+    "@modern-js/core": "2.68.12"
   },
   "sideEffects": false,
   "publishConfig": {