fix(build & cli): runtime copy error and h5skip option

Author: allen-zh

packages/mars-build/src/compiler/runtime/compiler.js

@@ -41,10 +41,12 @@ function compile(options) {
         entry = require.resolve('@marsjs/core/src/h5', {
             paths: [process.cwd()]
         });
-        return Promise.all([
-            // fs.copy(entry, coreDestDir + '/index.js'),
-            fs.copy(path.dirname(entry), path.resolve(process.cwd(), destPath))
-        ]);
+        const entryDir = path.dirname(entry);
+        const files = fs.readdirSync(entryDir);
+        return Promise.all(files.map(file => fs.copy(
+            path.resolve(entryDir, file),
+            path.resolve(process.cwd(), destPath, file)
+        )));
     }
     else {
         return Promise.resolve();

packages/mars-build/src/scripts/run.js

@@ -37,7 +37,7 @@ function getBuildTasks(config = {}, options = {}) {
     // if (target !== 'h5') {
     gulp.task('compile:runtime', getTaskRuntime(config, options));
     buildTasks.push('compile:runtime');
-    // }
+    // // }
 
     return buildTasks;
 }

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

@@ -14,7 +14,7 @@ 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)')
     .option('-w, --watch', 'Open watch mode')
-    .option('--skipMars', 'Skip mars compile process, directly call vue cli serve')
+    .option('--h5skip <process>', 'Skip h5 compile process (mars | vue)')
     .action(cmd => {
         const build = require('../lib/build');
         const options = cleanArgs(cmd);

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

@@ -13,7 +13,7 @@ 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)')
-    .option('--skipMars', 'Skip mars compile process, directly call vue cli serve')
+    .option('--h5skip <process>', 'Skip h5 compile process (mars | vue)')
     .action(cmd => {
         const start = require('../lib/serve');
         const options = cleanArgs(cmd);

packages/mars-cli/bin/mars.js

@@ -188,7 +188,7 @@ 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)')
     .option('-w, --watch', 'Open watch mode')
-    .option('--skipMars', 'Skip mars compile process, directly call vue cli serve')
+    .option('--h5skip <process>', 'Skip h5 compile process (mars | vue)')
     .action(cmd => {
         const options = cleanArgs(cmd);
         const buildPath = path.resolve(__dirname, './mars-build.js');
@@ -204,7 +204,7 @@ program
                 if (options[op] !== false) {
                     args.push('--' + op);
                     if (options[op] !== true) {
-                        args.push(options.op);
+                        args.push(options[op]);
                     }
                 }
             });
@@ -220,7 +220,7 @@ 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)')
-    .option('--skipMars', 'Skip mars compile process, directly call vue cli serve')
+    .option('--h5skip <process>', 'Skip h5 compile process (mars | vue)')
     .action(cmd => {
         const options = cleanArgs(cmd);
         const buildPath = path.resolve(__dirname, './mars-serve.js');
@@ -236,7 +236,7 @@ program
                 if (options[op] !== false) {
                     args.push('--' + op);
                     if (options[op] !== true) {
-                        args.push(options.op);
+                        args.push(options[op]);
                     }
                 }
             });

packages/mars-cli/lib/build.js

@@ -47,15 +47,15 @@ async function build(cmd) {
         child.stderr.pipe(process.stderr);
     }
 
-    if (target === 'h5' && cmd.skipMars) {
+    if (target === 'h5' && cmd.h5skip === 'mars') {
         return serveH5();
     }
 
     const run = cmd.watch ? watch : build;
 
     clean(options).once('stop', () => {
         run(options).once('stop', () => {
-            if (target === 'h5') {
+            if (target === 'h5' && cmd.h5skip !== 'vue') {
                 serveH5();
             }
             else {

packages/mars-cli/lib/serve.js

@@ -46,13 +46,13 @@ async function start(cmd) {
         child.stderr.pipe(process.stderr);
     }
 
-    if (target === 'h5' && cmd.skipMars) {
+    if (target === 'h5' && cmd.h5skip === 'mars') {
         return serveH5();
     }
 
     clean(options).once('stop', () => {
         watch(options).once('stop', () => {
-            if (target === 'h5') {
+            if (target === 'h5' && cmd.h5skip !== 'vue') {
                 serveH5();
             }
             else {