@module-federation/modern-js 2.1.0 → 2.2.0

package/dist/cjs/cli/configPlugin.js

@@ -58,6 +58,8 @@ var __webpack_exports__ = {};
         setEnv: ()=>setEnv,
         patchBundlerConfig: ()=>patchBundlerConfig
     });
+    const external_fs_namespaceObject = require("fs");
+    var external_fs_default = /*#__PURE__*/ __webpack_require__.n(external_fs_namespaceObject);
     const external_path_namespaceObject = require("path");
     var external_path_default = /*#__PURE__*/ __webpack_require__.n(external_path_namespaceObject);
     const external_utils_js_namespaceObject = require("./utils.js");
@@ -67,6 +69,20 @@ var __webpack_exports__ = {};
     const external_logger_js_namespaceObject = require("../logger.js");
     var external_logger_js_default = /*#__PURE__*/ __webpack_require__.n(external_logger_js_namespaceObject);
     const defaultPath = external_path_default().resolve(process.cwd(), 'module-federation.config.ts');
+    const resolvePackageFile = (packageName, esmRelativePath, cjsRelativePath)=>{
+        const packageEntry = require.resolve(packageName);
+        let packageRoot = external_path_default().dirname(packageEntry);
+        while(!external_fs_default().existsSync(external_path_default().join(packageRoot, 'package.json'))){
+            const parentDir = external_path_default().dirname(packageRoot);
+            if (parentDir === packageRoot) throw new Error(`Unable to resolve package root for ${packageName} from ${packageEntry}`);
+            packageRoot = parentDir;
+        }
+        return require.resolve(external_path_default().join(packageRoot, 'true' === process.env.IS_ESM_BUILD ? esmRelativePath : cjsRelativePath));
+    };
+    const resolveSharedStrategyPlugin = ()=>resolvePackageFile('@module-federation/modern-js', 'dist/esm/cli/mfRuntimePlugins/shared-strategy.mjs', 'dist/cjs/cli/mfRuntimePlugins/shared-strategy.js');
+    const resolveInjectNodeFetchPlugin = ()=>resolvePackageFile('@module-federation/modern-js', 'dist/esm/cli/mfRuntimePlugins/inject-node-fetch.mjs', 'dist/cjs/cli/mfRuntimePlugins/inject-node-fetch.js');
+    const resolveNodeRuntimePlugin = ()=>resolvePackageFile('@module-federation/node', 'dist/src/runtimePlugin.mjs', 'dist/src/runtimePlugin.js');
+    const resolveNodeRecordRemoteHashPlugin = ()=>resolvePackageFile('@module-federation/node', 'dist/src/recordDynamicRemoteEntryHashPlugin.mjs', 'dist/src/recordDynamicRemoteEntryHashPlugin.js');
     function setEnv(enableSSR) {
         if (enableSSR) process.env['MF_SSR_PRJ'] = 'true';
     }
@@ -76,8 +92,7 @@ var __webpack_exports__ = {};
         const mfConfigPath = configPath ? configPath : defaultPath;
         const { createJiti } = __webpack_require__("jiti");
         const jit = createJiti(__filename, {
-            interopDefault: true,
-            esmResolve: true
+            interopDefault: true
         });
         const configModule = await jit(mfConfigPath);
         const resolvedConfig = configModule && 'object' == typeof configModule && 'default' in configModule ? configModule.default : configModule;
@@ -125,11 +140,11 @@ var __webpack_exports__ = {};
             ...mfConfig.runtimePlugins || []
         ];
         patchDTSConfig(mfConfig, isServer);
