Merge pull request #942 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.0.9

package-lock.json

@@ -20263,12 +20263,13 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "4.2.2",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
-			"integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
+			"version": "5.0.9",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.0.9.tgz",
+			"integrity": "sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==",
 			"dev": true,
 			"requires": {
-				"lodash": "^4.17.15"
+				"clone-deep": "^4.0.1",
+				"wildcard": "^2.0.0"
 			}
 		},
 		"webpack-sources": {
@@ -20347,6 +20348,12 @@
 				"string-width": "^1.0.2 || 2"
 			}
 		},
+		"wildcard": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz",
+			"integrity": "sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==",
+			"dev": true
+		},
 		"word-wrap": {
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",

package.json

@@ -96,7 +96,7 @@
 		"vue-template-compiler": "^2.6.10",
 		"webpack": "^4.43.0",
 		"webpack-cli": "^3.3.11",
-		"webpack-merge": "^4.2.2"
+		"webpack-merge": "^5.0.9"
 	},
 	"jest": {
 		"moduleFileExtensions": [

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, {

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, {