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

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # @modern-js/plugin-garfish
 
+## 1.8.0
+
+### Minor Changes
+
+- 59c941a: chore(runtime): merge `@modern-js/runtime-core` to `@modern-js/runtime`
+
+  chore(runtime): 合并 `@modern-js/runtime-core` 到 `@modern-js/runtime`
+
+### Patch Changes
+
+- e686059: chore: adjust `@modern-js/plugin-garfish` runtime export path
+
+  chore: 调整 `@modern-js/plugin-garfish` runtime 导出路径
+
+- 246ac0d: feat: support runtime masterApp type
+
+  feat: 支持在 `modern.config.ts` 中提示 `runtime.masterApp` 类型
+
+- Updated dependencies [79e83ef]
+- Updated dependencies [e0cd14a]
+- Updated dependencies [287ac8b]
+- Updated dependencies [22f4dca]
+- Updated dependencies [59c941a]
+- Updated dependencies [7b9067f]
+  - @modern-js/utils@1.9.0
+  - @modern-js/runtime@1.5.0
+
+## 1.7.0
+
+### Minor Changes
+
+- 4fc801f: chore(runtime): merge `@modern-js/plugin-router` to `@modern-js/runtime`
+
+  chore(runtime): 合并 `@modern-js/plugin-router` 到 `@modern-js/runtime`
+
+### Patch Changes
+
+- Updated dependencies [1421965]
+- Updated dependencies [4fc801f]
+- Updated dependencies [b8ea9cd]
+- Updated dependencies [4fc801f]
+- Updated dependencies [4fc801f]
+- Updated dependencies [4fc801f]
+- Updated dependencies [4fc801f]
+- Updated dependencies [16eaebd]
+- Updated dependencies [8f046e8]
+- Updated dependencies [c8614b8]
+  - @modern-js/runtime@1.4.0
+  - @modern-js/utils@1.8.0
+
+## 1.6.2
+
+### Patch Changes
+
+- 7b9e302: fix: incorrect @babel/runtime version
+- Updated dependencies [dc37349]
+- Updated dependencies [a90bc96]
+  - @modern-js/plugin-router@1.2.16
+  - @modern-js/utils@1.7.9
+
 ## 1.6.0
 
 ### Minor Changes

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

