From 01f18355136631311e5d52631f2896063943ca70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Nov 2020 19:04:35 +0900
Subject: [PATCH] Bump webpack-merge from 5.0.9 to 5.3.0 (#15130)
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.0.9 to 5.3.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.0.9...v5.3.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 b51863c71..e2f027b21 100644
--- a/package.json
+++ b/package.json
@@ -166,7 +166,7 @@
"webpack-assets-manifest": "^3.1.1",
"webpack-bundle-analyzer": "^3.9.0",
"webpack-cli": "^3.3.12",
- "webpack-merge": "^5.0.9",
+ "webpack-merge": "^5.3.0",
"wicg-inert": "^3.1.0"
},
"devDependencies": {
diff --git a/yarn.lock b/yarn.lock
index a18dd960d..c3d961f61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -11046,10 +11046,10 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"
-webpack-merge@^5.0.9:
- version "5.0.9"
- resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.0.9.tgz#d5e0e0ae564ae704836d747893bdd2741544bf31"
- integrity sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==
+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==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"