From: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 28 Dec 2020 11:39:40 +0000 (+0800)
Subject: build(deps-dev): bump webpack-merge from 5.5.0 to 5.7.3 in /html (#567)
X-Git-Url: http://git.prime8.dev/?a=commitdiff_plain;h=4532fa1a840e458dea50f2bdbae9f5266b8e9bd8;p=ttyd.git

build(deps-dev): bump webpack-merge from 5.5.0 to 5.7.3 in /html (#567)

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

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

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---

diff --git a/html/package.json b/html/package.json
index b454ff5..0ac60a3 100644
--- a/html/package.json
+++ b/html/package.json
@@ -58,7 +58,7 @@
     "webpack": "4.44.2",
     "webpack-cli": "^4.3.0",
     "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^5.5.0"
+    "webpack-merge": "^5.7.3"
   },
   "dependencies": {
     "backoff": "^2.5.0",
diff --git a/html/yarn.lock b/html/yarn.lock
index 0340704..f641916 100644
--- a/html/yarn.lock
+++ b/html/yarn.lock
@@ -8490,10 +8490,10 @@ webpack-merge@^4.2.2:
   dependencies:
     lodash "^4.17.15"
 
-webpack-merge@^5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.5.0.tgz#18b860249ee3f940ed1607c6b0cf1912b27dbf44"
-  integrity sha512-EYKu2To70zpXh65y+ERG/8TbOy0YxPERP1hGvl5nnx7zY0HLZU57zNRlIowiPYQ8lI7kXsCHa5owKMgv/ImW/w==
+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"