From be87dccc660cb78936ca85c75c12df513b3ffa8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <support@dependabot.com>
Date: Sun, 6 Jan 2019 13:01:26 +0000
Subject: [PATCH] Bump webpack-merge from 4.1.5 to 4.2.1 in /settings
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.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/v4.1.5...v4.2.1)
Signed-off-by: dependabot[bot] <support@dependabot.com>
---
settings/package-lock.json | 6 +++---
settings/package.json | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/settings/package-lock.json b/settings/package-lock.json
index 0753dd3ccd6..aa6fddd759f 100644
--- a/settings/package-lock.json
+++ b/settings/package-lock.json
@@ -7891,9 +7891,9 @@
}
},
"webpack-merge": {
- "version": "4.1.5",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.5.tgz",
- "integrity": "sha512-sVcM+MMJv6DO0C0GLLltx8mUlGMKXE0zBsuMqZ9jz2X9gsekALw6Rs0cAfTWc97VuWS6NpVUa78959zANnMMLQ==",
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.1.tgz",
+ "integrity": "sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==",
"dev": true,
"requires": {
"lodash": "^4.17.5"
diff --git a/settings/package.json b/settings/package.json
index 609fe660370..7dee7c9099a 100644
--- a/settings/package.json
+++ b/settings/package.json
@@ -43,6 +43,6 @@
"vue-template-compiler": "^2.5.21",
"webpack": "^4.28.3",
"webpack-cli": "^3.2.0",
- "webpack-merge": "^4.1.5"
+ "webpack-merge": "^4.2.1"
}
}
--
GitLab