Skip to content

Commit c00c4b2

Browse files
authored
Fix importing webpack-merge after latest webpack release (#660)
1 parent 66e71f8 commit c00c4b2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

frontend/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const merge = require('webpack-merge');
1+
const { merge } = require('webpack-merge');
22
const common = require('./webpack.common.js');
33

44
module.exports = merge(common, {

frontend/webpack.prod.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const merge = require('webpack-merge');
1+
const { merge } = require('webpack-merge');
22
const common = require('./webpack.common.js');
33
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
44
const TerserJSPlugin = require('terser-webpack-plugin');

0 commit comments

Comments
 (0)