@modern-js/plugin-garfish 1.5.1 → 1.5.2

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @modern-js/plugin-garfish
 
+## 1.5.2
+
+### Patch Changes
+
+- a1198d509: feat: bump babel 7.18.0
+- df0694aba: fix(garfish-plugin): app static properties missing
+- Updated dependencies [a1198d509]
+  - @modern-js/plugin-router@1.2.15
+
 ## 1.5.1
 
 ### Patch Changes

package/dist/js/modern/cli/index.js

@@ -172,7 +172,7 @@ export default (({
       },
 
       addRuntimeExports() {
-        const addExportStatement = `export { default as garfish, default as masterApp } from '${_mfPackagePath}'`;
+        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${_mfPackagePath}'`;
         logger('exportStatement', addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
         runtimeExportsUtils.addExport(`export * from '${_mfPackagePath}'`);
@@ -203,6 +203,12 @@ export default (({
           });
         }
 
+        imports.push({
+          value: _runtimePluginName,
+          specifiers: [{
+            imported: 'hoistNonReactStatics'
+          }]
+        });
         imports.push({
           value: 'react-dom',
           specifiers: [{

package/dist/js/modern/cli/utils.js

@@ -7,7 +7,7 @@ export const provider = function ({basename, dom}) {
       const App = function () {
         return React.createElement(SubApp, props)
       };
-      bootstrap(App, node);
+      bootstrap(hoistNonReactStatics(App,SubApp), node);
     },
     destroy({ dom }) {
       const node = dom.querySelector('#' + MOUNT_ID) || dom;

package/dist/js/modern/runtime/index.js

@@ -1,3 +1,4 @@
 export { default } from "./plugin";
 export { useModuleApps, useModuleApp } from "./useModuleApps";
-export { default as Garfish, default as garfish } from 'garfish';
+export { default as Garfish, default as garfish } from 'garfish';
+export { default as hoistNonReactStatics } from 'hoist-non-react-statics';

package/dist/js/node/cli/index.js

@@ -189,7 +189,7 @@ var _default = ({
       },
 
       addRuntimeExports() {
-        const addExportStatement = `export { default as garfish, default as masterApp } from '${_mfPackagePath}'`;
+        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${_mfPackagePath}'`;
         (0, _util.logger)('exportStatement', addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
         runtimeExportsUtils.addExport(`export * from '${_mfPackagePath}'`);
@@ -220,6 +220,12 @@ var _default = ({
           });
         }
 
+        imports.push({
+          value: _runtimePluginName,
+          specifiers: [{
+            imported: 'hoistNonReactStatics'
+          }]
+        });
         imports.push({
           value: 'react-dom',
           specifiers: [{

package/dist/js/node/cli/utils.js

@@ -16,7 +16,7 @@ export const provider = function ({basename, dom}) {
       const App = function () {
         return React.createElement(SubApp, props)
       };
-      bootstrap(App, node);
+      bootstrap(hoistNonReactStatics(App,SubApp), node);
     },
     destroy({ dom }) {
       const node = dom.querySelector('#' + MOUNT_ID) || dom;

package/dist/js/node/runtime/index.js

@@ -21,6 +21,12 @@ Object.defineProperty(exports, "garfish", {
     return _garfish.default;
   }
 });
+Object.defineProperty(exports, "hoistNonReactStatics", {
+  enumerable: true,
+  get: function () {
+    return _hoistNonReactStatics.default;
+  }
+});
 Object.defineProperty(exports, "useModuleApp", {
   enumerable: true,
   get: function () {
@@ -40,4 +46,6 @@ var _useModuleApps = require("./useModuleApps");
 
 var _garfish = _interopRequireDefault(require("garfish"));
 
+var _hoistNonReactStatics = _interopRequireDefault(require("hoist-non-react-statics"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/js/treeshaking/cli/index.js

@@ -1,7 +1,7 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import path from 'path';
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from '@modern-js/utils';
 import { logger } from "../util";
@@ -44,10 +44,10 @@ export default (function () {
           return PLUGIN_SCHEMAS['@modern-js/plugin-garfish'];
         },
         resolvedConfig: function () {
-          var _resolvedConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(config) {
+          var _resolvedConfig = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(config) {
             var resolved, _getRuntimeConfig, masterApp, router, nConfig, _router$historyOption;
 
-            return _regeneratorRuntime.wrap(function _callee$(_context) {
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) {
                 switch (_context.prev = _context.next) {
                   case 0:
@@ -183,7 +183,7 @@ export default (function () {
           };
         },
         addRuntimeExports: function addRuntimeExports() {
-          var addExportStatement = "export { default as garfish, default as masterApp } from '".concat(mfPackagePath, "'");
+          var addExportStatement = "export { default as garfish, default as masterApp, hoistNonReactStatics } from '".concat(mfPackagePath, "'");
           logger('exportStatement', addExportStatement);
           pluginsExportsUtils.addExport(addExportStatement);
           runtimeExportsUtils.addExport("export * from '".concat(mfPackagePath, "'"));
@@ -212,6 +212,12 @@ export default (function () {
             });
           }
 
+          imports.push({
+            value: runtimePluginName,
+            specifiers: [{
+              imported: 'hoistNonReactStatics'
+            }]
+          });
           imports.push({
             value: 'react-dom',
             specifiers: [{

package/dist/js/treeshaking/cli/utils.js

@@ -1,5 +1,5 @@
 export var makeProvider = function makeProvider() {
-  return "\nexport const provider = function ({basename, dom}) {\n  return {\n    render({basename, dom, props}) {\n      const SubApp = render({ props, basename });\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n      const App = function () {\n        return React.createElement(SubApp, props)\n      };\n      bootstrap(App, node);\n    },\n    destroy({ dom }) {\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n      if (node) {\n        unmountComponentAtNode(node);\n      }\n    },\n    SubModuleComponent: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    },\n    jupiter_submodule_app_key: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    }\n  }\n};\n\nif (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n  __GARFISH_EXPORTS__.provider = provider;\n}\n";
+  return "\nexport const provider = function ({basename, dom}) {\n  return {\n    render({basename, dom, props}) {\n      const SubApp = render({ props, basename });\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n      const App = function () {\n        return React.createElement(SubApp, props)\n      };\n      bootstrap(hoistNonReactStatics(App,SubApp), node);\n    },\n    destroy({ dom }) {\n      const node = dom.querySelector('#' + MOUNT_ID) || dom;\n\n      if (node) {\n        unmountComponentAtNode(node);\n      }\n    },\n    SubModuleComponent: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    },\n    jupiter_submodule_app_key: (props) => {\n      const SubApp = render({props, basename});\n\n      return createPortal(<SubApp />, dom.querySelector('#' + MOUNT_ID)  || dom);\n    }\n  }\n};\n\nif (typeof __GARFISH_EXPORTS__ !== 'undefined') {\n  __GARFISH_EXPORTS__.provider = provider;\n}\n";
 };
 export var makeRenderFunction = function makeRenderFunction(code) {
   var inGarfishToRender = "\n  const { basename, props } = arguments[0] || {};\n  let renderByGarfish = false;\n  const renderByProvider = !!basename;\n\n  if (IS_BROWSER && window.Garfish && window.Garfish.activeApps && window.Garfish.activeApps.length !== 0) renderByGarfish = true;\n  if (IS_BROWSER && window.Garfish && window.Garfish.apps && Object.keys(window.Garfish.apps).length !== 0) renderByGarfish = true;\n  if (typeof __GARFISH_EXPORTS__ !== 'undefined') renderByGarfish = true;\n  if (renderByGarfish && !renderByProvider) return null;\n\n  function RouterPlugin (routerConfig) {\n    if (basename) {\n      routerConfig.basename = basename;\n      if (routerConfig.supportHtml5History !== false) {\n        if (!routerConfig.historyOptions) {\n          routerConfig.historyOptions = {\n            basename: basename\n          };\n        } else {\n          routerConfig.historyOptions.basename = basename;\n        }\n      }\n    }\n    return router(routerConfig);\n  }\n  ";

package/dist/js/treeshaking/runtime/index.js

@@ -1,3 +1,4 @@
 export { default } from "./plugin";
 export { useModuleApps, useModuleApp } from "./useModuleApps";
-export { default as Garfish, default as garfish } from 'garfish';
+export { default as Garfish, default as garfish } from 'garfish';
+export { default as hoistNonReactStatics } from 'hoist-non-react-statics';

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

@@ -1,4 +1,5 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
 import _assertThisInitialized from "@babel/runtime/helpers/esm/assertThisInitialized";
@@ -8,7 +9,6 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 var _excluded = ["manifest"];
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React from 'react';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import { logger } from "../util";
@@ -24,7 +24,7 @@ function initOptions() {
 
 
 function _initOptions() {
-  _initOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+  _initOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var _window, _window$modern_manife, _window2, _window2$modern_manif;
 
     var manifest,
@@ -35,7 +35,7 @@ function _initOptions() {
         _window3$modern_manif,
         _args2 = arguments;
 
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
@@ -133,10 +133,10 @@ export default (function (config) {
               });
 
               var load = /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
                   var GarfishConfig, MApp, _generateApps, appInfoList, apps;
 
-                  return _regeneratorRuntime.wrap(function _callee$(_context) {
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) {
                       switch (_context.prev = _context.next) {
                         case 0:

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

@@ -1,3 +1,4 @@
+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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -9,7 +10,6 @@ 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 = ["match", "history", "setLoadingState"];
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 // The loading logic of the current component refers to react-loadable https://github.com/jamiebuilds/react-loadable
 import path from 'path';
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
@@ -60,10 +60,10 @@ function getAppInstance(options, appInfo, manifest) {
       key: "UNSAFE_componentWillMount",
       value: // eslint-disable-next-line @typescript-eslint/naming-convention
       function () {
-        var _UNSAFE_componentWillMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _UNSAFE_componentWillMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           var _this$props, match, history, setLoadingState, userProps, domId, loadAppOptions, appInstance;
 
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
@@ -188,12 +188,12 @@ function getAppInstance(options, appInfo, manifest) {
     }, {
       key: "componentWillUnmount",
       value: function () {
-        var _componentWillUnmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var _componentWillUnmount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
           var _this$unregisterHisto;
 
           var appInstance, _appInfo;
 
-          return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
                 case 0:

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

@@ -1,4 +1,5 @@
 export { default } from './plugin';
 export { useModuleApps, useModuleApp } from './useModuleApps';
 export type { Manifest, ModuleInfo } from './useModuleApps';
-export { default as Garfish, default as garfish } from 'garfish';
+export { default as Garfish, default as garfish } from 'garfish';
+export { default as hoistNonReactStatics } from 'hoist-non-react-statics';

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.5.1",
+  "version": "1.5.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/runtime/index.d.ts",
   "typesVersions": {
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/utils": "^1.7.6",
+    "@modern-js/utils": "^1.7.5",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
@@ -58,10 +58,18 @@
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0"
   },
+  "peerDependencies": {
+    "@modern-js/plugin-router": "^1.2.15"
+  },
+  "peerDependenciesMeta": {
+    "@modern-js/plugin-router": {
+      "optional": true
+    }
+  },
   "devDependencies": {
-    "@modern-js/core": "1.11.1",
-    "@modern-js/plugin-router": "1.2.14",
-    "@modern-js/runtime-core": "1.4.7",
+    "@modern-js/core": "1.11.2",
+    "@modern-js/plugin-router": "1.2.15",
+    "@modern-js/runtime-core": "1.4.9",
     "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
@@ -82,11 +90,6 @@
     "typescript": "^4",
     "webpack-chain": "^6.5.1"
   },
-  "peerDependencies": {
-    "@modern-js/plugin-router": "^1.2.14",
-    "@modern-js/runtime-core": "^1.4.7",
-    "react": "^17"
-  },
   "sideEffects": false,
   "modernConfig": {},
   "publishConfig": {