@modern-js/plugin-garfish 2.0.0-beta.5 → 2.0.0-beta.7

package/CHANGELOG.md

@@ -1,5 +1,97 @@
 # @modern-js/plugin-garfish
 
+## 2.0.0-beta.7
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Patch Changes
+
+- Updated dependencies [c9e800d39a]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [6bda14ed71]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [8b8e1bb571]
+- Updated dependencies [bbe4c4ab64]
+  - @modern-js/runtime@2.0.0-beta.7
+  - @modern-js/utils@2.0.0-beta.7
+
+## 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

@@ -34,7 +34,6 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import path from "path";
 import { createRuntimeExportsUtils, PLUGIN_SCHEMAS } from "@modern-js/utils";
 import { logger } from "../util";
 import {
@@ -44,7 +43,6 @@ import {
   setRuntimeConfig,
   generateAsyncEntry
 } from "./utils";
-import "./types";
 const externals = { "react-dom": "react-dom", react: "react" };
 function getDefaultMicroFrontedConfig(microFrontend) {
   if (microFrontend === true) {
@@ -61,13 +59,11 @@ function getDefaultMicroFrontedConfig(microFrontend) {
 }
 var cli_default = ({
   pluginName = "@modern-js/plugin-garfish",
-  runtimePluginName = "@modern-js/runtime/plugins",
-  mfPackagePath = path.resolve(__dirname, "../../../../")
+  runtimePluginName = "@modern-js/runtime/plugins"
 } = {}) => ({
   name: "@modern-js/plugin-garfish",
   setup: ({ useAppContext, useResolvedConfigContext, useConfigContext }) => {
     let pluginsExportsUtils;
-    let runtimeExportsUtils;
     return {
       validateSchema() {
         return PLUGIN_SCHEMAS["@modern-js/plugin-garfish"];
@@ -108,10 +104,6 @@ var cli_default = ({
           config.internalDirectory,
           "plugins"
         );
-        runtimeExportsUtils = createRuntimeExportsUtils(
-          config.internalDirectory,
-          "index"
-        );
         let disableCssExtract = ((_a = useConfig.output) == null ? void 0 : _a.disableCssExtract) || false;
         if ((_b = useConfig.deploy) == null ? void 0 : _b.microFrontend) {
           const { enableHtmlEntry } = getDefaultMicroFrontedConfig(
@@ -128,7 +120,7 @@ var cli_default = ({
           source: {
             alias: {
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath(),
-              "@modern-js/runtime/garfish": mfPackagePath
+              "@modern-js/runtime/garfish": "@modern-js/plugin-garfish/runtime"
             }
           },
           tools: {
@@ -185,9 +177,6 @@ var cli_default = ({
         const addExportStatement = `export { default as garfish, default as masterApp, hoistNonReactStatics } from '${pluginName}/runtime'`;
         logger("exportStatement", addExportStatement);
         pluginsExportsUtils.addExport(addExportStatement);
-        runtimeExportsUtils.addExport(
-          `export * from '${mfPackagePath}/runtime'`
-        );
       },
       modifyEntryImports({ entrypoint, imports }) {
         const config = useResolvedConfigContext();

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

@@ -64,7 +64,7 @@ function pathJoin(...args) {
     if (nPath[0] !== "/") {
       nPath = `/${nPath}`;
     }
-    const lastIndex = path.length - 1;
+    const lastIndex = nPath.length - 1;
     if (nPath[lastIndex] === "/") {
       nPath = nPath.substring(0, lastIndex);
     }
@@ -90,7 +90,7 @@ function getAppInstance(options, appInfo, manifest) {
       basename = pathJoin(basename, (match == null ? void 0 : match.path) || "/");
     }
     useEffect(() => {
-      if (location && locationHref !== location.pathname) {
+      if (location && locationHref !== location.pathname && !Garfish.running) {
         locationHref = location.pathname;
         const popStateEvent = new PopStateEvent("popstate");
         popStateEvent.garfish = true;

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

@@ -1,9 +1,7 @@
-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;
@@ -30,10 +28,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   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) => {
@@ -62,11 +56,9 @@ __export(cli_exports, {
   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) {
@@ -83,13 +75,11 @@ function getDefaultMicroFrontedConfig(microFrontend) {
 }
 var cli_default = ({
   pluginName = "@modern-js/plugin-garfish",
-  runtimePluginName = "@modern-js/runtime/plugins",
-  mfPackagePath = import_path.default.resolve(__dirname, "../../../../")
+  runtimePluginName = "@modern-js/runtime/plugins"
 } = {}) => ({
   name: "@modern-js/plugin-garfish",
   setup: ({ useAppContext, useResolvedConfigContext, useConfigContext }) => {
     let pluginsExportsUtils;
-    let runtimeExportsUtils;
     return {
       validateSchema() {
         return import_utils.PLUGIN_SCHEMAS["@modern-js/plugin-garfish"];
@@ -130,10 +120,6 @@ var cli_default = ({
           config.internalDirectory,
           "plugins"
         );
-        runtimeExportsUtils = (0, import_utils.createRuntimeExportsUtils)(
-          config.internalDirectory,
-          "index"
-        );
         let disableCssExtract = ((_a = useConfig.output) == null ? void 0 : _a.disableCssExtract) || false;
         if ((_b = useConfig.deploy) == null ? void 0 : _b.microFrontend) {
           const { enableHtmlEntry } = getDefaultMicroFrontedConfig(
@@ -150,7 +136,7 @@ var cli_default = ({
           source: {
             alias: {
               "@modern-js/runtime/plugins": pluginsExportsUtils.getPath(),
-              "@modern-js/runtime/garfish": mfPackagePath
+              "@modern-js/runtime/garfish": "@modern-js/plugin-garfish/runtime"
             }
           },
           tools: {
@@ -207,9 +193,6 @@ var cli_default = ({
         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}/runtime'`
-        );
       },
       modifyEntryImports({ entrypoint, imports }) {
         const config = useResolvedConfigContext();

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

@@ -91,7 +91,7 @@ function pathJoin(...args) {
     if (nPath[0] !== "/") {
       nPath = `/${nPath}`;
     }
-    const lastIndex = path.length - 1;
+    const lastIndex = nPath.length - 1;
     if (nPath[lastIndex] === "/") {
       nPath = nPath.substring(0, lastIndex);
     }
@@ -117,7 +117,7 @@ function getAppInstance(options, appInfo, manifest) {
       basename = pathJoin(basename, (match == null ? void 0 : match.path) || "/");
     }
     (0, import_react.useEffect)(() => {
-      if (location && locationHref !== location.pathname) {
+      if (location && locationHref !== location.pathname && !import_garfish.default.running) {
         locationHref = location.pathname;
         const popStateEvent = new PopStateEvent("popstate");
         popStateEvent.garfish = true;

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

@@ -150,11 +150,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-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"
@@ -173,13 +171,12 @@ function getDefaultMicroFrontedConfig(microFrontend) {
     }, microFrontend);
 }
 var cli_default = function() {
-    var ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, _pluginName = ref.pluginName, pluginName = _pluginName === void 0 ? "@modern-js/plugin-garfish" : _pluginName, _runtimePluginName = ref.runtimePluginName, runtimePluginName = _runtimePluginName === void 0 ? "@modern-js/runtime/plugins" : _runtimePluginName, _mfPackagePath = ref.mfPackagePath, mfPackagePath = _mfPackagePath === void 0 ? path.resolve(__dirname, "../../../../") : _mfPackagePath;
+    var ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, _pluginName = ref.pluginName, pluginName = _pluginName === void 0 ? "@modern-js/plugin-garfish" : _pluginName, _runtimePluginName = ref.runtimePluginName, runtimePluginName = _runtimePluginName === void 0 ? "@modern-js/runtime/plugins" : _runtimePluginName;
     return {
         name: "@modern-js/plugin-garfish",
         setup: function(param) {
             var useAppContext = param.useAppContext, useResolvedConfigContext = param.useResolvedConfigContext, useConfigContext = param.useConfigContext;
             var pluginsExportsUtils;
-            var runtimeExportsUtils;
             return {
                 validateSchema: function validateSchema() {
                     return PLUGIN_SCHEMAS["@modern-js/plugin-garfish"];
@@ -221,7 +218,6 @@ var cli_default = function() {
                     logger("useConfig", useConfig);
                     var config = useAppContext();
                     pluginsExportsUtils = createRuntimeExportsUtils(config.internalDirectory, "plugins");
-                    runtimeExportsUtils = createRuntimeExportsUtils(config.internalDirectory, "index");
                     var disableCssExtract = ((ref = useConfig.output) === null || ref === void 0 ? void 0 : ref.disableCssExtract) || false;
                     if ((ref1 = useConfig.deploy) === null || ref1 === void 0 ? void 0 : ref1.microFrontend) {
                         var ref2;
@@ -237,7 +233,7 @@ var cli_default = function() {
                         source: {
                             alias: {
                                 "@modern-js/runtime/plugins": pluginsExportsUtils.getPath(),
-                                "@modern-js/runtime/garfish": mfPackagePath
+                                "@modern-js/runtime/garfish": "@modern-js/plugin-garfish/runtime"
                             }
                         },
                         tools: {
@@ -292,7 +288,6 @@ var cli_default = function() {
                     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, "/runtime'"));
                 },
                 modifyEntryImports: function modifyEntryImports(param) {
                     var entrypoint = param.entrypoint, imports = param.imports;

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

@@ -277,7 +277,7 @@ function pathJoin() {
         if (nPath[0] !== "/") {
             nPath = "/".concat(nPath);
         }
-        var lastIndex = path.length - 1;
+        var lastIndex = nPath.length - 1;
         if (nPath[lastIndex] === "/") {
             nPath = nPath.substring(0, lastIndex);
         }
@@ -302,7 +302,7 @@ function getAppInstance(options, appInfo, manifest) {
             basename = pathJoin(basename, (match === null || match === void 0 ? void 0 : match.path) || "/");
         }
         useEffect(function() {
-            if (location && locationHref !== location.pathname) {
+            if (location && locationHref !== location.pathname && !Garfish.running) {
                 locationHref = location.pathname;
                 var popStateEvent = new PopStateEvent("popstate");
                 popStateEvent.garfish = true;

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

@@ -1,6 +1,5 @@
 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;
@@ -12,12 +11,10 @@ export declare function getDefaultMicroFrontedConfig(microFrontend: NonInValidAb
 
 declare const _default: ({
   pluginName,
-  runtimePluginName,
-  mfPackagePath
+  runtimePluginName
 }?: {
   pluginName?: string | undefined;
   runtimePluginName?: string | undefined;
-  mfPackagePath?: string | undefined;
 }) => CliPlugin<AppTools>;
 
 export default _default;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "jsnext:source": "./src/cli/index.ts",
   "types": "./dist/types/cli/index.d.ts",
   "typesVersions": {
@@ -54,16 +54,16 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/utils": "2.0.0-beta.4",
     "@types/debug": "^4.1.7",
     "@types/react-loadable": "^5.5.6",
     "debug": "^4.3.2",
     "garfish": "^1.8.1",
     "hoist-non-react-statics": "^3.3.2",
-    "react-loadable": "^5.5.0"
+    "react-loadable": "^5.5.0",
+    "@modern-js/utils": "2.0.0-beta.7"
   },
   "peerDependencies": {
-    "@modern-js/runtime": "^2.0.0-beta.4"
+    "@modern-js/runtime": "^2.0.0-beta.7"
   },
   "peerDependenciesMeta": {
     "@modern-js/runtime": {
@@ -71,13 +71,6 @@
     }
   },
   "devDependencies": {
-    "@modern-js/core": "2.0.0-beta.4",
-    "@modern-js/runtime": "2.0.0-beta.5",
-    "@modern-js/plugin-router-v5": "2.0.0-beta.5",
-    "@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",
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^13.4.0",
     "@testing-library/react-hooks": "^8.0.1",
@@ -89,9 +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"
+    "webpack-chain": "^6.5.1",
+    "@modern-js/app-tools": "2.0.0-beta.7",
+    "@modern-js/core": "2.0.0-beta.7",
+    "@modern-js/runtime": "2.0.0-beta.7",
+    "@modern-js/plugin-router-v5": "2.0.0-beta.7",
+    "@modern-js/types": "2.0.0-beta.7",
+    "@scripts/build": "2.0.0-beta.7",
+    "@scripts/jest-config": "2.0.0-beta.7"
   },
   "sideEffects": false,
   "modernConfig": {},

package/type.d.ts

@@ -10,3 +10,8 @@ declare module '@modern-js/runtime' {
     masterApp?: Config;
   }
 }
+declare module '@modern-js/app-tools' {
+  interface RuntimeUserConfig {
+    masterApp?: Config;
+  }
+}

package/dist/js/treeshaking/cli/types.js

@@ -1 +0,0 @@
-"use strict";

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

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