@@ -173,7 +173,7 @@ export default (({
       },
 
       addRuntimeExports() {
-        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${_mfPackagePath}'`;
+        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '@modern-js/plugin-garfish'`;
         logger('exportStatement', addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
         runtimeExportsUtils.addExport(`export * from '${_mfPackagePath}'`);

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

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

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

@@ -15,7 +15,7 @@ import path from 'path';
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
 
 import Garfish from 'garfish';
-import { withRouter } from '@modern-js/plugin-router'; // import Loadable from 'react-loadable';
+import { withRouter } from '@modern-js/runtime/router'; // import Loadable from 'react-loadable';
 
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";

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

@@ -190,7 +190,7 @@ var _default = ({
       },
 
       addRuntimeExports() {
-        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${_mfPackagePath}'`;
+        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '@modern-js/plugin-garfish'`;
         (0, _util.logger)('exportStatement', addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
         runtimeExportsUtils.addExport(`export * from '${_mfPackagePath}'`);

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

@@ -15,8 +15,7 @@ var _loadable = require("../loadable");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-const _excluded = ["setLoadingState", "style"],
-      _excluded2 = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
+const _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -44,13 +43,9 @@ function generateMApp(options, manifest) {
       const {
         domId
       } = this.state;
-
-      const _this$props = this.props,
-            {
-        setLoadingState,
-        style
-      } = _this$props,
-            userProps = _objectWithoutProperties(_this$props, _excluded);
+      const {
+        setLoadingState
+      } = this.props;
 
       const {
         beforeLoad,
@@ -59,7 +54,7 @@ function generateMApp(options, manifest) {
         errorMountApp,
         errorUnmountApp
       } = options,
-            otherOptions = _objectWithoutProperties(options, _excluded2); // start auto render able
+            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
 
 
       _garfish.default.router.setRouterConfig({
@@ -131,7 +126,6 @@ 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/apps.js

@@ -11,7 +11,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _garfish = _interopRequireDefault(require("garfish"));
 
-var _pluginRouter = require("@modern-js/plugin-router");
+var _router = require("@modern-js/runtime/router");
 
 var _util = require("../../util");
 
@@ -193,7 +193,7 @@ function getAppInstance(options, appInfo, manifest) {
 
   }
 
-  return (0, _loadable.Loadable)((0, _pluginRouter.withRouter)(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
+  return (0, _loadable.Loadable)((0, _router.withRouter)(MicroApp))(manifest === null || manifest === void 0 ? void 0 : manifest.loadable);
 }
 
 function generateApps(options, manifest) {

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

@@ -184,7 +184,7 @@ export default (function () {
           };
         },
         addRuntimeExports: function addRuntimeExports() {
-          var addExportStatement = "export { default as garfish, default as masterApp, hoistNonReactStatics } from '".concat(mfPackagePath, "'");
+          var addExportStatement = "export { default as garfish, default as masterApp, hoistNonReactStatics } from '@modern-js/plugin-garfish'";
           logger('exportStatement', addExportStatement);
           pluginsExportsUtils.addExport(addExportStatement);
           runtimeExportsUtils.addExport("export * from '".concat(mfPackagePath, "'"));

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

@@ -7,8 +7,7 @@ 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 = ["setLoadingState", "style"],
-    _excluded2 = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
+var _excluded = ["beforeLoad", "beforeMount", "errorLoadApp", "errorMountApp", "errorUnmountApp"];
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
 
 import Garfish from 'garfish';
@@ -45,18 +44,14 @@ export function generateMApp(options, manifest) {
         var _this2 = this;
 
         var domId = this.state.domId;
-
-        var _this$props = this.props,
-            setLoadingState = _this$props.setLoadingState,
-            style = _this$props.style,
-            userProps = _objectWithoutProperties(_this$props, _excluded);
+        var setLoadingState = this.props.setLoadingState;
 
         var _beforeLoad = options.beforeLoad,
             _beforeMount = options.beforeMount,
             _errorLoadApp = options.errorLoadApp,
             _errorMountApp = options.errorMountApp,
             _errorUnmountApp = options.errorUnmountApp,
-            otherOptions = _objectWithoutProperties(options, _excluded2); // start auto render able
+            otherOptions = _objectWithoutProperties(options, _excluded); // start auto render able
 
 
         Garfish.router.setRouterConfig({
@@ -142,7 +137,6 @@ 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/js/treeshaking/runtime/utils/apps.js

@@ -15,7 +15,7 @@ import path from 'path';
 import React from 'react'; // eslint-disable-next-line import/no-named-as-default
 
 import Garfish from 'garfish';
-import { withRouter } from '@modern-js/plugin-router'; // import Loadable from 'react-loadable';
+import { withRouter } from '@modern-js/runtime/router'; // import Loadable from 'react-loadable';
 
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RouteComponentProps } from '@modern-js/plugin-router';
+import { RouteComponentProps } from '@modern-js/runtime/router';
 import { LoadableConfig, MicroComponentProps } from './useModuleApps';
 export interface MicroProps extends RouteComponentProps {
   setLoadingState: (state: {

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

@@ -1,4 +1,4 @@
-import type { Plugin } from '@modern-js/runtime-core';
+import type { Plugin } from '@modern-js/runtime';
 import { Config } from './useModuleApps';
 
 declare const _default: (config: Config) => Plugin;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.2-beta.1",
+  "version": "1.8.0",
   "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.7.8",
+    "@modern-js/utils": "^1.9.0",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
@@ -59,18 +59,17 @@
     "react-loadable": "^5.5.0"
   },
   "peerDependencies": {
-    "@modern-js/plugin-router": "^1.2.15"
+    "@modern-js/runtime": "^1.5.0"
   },
   "peerDependenciesMeta": {
-    "@modern-js/plugin-router": {
+    "@modern-js/runtime": {
       "optional": true
     }
   },
   "devDependencies": {
-    "@modern-js/core": "1.12.1",
-    "@modern-js/plugin-router": "1.2.15",
-    "@modern-js/runtime-core": "1.5.1",
-    "@modern-js/types": "1.5.4",
+    "@modern-js/core": "1.14.0",
+    "@modern-js/runtime": "1.5.0",
+    "@modern-js/types": "1.6.2",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@testing-library/jest-dom": "^5.16.1",
@@ -78,6 +77,7 @@
     "@testing-library/react-hooks": "^7.0.1",
     "@testing-library/user-event": "^13.5.0",
     "@types/hoist-non-react-statics": "^3.3.1",
+    "@types/testing-library__jest-dom": "^5.14.3",
     "@types/jest": "^27",
     "@types/node": "^14",
     "@types/react": "^17",

package/type.d.ts

@@ -1,4 +1,12 @@
+import { Config } from './dist/types/runtime/useModuleApps';
+
 declare module '@modern-js/runtime' {
   export const useModuleApp: typeof import('./dist/types/runtime').useModuleApp;
   export const useModuleApps: typeof import('./dist/types/runtime').useModuleApps;
 }
+
+declare module '@modern-js/core' {
+  interface RuntimeConfig {
+    masterApp?: Config
+  }
+}