feat: cli build and serve support multi target

Author: meixg

packages/mars-cli/bin/mars-build.js

@@ -0,0 +1,26 @@
+/**
+ * @file mars build
+ * @author meixuguang
+ */
+
+/* eslint-disable fecs-no-require */
+/* eslint-disable no-console */
+
+const program = require('commander');
+const {defaultConfig, cleanArgs} = require('../lib/helper/utils');
+
+program
+    .description('build project in production mode')
+    .option('-r, --registry <url>', 'Use specified npm registry when installing dependencies (only for npm)')
+    .option('-t, --target <target>', 'Build target (swan | h5 | wx, default: swan)')
+    .action(cmd => {
+        const build = require('../lib/build');
+        const options = cleanArgs(cmd);
+
+        if (!options.registry) {
+            options.registry = defaultConfig.registry;
+        }
+
+        build(options);
+    })
+    .parse(process.argv);

packages/mars-cli/bin/mars-serve.js

@@ -0,0 +1,26 @@
+/**
+ * @file mars build
+ * @author meixuguang
+ */
+
+/* eslint-disable fecs-no-require */
+/* eslint-disable no-console */
+
+const program = require('commander');
+const {defaultConfig, cleanArgs} = require('../lib/helper/utils');
+
+program
+    .description('serve project in development mode')
+    .option('-r, --registry <url>', 'Use specified npm registry when installing dependencies (only for npm)')
+    .option('-t, --target <target>', 'Build target (swan | h5 | wx, default: swan)')
+    .action(cmd => {
+        const start = require('../lib/serve');
+        const options = cleanArgs(cmd);
+
+        if (!options.registry) {
+            options.registry = defaultConfig.registry;
+        }
+
+        start(options);
+    })
+    .parse(process.argv);

packages/mars-cli/bin/mars.js

@@ -18,7 +18,8 @@ const fs = require('fs-extra');
 const path = require('path');
 const slash = require('slash');
 const minimist = require('minimist');
-const {getCliVersion} = require('../lib/helper/utils');
+const {getCliVersion, cleanArgs, defaultConfig} = require('../lib/helper/utils');
+const execa = require('execa');
 
 function checkNodeVersion(wanted, id) {
     if (!semver.satisfies(process.version, wanted)) {
@@ -30,10 +31,6 @@ function checkNodeVersion(wanted, id) {
     }
 }
 
-const defaultConfig = {
-    registry: 'https://registry.npm.taobao.org'
-};
-
 checkNodeVersion(requiredVersion, 'mars-cli');
 
 if (semver.satisfies(process.version, '9.x')) {
@@ -152,31 +149,58 @@ program
     .option('-r, --registry <url>', 'Use specified npm registry when installing dependencies (only for npm)')
     .option('-t, --target <target>', 'Build target (swan | h5 | wx, default: swan)')
     .action(cmd => {
-        const build = require('../lib/build');
         const options = cleanArgs(cmd);
+        const buildPath = path.resolve(__dirname, './mars-build.js');
+
+        const targets = (options.target || 'swan').split(',');
+        targets.forEach(t => {
+            const args = [buildPath, '-t', t];
+            Object.keys(options).forEach(op => {
+                if (op === 'target') {
+                    return;
+                }
 
-        if (!options.registry) {
-            options.registry = defaultConfig.registry;
-        }
-
-        build(options);
+                if (options[op] !== false) {
+                    args.push('--' + op);
+                    if (options[op] !== true) {
+                        args.push(options.op);
+                    }
+                }
+            });
+            execa('node', args, {
+                stdout: 'inherit'
+            });
+        });
     });
 
 program
     .command('serve')
     .description('serve project in development mode')
     .option('-r, --registry <url>', 'Use specified npm registry when installing dependencies (only for npm)')
     .option('-t, --target <target>', 'Build target (swan | h5 | wx, default: swan)')
-    // .option('-d, --dest <dir>', 'output directory (default: dist)')
     .action(cmd => {
-        const start = require('../lib/serve');
         const options = cleanArgs(cmd);
+        const buildPath = path.resolve(__dirname, './mars-serve.js');
+
+        const targets = (options.target || 'swan').split(',');
+        targets.forEach(t => {
+            const args = [buildPath, '-t', t];
+            Object.keys(options).forEach(op => {
+                if (op === 'target') {
+                    return;
+                }
 
-        if (!options.registry) {
-            options.registry = defaultConfig.registry;
-        }
-
-        start(options);
+                if (options[op] !== false) {
+                    args.push('--' + op);
+                    if (options[op] !== true) {
+                        args.push(options.op);
+                    }
+                }
+            });
+            execa('node', args, {
+                stdout: 'inherit'
+            });
+        });
     });
 
 program
@@ -227,22 +251,3 @@ program.parse(process.argv);
 if (!process.argv.slice(2).length) {
     program.outputHelp();
 }
-
-function camelize(str) {
-    return str.replace(/-(\w)/g, (_, c) => c ? c.toUpperCase() : '');
-}
-
-// commander passes the Command object itself as options,
-// extract only actual options into a fresh object.
-function cleanArgs(cmd) {
-    const args = {};
-    cmd.options.forEach(o => {
-        const key = camelize(o.long.replace(/^--/, ''));
-        // if an option is not present and Command has a method with the same name
-        // it should not be copied
-        if (typeof cmd[key] !== 'function' && typeof cmd[key] !== 'undefined') {
-            args[key] = cmd[key];
-        }
-    });
-    return args;
-}

packages/mars-cli/lib/helper/utils.js

@@ -21,6 +21,10 @@ const dependencyListH5 = [
     '@marsjs/vue-cli-plugin-mars-web'
 ];
 
+const defaultConfig = {
+    registry: 'https://registry.npm.taobao.org'
+};
+
 function getCliVersion() {
     return version !== undefined ? version : version = require('../../package').version;
 }
@@ -29,9 +33,30 @@ function isH5Project() {
     return isH5 !== undefined ? isH5 : isH5 = fs.existsSync(process.cwd() + '/vue.config.js');
 }
 
+function camelize(str) {
+    return str.replace(/-(\w)/g, (_, c) => (c ? c.toUpperCase() : ''));
+}
+
+// commander passes the Command object itself as options,
+// extract only actual options into a fresh object.
+function cleanArgs(cmd) {
+    const args = {};
+    cmd.options.forEach(o => {
+        const key = camelize(o.long.replace(/^--/, ''));
+        // if an option is not present and Command has a method with the same name
+        // it should not be copied
+        if (typeof cmd[key] !== 'function' && typeof cmd[key] !== 'undefined') {
+            args[key] = cmd[key];
+        }
+    });
+    return args;
+}
+
 module.exports = {
     dependencyList,
     dependencyListH5,
     getCliVersion,
-    isH5Project
+    isH5Project,
+    defaultConfig,
+    cleanArgs
 };