feat: 优化command

1.  能结束
2.  提升fes命令的效率

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

@@ -115,9 +115,8 @@ export default class Service extends EventEmitter {
             env: this.env
         });
 
-        this.program = new Command();
+        this.program = this.initCommand();
 
-        this.initCommand();
 
         // setup initial plugins
         const baseOpts = {
@@ -492,24 +491,12 @@ export default class Service extends EventEmitter {
     }
 
     initCommand() {
-        this.program
+        const command = new Command();
+        command
             .usage('<command> [options]')
             .version(`@webank/fes ${this.fesPkg.version}`, '-v, --vers', 'output the current version')
             .description(chalk.cyan('一个好用的前端应用解决方案'));
-    }
+        return command;
-
-    parseCommand() {
-        this.program.on('--help', () => {
-            console.log();
-            console.log(
-                `  Run ${chalk.cyan(
-                    'fes <command> --help'
-                )} for detailed usage of given command.`
-            );
-            console.log();
-        });
-        this.program.commands.forEach(c => c.on('--help', () => console.log()));
-        this.program.parse(process.argv);
     }
 
     async run({ rawArgv = {}, args = {} }) {
@@ -524,7 +511,7 @@ export default class Service extends EventEmitter {
             }
         });
 
-        this.runCommand({ rawArgv, args });
+        return this.runCommand({ rawArgv, args });
     }
 
     async runCommand({ rawArgv = {}, args = {} }) {
@@ -555,6 +542,20 @@ export default class Service extends EventEmitter {
             }
         });
 
-        this.parseCommand();
+        return this.parseCommand();
+    }
+
+    async parseCommand() {
+        this.program.on('--help', () => {
+            console.log();
+            console.log(
+                `  Run ${chalk.cyan(
+                    'fes <command> --help'
+                )} for detailed usage of given command.`
+            );
+            console.log();
+        });
+        this.program.commands.forEach(c => c.on('--help', () => console.log()));
+        return this.program.parseAsync(process.argv);
     }
 }

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

@@ -1,13 +1,5 @@
-import { relative } from 'path';
+
-import { existsSync } from 'fs';
 import { Logger } from '@webank/fes-compiler';
-import {
-    cleanTmpPathExceptCache,
-    getBundleAndConfigs,
-    printFileSizes
-} from '../buildDevUtils';
-import generateFiles from '../../../utils/generateFiles';
-import { build } from './build';
 
 const logger = new Logger('fes:plugin-built-in');
 
@@ -21,6 +13,16 @@ export default function (api) {
         command: 'build',
         description: 'build application for production',
         async fn() {
+            const { relative } = require('path');
+            const { existsSync } = require('fs');
+            const {
+                cleanTmpPathExceptCache,
+                getBundleAndConfigs,
+                printFileSizes
+            } = require('../buildDevUtils');
+            const generateFiles = require('../../../utils/generateFiles').default;
+            const { build } = require('./build');
+
             cleanTmpPathExceptCache({
                 absTmpPath: paths.absTmpPath
             });

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

@@ -1,12 +1,4 @@
-import assert from 'assert';
+const assert = require('assert');
-import { delay } from '@umijs/utils';
-import {
-    cleanTmpPathExceptCache,
-    getBundleAndConfigs
-} from '../buildDevUtils';
-import generateFiles from '../../../utils/generateFiles';
-import { watchPkg } from './watchPkg';
-import { startDevServer } from './devServer';
 
 export default (api) => {
     const {
@@ -38,6 +30,14 @@ export default (api) => {
             description: 'whether to turn on the https service'
         }],
         async fn({ args = {} }) {
+            const {
+                cleanTmpPathExceptCache,
+                getBundleAndConfigs
+            } = require('../buildDevUtils');
+            const { delay } = require('@umijs/utils');
+            const generateFiles = require('../../../utils/generateFiles').default;
+            const { watchPkg } = require('./watchPkg');
+
             const defaultPort = process.env.PORT || args.port || api.config.devServer?.port;
             port = await portfinder.getPortPromise({
                 port: defaultPort ? parseInt(String(defaultPort), 10) : 8000
@@ -163,6 +163,7 @@ export default (api) => {
                 initialValue: [],
                 args: {}
             });
+            const { startDevServer } = require('./devServer');
             server = startDevServer({
                 webpackConfig: bundleConfig,
                 host: hostname,

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

@@ -4,7 +4,7 @@ export default function (api) {
         command: 'info',
         description: 'print debugging information about your environment',
         async fn() {
-            require('envinfo').run(
+            return require('envinfo').run(
                 {
                     System: ['OS', 'CPU'],
                     Binaries: ['Node', 'Yarn', 'npm'],

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

@@ -1,7 +1,3 @@
-
-import assert from 'assert';
-import { getBundleAndConfigs } from '../buildDevUtils';
-
 export default function (api) {
     api.registerCommand({
         command: 'webpack',
@@ -23,11 +19,13 @@ export default function (api) {
             description: 'show full function definitions in output'
         }],
         async fn({ options }) {
+            const assert = require('assert');
+            const { getBundleAndConfigs } = require('../buildDevUtils');
             const { toString } = require('webpack-chain');
             const { highlight } = require('cli-highlight');
             const { bundleConfig } = await getBundleAndConfigs({ api });
 
-            let config = bundleConfig.filter(bc => bc.entry?.index)[0];
+            let config = bundleConfig;
             assert(config, 'No valid config found with fes entry.');
 
             if (options.rule) {

packages/fes-template/package.json

@@ -6,8 +6,8 @@
     "build": "fes build",
     "prod": "FES_ENV=prod fes build",
     "analyze": "ANALYZE=1 fes build",
-    "dev": "fes dev --https",
+    "dev": "fes dev",
-    "test:unit": "fes test:unit"
+    "test": "fes test"
   },
   "keywords": [
     "管理端",

packages/fes/src/cli.js

@@ -56,6 +56,7 @@ const args = yParser(rawArgv);
                 args,
                 rawArgv
             });
+            process.exit(0);
         }
     } catch (e) {
         console.error(chalk.red(e.message));