🚑 修复部分问题.

Author: zyao89

src/adapter/vusion/index.js

@@ -6,7 +6,7 @@ const resolveConfig = require('./resolve');
 module.exports = function(webpackConfig, isDev, { modifyDefaultVusionConfig, resolveVusionConfig, resolveVusionWebpackConfig }) {
 
     let defaultVusionConfig = {
-        type: 'app',
+        // type: 'app',
         isDev,
         webpack: webpackConfig,
         needLoadFile: true,
@@ -21,10 +21,6 @@ module.exports = function(webpackConfig, isDev, { modifyDefaultVusionConfig, res
         vusionConfig = resolveVusionConfig(vusionConfig);
     }
 
-    vusionConfig.webpack = merge.smartStrategy({
-        entry: 'replace',
-    })(vusionConfig.webpack, webpackConfig);
-
     global.vusionConfig = vusionConfig; // fixed vusion
 
     const config = require('./config')(vusionConfig);

src/adapter/vusion/resolve.js

@@ -48,8 +48,9 @@ module.exports = function resolveVusionConfig(defaultVusionConfig) {
             let filename = 'vusion.config.js';
             if (!needLoadFile) {
                 filename = path.resolve(__dirname, 'vusion.config.js');
+                return vusionConfigModule(filename, ...externalConfigs);
             }
-            return vusionConfigModule(filename, ...externalConfigs);
+            return Object.assign(vusionConfigModule(filename, ...externalConfigs), defaultVusionConfig);
         }
         return vusionConfigModule();
     }

src/server/koa-webpack-middleware/hotMiddleware.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const microApp = require('@micro-app/core');
+const logger = microApp.logger;
+
 const hotMiddleware = require('webpack-hot-middleware');
 const { PassThrough } = require('stream');
 
@@ -14,6 +17,9 @@ module.exports = function(compiler, opts) {
                 ctx.status = status;
                 ctx.set(headers);
             },
+            end: () => {
+                logger.warn('hotMiddleware end!');
+            },
         }, next);
     };
 };