From 60cc3a96d8d7fb3253dc93356009e52ccde2fc05 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 19 Nov 2020 11:07:57 +0900
Subject: [PATCH] Bump webpack-merge from 5.3.0 to 5.4.0 (#15166)
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.3.0 to 5.4.0.
- [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.3.0...v5.4.0)
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 f6fb2528f..d31b0de3f 100644
--- a/package.json
+++ b/package.json
@@ -166,7 +166,7 @@
"webpack-assets-manifest": "^3.1.1",
"webpack-bundle-analyzer": "^4.1.0",
"webpack-cli": "^3.3.12",
- "webpack-merge": "^5.3.0",
+ "webpack-merge": "^5.4.0",
"wicg-inert": "^3.1.0"
},
"devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index cecebe88b..b477aae3e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11061,10 +11061,10 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"
-webpack-merge@^5.3.0:
- version "5.3.0"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.3.0.tgz#a80df44d35fabace680bf430a19fda9ec49ed8eb"
- integrity sha512-4PtsBAWnmJULIJYviiPq4BxwAykbAgGMheyEVaemj2bJI54h+p/gnlbXZEH2EM0IYC3blOE1Qm6kzKlc06N1UQ==
+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==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"