chore: 优化command的配置

packages/fes-compiler/src/service/index.js

@@ -4,7 +4,7 @@ import assert from 'assert';
 import { AsyncSeriesWaterfallHook } from 'tapable';
 import { existsSync } from 'fs';
 import { BabelRegister, lodash, chalk } from '@umijs/utils';
-import { Command } from 'commander';
+import { Command, Option } from 'commander';
 import { resolvePresets, pathToObj, resolvePlugins } from './utils/pluginUtils';
 import loadDotEnv from './utils/loadDotEnv';
 import isPromise from './utils/isPromise';
@@ -526,17 +526,24 @@ export default class Service extends EventEmitter {
         assert(this.stage >= ServiceStage.init, 'service is not initialized.');
 
         Object.keys(this.commands).forEach((command) => {
-            const commandOption = this.commands[command];
+            const commandOptionConfig = this.commands[command];
             const program = this.program;
-            let c = program.command(command).description(commandOption.description);
+            let c = program.command(command).description(commandOptionConfig.description);
-            if (commandOption.options) {
+            if (Array.isArray(commandOptionConfig.options)) {
-                Object.keys(commandOption.options).forEach((option) => {
+                commandOptionConfig.options.forEach((config) => {
-                    c = c.option(option, commandOption.options[option]);
+                    const option = new Option(config.name, config.description);
+                    if (config.default) {
+                        option.default(config.default);
+                    }
+                    if (config.choices) {
+                        option.choices(config.choices);
+                    }
+                    c = c.addOption(option);
                 });
             }
-            if (commandOption.fn) {
+            if (commandOptionConfig.fn) {
                 c.action(async () => {
-                    await commandOption.fn({
+                    await commandOptionConfig.fn({
                         rawArgv, args, options: c.opts(), program
                     });
                 });

packages/fes-plugin-jest/src/index.js

@@ -9,20 +9,21 @@ import createDefaultConfig from './createDefaultConfig';
 const logger = new Logger('fes:plugin-unit-jest');
 
 function getCommandOptiton() {
-    const opt = {};
+    const opts = [];
     Object.keys(CliOptions).forEach((key) => {
         const option = CliOptions[key];
-        let otpKey = '';
+        const opt = {};
-        if (option.alias) {
-            otpKey = `-${option.alias} --${key}`;
-        } else {
-            otpKey = `--${key}`;
-        }
         if (key !== 'version') {
-            opt[otpKey] = option.description;
+            if (option.alias) {
+                opt.name = `-${option.alias} --${key}`;
+            } else {
+                opt.name = `--${key}`;
+            }
+            opt.description = option.description;
+            opts.push(opt);
         }
     });
-    return opt;
+    return opts;
 }
 
 export default function (api) {

packages/fes-preset-built-in/src/plugins/commands/dev/index.js

@@ -30,10 +30,13 @@ export default (api) => {
     api.registerCommand({
         command: 'dev',
         description: 'start a local http service for development',
-        options: {
+        options: [{
-            '--port': 'http service port, like 8080',
+            name: '--port',
-            '--https': 'whether to turn on the https service'
+            description: 'http service port, like 8080'
-        },
+        }, {
+            name: '--https',
+            description: 'whether to turn on the https service'
+        }],
         async fn({ args = {} }) {
             const defaultPort = process.env.PORT || args.port || api.config.devServer?.port;
             port = await portfinder.getPortPromise({

packages/fes-preset-built-in/src/plugins/commands/webpack/index.js

@@ -6,13 +6,22 @@ export default function (api) {
     api.registerCommand({
         command: 'webpack',
         description: 'inspect webpack configurations',
-        options: {
+        options: [{
-            '--rule <ruleName>': 'inspect a specific module rule',
+            name: '--rule <ruleName>',
-            '--plugin <pluginName>': 'inspect a specific plugin',
+            description: 'inspect a specific module rule'
-            '--rules': 'list all module rule names',
+        }, {
-            '--plugins': 'list all plugin names',
+            name: '--plugin <pluginName>',
-            '--verbose': 'show full function definitions in output'
+            description: 'inspect a specific plugin'
-        },
+        }, {
+            name: '--rules',
+            description: 'list all module rule names'
+        }, {
+            name: '--plugins',
+            description: 'list all plugin names'
+        }, {
+            name: '--verbose',
+            description: 'show full function definitions in output'
+        }],
         async fn({ options }) {
             const { toString } = require('webpack-chain');
             const { highlight } = require('cli-highlight');