From 1e984cc0283d31093ae17f5449dc30142ee3764a Mon Sep 17 00:00:00 2001
From: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Date: Tue, 14 Jul 2020 13:47:26 +0200
Subject: [PATCH] Revert "Revert "Bump webpack-merge from 4.2.2 to 5.0.9""

---
 package-lock.json | 44 ++++++++++++++++++++++++++++++++++++++++----
 package.json      |  2 +-
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8bf249a33..74f84fe63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5161,6 +5161,15 @@
 						"punycode": "^2.1.1"
 					}
 				},
+				"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==",
+					"dev": true,
+					"requires": {
+						"lodash": "^4.17.15"
+					}
+				},
 				"yallist": {
 					"version": "3.1.1",
 					"resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
@@ -7827,6 +7836,17 @@
 			"integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
 			"dev": true
 		},
+		"clone-deep": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+			"integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+			"dev": true,
+			"requires": {
+				"is-plain-object": "^2.0.4",
+				"kind-of": "^6.0.2",
+				"shallow-clone": "^3.0.0"
+			}
+		},
 		"clone-regexp": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz",
@@ -18398,6 +18418,15 @@
 				"safe-buffer": "^5.0.1"
 			}
 		},
+		"shallow-clone": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+			"integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+			"dev": true,
+			"requires": {
+				"kind-of": "^6.0.2"
+			}
+		},
 		"shebang-command": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -21861,12 +21890,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-node-externals": {
@@ -22010,6 +22040,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
+		},
 		"wildemitter": {
 			"version": "1.2.1",
 			"resolved": "https://registry.npmjs.org/wildemitter/-/wildemitter-1.2.1.tgz",
diff --git a/package.json b/package.json
index ceaf075e0..6f41164b5 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
 		"vue-template-compiler": "^2.6.11",
 		"webpack": "^4.43.0",
 		"webpack-cli": "^3.3.12",
-		"webpack-merge": "^4.2.2",
+		"webpack-merge": "^5.0.9",
 		"webpack-node-externals": "^2.3.0"
 	},
 	"browserslist": [