@modern-js/plugin-garfish 1.21.1 → 1.21.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @modern-js/plugin-garfish
 
+## 1.21.2
+
+### Patch Changes
+
+- 92501d9: fix(garfish): fix reRender issue when use apps and Garfish.run with activeWhen parameter
+  修复在同时调用 apps 和 Garfish.run 方法并提供 activeWhen 参数时重复渲染的问题
+  - @modern-js/runtime@1.21.2
+  - @modern-js/utils@1.21.2
+
 ## 1.21.1
 
 ### Patch Changes

package/dist/js/modern/runtime/plugin.js

@@ -93,18 +93,21 @@ export default (config => ({
             });
 
             const load = async () => {
+              GarfishInstance.setOptions(_objectSpread(_objectSpread({}, options), {}, {
+                insulationVariable: [...(options.insulationVariable || []), '_SERVER_DATA'],
+                apps: []
+              }));
               const GarfishConfig = await promise;
-              logger('initOptions result', {
-                manifest,
-                GarfishConfig
-              });
-              const MApp = generateMApp(GarfishConfig, manifest);
               const {
                 appInfoList,
                 apps
               } = generateApps(GarfishConfig, manifest);
-              GarfishInstance.setOptions(GarfishConfig);
               GarfishInstance.registerApp(appInfoList);
+              const MApp = generateMApp(GarfishConfig, manifest);
+              logger('initOptions result', {
+                manifest,
+                GarfishConfig
+              });
               logger('generateApps', {
                 MApp,
                 apps,

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

@@ -1,14 +1,13 @@
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+const _excluded = ["style", "setLoadingState"];
 
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
@@ -34,22 +33,18 @@ export function generateMApp(options, manifest) {
       const {
         setLoadingState
       } = this.props;
-
       const {
         beforeLoad,
         beforeMount,
         errorLoadApp,
         errorMountApp,
         errorUnmountApp
-      } = options,
-            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
-
+      } = options; // start auto render able
 
       Garfish.router.setRouterConfig({
         listening: true
       });
-
-      const garfishOptions = _objectSpread(_objectSpread({
+      const garfishOptions = {
         domGetter: `#${domId}`,
 
         beforeLoad(appInfo, ...args) {
@@ -111,10 +106,8 @@ export function generateMApp(options, manifest) {
           }
 
           return errorUnmountApp === null || errorUnmountApp === void 0 ? void 0 : errorUnmountApp(error, appInfo, ...args);
-        }
+        },
 
-      }, otherOptions), {}, {
-        insulationVariable: [...(otherOptions.insulationVariable || []), '_SERVER_DATA'],
         customLoader: provider => {
           const {
             render,
@@ -151,8 +144,7 @@ export function generateMApp(options, manifest) {
             }
           };
         }
-      });
-
+      };
       logger('MApp componentDidMount', {
         garfishRunning: Garfish.running,
         garfishOptions
@@ -177,7 +169,7 @@ export function generateMApp(options, manifest) {
         style,
         setLoadingState
       } = _this$props,
-            others = _objectWithoutProperties(_this$props, _excluded2);
+            others = _objectWithoutProperties(_this$props, _excluded);
 
       return others;
     }

package/dist/js/node/runtime/plugin.js

@@ -110,21 +110,24 @@ var _default = config => ({
             });
 
             const load = async () => {
+              _garfish.default.setOptions(_objectSpread(_objectSpread({}, options), {}, {
+                insulationVariable: [...(options.insulationVariable || []), '_SERVER_DATA'],
+                apps: []
+              }));
+
               const GarfishConfig = await promise;
-              (0, _util.logger)('initOptions result', {
-                manifest,
-                GarfishConfig
-              });
-              const MApp = (0, _MApp.generateMApp)(GarfishConfig, manifest);
               const {
                 appInfoList,
                 apps
               } = (0, _apps.generateApps)(GarfishConfig, manifest);
 
-              _garfish.default.setOptions(GarfishConfig);
-
               _garfish.default.registerApp(appInfoList);
 
+              const MApp = (0, _MApp.generateMApp)(GarfishConfig, manifest);
+              (0, _util.logger)('initOptions result', {
+                manifest,
+                GarfishConfig
+              });
               (0, _util.logger)('generateApps', {
                 MApp,
                 apps,

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

@@ -15,19 +15,18 @@ var _loadable = require("../loadable");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"],
-      _excluded2 = ["style", "setLoadingState"];
+const _excluded = ["style", "setLoadingState"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function generateMApp(options, manifest) {
@@ -47,22 +46,19 @@ function generateMApp(options, manifest) {
       const {
         setLoadingState
       } = this.props;
-
       const {
         beforeLoad,
         beforeMount,
         errorLoadApp,
         errorMountApp,
         errorUnmountApp
-      } = options,
-            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
-
+      } = options; // start auto render able
 
       _garfish.default.router.setRouterConfig({
         listening: true
       });
 
-      const garfishOptions = _objectSpread(_objectSpread({
+      const garfishOptions = {
         domGetter: `#${domId}`,
 
         beforeLoad(appInfo, ...args) {
@@ -124,10 +120,8 @@ function generateMApp(options, manifest) {
           }
 
           return errorUnmountApp === null || errorUnmountApp === void 0 ? void 0 : errorUnmountApp(error, appInfo, ...args);
-        }
+        },
 
-      }, otherOptions), {}, {
-        insulationVariable: [...(otherOptions.insulationVariable || []), '_SERVER_DATA'],
         customLoader: provider => {
           const {
             render,
@@ -164,8 +158,7 @@ function generateMApp(options, manifest) {
             }
           };
         }
-      });
-
+      };
       (0, _util.logger)('MApp componentDidMount', {
         garfishRunning: _garfish.default.running,
         garfishOptions
@@ -191,7 +184,7 @@ function generateMApp(options, manifest) {
         style,
         setLoadingState
       } = _this$props,
-            others = _objectWithoutProperties(_this$props, _excluded2);
+            others = _objectWithoutProperties(_this$props, _excluded);
 
       return others;
     }

package/dist/js/treeshaking/runtime/plugin.js

@@ -1,5 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -135,25 +136,28 @@ export default (function (config) {
 
               var load = /*#__PURE__*/function () {
                 var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                  var GarfishConfig, MApp, _generateApps, appInfoList, apps;
+                  var GarfishConfig, _generateApps, appInfoList, apps, MApp;
 
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:
-                          _context.next = 2;
+                          GarfishInstance.setOptions(_objectSpread(_objectSpread({}, options), {}, {
+                            insulationVariable: [].concat(_toConsumableArray(options.insulationVariable || []), ['_SERVER_DATA']),
+                            apps: []
+                          }));
+                          _context.next = 3;
                           return promise;
 
-                        case 2:
+                        case 3:
                           GarfishConfig = _context.sent;
+                          _generateApps = generateApps(GarfishConfig, manifest), appInfoList = _generateApps.appInfoList, apps = _generateApps.apps;
+                          GarfishInstance.registerApp(appInfoList);
+                          MApp = generateMApp(GarfishConfig, manifest);
                           logger('initOptions result', {
                             manifest: manifest,
                             GarfishConfig: GarfishConfig
                           });
-                          MApp = generateMApp(GarfishConfig, manifest);
-                          _generateApps = generateApps(GarfishConfig, manifest), appInfoList = _generateApps.appInfoList, apps = _generateApps.apps;
-                          GarfishInstance.setOptions(GarfishConfig);
-                          GarfishInstance.registerApp(appInfoList);
                           logger('generateApps', {
                             MApp: MApp,
                             apps: apps,

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

@@ -1,14 +1,12 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
 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"],
-    _excluded2 = ["style", "setLoadingState"];
+var _excluded = ["style", "setLoadingState"];
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
 
 import Garfish from 'garfish';
@@ -46,20 +44,16 @@ export function generateMApp(options, manifest) {
 
         var domId = this.state.domId;
         var setLoadingState = this.props.setLoadingState;
-
         var _beforeLoad = options.beforeLoad,
             _beforeMount = options.beforeMount,
             _errorLoadApp = options.errorLoadApp,
             _errorMountApp = options.errorMountApp,
-            _errorUnmountApp = options.errorUnmountApp,
-            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
-
+            _errorUnmountApp = options.errorUnmountApp; // start auto render able
 
         Garfish.router.setRouterConfig({
           listening: true
         });
-
-        var garfishOptions = _objectSpread(_objectSpread({
+        var garfishOptions = {
           domGetter: "#".concat(domId),
           beforeLoad: function beforeLoad(appInfo) {
             logger('MApp beforeLoad', [appInfo]);
@@ -136,9 +130,7 @@ export function generateMApp(options, manifest) {
             }
 
             return _errorUnmountApp === null || _errorUnmountApp === void 0 ? void 0 : _errorUnmountApp.apply(void 0, [error, appInfo].concat(args));
-          }
-        }, otherOptions), {}, {
-          insulationVariable: [].concat(_toConsumableArray(otherOptions.insulationVariable || []), ['_SERVER_DATA']),
+          },
           customLoader: function customLoader(provider) {
             var render = provider.render,
                 destroy = provider.destroy,
@@ -176,8 +168,7 @@ export function generateMApp(options, manifest) {
               }
             };
           }
-        });
-
+        };
         logger('MApp componentDidMount', {
           garfishRunning: Garfish.running,
           garfishOptions: garfishOptions
@@ -202,7 +193,7 @@ export function generateMApp(options, manifest) {
         var _this$props = this.props,
             style = _this$props.style,
             setLoadingState = _this$props.setLoadingState,
-            others = _objectWithoutProperties(_this$props, _excluded2);
+            others = _objectWithoutProperties(_this$props, _excluded);
 
         return others;
       }

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.21.1",
+  "version": "1.21.2",
   "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.21.1",
+    "@modern-js/utils": "1.21.2",
     "@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.21.1"
+    "@modern-js/runtime": "^1.21.2"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -67,11 +67,11 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.21.1",
-    "@modern-js/runtime": "1.21.1",
-    "@modern-js/types": "1.21.1",
-    "@scripts/build": "1.21.1",
-    "@scripts/jest-config": "1.21.1",
+    "@modern-js/core": "1.21.2",
+    "@modern-js/runtime": "1.21.2",
+    "@modern-js/types": "1.21.2",
+    "@scripts/build": "1.21.2",
+    "@scripts/jest-config": "1.21.2",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.0.0",
     "@testing-library/react-hooks": "^7.0.1",