@modern-js/plugin-garfish 2.68.19-alpha.0 → 2.68.19-alpha.2

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

@@ -96,9 +96,11 @@ function getAppInstance(options, appInfo, manifest) {
     const previousPropsRef = (0, import_react.useRef)(props);
     const propsUpdateCounterRef = (0, import_react.useRef)(0);
     const domId = (0, import_util.generateSubAppContainerKey)(appInfo);
-    const [{ component: SubModuleComponent }, setSubModuleComponent] = (0, import_react.useState)({
-      component: null
+    const [{ component: SubModuleComponent, isFromJupiter }, setSubModuleComponent] = (0, import_react.useState)({
+      component: null,
+      isFromJupiter: false
     });
+    const [propsUpdateKey, setPropsUpdateKey] = (0, import_react.useState)(0);
     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;
@@ -183,18 +185,10 @@ or directly pass the "basename":
         }
       });
       if (!deepEqualExcludeFunctions(prevPropsForCompare, currentPropsForCompare)) {
-        var _appRef_current;
         previousPropsRef.current = props;
         propsRef.current = props;
         propsUpdateCounterRef.current += 1;
-        if ((_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.mounted) {
-          window.dispatchEvent(new CustomEvent("garfishPropsUpdated", {
-            detail: {
-              appName: appInfo.name,
-              props
-            }
-          }));
-        }
+        setPropsUpdateKey((prev) => prev + 1);
       }
     }, [
       props,
@@ -202,7 +196,7 @@ or directly pass the "basename":
     ]);
     (0, import_react.useEffect)(() => {
       componentSetterRegistry.current = setSubModuleComponent;
-      const { setLoadingState, ...userProps } = propsRef.current;
+      const { setLoadingState: setLoadingState2, ...userProps } = propsRef.current;
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -219,13 +213,15 @@ or directly pass the "basename":
         customLoader: (provider) => {
           const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
           const SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
+          const isFromJupiter2 = !SubModuleComponent2 && !!jupiter_submodule_app_key;
           const componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
           return {
             mount: (...props2) => {
               if (componetRenderMode && SubComponent) {
                 if (componentSetterRegistry.current) {
                   componentSetterRegistry.current({
-                    component: SubComponent
+                    component: SubComponent,
+                    isFromJupiter: isFromJupiter2
                   });
                 } else {
                   (0, import_util.logger)(`[Garfish] MicroApp for "${appInfo.name}" tried to mount, but no active component setter was found.`);
@@ -246,7 +242,7 @@ or directly pass the "basename":
           };
         }
       };
-      setLoadingState({
+      setLoadingState2({
         isLoading: true,
         error: null
       });
@@ -260,7 +256,7 @@ or directly pass the "basename":
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          setLoadingState({
+          setLoadingState2({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -277,7 +273,7 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          setLoadingState({
+          setLoadingState2({
             isLoading: true,
             error
           });
@@ -304,12 +300,36 @@ or directly pass the "basename":
       domId,
       appInfo.name
     ]);
+    (0, import_react.useEffect)(() => {
+      var _appRef_current;
+      if ((_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.appInfo) {
+        const { setLoadingState: setLoadingState2, ...updatedProps } = props;
+        const updatedPropsWithKey = {
+          ...appInfo.props,
+          ...updatedProps,
+          _garfishPropsUpdateKey: propsUpdateKey
+        };
+        appRef.current.appInfo.props = updatedPropsWithKey;
+      }
+    }, [
+      propsUpdateKey,
+      props
+    ]);
+    const { setLoadingState, ...renderProps } = props;
+    const finalRenderProps = {
+      ...renderProps,
+      _garfishPropsUpdateKey: propsUpdateKey
+    };
+    const componentKey = isFromJupiter ? void 0 : `${appInfo.name}-${propsUpdateKey}`;
     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, {
-          ...propsRef.current
-        }, `${appInfo.name}-${propsUpdateCounterRef.current}`)
+          ...componentKey ? {
+            key: componentKey
+          } : {},
+          ...finalRenderProps
+        })
       })
     });
   }

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

@@ -95,8 +95,10 @@ function getAppInstance(options, appInfo, manifest) {
     var propsUpdateCounterRef = useRef(0);
     var domId = generateSubAppContainerKey(appInfo);
     var _useState = _sliced_to_array(useState({
-      component: null
-    }), 2), _useState_ = _useState[0], SubModuleComponent = _useState_.component, setSubModuleComponent = _useState[1];
+      component: null,
+      isFromJupiter: false
+    }), 2), _useState_ = _useState[0], SubModuleComponent = _useState_.component, isFromJupiter = _useState_.isFromJupiter, setSubModuleComponent = _useState[1];
+    var _useState1 = _sliced_to_array(useState(0), 2), propsUpdateKey = _useState1[0], setPropsUpdateKey = _useState1[1];
     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;
@@ -175,18 +177,12 @@ or directly pass the "basename":
         }
       });
       if (!deepEqualExcludeFunctions(prevPropsForCompare, currentPropsForCompare)) {
-        var _appRef_current;
         previousPropsRef.current = props;
         propsRef.current = props;
         propsUpdateCounterRef.current += 1;
-        if ((_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.mounted) {
-          window.dispatchEvent(new CustomEvent("garfishPropsUpdated", {
-            detail: {
-              appName: appInfo.name,
-              props
-            }
-          }));
-        }
+        setPropsUpdateKey(function(prev) {
+          return prev + 1;
+        });
       }
     }, [
       props,
@@ -197,7 +193,7 @@ or directly pass the "basename":
         return _renderApp.apply(this, arguments);
       };
       componentSetterRegistry.current = setSubModuleComponent;
