From c939ef57fb86680f638f0797082d30decd72d899 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 17 Dec 2020 18:34:10 +0000
Subject: [PATCH] Bump webpack-merge from 5.6.1 to 5.7.2

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.6.1 to 5.7.2.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.6.1...v5.7.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 27 +++++++++------------------
 package.json      |  2 +-
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aa9797e722b..168ac6983f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4118,7 +4118,6 @@
 					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"color-convert": "^2.0.1"
 					}
@@ -4184,7 +4183,6 @@
 					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"color-name": "~1.1.4"
 					}
@@ -4193,8 +4191,7 @@
 					"version": "1.1.4",
 					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 					"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"css-loader": {
 					"version": "3.6.0",
@@ -4233,8 +4230,7 @@
 					"version": "3.0.0",
 					"resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
 					"integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-					"dev": true,
-					"optional": true
+					"dev": true
 				},
 				"find-cache-dir": {
 					"version": "3.3.1",
@@ -4585,11 +4581,10 @@
 					}
 				},
 				"vue-loader-v16": {
-					"version": "npm:vue-loader@16.1.1",
-					"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.1.tgz",
-					"integrity": "sha512-wz/+HFg/3SBayHWAlZXARcnDTl3VOChrfW9YnxvAweiuyKX/7IGx1ad/4yJHmwhgWlOVYMAbTiI7GV8G33PfGQ==",
+					"version": "npm:vue-loader@16.1.2",
+					"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+					"integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
 					"dev": true,
-					"optional": true,
 					"requires": {
 						"chalk": "^4.1.0",
 						"hash-sum": "^2.0.0",
@@ -4601,7 +4596,6 @@
 							"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
 							"integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
 							"dev": true,
-							"optional": true,
 							"requires": {
 								"ansi-styles": "^4.1.0",
 								"supports-color": "^7.1.0"
@@ -4611,15 +4605,13 @@
 							"version": "4.0.0",
 							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 							"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-							"dev": true,
-							"optional": true
+							"dev": true
 						},
 						"loader-utils": {
 							"version": "2.0.0",
 							"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
 							"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
 							"dev": true,
-							"optional": true,
 							"requires": {
 								"big.js": "^5.2.2",
 								"emojis-list": "^3.0.0",
@@ -4631,7 +4623,6 @@
 							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 							"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 							"dev": true,
-							"optional": true,
 							"requires": {
 								"has-flag": "^4.0.0"
 							}
@@ -21833,9 +21824,9 @@
 			}
 		},
 		"webpack-merge": {
-			"version": "5.6.1",
-			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz",
-			"integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==",
+			"version": "5.7.2",
+			"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.2.tgz",
+			"integrity": "sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg==",
 			"dev": true,
 			"requires": {
 				"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index b90a6767422..72dd251cae1 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
 		"vue-template-compiler": "^2.6.12",
 		"webpack": "^4.44.2",
 		"webpack-cli": "^4.2.0",
-		"webpack-merge": "^5.6.1",
+		"webpack-merge": "^5.7.2",
 		"webpack-node-externals": "^2.5.2"
 	},
 	"browserslist": [