Bump webpack-merge from 4.2.2 to 5.7.3

CHANGELOG.md

@@ -25,6 +25,8 @@
   [#560](https://github.com/nextcloud/cookbook/pull/560/) @seyfeb
 - Bumped @nextcloud/vue to 3.5.4
   [#561](https://github.com/nextcloud/cookbook/pull/561/) @seyfeb
+- Bump webpack-merge from 4.2.2 to 5.7.3
+  [#458](https://github.com/nextcloud/cookbook/pull/458/) @seyfeb
 - Bump webpack-cli from 3.3.12 to 4.5.0
   [#565](https://github.com/nextcloud/cookbook/pull/565/)
 

package.json

@@ -49,7 +49,7 @@
     "webpack": "^4.42.1",
     "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^4.5.0",
-    "webpack-merge": "^4.2.2",
+    "webpack-merge": "^5.7.3",
     "compression-webpack-plugin": "^6.1.1"
   }
 }

webpack.build.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const common = require('./webpack.config.js')
 const TerserPlugIn = require('terser-webpack-plugin')
 const CompressionPlugin = require('compression-webpack-plugin')
@@ -7,33 +7,33 @@ module.exports = merge(common, {
     mode: 'production',
     devtool: 'source-map',
     optimization: {
-            minimizer: [
-                new TerserPlugIn({
-                    terserOptions:{	
-                        //sideEffects: false,
-                        // All files have side effects, and none can be tree-shaken
-                        // {
-                        //   "./src/file2.js"
-                        //  ]
-                        // }
-                        output:{
-                            comments: false
-                        }
-                    },
-                    sourceMap: true
-                })
-            ],
-        },
-        plugins: [
-            new CompressionPlugin({
-                test: /\.js(\?.*)?$/i,
-            }),
+        minimizer: [
+            new TerserPlugIn({
+                terserOptions:{	
+                    //sideEffects: false,
+                    // All files have side effects, and none can be tree-shaken
+                    // {
+                    //   "./src/file2.js"
+                    //  ]
+                    // }
+                    output:{
+                        comments: false
+                    }
+                },
+                sourceMap: true
+            })
         ],
-        performance: {
-            hints: "warning",
-            // Calculates sizes of gziped bundles.
-            assetFilter: function (assetFilename) {
-                return assetFilename.endsWith(".js.gz");
-            },
-        }
+    },
+    plugins: [
+        new CompressionPlugin({
+            test: /\.js(\?.*)?$/i,
+        }),
+    ],
+    performance: {
+        hints: "warning",
+        // Calculates sizes of gziped bundles.
+        assetFilter: function (assetFilename) {
+            return assetFilename.endsWith(".js.gz");
+        },
+    }
 })

webpack.devel.js

@@ -1,4 +1,4 @@
-const merge = require('webpack-merge')
+const { merge } = require('webpack-merge')
 const common = require('./webpack.config.js')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin