From 998c28e0316d090a6befdac4a5052aa1e4888971 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Dec 2020 23:56:33 +0900
Subject: [PATCH] Bump webpack-merge from 5.4.0 to 5.7.3 (#15452)

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.4.0 to 5.7.3.
- [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.4.0...v5.7.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 68aa72a2b8e..572638bf6e0 100644
--- a/package.json
+++ b/package.json
@@ -167,7 +167,7 @@
     "webpack-assets-manifest": "^3.1.1",
     "webpack-bundle-analyzer": "^4.1.0",
     "webpack-cli": "^3.3.12",
-    "webpack-merge": "^5.4.0",
+    "webpack-merge": "^5.7.3",
     "wicg-inert": "^3.1.0"
   },
   "devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a3811e0d2e7..a077e0c4b95 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11109,10 +11109,10 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-webpack-merge@^5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.0.tgz#81bef0a7d23fc1e6c24b06ad8bf22ddeb533a3a3"
-  integrity sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==
+webpack-merge@^5.7.3:
+  version "5.7.3"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
+  integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"