From 496e2c2f886e361d4ade4b426fb6e652aee27f2c Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sat, 5 Sep 2020 08:54:36 +0800 Subject: [PATCH] build(deps-dev): bump webpack-merge from 5.1.2 to 5.1.3 in /html (#463) Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.2 to 5.1.3. - [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.1.2...v5.1.3) Signed-off-by: dependabot-preview[bot] Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> --- html/package.json | 2 +- html/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/html/package.json b/html/package.json index 18ca9e8..9b7c107 100644 --- a/html/package.json +++ b/html/package.json @@ -58,7 +58,7 @@ "webpack": "4.44.1", "webpack-cli": "^3.3.12", "webpack-dev-server": "^3.11.0", - "webpack-merge": "^5.1.2" + "webpack-merge": "^5.1.3" }, "dependencies": { "backoff": "^2.5.0", diff --git a/html/yarn.lock b/html/yarn.lock index c7c8146..4cee079 100644 --- a/html/yarn.lock +++ b/html/yarn.lock @@ -8477,10 +8477,10 @@ webpack-log@^2.0.0: ansi-colors "^3.0.0" uuid "^3.3.2" -webpack-merge@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.2.tgz#21dc1ed0e860c305cf5a07a48750f53a99750855" - integrity sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g== +webpack-merge@^5.1.3: + version "5.1.3" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.3.tgz#e5570b0bfa654915340f1e348c93a6fd16d7a820" + integrity sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -- 2.43.4