Skip to content

Commit

Permalink
Update dist.
Browse files Browse the repository at this point in the history
  • Loading branch information
arunoda committed Jan 15, 2017
1 parent b44528b commit 08a6149
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions dist/server/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ exports.default = function (configType, baseConfig, configDir) {
customConfig.module = customConfig.module || {};

var newConfig = (0, _extends3.default)({}, customConfig, config, {
// Override with custom devtool if provided
devtool: customConfig.devtool || config.devtool,
// We need to use our and custom plugins.
plugins: [].concat((0, _toConsumableArray3.default)(config.plugins), (0, _toConsumableArray3.default)(customConfig.plugins || [])),
module: (0, _extends3.default)({}, config.module, customConfig.module, {
Expand Down

0 comments on commit 08a6149

Please sign in to comment.