Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 02:35:49 +00:00
Code Issues Projects Releases Wiki Activity

feature(webpack) deepmerge -> webpack-merge

Browse source
This commit is contained in:
coderaiser 2018-04-11 11:28:25 +03:00
parent 1e716ef64f
commit 567a14f93d
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
package.json
View file

@ -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": {

10
webpack.config.js
View file

@ -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});
]);