Skip to content

Fix loader concatentation bug #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arunoda merged 1 commit into from
May 9, 2016
Merged

Fix loader concatentation bug #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions dist/manager.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/manager.js.map
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file modified dist/server/build.js
100755 → 100644
View file
Open in desktop
Empty file.
4 changes: 3 additions & 1 deletion dist/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,12 @@ exports.default = function (configType, baseConfig, configDir) {

logger.info('=> Loading custom webpack config.');

customConfig.module = customConfig.module || {};

return (0, _extends3.default)({}, customConfig, config, {
// 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 || {}, {
module: (0, _extends3.default)({}, config.module, customConfig.module, {
loaders: [].concat((0, _toConsumableArray3.default)(config.module.loaders), (0, _toConsumableArray3.default)(customConfig.module.loaders || []))
})
});
Expand Down
4 changes: 3 additions & 1 deletion src/server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ export default function (configType, baseConfig, configDir) {

logger.info('=> Loading custom webpack config.');

customConfig.module = customConfig.module || {};

return {
...customConfig,
// We'll always load our configurations after the custom config.
Expand All @@ -87,7 +89,7 @@ export default function (configType, baseConfig, configDir) {
module: {
...config.module,
// We need to use our and custom loaders.
...customConfig.module || {},
...customConfig.module,
loaders: [
...config.module.loaders,
...customConfig.module.loaders || [],
Expand Down