-      var _propsRef_current = propsRef.current, setLoadingState = _propsRef_current.setLoadingState, userProps = _object_without_properties(_propsRef_current, [
+      var _propsRef_current = propsRef.current, setLoadingState2 = _propsRef_current.setLoadingState, userProps = _object_without_properties(_propsRef_current, [
         "setLoadingState"
       ]);
       var loadAppOptions = _object_spread_props(_object_spread({
@@ -212,6 +208,7 @@ or directly pass the "basename":
         customLoader: function(provider) {
           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 isFromJupiter2 = !SubModuleComponent2 && !!jupiter_submodule_app_key;
           var componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
           return {
             mount: function() {
@@ -221,7 +218,8 @@ or directly pass the "basename":
               if (componetRenderMode && SubComponent) {
                 if (componentSetterRegistry.current) {
                   componentSetterRegistry.current({
-                    component: SubComponent
+                    component: SubComponent,
+                    isFromJupiter: isFromJupiter2
                   });
                 } else {
                   logger('[Garfish] MicroApp for "'.concat(appInfo.name, '" tried to mount, but no active component setter was found.'));
@@ -245,7 +243,7 @@ or directly pass the "basename":
           };
         }
       });
-      setLoadingState({
+      setLoadingState2({
         isLoading: true,
         error: null
       });
@@ -274,7 +272,7 @@ or directly pass the "basename":
                   throw new Error('MicroApp Garfish.loadApp "'.concat(appInfo.name, '" result is null'));
                 }
                 appRef.current = appInstance;
-                setLoadingState({
+                setLoadingState2({
                   isLoading: false
                 });
                 if (!(appInstance.mounted && appInstance.appInfo.cache))
@@ -315,7 +313,7 @@ or directly pass the "basename":
                 ];
               case 6:
                 error = _state.sent();
-                setLoadingState({
+                setLoadingState2({
                   isLoading: true,
                   error
                 });
@@ -353,10 +351,34 @@ or directly pass the "basename":
       domId,
       appInfo.name
     ]);
+    useEffect(function() {
+      var _appRef_current;
+      if ((_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.appInfo) {
+        var setLoadingState2 = props.setLoadingState, updatedProps = _object_without_properties(props, [
+          "setLoadingState"
+        ]);
+        var updatedPropsWithKey = _object_spread_props(_object_spread({}, appInfo.props, updatedProps), {
+          _garfishPropsUpdateKey: propsUpdateKey
+        });
+        appRef.current.appInfo.props = updatedPropsWithKey;
+      }
+    }, [
+      propsUpdateKey,
+      props
+    ]);
+    var setLoadingState = props.setLoadingState, renderProps = _object_without_properties(props, [
+      "setLoadingState"
+    ]);
+    var finalRenderProps = _object_spread_props(_object_spread({}, renderProps), {
+      _garfishPropsUpdateKey: propsUpdateKey
+    });
+    var componentKey = isFromJupiter ? void 0 : "".concat(appInfo.name, "-").concat(propsUpdateKey);
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsx("div", {
         id: domId,
-        children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, _object_spread({}, propsRef.current), "".concat(appInfo.name, "-").concat(propsUpdateCounterRef.current))
+        children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, _object_spread({}, componentKey ? {
+          key: componentKey
+        } : {}, finalRenderProps))
       })
     });
   }

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

@@ -62,9 +62,11 @@ function getAppInstance(options, appInfo, manifest) {
     const previousPropsRef = useRef(props);
     const propsUpdateCounterRef = useRef(0);
     const domId = generateSubAppContainerKey(appInfo);
-    const [{ component: SubModuleComponent }, setSubModuleComponent] = useState({
-      component: null
+    const [{ component: SubModuleComponent, isFromJupiter }, setSubModuleComponent] = useState({
+      component: null,
+      isFromJupiter: false
     });
+    const [propsUpdateKey, setPropsUpdateKey] = useState(0);
     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;
@@ -149,18 +151,10 @@ or directly pass the "basename":
         }
       });
       if (!deepEqualExcludeFunctions(prevPropsForCompare, currentPropsForCompare)) {
-        var _appRef_current;
         previousPropsRef.current = props;
         propsRef.current = props;
         propsUpdateCounterRef.current += 1;
-        if ((_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.mounted) {
-          window.dispatchEvent(new CustomEvent("garfishPropsUpdated", {
-            detail: {
-              appName: appInfo.name,
-              props
-            }
-          }));
-        }
+        setPropsUpdateKey((prev) => prev + 1);
       }
     }, [
       props,
@@ -168,7 +162,7 @@ or directly pass the "basename":
     ]);
     useEffect(() => {
       componentSetterRegistry.current = setSubModuleComponent;
-      const { setLoadingState, ...userProps } = propsRef.current;
+      const { setLoadingState: setLoadingState2, ...userProps } = propsRef.current;
       const loadAppOptions = {
         cache: true,
         insulationVariable: [
@@ -185,13 +179,15 @@ or directly pass the "basename":
         customLoader: (provider) => {
           const { render, destroy, SubModuleComponent: SubModuleComponent2, jupiter_submodule_app_key } = provider;
           const SubComponent = SubModuleComponent2 || jupiter_submodule_app_key;
+          const isFromJupiter2 = !SubModuleComponent2 && !!jupiter_submodule_app_key;
           const componetRenderMode = manifest === null || manifest === void 0 ? void 0 : manifest.componentRender;
           return {
             mount: (...props2) => {
               if (componetRenderMode && SubComponent) {
                 if (componentSetterRegistry.current) {
                   componentSetterRegistry.current({
-                    component: SubComponent
+                    component: SubComponent,
+                    isFromJupiter: isFromJupiter2
                   });
                 } else {
                   logger(`[Garfish] MicroApp for "${appInfo.name}" tried to mount, but no active component setter was found.`);
@@ -212,7 +208,7 @@ or directly pass the "basename":
           };
         }
       };
-      setLoadingState({
+      setLoadingState2({
         isLoading: true,
         error: null
       });
@@ -226,7 +222,7 @@ or directly pass the "basename":
             throw new Error(`MicroApp Garfish.loadApp "${appInfo.name}" result is null`);
           }
           appRef.current = appInstance;
-          setLoadingState({
+          setLoadingState2({
             isLoading: false
           });
           if (appInstance.mounted && appInstance.appInfo.cache) {
@@ -243,7 +239,7 @@ or directly pass the "basename":
             await (appInstance === null || appInstance === void 0 ? void 0 : appInstance.mount());
           }
         } catch (error) {
-          setLoadingState({
+          setLoadingState2({
             isLoading: true,
             error
           });
@@ -270,12 +266,36 @@ or directly pass the "basename":
       domId,
       appInfo.name
     ]);
+    useEffect(() => {
+      var _appRef_current;
+      if ((_appRef_current = appRef.current) === null || _appRef_current === void 0 ? void 0 : _appRef_current.appInfo) {
+        const { setLoadingState: setLoadingState2, ...updatedProps } = props;
+        const updatedPropsWithKey = {
+          ...appInfo.props,
+          ...updatedProps,
+          _garfishPropsUpdateKey: propsUpdateKey
+        };
+        appRef.current.appInfo.props = updatedPropsWithKey;
+      }
+    }, [
+      propsUpdateKey,
+      props
+    ]);
+    const { setLoadingState, ...renderProps } = props;
+    const finalRenderProps = {
+      ...renderProps,
+      _garfishPropsUpdateKey: propsUpdateKey
+    };
+    const componentKey = isFromJupiter ? void 0 : `${appInfo.name}-${propsUpdateKey}`;
     return /* @__PURE__ */ _jsx(_Fragment, {
       children: /* @__PURE__ */ _jsx("div", {
         id: domId,
         children: SubModuleComponent && /* @__PURE__ */ _jsx(SubModuleComponent, {
-          ...propsRef.current
-        }, `${appInfo.name}-${propsUpdateCounterRef.current}`)
+          ...componentKey ? {
+            key: componentKey
+          } : {},
+          ...finalRenderProps
+        })
       })
     });
   }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.19-alpha.0",
+  "version": "2.68.19-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/runtime-utils": "2.68.18",
     "@modern-js/plugin-v2": "2.68.18",
+    "@modern-js/runtime-utils": "2.68.18",
     "@modern-js/utils": "2.68.18"
   },
   "peerDependencies": {
@@ -97,9 +97,9 @@
     "@scripts/build": "2.66.0",
     "@modern-js/core": "2.68.18",
     "@modern-js/plugin-router-v5": "2.68.18",
+    "@modern-js/types": "2.68.18",
     "@modern-js/runtime": "2.68.18",
-    "@scripts/jest-config": "2.66.0",
-    "@modern-js/types": "2.68.18"
+    "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {