fix: array merge repeat

Author: hubcarl

lib/config.js

@@ -5,6 +5,7 @@ const WebpackTool = require('webpack-tool');
 const webpack = WebpackTool.webpack;
 const merge = WebpackTool.merge;
 const utils = require('../utils/utils');
+const uniq = require('lodash.uniq');
 const Logger = require('../utils/logger');
 const Adapter = require('../utils/adapter');
 
@@ -14,7 +15,11 @@ class Config {
     this.baseDir = config.baseDir || process.cwd();
     this.configList = [config];
     this.webpack = webpack;
-    this.merge = merge;
+    this.merge = merge({
+      customizeArray(a, b, key) {
+        return uniq([...a, ...b]);
+      }
+    });
     this.utils = utils;
     this.packs = {};
     this.webpackInfo = {};

package.json

@@ -28,8 +28,9 @@
     "lodash.clonedeep": "^4.5.0",
     "lodash.clonedeepwith": "^4.5.0",
     "lodash.get": "^4.4.2",
-    "npm-install-webpack-plugin": "^4.0.5",
+    "lodash.uniq": "^4.5.0",
     "node-noop": "^1.0.0",
+    "npm-install-webpack-plugin": "^4.0.5",
     "postcss-loader": "^2.1.0",
     "progress-bar-webpack-plugin": "^1.10.0",
     "service-worker-precache-webpack-plugin": "^1.0.0",

test/client.test.js

@@ -517,4 +517,21 @@ describe('client.test.js', () => {
       expect(webpackConfig.devtool).to.equal('eval');
     });
   });
+  describe('#webpack merge test', () => {
+    it('should merge array uniq', () => {
+      const builder = createBuilder({
+        loaders : {
+          scss: {
+            options: {
+              includePaths: [path.resolve(__dirname, 'app/web/asset'), path.resolve(__dirname, 'app/web/asset/style')],
+              sourceMap: true,
+            },
+          },
+        }
+      });
+      const webpackConfig = builder.create();
+      const scssLoader = getLoaderByName('sass', webpackConfig.module.rules, /\.scss/);
+      expect(scssLoader.use[3].options.includePaths.length).to.equal(2);
+    });
+  });
 });

utils/utils.js

@@ -8,10 +8,12 @@ const queryString = require('querystring');
 const mkdirp = require('mkdirp');
 const cloneDeep = require('lodash.clonedeep');
 const cloneDeepWith = require('lodash.clonedeepwith');
+const uniq = require('lodash.uniq');
 const install = require('./install');
 const utils = Object.assign({}, {
   cloneDeep,
   cloneDeepWith,
+  uniq,
   mkdirp,
   queryString
 }, install);