@modern-js/plugin-garfish 1.18.0 → 1.18.1

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @modern-js/plugin-garfish
 
+## 1.18.1
+
+### Patch Changes
+
+- 6839e46: fix: fix MApp can not pass props to microapp and fix closure causes loadable invalid
+  fix: 修复 MApp 无法传递 props 问题，修复 loadable setstate 闭包问题导致 state 更新异常
+- Updated dependencies [9fcfbd4]
+- Updated dependencies [6c2c745]
+  - @modern-js/utils@1.18.1
+  - @modern-js/runtime@1.18.1
+
 ## 1.18.0
 
 ### Patch Changes

package/dist/js/modern/runtime/loadable.js

@@ -107,7 +107,7 @@ export function Loadable(WrapComponent) {
           return;
         }
 
-        setState(_objectSpread(_objectSpread({}, state), newState));
+        setState(state => _objectSpread(_objectSpread({}, state), newState));
       }, [state]);
       const showLoading = (state.isLoading || state.error) && LoadingComponent;
       return /*#__PURE__*/_jsxs(_Fragment, {

package/dist/js/modern/runtime/utils/MApp.js

@@ -1,4 +1,5 @@
-const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
+const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"],
+      _excluded2 = ["style", "setLoadingState"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -123,27 +124,31 @@ export function generateMApp(options, manifest) {
           } = provider;
           const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
           return {
-            mount: (...props) => {
+            mount: appInfo => {
+              const transferProps = this.filterTransferProps();
+              appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
+
               if (componetRenderMode) {
                 this.setState({
                   SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
                 });
                 return undefined;
               } else {
-                logger('MicroApp customer render', props);
-                return render === null || render === void 0 ? void 0 : render.apply(provider, props);
+                logger('MicroApp customer render', appInfo);
+                return render === null || render === void 0 ? void 0 : render.apply(provider, [appInfo]);
               }
             },
+            unmount: appInfo => {
+              const transferProps = this.filterTransferProps();
+              appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
 
-            unmount(...props) {
               if (componetRenderMode) {
                 return undefined;
               }
 
-              logger('MicroApp customer destroy', props);
-              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props);
+              logger('MicroApp customer destroy', appInfo);
+              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, [appInfo]);
             }
-
           };
         }
       });
@@ -166,11 +171,26 @@ export function generateMApp(options, manifest) {
       logger('MApp componentWillUnmount');
     }
 
+    filterTransferProps() {
+      const _this$props = this.props,
+            {
+        style,
+        setLoadingState
+      } = _this$props,
+            others = _objectWithoutProperties(_this$props, _excluded2);
+
+      return others;
+    }
+
     render() {
+      const {
+        style
+      } = this.props;
       const {
         SubModuleComponent
       } = this.state;
       return /*#__PURE__*/_jsx("div", {
+        style: _objectSpread({}, style),
         id: generateSubAppContainerKey(),
         children: SubModuleComponent && /*#__PURE__*/_jsx(SubModuleComponent, {})
       });

package/dist/js/node/runtime/loadable.js

@@ -115,7 +115,7 @@ function Loadable(WrapComponent) {
           return;
         }
 
-        setState(_objectSpread(_objectSpread({}, state), newState));
+        setState(state => _objectSpread(_objectSpread({}, state), newState));
       }, [state]);
       const showLoading = (state.isLoading || state.error) && LoadingComponent;
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {

package/dist/js/node/runtime/utils/MApp.js

@@ -15,7 +15,8 @@ var _loadable = require("../loadable");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
+const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"],
+      _excluded2 = ["style", "setLoadingState"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -136,27 +137,31 @@ function generateMApp(options, manifest) {
           } = provider;
           const componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
           return {
-            mount: (...props) => {
+            mount: appInfo => {
+              const transferProps = this.filterTransferProps();
+              appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
+
               if (componetRenderMode) {
                 this.setState({
                   SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
                 });
                 return undefined;
               } else {
-                (0, _util.logger)('MicroApp customer render', props);
-                return render === null || render === void 0 ? void 0 : render.apply(provider, props);
+                (0, _util.logger)('MicroApp customer render', appInfo);
+                return render === null || render === void 0 ? void 0 : render.apply(provider, [appInfo]);
               }
             },
+            unmount: appInfo => {
+              const transferProps = this.filterTransferProps();
+              appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
 
-            unmount(...props) {
               if (componetRenderMode) {
                 return undefined;
               }
 
-              (0, _util.logger)('MicroApp customer destroy', props);
-              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props);
+              (0, _util.logger)('MicroApp customer destroy', appInfo);
+              return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, [appInfo]);
             }
-
           };
         }
       });
@@ -180,11 +185,26 @@ function generateMApp(options, manifest) {
       (0, _util.logger)('MApp componentWillUnmount');
     }
 