-        injectRuntimePlugins(require.resolve('@module-federation/modern-js/shared-strategy'), runtimePlugins);
+        injectRuntimePlugins(resolveSharedStrategyPlugin(), runtimePlugins);
         if (isServer) {
-            injectRuntimePlugins(require.resolve('@module-federation/node/runtimePlugin'), runtimePlugins);
-            if ((0, external_utils_js_namespaceObject.isDev)()) injectRuntimePlugins(require.resolve('@module-federation/node/record-dynamic-remote-entry-hash-plugin'), runtimePlugins);
-            injectRuntimePlugins(require.resolve('@module-federation/modern-js/inject-node-fetch'), runtimePlugins);
+            injectRuntimePlugins(resolveNodeRuntimePlugin(), runtimePlugins);
+            if ((0, external_utils_js_namespaceObject.isDev)()) injectRuntimePlugins(resolveNodeRecordRemoteHashPlugin(), runtimePlugins);
+            injectRuntimePlugins(resolveInjectNodeFetchPlugin(), runtimePlugins);
             if (mfConfig.library) {
                 if (!mfConfig.library.type) mfConfig.library.type = 'commonjs-module';
                 if (!mfConfig.library.name) mfConfig.library.name = mfConfig.name;
@@ -237,12 +252,19 @@ var __webpack_exports__ = {};
                 userConfig.csrConfig = csrConfig;
                 const enableSSR = Boolean(null != (_ref = null == (_userConfig_userConfig = userConfig.userConfig) ? void 0 : _userConfig_userConfig.ssr) ? _ref : Boolean(null == modernjsConfig ? void 0 : null == (_modernjsConfig_server = modernjsConfig.server) ? void 0 : _modernjsConfig_server.ssr));
                 api.modifyBundlerChain((chain)=>{
+                    var _modernjsConfig_source, _targetMFConfig_experiments;
+                    const bundlerType = 'rspack' === api.getAppContext().bundlerType ? 'rspack' : 'webpack';
                     const target = chain.get('target');
                     if ((0, external_utils_js_namespaceObject.skipByTarget)(target)) return;
                     const isWeb = (0, external_utils_js_namespaceObject.isWebTarget)(target);
                     addMyTypes2Ignored(chain, isWeb ? csrConfig : ssrConfig);
                     const targetMFConfig = isWeb ? csrConfig : ssrConfig;
                     patchMFConfig(targetMFConfig, !isWeb);
+                    if ('rspack' === bundlerType && (null == (_modernjsConfig_source = modernjsConfig.source) ? void 0 : _modernjsConfig_source.enableAsyncEntry) !== true && (null == (_targetMFConfig_experiments = targetMFConfig.experiments) ? void 0 : _targetMFConfig_experiments.asyncStartup) !== false) {
+                        var _targetMFConfig;
+                        (_targetMFConfig = targetMFConfig).experiments || (_targetMFConfig.experiments = {});
+                        targetMFConfig.experiments.asyncStartup = true;
+                    }
                     patchBundlerConfig({
                         chain,
                         isServer: !isWeb,

package/dist/esm/cli/configPlugin.mjs

@@ -5,6 +5,7 @@ import { _ as _object_spread_props__ } from "@swc/helpers/_/_object_spread_props
 import { _ as _to_consumable_array__ } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _type_of__ } from "@swc/helpers/_/_type_of";
 import { _ as _ts_generator__ } from "@swc/helpers/_/_ts_generator";
+import fs from "fs";
 import path from "path";
 import { isDev, isWebTarget, skipByTarget } from "./utils.mjs";
 import { encodeName } from "@module-federation/sdk";
@@ -27,6 +28,28 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 var defaultPath = path.resolve(process.cwd(), 'module-federation.config.ts');
+var resolvePackageFile = function(packageName, esmRelativePath, cjsRelativePath) {
+    var packageEntry = require.resolve(packageName);
+    var packageRoot = path.dirname(packageEntry);
+    while(!fs.existsSync(path.join(packageRoot, 'package.json'))){
+        var parentDir = path.dirname(packageRoot);
+        if (parentDir === packageRoot) throw new Error("Unable to resolve package root for ".concat(packageName, " from ").concat(packageEntry));
+        packageRoot = parentDir;
+    }
+    return require.resolve(path.join(packageRoot, 'true' === process.env.IS_ESM_BUILD ? esmRelativePath : cjsRelativePath));
+};
+var resolveSharedStrategyPlugin = function() {
+    return resolvePackageFile('@module-federation/modern-js', 'dist/esm/cli/mfRuntimePlugins/shared-strategy.mjs', 'dist/cjs/cli/mfRuntimePlugins/shared-strategy.js');
+};
+var resolveInjectNodeFetchPlugin = function() {
+    return resolvePackageFile('@module-federation/modern-js', 'dist/esm/cli/mfRuntimePlugins/inject-node-fetch.mjs', 'dist/cjs/cli/mfRuntimePlugins/inject-node-fetch.js');
+};
+var resolveNodeRuntimePlugin = function() {
+    return resolvePackageFile('@module-federation/node', 'dist/src/runtimePlugin.mjs', 'dist/src/runtimePlugin.js');
+};
+var resolveNodeRecordRemoteHashPlugin = function() {
+    return resolvePackageFile('@module-federation/node', 'dist/src/recordDynamicRemoteEntryHashPlugin.mjs', 'dist/src/recordDynamicRemoteEntryHashPlugin.js');
+};
 function setEnv(enableSSR) {
     if (enableSSR) process.env['MF_SSR_PRJ'] = 'true';
 }
@@ -44,8 +67,7 @@ var getMFConfig = function(userConfig) {
                     mfConfigPath = configPath ? configPath : defaultPath;
                     createJiti = __webpack_require__("jiti").createJiti;
                     jit = createJiti(__filename, {
-                        interopDefault: true,
-                        esmResolve: true
+                        interopDefault: true
                     });
                     return [
                         4,
@@ -102,11 +124,11 @@ var patchMFConfig = function(mfConfig, isServer) {
     if (!mfConfig.name) throw new Error("".concat(PLUGIN_IDENTIFIER, " mfConfig.name can not be empty!"));
     var runtimePlugins = _to_consumable_array__(mfConfig.runtimePlugins || []);
     patchDTSConfig(mfConfig, isServer);
-    injectRuntimePlugins(require.resolve('@module-federation/modern-js/shared-strategy'), runtimePlugins);
+    injectRuntimePlugins(resolveSharedStrategyPlugin(), runtimePlugins);
     if (isServer) {
-        injectRuntimePlugins(require.resolve('@module-federation/node/runtimePlugin'), runtimePlugins);
-        if (isDev()) injectRuntimePlugins(require.resolve('@module-federation/node/record-dynamic-remote-entry-hash-plugin'), runtimePlugins);
-        injectRuntimePlugins(require.resolve('@module-federation/modern-js/inject-node-fetch'), runtimePlugins);
+        injectRuntimePlugins(resolveNodeRuntimePlugin(), runtimePlugins);
+        if (isDev()) injectRuntimePlugins(resolveNodeRecordRemoteHashPlugin(), runtimePlugins);
+        injectRuntimePlugins(resolveInjectNodeFetchPlugin(), runtimePlugins);
         if (mfConfig.library) {
             if (!mfConfig.library.type) mfConfig.library.type = 'commonjs-module';
             if (!mfConfig.library.name) mfConfig.library.name = mfConfig.name;
@@ -221,12 +243,19 @@ var moduleFederationConfigPlugin = function(userConfig) {
                             userConfig.csrConfig = csrConfig;
                             enableSSR = Boolean(null != (_ref = null == (_userConfig_userConfig = userConfig.userConfig) ? void 0 : _userConfig_userConfig.ssr) ? _ref : Boolean(null == modernjsConfig ? void 0 : null == (_modernjsConfig_server = modernjsConfig.server) ? void 0 : _modernjsConfig_server.ssr));
                             api.modifyBundlerChain(function(chain) {
+                                var _modernjsConfig_source, _targetMFConfig_experiments;
+                                var bundlerType = 'rspack' === api.getAppContext().bundlerType ? 'rspack' : 'webpack';
                                 var target = chain.get('target');
                                 if (skipByTarget(target)) return;
                                 var isWeb = isWebTarget(target);
                                 addMyTypes2Ignored(chain, isWeb ? csrConfig : ssrConfig);
                                 var targetMFConfig = isWeb ? csrConfig : ssrConfig;
                                 patchMFConfig(targetMFConfig, !isWeb);
+                                if ('rspack' === bundlerType && (null == (_modernjsConfig_source = modernjsConfig.source) ? void 0 : _modernjsConfig_source.enableAsyncEntry) !== true && (null == (_targetMFConfig_experiments = targetMFConfig.experiments) ? void 0 : _targetMFConfig_experiments.asyncStartup) !== false) {
+                                    var _targetMFConfig;
+                                    (_targetMFConfig = targetMFConfig).experiments || (_targetMFConfig.experiments = {});
+                                    targetMFConfig.experiments.asyncStartup = true;
+                                }
                                 patchBundlerConfig({
                                     chain: chain,
                                     isServer: !isWeb,

package/dist/esm-node/cli/configPlugin.mjs

@@ -1,4 +1,5 @@
 import * as __rspack_external_jiti from "jiti";
+import fs from "fs";
 import path from "path";
 import { isDev, isWebTarget, skipByTarget } from "./utils.mjs";
 import { encodeName } from "@module-federation/sdk";
@@ -21,6 +22,20 @@ function __webpack_require__(moduleId) {
     return module.exports;
 }
 const defaultPath = path.resolve(process.cwd(), 'module-federation.config.ts');
+const resolvePackageFile = (packageName, esmRelativePath, cjsRelativePath)=>{
+    const packageEntry = require.resolve(packageName);
+    let packageRoot = path.dirname(packageEntry);
+    while(!fs.existsSync(path.join(packageRoot, 'package.json'))){
+        const parentDir = path.dirname(packageRoot);
+        if (parentDir === packageRoot) throw new Error(`Unable to resolve package root for ${packageName} from ${packageEntry}`);
+        packageRoot = parentDir;
+    }
+    return require.resolve(path.join(packageRoot, 'true' === process.env.IS_ESM_BUILD ? esmRelativePath : cjsRelativePath));
+};
+const resolveSharedStrategyPlugin = ()=>resolvePackageFile('@module-federation/modern-js', 'dist/esm/cli/mfRuntimePlugins/shared-strategy.mjs', 'dist/cjs/cli/mfRuntimePlugins/shared-strategy.js');
+const resolveInjectNodeFetchPlugin = ()=>resolvePackageFile('@module-federation/modern-js', 'dist/esm/cli/mfRuntimePlugins/inject-node-fetch.mjs', 'dist/cjs/cli/mfRuntimePlugins/inject-node-fetch.js');
+const resolveNodeRuntimePlugin = ()=>resolvePackageFile('@module-federation/node', 'dist/src/runtimePlugin.mjs', 'dist/src/runtimePlugin.js');
+const resolveNodeRecordRemoteHashPlugin = ()=>resolvePackageFile('@module-federation/node', 'dist/src/recordDynamicRemoteEntryHashPlugin.mjs', 'dist/src/recordDynamicRemoteEntryHashPlugin.js');
 function setEnv(enableSSR) {
     if (enableSSR) process.env['MF_SSR_PRJ'] = 'true';
 }
@@ -30,8 +45,7 @@ const getMFConfig = async (userConfig)=>{
     const mfConfigPath = configPath ? configPath : defaultPath;
     const { createJiti } = __webpack_require__("jiti");
     const jit = createJiti(__filename, {
-        interopDefault: true,
-        esmResolve: true
+        interopDefault: true
     });
     const configModule = await jit(mfConfigPath);
     const resolvedConfig = configModule && 'object' == typeof configModule && 'default' in configModule ? configModule.default : configModule;
@@ -79,11 +93,11 @@ const patchMFConfig = (mfConfig, isServer)=>{
         ...mfConfig.runtimePlugins || []
     ];
     patchDTSConfig(mfConfig, isServer);
-    injectRuntimePlugins(require.resolve('@module-federation/modern-js/shared-strategy'), runtimePlugins);
+    injectRuntimePlugins(resolveSharedStrategyPlugin(), runtimePlugins);
     if (isServer) {
-        injectRuntimePlugins(require.resolve('@module-federation/node/runtimePlugin'), runtimePlugins);
-        if (isDev()) injectRuntimePlugins(require.resolve('@module-federation/node/record-dynamic-remote-entry-hash-plugin'), runtimePlugins);
-        injectRuntimePlugins(require.resolve('@module-federation/modern-js/inject-node-fetch'), runtimePlugins);
+        injectRuntimePlugins(resolveNodeRuntimePlugin(), runtimePlugins);
+        if (isDev()) injectRuntimePlugins(resolveNodeRecordRemoteHashPlugin(), runtimePlugins);
+        injectRuntimePlugins(resolveInjectNodeFetchPlugin(), runtimePlugins);
         if (mfConfig.library) {
             if (!mfConfig.library.type) mfConfig.library.type = 'commonjs-module';
             if (!mfConfig.library.name) mfConfig.library.name = mfConfig.name;
@@ -191,12 +205,19 @@ const moduleFederationConfigPlugin = (userConfig)=>({
             userConfig.csrConfig = csrConfig;
             const enableSSR = Boolean(null != (_ref = null == (_userConfig_userConfig = userConfig.userConfig) ? void 0 : _userConfig_userConfig.ssr) ? _ref : Boolean(null == modernjsConfig ? void 0 : null == (_modernjsConfig_server = modernjsConfig.server) ? void 0 : _modernjsConfig_server.ssr));
             api.modifyBundlerChain((chain)=>{
+                var _modernjsConfig_source, _targetMFConfig_experiments;
+                const bundlerType = 'rspack' === api.getAppContext().bundlerType ? 'rspack' : 'webpack';
                 const target = chain.get('target');
                 if (skipByTarget(target)) return;
                 const isWeb = isWebTarget(target);
                 addMyTypes2Ignored(chain, isWeb ? csrConfig : ssrConfig);
                 const targetMFConfig = isWeb ? csrConfig : ssrConfig;
                 patchMFConfig(targetMFConfig, !isWeb);
+                if ('rspack' === bundlerType && (null == (_modernjsConfig_source = modernjsConfig.source) ? void 0 : _modernjsConfig_source.enableAsyncEntry) !== true && (null == (_targetMFConfig_experiments = targetMFConfig.experiments) ? void 0 : _targetMFConfig_experiments.asyncStartup) !== false) {
+                    var _targetMFConfig;
+                    (_targetMFConfig = targetMFConfig).experiments || (_targetMFConfig.experiments = {});
+                    targetMFConfig.experiments.asyncStartup = true;
+                }
                 patchBundlerConfig({
                     chain,
                     isServer: !isWeb,

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

@@ -4,6 +4,13 @@ import { PluginOptions } from '../types';
 import type { InternalModernPluginOptions } from '../types';
 import type { AppTools, webpack, UserConfig, Rspack, CliPluginFuture } from '@modern-js/app-tools';
 import type { BundlerChainConfig } from '../interfaces/bundler';
+declare global {
+    namespace NodeJS {
+        interface ProcessEnv {
+            IS_ESM_BUILD?: string;
+        }
+    }
+}
 export type ConfigType<T> = T extends 'webpack' ? webpack.Configuration : T extends 'rspack' ? Rspack.Configuration : never;
 export declare function setEnv(enableSSR: boolean): void;
 export declare const getMFConfig: (userConfig: PluginOptions) => Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/modern-js",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "files": [
     "dist/",
     "types.d.ts",
@@ -132,13 +132,13 @@
     "node-fetch": "~3.3.0",
     "jiti": "2.4.2",
     "react-error-boundary": "4.1.2",
-    "@module-federation/rsbuild-plugin": "2.1.0",
-    "@module-federation/runtime": "2.1.0",
-    "@module-federation/bridge-react": "2.1.0",
-    "@module-federation/enhanced": "2.1.0",
-    "@module-federation/node": "2.7.33",
-    "@module-federation/cli": "2.1.0",
-    "@module-federation/sdk": "2.1.0"
+    "@module-federation/rsbuild-plugin": "2.2.0",
+    "@module-federation/bridge-react": "2.2.0",
+    "@module-federation/enhanced": "2.2.0",
+    "@module-federation/node": "2.7.34",
+    "@module-federation/sdk": "2.2.0",
+    "@module-federation/cli": "2.2.0",
+    "@module-federation/runtime": "2.2.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-react": "1.4.5",
@@ -151,7 +151,7 @@
     "@modern-js/tsconfig": "2.70.5",
     "@types/react": "^18.3.11",
     "@types/react-dom": "^18.3.0",
-    "@module-federation/manifest": "2.1.0"
+    "@module-federation/manifest": "2.2.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -176,6 +176,9 @@
     }
   },
   "scripts": {
-    "build": "rslib build"
+    "build": "rslib build",
+    "lint": "ESLINT_USE_FLAT_CONFIG=false pnpm exec eslint --ignore-pattern node_modules \"**/*.ts\"",
+    "test": "pnpm exec vitest run --passWithNoTests --config vite.config.mts",
+    "pre-release": "pnpm run test && pnpm run build"
   }
 }

package/dist/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2024-present zhanghang(2heal1)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.