@module-federation/cli 0.0.0-next-20250321032801 → 0.0.0-next-20250321084248

package/dist/index.cjs.js

@@ -1,10 +1,10 @@
 'use strict';
 
 var commander = require('commander');
-var path = require('path');
+var dtsPlugin = require('@module-federation/dts-plugin');
 var sdk = require('@module-federation/sdk');
 var chalk = require('chalk');
-var dtsPlugin = require('@module-federation/dts-plugin');
+var path = require('path');
 var nodeBundleRequire = require('@modern-js/node-bundle-require');
 
 var applyCommonOptions = function(command) {
@@ -34,7 +34,7 @@ function _templateObject() {
 var PREFIX = '[ Module Federation CLI ]';
 var logger = sdk.createLogger(chalk(_templateObject(), PREFIX));
 
-function asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, key, arg) {
+function asyncGeneratorStep$2(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
         var value = info.value;
@@ -48,22 +48,22 @@ function asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, key, arg) {
         Promise.resolve(value).then(_next, _throw);
     }
 }
-function _async_to_generator$1(fn) {
+function _async_to_generator$2(fn) {
     return function() {
         var self = this, args = arguments;
         return new Promise(function(resolve, reject) {
             var gen = fn.apply(self, args);
             function _next(value) {
-                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "next", value);
+                asyncGeneratorStep$2(gen, resolve, reject, _next, _throw, "next", value);
             }
             function _throw(err) {
-                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "throw", err);
+                asyncGeneratorStep$2(gen, resolve, reject, _next, _throw, "throw", err);
             }
             _next(undefined);
         });
     };
 }
-function _ts_generator$1(thisArg, body) {
+function _ts_generator$2(thisArg, body) {
     var f, y, t, g, _ = {
         label: 0,
         sent: function() {
@@ -158,19 +158,22 @@ function _ts_generator$1(thisArg, body) {
         };
     }
 }
-function dts(options, _) {
-    return _dts.apply(this, arguments);
+var DEFAULT_CONFIG_PATH = 'module-federation.config.ts';
+var getConfigPath = function(userConfigPath) {
+    var defaultPath = path.resolve(process.cwd(), DEFAULT_CONFIG_PATH);
+    var filepath = userConfigPath !== null && userConfigPath !== void 0 ? userConfigPath : defaultPath;
+    return path.isAbsolute(filepath) ? filepath : path.resolve(process.cwd(), filepath);
+};
+function readConfig(userConfigPath) {
+    return _readConfig.apply(this, arguments);
 }
-function _dts() {
-    _dts = _async_to_generator$1(function(options, param) {
-        var defaultConfig, defaultPath, _options_fetch, fetch, _options_generate, generate, _options_root, root, output, _options_config, config, configPath, preBundlePath, mfConfig, normalizedDtsOptions, dtsManagerOptions, dtsManagerOptions1;
-        return _ts_generator$1(this, function(_state) {
+function _readConfig() {
+    _readConfig = _async_to_generator$2(function(userConfigPath) {
+        var configPath, preBundlePath, mfConfig;
+        return _ts_generator$2(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    defaultConfig = param.defaultConfig;
-                    defaultPath = path.resolve(process.cwd(), defaultConfig);
-                    _options_fetch = options.fetch, fetch = _options_fetch === void 0 ? true : _options_fetch, _options_generate = options.generate, generate = _options_generate === void 0 ? true : _options_generate, _options_root = options.root, root = _options_root === void 0 ? process.cwd() : _options_root, output = options.output, _options_config = options.config, config = _options_config === void 0 ? defaultPath : _options_config;
-                    configPath = path.isAbsolute(config) ? config : path.resolve(process.cwd(), config);
+                    configPath = getConfigPath(userConfigPath);
                     return [
                         4,
                         nodeBundleRequire.bundle(configPath)
@@ -183,6 +186,156 @@ function _dts() {
                     ];
                 case 2:
                     mfConfig = _state.sent().default.default;
+                    return [
+                        2,
+                        mfConfig
+                    ];
+            }
+        });
+    });
+    return _readConfig.apply(this, arguments);
+}
+
+function asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator$1(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _ts_generator$1(thisArg, body) {
+    var f, y, t, g, _ = {
+        label: 0,
+        sent: function() {
+            if (t[0] & 1) throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    };
+    return g = {
+        next: verb(0),
+        "throw": verb(1),
+        "return": verb(2)
+    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+        return this;
+    }), g;
+    function verb(n) {
+        return function(v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while(_)try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [
+                op[0] & 2,
+                t.value
+            ];
+            switch(op[0]){
+                case 0:
+                case 1:
+                    t = op;
+                    break;
+                case 4:
+                    _.label++;
+                    return {
+                        value: op[1],
+                        done: false
+                    };
+                case 5:
+                    _.label++;
+                    y = op[1];
+                    op = [
+                        0
+                    ];
+                    continue;
+                case 7:
+                    op = _.ops.pop();
+                    _.trys.pop();
+                    continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                        _ = 0;
+                        continue;
+                    }
+                    if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                        _.label = op[1];
+                        break;
+                    }
+                    if (op[0] === 6 && _.label < t[1]) {
+                        _.label = t[1];
+                        t = op;
+                        break;
+                    }
+                    if (t && _.label < t[2]) {
+                        _.label = t[2];
+                        _.ops.push(op);
+                        break;
+                    }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop();
+                    continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) {
+            op = [
+                6,
+                e
+            ];
+            y = 0;
+        } finally{
+            f = t = 0;
+        }
+        if (op[0] & 5) throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+function dts(options) {
+    return _dts.apply(this, arguments);
+}
+function _dts() {
+    _dts = _async_to_generator$1(function(options) {
+        var _options_fetch, fetch, _options_generate, generate, _options_root, root, output, config, mfConfig, normalizedDtsOptions, dtsManagerOptions, dtsManagerOptions1;
+        return _ts_generator$1(this, function(_state) {
+            switch(_state.label){
+                case 0:
+                    _options_fetch = options.fetch, fetch = _options_fetch === void 0 ? true : _options_fetch, _options_generate = options.generate, generate = _options_generate === void 0 ? true : _options_generate, _options_root = options.root, root = _options_root === void 0 ? process.cwd() : _options_root, output = options.output, config = options.config;
+                    return [
+                        4,
+                        readConfig(config)
+                    ];
+                case 1:
+                    mfConfig = _state.sent();
                     if (!dtsPlugin.isTSProject(mfConfig.dts, root)) {
                         logger.error('dts is only supported for TypeScript projects');
                         return [
@@ -210,7 +363,7 @@ function _dts() {
                     }
                     if (!fetch) return [
                         3,
-                        5
+                        4
                     ];
                     dtsManagerOptions = dtsPlugin.normalizeConsumeTypesOptions({
                         context: root,
@@ -219,27 +372,27 @@ function _dts() {
                     });
                     if (!!dtsManagerOptions) return [
                         3,
-                        3
+                        2
                     ];
                     logger.warn('dts.consumeTypes is not enabled in module-federation.config.ts, skip fetching remote types');
                     return [
                         3,
-                        5
+                        4
                     ];
-                case 3:
+                case 2:
                     logger.debug('start fetching remote types...');
                     return [
                         4,
                         dtsPlugin.consumeTypesAPI(dtsManagerOptions)
                     ];
-                case 4:
+                case 3:
                     _state.sent();
                     logger.debug('fetch remote types success!');
-                    _state.label = 5;
-                case 5:
+                    _state.label = 4;
+                case 4:
                     if (!generate) return [
                         3,
-                        7
+                        6
                     ];
                     dtsManagerOptions1 = dtsPlugin.normalizeGenerateTypesOptions({
                         context: root,
@@ -260,11 +413,11 @@ function _dts() {
                             dtsManagerOptions: dtsManagerOptions1
                         })
                     ];
-                case 6:
+                case 5:
                     _state.sent();
                     logger.debug('generate types success!');
-                    _state.label = 7;
-                case 7:
+                    _state.label = 6;
+                case 6:
                     return [
                         2
                     ];
@@ -438,7 +591,7 @@ function _ts_generator(thisArg, body) {
     }
 }
 function cli(param) {
-    var name = param.name, version = param.version, applyCommands = param.applyCommands, config = param.config;
+    var name = param.name, version = param.version, applyCommands = param.applyCommands;
     commander.program.name(name).usage('<command> [options]').version(version);
     var dtsCommand = commander.program.command('dts');
     dtsCommand.option('--root <root>', 'specify the project root directory').option('--output <output>', 'specify the generated dts output directory').option('--fetch <boolean>', 'fetch types from remote, default is true', function(value) {
@@ -461,9 +614,7 @@ function cli(param) {
                         ]);
                         return [
                             4,
-                            dts(options, {
-                                defaultConfig: config
-                            })
+                            dts(options)
                         ];
                     case 1:
                         _state.sent();
@@ -497,12 +648,14 @@ function cli(param) {
 }
 function runCli(options) {
     var normalizedOptions = _object_spread({
+        loggerPrefix: PREFIX,
         welcomeMsg: "".concat("Module Federation v".concat("0.10.0"), "\n"),
         name: 'mf',
-        config: 'module-federation.config.ts',
+        readConfig: readConfig,
         version: "0.10.0",
         applyCommands: function() {}
     }, options);
+    logger.setPrefix(normalizedOptions.loggerPrefix);
     prepareCli(normalizedOptions);
     try {
         cli(normalizedOptions);

package/dist/src/commands/dts.d.ts

@@ -1,4 +1,2 @@
 import type { DtsOptions } from '../types';
-export declare function dts(options: DtsOptions, { defaultConfig }: {
-    defaultConfig: string;
-}): Promise<void>;
+export declare function dts(options: DtsOptions): Promise<void>;

package/dist/src/types.d.ts

@@ -1,4 +1,5 @@
 import type { Command } from 'commander';
+import type { moduleFederationPlugin } from '@module-federation/sdk';
 export type CommonOptions = {
     config?: string;
 };
@@ -10,8 +11,9 @@ export type DtsOptions = {
 } & CommonOptions;
 export type CliOptions = {
     welcomeMsg?: string;
+    loggerPrefix?: string;
     name?: string;
     version?: string;
-    config?: string;
+    readConfig?: (userConfigPath?: string) => Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;
     applyCommands?: (command: Command, applyCommonOptions: (command: Command) => void) => void;
 };

package/dist/src/utils/logger.d.ts

@@ -1,3 +1,4 @@
 import { type Logger } from '@module-federation/sdk';
+export declare const PREFIX = "[ Module Federation CLI ]";
 declare const logger: Logger;
 export default logger;

package/dist/src/utils/readConfig.d.ts

@@ -0,0 +1,3 @@
+import type { moduleFederationPlugin } from '@module-federation/sdk';
+export declare const getConfigPath: (userConfigPath?: string) => string;
+export declare function readConfig(userConfigPath?: string): Promise<moduleFederationPlugin.ModuleFederationPluginOptions>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/cli",
-  "version": "0.0.0-next-20250321032801",
+  "version": "0.0.0-next-20250321084248",
   "type": "commonjs",
   "description": "Module Federation CLI",
   "homepage": "https://module-federation.io",
@@ -25,8 +25,8 @@
     "commander": "11.1.0",
     "chalk": "3.0.0",
     "@modern-js/node-bundle-require": "2.65.1",
-    "@module-federation/sdk": "0.0.0-next-20250321032801",
-    "@module-federation/dts-plugin": "0.0.0-next-20250321032801"
+    "@module-federation/sdk": "0.0.0-next-20250321084248",
+    "@module-federation/dts-plugin": "0.0.0-next-20250321084248"
   },
   "devDependencies": {
     "@types/node": "~16.11.7"