fix: default config merge repeat

easy-team · Jan 17, 2018 · 79939ae · 79939ae
1 parent 682200b
commit 79939ae
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/builder.js b/lib/builder.js
@@ -7,13 +7,16 @@ const WebpackDllBuilder = require('./dll');
 const utils = require('../utils/utils');
 const baseDir = process.cwd();
 exports.getBuilderConfig = (config = {}, option = {}) => {
-  if (typeof config === 'string') {
+  if (utils.isString(config)) {
     const filepath = path.isAbsolute(config) ? config : path.resolve(baseDir, config);
     if (fs.existsSync(filepath)) {
       return merge({ baseDir }, require(filepath));
     }
     return { baseDir };
   }
+  if (utils.isObject(config) && (config.entry || config.framework || config.egg || config.lib || config.dll)) {
+    return merge({ baseDir }, config);
+  }
   const filepath = path.join(config.baseDir || baseDir, 'webpack.config.js');
   if (fs.existsSync(filepath)) {
     return merge({ baseDir }, require(filepath), config);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "easywebpack",
-  "version": "3.6.2",
+  "version": "3.6.3",
   "description": "基于 Webpack 的前端构建工程化解决方案",
   "keywords": [
     "webpack",