From 567a14f93dee8fe8e80c8484e960f4feac2a135b Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 11 Apr 2018 11:28:25 +0300 Subject: [PATCH] feature(webpack) deepmerge -> webpack-merge --- package.json | 1 + webpack.config.js | 10 +++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f6c9f946..ec32ead2 100644 --- 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 index 79731814..b663db21 100644 --- 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}); +]);