+    filterTransferProps() {
+      const _this$props = this.props,
+            {
+        style,
+        setLoadingState
+      } = _this$props,
+            others = _objectWithoutProperties(_this$props, _excluded2);
+
+      return others;
+    }
+
     render() {
+      const {
+        style
+      } = this.props;
       const {
         SubModuleComponent
       } = this.state;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        style: _objectSpread({}, style),
         id: (0, _util.generateSubAppContainerKey)(),
         children: SubModuleComponent && /*#__PURE__*/(0, _jsxRuntime.jsx)(SubModuleComponent, {})
       });

package/dist/js/treeshaking/runtime/loadable.js

@@ -101,7 +101,9 @@ export function Loadable(WrapComponent) {
           return;
         }
 
-        setState(_objectSpread(_objectSpread({}, state), newState));
+        setState(function (state) {
+          return _objectSpread(_objectSpread({}, state), newState);
+        });
       }, [state]);
       var showLoading = (state.isLoading || state.error) && LoadingComponent;
       return /*#__PURE__*/_jsxs(_Fragment, {

package/dist/js/treeshaking/runtime/utils/MApp.js

@@ -7,7 +7,8 @@ import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitial
 import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
+var _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"],
+    _excluded2 = ["style", "setLoadingState"];
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
 
 import Garfish from 'garfish';
@@ -145,7 +146,11 @@ export function generateMApp(options, manifest) {
                 jupiter_submodule_app_key = provider.jupiter_submodule_app_key;
             var componetRenderMode = (manifest === null || manifest === void 0 ? void 0 : manifest.componentRender) && (SubModuleComponent || jupiter_submodule_app_key);
             return {
-              mount: function mount() {
+              mount: function mount(appInfo) {
+                var transferProps = _this2.filterTransferProps();
+
+                appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
+
                 if (componetRenderMode) {
                   _this2.setState({
                     SubModuleComponent: SubModuleComponent !== null && SubModuleComponent !== void 0 ? SubModuleComponent : jupiter_submodule_app_key
@@ -153,25 +158,21 @@ export function generateMApp(options, manifest) {
 
                   return undefined;
                 } else {
-                  for (var _len7 = arguments.length, props = new Array(_len7), _key7 = 0; _key7 < _len7; _key7++) {
-                    props[_key7] = arguments[_key7];
-                  }
-
-                  logger('MicroApp customer render', props);
-                  return render === null || render === void 0 ? void 0 : render.apply(provider, props);
+                  logger('MicroApp customer render', appInfo);
+                  return render === null || render === void 0 ? void 0 : render.apply(provider, [appInfo]);
                 }
               },
-              unmount: function unmount() {
+              unmount: function unmount(appInfo) {
+                var transferProps = _this2.filterTransferProps();
+
+                appInfo.props = _objectSpread(_objectSpread({}, appInfo.props), transferProps);
+
                 if (componetRenderMode) {
                   return undefined;
                 }
 
-                for (var _len8 = arguments.length, props = new Array(_len8), _key8 = 0; _key8 < _len8; _key8++) {
-                  props[_key8] = arguments[_key8];
-                }
-
-                logger('MicroApp customer destroy', props);
-                return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, props);
+                logger('MicroApp customer destroy', appInfo);
+                return destroy === null || destroy === void 0 ? void 0 : destroy.apply(provider, [appInfo]);
               }
             };
           }
@@ -195,11 +196,23 @@ export function generateMApp(options, manifest) {
         });
         logger('MApp componentWillUnmount');
       }
+    }, {
+      key: "filterTransferProps",
+      value: function filterTransferProps() {
+        var _this$props = this.props,
+            style = _this$props.style,
+            setLoadingState = _this$props.setLoadingState,
+            others = _objectWithoutProperties(_this$props, _excluded2);
+
+        return others;
+      }
     }, {
       key: "render",
       value: function render() {
+        var style = this.props.style;
         var SubModuleComponent = this.state.SubModuleComponent;
         return /*#__PURE__*/_jsx("div", {
+          style: _objectSpread({}, style),
           id: generateSubAppContainerKey(),
           children: SubModuleComponent && /*#__PURE__*/_jsx(SubModuleComponent, {})
         });

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.18.0",
+  "version": "1.18.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "1.18.0",
+    "@modern-js/utils": "1.18.1",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
@@ -59,7 +59,7 @@
     "react-loadable": "^5.5.0"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^1.18.0"
+    "@modern-js/runtime": "^1.18.1"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -67,11 +67,11 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.18.0",
-    "@modern-js/runtime": "1.18.0",
-    "@modern-js/types": "1.18.0",
-    "@scripts/build": "1.18.0",
-    "@scripts/jest-config": "1.18.0",
+    "@modern-js/core": "1.18.1",
+    "@modern-js/runtime": "1.18.1",
+    "@modern-js/types": "1.18.1",
+    "@scripts/build": "1.18.1",
+    "@scripts/jest-config": "1.18.1",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",