Merge branch 'feature/webpack4' into develop

* feature/webpack4:
  :add: 增加 vusion-core 适配 adapter
  :update: adapter webpack4

# Conflicts:
#	package.json

Author: zyao89

bin/micro-app-build.js

@@ -3,7 +3,6 @@
 
 const program = require('commander');
 const microApp = require('@micro-app/core');
-const chalk = require('chalk').default;
 
 program
     .version(require('../package').version, '-v, --version')
@@ -15,21 +14,22 @@ process.env.NODE_ENV = 'production';
 global.extraArgs = program.args;
 
 const type = program.type;
-if (type === 'vusion') {
-    const vusionAdapter = new microApp.VusionAdapter();
-    vusionAdapter.build().then(() => {
-        console.info('>>> Build Success >>>');
-    }).catch(e => {
-        console.error('>>> Build Error >>>', e);
-    });
-} else if (!type || type === 'webpack') {
-    // webpack build ...
-    const webpackAdapter = new microApp.WebpackAdapter();
-    webpackAdapter.build().then(() => {
-        console.info('>>> Build Success >>>');
-    }).catch(e => {
-        console.error('>>> Build Error >>>', e);
-    });
-} else {
-    console.warn(chalk.red(`Not Support < ${type} >`));
+let wbpackAdapter = null;
+switch (type) {
+    case 'vusion':
+        wbpackAdapter = new microApp.VusionAdapter();
+        break;
+    case 'vusioncore':
+        wbpackAdapter = new microApp.VusionCoreAdapter();
+        break;
+    case 'webpack':
+    default:
+        wbpackAdapter = new microApp.WebpackAdapter();
+        break;
 }
+
+wbpackAdapter.build().then(() => {
+    console.info('>>> Build Success >>>');
+}).catch(e => {
+    console.error('>>> Build Error >>>', e);
+});

bin/micro-app-dev.js

@@ -21,7 +21,22 @@ process.env.NODE_ENV = 'development';
 
 global.extraArgs = program.args;
 
-const wbpackAdapter = program.type === 'vusion' ? new microApp.VusionAdapter() : new microApp.WebpackAdapter();
+const type = program.type;
+// const wbpackAdapter = program.type === 'vusion' ? new microApp.VusionAdapter() : new microApp.WebpackAdapter();
+let wbpackAdapter = null;
+switch (type) {
+    case 'vusion':
+        wbpackAdapter = new microApp.VusionAdapter();
+        break;
+    case 'vusioncore':
+        wbpackAdapter = new microApp.VusionCoreAdapter();
+        break;
+    case 'webpack':
+    default:
+        wbpackAdapter = new microApp.WebpackAdapter();
+        break;
+}
+
 const koaAdapter = new microApp.KoaAdapter(wbpackAdapter, program);
 koaAdapter.serve(url => {
     // success

bin/micro-app-start.js

@@ -18,28 +18,33 @@ process.env.NODE_ENV = 'production';
 
 global.extraArgs = program.args;
 
+
+// const wbpackAdapter = program.type === 'vusion' ? new microApp.VusionAdapter() : new microApp.WebpackAdapter();
+let wbpackAdapter = null;
+switch (program.type) {
+    case 'vusion':
+        wbpackAdapter = new microApp.VusionAdapter();
+        break;
+    case 'vusioncore':
+        wbpackAdapter = new microApp.VusionCoreAdapter();
+        break;
+    case 'webpack':
+    default:
+        wbpackAdapter = new microApp.WebpackAdapter();
+        break;
+}
+
 let promise = Promise.resolve();
 if (program.build) {
-    const type = program.type;
-    if (type === 'vusion') {
-        const vusionAdapter = new microApp.VusionAdapter();
-        promise = vusionAdapter.build().then(() => {
-            return Promise.resolve(true);
-        });
-    } else {
-        // webpack build ...
-        const webpackAdapter = new microApp.WebpackAdapter();
-        promise = webpackAdapter.build().then(() => {
-            return Promise.resolve(true);
-        });
-    }
+    promise = wbpackAdapter.build().then(() => {
+        return Promise.resolve(true);
+    });
 }
 
 promise.then(flag => {
     if (flag) {
         logger.success('Build finish');
     }
-    const wbpackAdapter = program.type === 'vusion' ? new microApp.VusionAdapter() : new microApp.WebpackAdapter();
     const koaAdapter = new microApp.KoaAdapter(wbpackAdapter, program);
     koaAdapter.start(url => {
         // success