diff --git a/package.json b/package.json index 71ac2526e..ce1ddc7a6 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "webpack": "^5.89.0", "webpack-assets-manifest": "^5.1.0", "webpack-cli": "^5.1.4", - "webpack-merge": "^5.9.0", + "webpack-merge": "^5.10.0", "webpack-sources": "^3.2.3", "webpack-subresource-integrity": "^5.1.0", "xss": "^1.0.14" diff --git a/yarn.lock b/yarn.lock index 230b3feac..5d5bd25f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2642,6 +2642,11 @@ find-up@^6.3.0: locate-path "^7.1.0" path-exists "^5.0.0" +flat@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241" + integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ== + follow-redirects@^1.0.0: version "1.15.3" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a" @@ -4554,12 +4559,13 @@ webpack-dev-server@^4.15.1: webpack-dev-middleware "^5.3.1" ws "^8.13.0" -webpack-merge@^5.7.3, webpack-merge@^5.9.0: - version "5.9.0" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.9.0.tgz#dc160a1c4cf512ceca515cc231669e9ddb133826" - integrity sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg== +webpack-merge@^5.10.0, webpack-merge@^5.7.3: + version "5.10.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177" + integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA== dependencies: clone-deep "^4.0.1" + flat "^5.0.2" wildcard "^2.0.0" webpack-sources@^3.2.3: