Merge pull request #485 from nextcloud/bugfix/noid/fix_webpack_build

Fix usage of webpack-merge
nextcloud · Aug 24, 2020 · b3e82bf · b3e82bf
2 parents 2e6f58a + 9780b24
commit b3e82bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/webpack.dev.js b/webpack.dev.js
@@ -1,4 +1,4 @@
-const merge = require('webpack-merge');
+const { merge } = require('webpack-merge');
 const common = require('./webpack.common.js');
 
 module.exports = merge(common, {

diff --git a/webpack.prod.js b/webpack.prod.js
@@ -1,4 +1,4 @@
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const common = require('./webpack.common.js')
 
 module.exports = merge(common, {