From 23594db07e4c06781c2f7c7da83c5e872d354758 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Sun, 13 Dec 2020 22:39:45 +0800 Subject: [PATCH] build(deps-dev): bump webpack-merge from 5.3.0 to 5.5.0 in /html (#553) Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.3.0 to 5.5.0. - [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.3.0...v5.5.0) 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 894884a..8fd9a17 100644 --- a/html/package.json +++ b/html/package.json @@ -58,7 +58,7 @@ "webpack": "4.44.2", "webpack-cli": "^4.2.0", "webpack-dev-server": "^3.11.0", - "webpack-merge": "^5.3.0" + "webpack-merge": "^5.5.0" }, "dependencies": { "backoff": "^2.5.0", diff --git a/html/yarn.lock b/html/yarn.lock index d78a934..83db858 100644 --- a/html/yarn.lock +++ b/html/yarn.lock @@ -8520,10 +8520,10 @@ webpack-merge@^4.2.2: dependencies: lodash "^4.17.15" -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== +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== dependencies: clone-deep "^4.0.1" wildcard "^2.0.0" -- 2.43.4