Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions build-utils/loadPresets.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const webpackMerge = require('webpack-merge');
const { merge } = require('webpack-merge');

const loadPresets = (env = { presets: [] }) => {
const presets = env.presets || [];
Expand All @@ -8,7 +8,7 @@ const loadPresets = (env = { presets: [] }) => {
return require(`./presets/webpack.${presetName}`)(env);
});

return webpackMerge({}, ...mergedConfigs);
return merge({}, ...mergedConfigs);
};

module.exports = loadPresets;
4 changes: 3 additions & 1 deletion build-utils/webpack.development.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ module.exports = () => ({
},
plugins: [
// Copy empty ServiceWorker so install doesn't blow up
new CopyWebpackPlugin(['src/sw.js'])
new CopyWebpackPlugin({
patterns: ['src/sw.js']
})
],
devtool: 'source-map'
});
Loading