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

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

@@ -64,8 +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 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,11 +127,6 @@ 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: [
@@ -151,26 +144,6 @@ 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) {
@@ -193,7 +166,7 @@ or directly pass the "basename":
           };
         }
       };
-      safeSetLoadingState({
+      setLoadingState({
         isLoading: true,
         error: null
       });
@@ -207,7 +180,7 @@ or directly pass the "basename":
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          safeSetLoadingState({
+          setLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -224,7 +197,7 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          safeSetLoadingState({
+          setLoadingState({
             isLoading: true,
             error
           });
@@ -232,7 +205,6 @@ or directly pass the "basename":
       }
       renderApp();
       return () => {
-        isMountedRef.current = false;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
@@ -247,20 +219,6 @@ 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
-    ]);
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
       children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", {
         id: domId,

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

@@ -40,8 +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 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,11 +106,6 @@ 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([
@@ -126,23 +119,6 @@ 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++) {
@@ -171,7 +147,7 @@ or directly pass the "basename":
           };
         }
       });
-      safeSetLoadingState({
+      setLoadingState({
         isLoading: true,
         error: null
       });
@@ -200,7 +176,7 @@ or directly pass the "basename":
                   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))
@@ -241,7 +217,7 @@ or directly pass the "basename":
                 ];
               case 6:
                 error = _state.sent();
-                safeSetLoadingState({
+                setLoadingState({
                   isLoading: true,
                   error
                 });
@@ -260,7 +236,6 @@ or directly pass the "basename":
       }
       renderApp();
       return function() {
-        isMountedRef.current = false;
         if (appRef.current) {
           var _$appInfo = appRef.current.appInfo;
           if (_$appInfo.cache) {
@@ -275,20 +250,6 @@ 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
-    ]);
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsx("div", {
         id: domId,

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

@@ -30,8 +30,6 @@ function getAppInstance(options, appInfo, manifest) {
     const [{ component: SubModuleComponent }, setSubModuleComponent] = useState({
       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;
@@ -95,11 +93,6 @@ or directly pass the "basename":
     ]);
     useEffect(() => {
       const { setLoadingState, ...userProps } = props;
-      const safeSetLoadingState = (state) => {
-        if (isMountedRef.current) {
-          setLoadingState(state);
-        }
-      };
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -117,26 +110,6 @@ 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) {
@@ -159,7 +132,7 @@ or directly pass the "basename":
           };
         }
       };
-      safeSetLoadingState({
+      setLoadingState({
         isLoading: true,
         error: null
       });
@@ -173,7 +146,7 @@ or directly pass the "basename":
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          safeSetLoadingState({
+          setLoadingState({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -190,7 +163,7 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          safeSetLoadingState({
+          setLoadingState({
             isLoading: true,
             error
           });
@@ -198,7 +171,6 @@ or directly pass the "basename":
       }
       renderApp();
       return () => {
-        isMountedRef.current = false;
         if (appRef.current) {
           const { appInfo: appInfo2 } = appRef.current;
           if (appInfo2.cache) {
@@ -213,20 +185,6 @@ 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
-    ]);
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsx("div", {
         id: domId,

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.13-alpha.1",
+  "version": "2.68.13-alpha.3",
   "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",
     "@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/build": "2.66.0",
     "@scripts/jest-config": "2.66.0",
-    "@modern-js/plugin-router-v5": "2.68.12",
-    "@modern-js/core": "2.68.12"
+    "@modern-js/plugin-router-v5": "2.68.12"
   },
   "sideEffects": false,
   "publishConfig": {