@modern-js/plugin-garfish 1.6.1 → 1.6.2-beta.1

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

@@ -1,4 +1,5 @@
-const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
+const _excluded = ["setLoadingState", "style"],
+      _excluded2 = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
 
 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; }
 
@@ -30,9 +31,13 @@ export function generateMApp(options, manifest) {
       const {
         domId
       } = this.state;
-      const {
-        setLoadingState
-      } = this.props;
+
+      const _this$props = this.props,
+            {
+        setLoadingState,
+        style
+      } = _this$props,
+            userProps = _objectWithoutProperties(_this$props, _excluded);
 
       const {
         beforeLoad,
@@ -41,7 +46,7 @@ export function generateMApp(options, manifest) {
         errorMountApp,
         errorUnmountApp
       } = options,
-            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
+            otherOptions = _objectWithoutProperties(options, _excluded2); // start auto render able
 
 
       Garfish.router.setRouterConfig({
@@ -113,6 +118,7 @@ export function generateMApp(options, manifest) {
         }
 
       }, otherOptions), {}, {
+        props: _objectSpread(_objectSpread({}, otherOptions.props || {}), userProps),
         insulationVariable: [...(otherOptions.insulationVariable || []), '_SERVER_DATA'],
         customLoader: provider => {
           const {

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 = ["setLoadingState", "style"],
+      _excluded2 = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -43,9 +44,13 @@ function generateMApp(options, manifest) {
       const {
         domId
       } = this.state;
-      const {
-        setLoadingState
-      } = this.props;
+
+      const _this$props = this.props,
+            {
+        setLoadingState,
+        style
+      } = _this$props,
+            userProps = _objectWithoutProperties(_this$props, _excluded);
 
       const {
         beforeLoad,
@@ -54,7 +59,7 @@ function generateMApp(options, manifest) {
         errorMountApp,
         errorUnmountApp
       } = options,
-            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
+            otherOptions = _objectWithoutProperties(options, _excluded2); // start auto render able
 
 
       _garfish.default.router.setRouterConfig({
@@ -126,6 +131,7 @@ function generateMApp(options, manifest) {
         }
 
       }, otherOptions), {}, {
+        props: _objectSpread(_objectSpread({}, otherOptions.props || {}), userProps),
         insulationVariable: [...(otherOptions.insulationVariable || []), '_SERVER_DATA'],
         customLoader: provider => {
           const {

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 = ["setLoadingState", "style"],
+    _excluded2 = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
 
 import Garfish from 'garfish';
@@ -44,14 +45,18 @@ export function generateMApp(options, manifest) {
         var _this2 = this;
 
         var domId = this.state.domId;
-        var setLoadingState = this.props.setLoadingState;
+
+        var _this$props = this.props,
+            setLoadingState = _this$props.setLoadingState,
+            style = _this$props.style,
+            userProps = _objectWithoutProperties(_this$props, _excluded);
 
         var _beforeLoad = options.beforeLoad,
             _beforeMount = options.beforeMount,
             _errorLoadApp = options.errorLoadApp,
             _errorMountApp = options.errorMountApp,
             _errorUnmountApp = options.errorUnmountApp,
-            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
+            otherOptions = _objectWithoutProperties(options, _excluded2); // start auto render able
 
 
         Garfish.router.setRouterConfig({
@@ -137,6 +142,7 @@ export function generateMApp(options, manifest) {
             return _errorUnmountApp === null || _errorUnmountApp === void 0 ? void 0 : _errorUnmountApp.apply(void 0, [error, appInfo].concat(args));
           }
         }, otherOptions), {}, {
+          props: _objectSpread(_objectSpread({}, otherOptions.props || {}), userProps),
           insulationVariable: [].concat(_toConsumableArray(otherOptions.insulationVariable || []), ['_SERVER_DATA']),
           customLoader: function customLoader(provider) {
             var render = provider.render,

package/dist/types/runtime/loadable.d.ts

@@ -8,7 +8,7 @@ export interface MicroProps extends RouteComponentProps {
   }) => void;
   [key: string]: any;
 }
-export declare function Loadable(WrapComponent: any): (defaultLoadable?: LoadableConfig | undefined) => {
+export declare function Loadable(WrapComponent: any): (defaultLoadable?: LoadableConfig) => {
   new (props: MicroComponentProps | Readonly<MicroComponentProps>): {
     state: {
       error: any;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.1",
+  "version": "1.6.2-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -49,8 +49,8 @@
     }
   },
   "dependencies": {
-    "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.7.7",
+    "@babel/runtime": "^7.18.0",
+    "@modern-js/utils": "^1.7.8",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
@@ -67,9 +67,9 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.12.0",
+    "@modern-js/core": "1.12.1",
     "@modern-js/plugin-router": "1.2.15",
-    "@modern-js/runtime-core": "1.5.0",
+    "@modern-js/runtime-core": "1.5.1",
     "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",