@modern-js/plugin-garfish 2.0.0-beta.4 → 2.0.0-beta.6

package/CHANGELOG.md

@@ -1,5 +1,80 @@
 # @modern-js/plugin-garfish
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- df7ee2d: feat: runtime user config types extends
+  feat: runtime 用户配置类型扩展
+
+### Patch Changes
+
+- 6604f1b8b3: feat: support router basename
+  feat: router 插件支持设置 basename
+- 21d2ddb59c: feat: support async export provider for module federation
+  支持模块联邦场景异步导出 provider
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- 2344eb26ed: fix: loadApp when dom is mount
+  修复 dom 未渲染时挂载子应用行为
+- Updated dependencies [2344eb26ed]
+- Updated dependencies [a11fcf8b50]
+- Updated dependencies [a93159440e]
+- Updated dependencies [e7ce0636d1]
+- Updated dependencies [b18fa8f3ed]
+- Updated dependencies [7879e8f711]
+- Updated dependencies [50d4675e5b]
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [6604f1b8b3]
+- Updated dependencies [6aca875011]
+- Updated dependencies [fda836fe8a]
+- Updated dependencies [d6bc321747]
+- Updated dependencies [3e57f2bd58]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [c5798d284f]
+- Updated dependencies [fbf5eed5aa]
+- Updated dependencies [a2509bfbdb]
+- Updated dependencies [a7c68832b3]
+- Updated dependencies [425e57092d]
+- Updated dependencies [e4357f1856]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [4369648ae2]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [df7ee2d]
+- Updated dependencies [92c0994468]
+- Updated dependencies [2cc2eb35ba]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [40ed5874c6]
+- Updated dependencies [60d5378632]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [21d7521]
+- Updated dependencies [9144c21d27]
+- Updated dependencies [b710adb843]
+- Updated dependencies [18aaf42249]
+- Updated dependencies [34702d5d47]
+- Updated dependencies [fcace5b5b9]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/runtime@2.0.0-beta.6
+  - @modern-js/utils@2.0.0-beta.6
+
 ## 2.0.0-beta.4
 
 ### Major Changes

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

@@ -44,6 +44,7 @@ import {
   setRuntimeConfig,
   generateAsyncEntry
 } from "./utils";
