fix: config merge

hubcarl · hubcarl · commit b76aca63d422 · 2018-10-13T17:30:45.000+08:00
diff --git a/lib/builder.js b/lib/builder.js
@@ -40,7 +40,7 @@ exports.getBuilderConfig = (config = {}, option = {}) => {
     const filepath = path.isAbsolute(config) ? config : path.resolve(baseDir, config);
     if (fs.existsSync(filepath)) {
       const customFileConfig = require(filepath);
-      return merge(baseConfig, customFileConfig, config);
+      return merge(baseConfig, customFileConfig);
     }
   }
   return merge(baseConfig, config);

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ exports.getBuilderConfig = (config = {}, option = {}) => {`
`40`	`40`	`const filepath = path.isAbsolute(config) ? config : path.resolve(baseDir, config);`
`41`	`41`	`if (fs.existsSync(filepath)) {`
`42`	`42`	`const customFileConfig = require(filepath);`
`43`		`- return merge(baseConfig, customFileConfig, config);`
	`43`	`+ return merge(baseConfig, customFileConfig);`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`return merge(baseConfig, config);`