feature(webpack) deepmerge -> webpack-merge

coderaiser · Apr 11, 2018 · 567a14f · 567a14f
1 parent 1e716ef
commit 567a14f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -203,6 +203,7 @@
     "version-io": "^2.0.1",
     "webpack": "^4.0.0",
     "webpack-cli": "^2.0.9",
+    "webpack-merge": "^4.1.2",
     "yaspeller": "^4.0.0"
   },
   "engines": {

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,18 +1,14 @@
 'use strict';
 
-const deepmerge = require('deepmerge');
-
-const isSimpleObject = ({constructor}) => constructor === Object;
-const {isArray} = Array;
-const isMergeableObject = (a) => isArray(a) || isSimpleObject(a);
+const merge = require('webpack-merge');
 
 const htmlConfig = require('./.webpack/html');
 const cssConfig = require('./.webpack/css');
 const jsConfig = require('./.webpack/js');
 
-module.exports = deepmerge.all([
+module.exports = merge([
     jsConfig,
     htmlConfig,
     cssConfig,
-], {isMergeableObject});
+]);