+import "./types";
 const externals = { "react-dom": "react-dom", react: "react" };
 function getDefaultMicroFrontedConfig(microFrontend) {
   if (microFrontend === true) {
@@ -181,10 +182,12 @@ var cli_default = ({
         };
       },
       addRuntimeExports() {
-        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${pluginName}'`;
+        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${pluginName}/runtime'`;
         logger("exportStatement", addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
-        runtimeExportsUtils.addExport(`export * from '${mfPackagePath}'`);
+        runtimeExportsUtils.addExport(
+          `export * from '${mfPackagePath}/runtime'`
+        );
       },
       modifyEntryImports({ entrypoint, imports }) {
         const config = useResolvedConfigContext();

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

@@ -53,7 +53,7 @@ import { Fragment, jsx } from "react/jsx-runtime";
 import path from "path";
 import React from "react";
 import Garfish from "garfish";
-import { withRouter } from "@modern-js/plugin-router-legacy";
+import { withRouter } from "@modern-js/plugin-router-v5/runtime";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
 function getAppInstance(options, appInfo, manifest) {

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

@@ -2,8 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,33 +35,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => cli_default,
-  externals: () => externals,
-  getDefaultMicroFrontedConfig: () => getDefaultMicroFrontedConfig
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_path = __toESM(require("path"));
-var import_utils = require("@modern-js/utils");
-var import_util = require("../util");
-var import_utils2 = require("./utils");
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -68,6 +55,18 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var cli_exports = {};
+__export(cli_exports, {
+  default: () => cli_default,
+  externals: () => externals,
+  getDefaultMicroFrontedConfig: () => getDefaultMicroFrontedConfig
+});
+module.exports = __toCommonJS(cli_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_util = require("../util");
+var import_utils2 = require("./utils");
+var import_types = require("./types");
 const externals = { "react-dom": "react-dom", react: "react" };
 function getDefaultMicroFrontedConfig(microFrontend) {
   if (microFrontend === true) {
@@ -205,10 +204,12 @@ var cli_default = ({
         };
       },
       addRuntimeExports() {
-        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${pluginName}'`;
+        const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${pluginName}/runtime'`;
         (0, import_util.logger)("exportStatement", addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
-        runtimeExportsUtils.addExport(`export * from '${mfPackagePath}'`);
+        runtimeExportsUtils.addExport(
+          `export * from '${mfPackagePath}/runtime'`
+        );
       },
       modifyEntryImports({ entrypoint, imports }) {
         const config = useResolvedConfigContext();
@@ -313,3 +314,8 @@ var cli_default = ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  externals,
+  getDefaultMicroFrontedConfig
+});

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

@@ -15,15 +15,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var utils_exports = {};
+__export(utils_exports, {
   generateAsyncEntry: () => generateAsyncEntry,
   getRuntimeConfig: () => getRuntimeConfig,
   makeProvider: () => makeProvider,
   makeRenderFunction: () => makeRenderFunction,
   setRuntimeConfig: () => setRuntimeConfig
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(utils_exports);
 const makeProvider = () => `
 export const provider = function ({basename, dom}) {
   return {
@@ -148,3 +148,11 @@ const generateAsyncEntry = (code) => {
       ${transformCode}
     `;
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateAsyncEntry,
+  getRuntimeConfig,
+  makeProvider,
+  makeRenderFunction,
+  setRuntimeConfig
+});

package/dist/js/node/index.js

@@ -22,10 +22,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var src_exports = {};
+__export(src_exports, {
   default: () => import_runtime.default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(src_exports);
 var import_runtime = __toESM(require("./runtime"));
-__reExport(stdin_exports, require("./runtime"), module.exports);
+__reExport(src_exports, require("./runtime"), module.exports);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

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

@@ -21,8 +21,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var runtime_exports = {};
+__export(runtime_exports, {
   Garfish: () => import_garfish.default,
   default: () => import_plugin.default,
   garfish: () => import_garfish.default,
@@ -30,8 +30,16 @@ __export(stdin_exports, {
   useModuleApp: () => import_useModuleApps.useModuleApp,
   useModuleApps: () => import_useModuleApps.useModuleApps
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(runtime_exports);
 var import_plugin = __toESM(require("./plugin"));
 var import_useModuleApps = require("./useModuleApps");
 var import_garfish = __toESM(require("garfish"));
 var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Garfish,
+  garfish,
+  hoistNonReactStatics,
+  useModuleApp,
+  useModuleApps
+});

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

@@ -1,38 +1,15 @@
 var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  Loadable: () => Loadable
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_react = require("react");
-var import_util = require("../util");
-var __defProp2 = Object.defineProperty;
 var __defProps = Object.defineProperties;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -45,7 +22,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
   if (source != null && __getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(source)) {
@@ -54,6 +31,27 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var loadable_exports = {};
+__export(loadable_exports, {
+  Loadable: () => Loadable
+});
+module.exports = __toCommonJS(loadable_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_react = require("react");
+var import_util = require("../util");
 const DEFAULT_LOADABLE = {
   delay: 200,
   timeout: 1e4,
@@ -150,3 +148,7 @@ function Loadable(WrapComponent) {
     };
   };
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Loadable
+});

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

@@ -1,50 +1,17 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  default: () => plugin_default
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_garfish = __toESM(require("garfish"));
-var import_react = __toESM(require("react"));
-var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
-var import_util = require("../util");
-var import_Context = require("./utils/Context");
-var import_setExternal = __toESM(require("./utils/setExternal"));
-var import_MApp = require("./utils/MApp");
-var import_apps = require("./utils/apps");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -57,7 +24,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
   if (source != null && __getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(source)) {
@@ -66,6 +33,23 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -86,6 +70,20 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var plugin_exports = {};
+__export(plugin_exports, {
+  default: () => plugin_default
+});
+module.exports = __toCommonJS(plugin_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_garfish = __toESM(require("garfish"));
+var import_react = __toESM(require("react"));
+var import_hoist_non_react_statics = __toESM(require("hoist-non-react-statics"));
+var import_util = require("../util");
+var import_Context = require("./utils/Context");
+var import_setExternal = __toESM(require("./utils/setExternal"));
+var import_MApp = require("./utils/MApp");
+var import_apps = require("./utils/apps");
 function initOptions() {
   return __async(this, arguments, function* (manifest = {}, options) {
     var _a, _b, _c;
@@ -179,3 +177,5 @@ var plugin_default = (config) => ({
     };
   }
 });
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/runtime/useModuleApps.js

@@ -2,8 +2,22 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,31 +35,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var useModuleApps_exports = {};
+__export(useModuleApps_exports, {
   useModuleApp: () => useModuleApp,
   useModuleApps: () => useModuleApps
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(useModuleApps_exports);
 var import_react = __toESM(require("react"));
 var import_util = require("../util");
 var import_Context = require("./utils/Context");
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
 function useModuleApps() {
   const { apps, MApp, appInfoList } = (0, import_react.useContext)(import_Context.GarfishContext);
   (0, import_util.logger)("call useModuleApps", __spreadValues({
@@ -73,3 +71,8 @@ function useModuleApp() {
   (0, import_util.logger)("call useModuleApps", MApp);
   return MApp;
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  useModuleApp,
+  useModuleApps
+});

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

@@ -21,12 +21,17 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var Context_exports = {};
+__export(Context_exports, {
   GarfishContext: () => GarfishContext,
   GarfishProvider: () => GarfishProvider
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(Context_exports);
 var import_react = __toESM(require("react"));
 const GarfishContext = import_react.default.createContext(null);
 const GarfishProvider = GarfishContext.Provider;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  GarfishContext,
+  GarfishProvider
+});

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

@@ -2,8 +2,34 @@ var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -21,44 +47,16 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var MApp_exports = {};
+__export(MApp_exports, {
   generateMApp: () => generateMApp
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(MApp_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_react = __toESM(require("react"));
 var import_garfish = __toESM(require("garfish"));
 var import_util = require("../../util");
 var import_loadable = require("../loadable");
-var __defProp2 = Object.defineProperty;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __objRest = (source, exclude) => {
-  var target = {};
-  for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
-      target[prop] = source[prop];
-  if (source != null && __getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(source)) {
-      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
-        target[prop] = source[prop];
-    }
-  return target;
-};
 function generateMApp(options, manifest) {
   class MApp extends import_react.default.Component {
     constructor() {
@@ -188,3 +186,7 @@ function generateMApp(options, manifest) {
   }
   return (0, import_loadable.Loadable)(MApp)(manifest == null ? void 0 : manifest.loadable);
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateMApp
+});

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

@@ -1,48 +1,17 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
-  generateApps: () => generateApps
-});
-module.exports = __toCommonJS(stdin_exports);
-var import_jsx_runtime = require("react/jsx-runtime");
-var import_path = __toESM(require("path"));
-var import_react = __toESM(require("react"));
-var import_garfish = __toESM(require("garfish"));
-var import_plugin_router_legacy = require("@modern-js/plugin-router-legacy");
-var import_util = require("../../util");
-var import_loadable = require("../loadable");
-var __defProp2 = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
-    if (__hasOwnProp2.call(b, prop))
+    if (__hasOwnProp.call(b, prop))
       __defNormalProp(a, prop, b[prop]);
   if (__getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(b)) {
@@ -55,7 +24,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __objRest = (source, exclude) => {
   var target = {};
   for (var prop in source)
-    if (__hasOwnProp2.call(source, prop) && exclude.indexOf(prop) < 0)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
       target[prop] = source[prop];
   if (source != null && __getOwnPropSymbols)
     for (var prop of __getOwnPropSymbols(source)) {
@@ -64,6 +33,23 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -84,6 +70,18 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+var apps_exports = {};
+__export(apps_exports, {
+  generateApps: () => generateApps
+});
+module.exports = __toCommonJS(apps_exports);
+var import_jsx_runtime = require("react/jsx-runtime");
+var import_path = __toESM(require("path"));
+var import_react = __toESM(require("react"));
+var import_garfish = __toESM(require("garfish"));
+var import_runtime = require("@modern-js/plugin-router-v5/runtime");
+var import_util = require("../../util");
+var import_loadable = require("../loadable");
 function getAppInstance(options, appInfo, manifest) {
   let locationHref = "";
   class MicroApp extends import_react.default.Component {
@@ -216,7 +214,7 @@ function getAppInstance(options, appInfo, manifest) {
       });
     }
   }
-  return (0, import_loadable.Loadable)((0, import_plugin_router_legacy.withRouter)(MicroApp))(
+  return (0, import_loadable.Loadable)((0, import_runtime.withRouter)(MicroApp))(
     manifest == null ? void 0 : manifest.loadable
   );
 }
@@ -230,3 +228,7 @@ function generateApps(options, manifest) {
   });
   return { apps, appInfoList: options.apps || [] };
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  generateApps
+});

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

@@ -21,11 +21,11 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var setExternal_exports = {};
+__export(setExternal_exports, {
   default: () => setExternal_default
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(setExternal_exports);
 var import_react = __toESM(require("react"));
 var import_react_dom = __toESM(require("react-dom"));
 var import_garfish = __toESM(require("garfish"));
@@ -35,3 +35,5 @@ var setExternal_default = () => {
   import_garfish.default.setExternal("react", import_react.default);
   import_garfish.default.setExternal("react-dom", import_react_dom.default);
 };
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {});

package/dist/js/node/util.js

@@ -21,16 +21,22 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var stdin_exports = {};
-__export(stdin_exports, {
+var util_exports = {};
+__export(util_exports, {
   SUBMODULE_APP_COMPONENT_KEY: () => SUBMODULE_APP_COMPONENT_KEY,
   generateSubAppContainerKey: () => generateSubAppContainerKey,
   logger: () => logger
 });
-module.exports = __toCommonJS(stdin_exports);
+module.exports = __toCommonJS(util_exports);
 var import_debug = __toESM(require("debug"));
 const logger = (0, import_debug.default)("modern-js:plugin-garfish");
 const SUBMODULE_APP_COMPONENT_KEY = "SubModuleComponent";
 function generateSubAppContainerKey(moduleInfo) {
   return moduleInfo ? `modern_sub_app_container_${decodeURIComponent(moduleInfo == null ? void 0 : moduleInfo.name)}` : "modern_sub_app_container";
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  SUBMODULE_APP_COMPONENT_KEY,
+  generateSubAppContainerKey,
+  logger
+});

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

@@ -154,6 +154,7 @@ import path from "path";
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 import { logger } from "../util";
 import { getRuntimeConfig, makeProvider, makeRenderFunction, setRuntimeConfig, generateAsyncEntry } from "./utils";
+import "./types";
 var externals = {
     "react-dom": "react-dom",
     react: "react"
@@ -288,10 +289,10 @@ var cli_default = function() {
                     };
                 },
                 addRuntimeExports: function addRuntimeExports() {
-                    var addExportStatement = "export { default as garfish, default as masterApp, hoistNonReactStatics } from '".concat(pluginName, "'");
+                    var addExportStatement = "export { default as garfish, default as masterApp, hoistNonReactStatics } from '".concat(pluginName, "/runtime'");
                     logger("exportStatement", addExportStatement);
                     pluginsExportsUtils.addExport(addExportStatement);
-                    runtimeExportsUtils.addExport("export * from '".concat(mfPackagePath, "'"));
+                    runtimeExportsUtils.addExport("export * from '".concat(mfPackagePath, "/runtime'"));
                 },
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;

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

@@ -315,7 +315,7 @@ import { Fragment, jsx } from "react/jsx-runtime";
 import path from "path";
 import React from "react";
 import Garfish from "garfish";
-import { withRouter } from "@modern-js/plugin-router-legacy";
+import { withRouter } from "@modern-js/plugin-router-v5/runtime";
 import { logger, generateSubAppContainerKey } from "../../util";
 import { Loadable } from "../loadable";
 function getAppInstance(options, appInfo, manifest) {

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

@@ -1,5 +1,6 @@
 import type { CliHookCallbacks, useConfigContext } from '@modern-js/core';
 import type { CliPlugin, AppTools } from '@modern-js/app-tools';
+import './types';
 export declare type UseConfig = ReturnType<typeof useConfigContext>;
 export declare const externals: {
   'react-dom': string;

package/dist/types/cli/types.d.ts

@@ -0,0 +1,6 @@
+import { Config as MasterAppConfig } from '../runtime/useModuleApps';
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
+    masterApp?: MasterAppConfig;
+  }
+}

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

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

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { RouteComponentProps } from '@modern-js/plugin-router-legacy';
+import { RouteComponentProps } from '@modern-js/plugin-router-v5/runtime';
 import { LoadableConfig, MicroComponentProps } from './useModuleApps';
 export interface MicroProps extends RouteComponentProps {
   setLoadingState: (state: {

package/package.json

@@ -11,9 +11,9 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.4",
-  "jsnext:source": "./src/index.ts",
-  "types": "./dist/types/runtime/index.d.ts",
+  "version": "2.0.0-beta.6",
+  "jsnext:source": "./src/cli/index.ts",
+  "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
     "*": {
       ".": [
@@ -30,22 +30,26 @@
       ]
     }
   },
-  "main": "./dist/js/node/index.js",
+  "main": "./dist/js/node/cli/index.js",
   "module": "./dist/js/treeshaking/runtime/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "jsnext:modern": "./dist/js/modern/cli/index.js",
   "exports": {
     "./types": "./type.d.ts",
     ".": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
+    "./cli": {
+      "jsnext:source": "./src/cli/index.ts",
+      "default": "./dist/js/node/cli/index.js"
+    },
+    "./runtime": {
       "node": {
         "jsnext:source": "./src/index.ts",
         "import": "./dist/js/modern/index.js",
         "require": "./dist/js/node/index.js"
       },
       "default": "./dist/js/treeshaking/runtime/index.js"
-    },
-    "./cli": {
-      "jsnext:source": "./src/cli/index.ts",
-      "default": "./dist/js/node/cli/index.js"
     }
   },
   "dependencies": {
@@ -56,10 +60,10 @@
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
     "react-loadable": "^5.5.0",
-    "@modern-js/utils": "2.0.0-beta.4"
+    "@modern-js/utils": "2.0.0-beta.6"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.0.0-beta.4"
+    "@modern-js/runtime": "^2.0.0-beta.6"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -78,16 +82,16 @@
     "jest-fetch-mock": "^3.0.3",
     "react": "^18",
     "react-dom": "^18",
-    "react-router-dom": "^6.4.4",
+    "react-router-dom": "^6.6.0",
     "typescript": "^4",
     "webpack-chain": "^6.5.1",
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/plugin-router-legacy": "2.0.0-beta.4",
-    "@modern-js/runtime": "2.0.0-beta.4",
-    "@modern-js/types": "2.0.0-beta.4",
-    "@scripts/build": "2.0.0-beta.4",
-    "@modern-js/app-tools": "2.0.0-beta.4",
-    "@scripts/jest-config": "2.0.0-beta.4"
+    "@modern-js/app-tools": "2.0.0-beta.6",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/plugin-router-v5": "2.0.0-beta.6",
+    "@modern-js/runtime": "2.0.0-beta.6",
+    "@modern-js/types": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6",
+    "@scripts/jest-config": "2.0.0-beta.6"
   },
   "sideEffects": false,
   "modernConfig": {},

package/type.d.ts

@@ -1,13 +1,12 @@
-import { Config } from './dist/types/runtime/useModuleApps';
-import '@modern-js/plugin-router-legacy';
-
-declare module '@modern-js/runtime' {
+import '@modern-js/plugin-router-v5';
+import { Config } from './dist/types';
+declare module '@modern-js/runtime/garfish' {
   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 {
+declare module '@modern-js/runtime' {
+  interface AppConfig {
     masterApp?: Config;
   }
 }