From: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2020 15:12:00 +0000 (+0800)
Subject: build(deps-dev): bump webpack-merge from 5.0.9 to 5.1.1 in /html (#435)
X-Git-Url: http://git.prime8.dev/?a=commitdiff_plain;h=752563bf33226e4a7b4220be5a4ebd06c0e24d19;p=ttyd.git

build(deps-dev): bump webpack-merge from 5.0.9 to 5.1.1 in /html (#435)

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.0.9 to 5.1.1.
- [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.1.1)

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 ed0486b..91e4208 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.0.9"
+    "webpack-merge": "^5.1.1"
   },
   "dependencies": {
     "backoff": "^2.5.0",
diff --git a/html/yarn.lock b/html/yarn.lock
index df9a859..9270282 100644
--- a/html/yarn.lock
+++ b/html/yarn.lock
@@ -8455,10 +8455,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.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.1.tgz#c79f36b4ad39a597c3bb780f809b514d65d85d01"
+  integrity sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"