Merge pull request #1124 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.4.0

package-lock.json

@@ -21039,9 +21039,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.3.0.tgz",
-			"integrity": "sha512-4PtsBAWnmJULIJYviiPq4BxwAykbAgGMheyEVaemj2bJI54h+p/gnlbXZEH2EM0IYC3blOE1Qm6kzKlc06N1UQ==",
+			"version": "5.4.0",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz",
+			"integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",

package.json

@@ -104,7 +104,7 @@
 		"vue-template-compiler": "^2.6.12",
 		"webpack": "^4.44.2",
 		"webpack-cli": "^4.2.0",
-		"webpack-merge": "^5.3.0"
+		"webpack-merge": "^5.4.0"
 	},
 	"jest": {
 		"moduleFileExtensions": [