summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-12-19 02:21:03 +0000
committerGitHub <noreply@github.com>2020-12-19 02:21:03 +0000
commit33fcdbb278669a6bd6f6055eec8f565f901ca79b (patch)
tree7d36d4d269b47e57d176914b21c89fdb3ff66918
parent6e56c1a689b963838710d97d35f99e926bea8b99 (diff)
Bump webpack-merge from 5.4.0 to 5.7.2dependabot/npm_and_yarn/webpack-merge-5.7.2
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.4.0 to 5.7.2. - [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.4.0...v5.7.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
-rw-r--r--package-lock.json6
-rw-r--r--package.json2
2 files changed, 4 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json
index 0b6b67bb..55145465 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19978,9 +19978,9 @@
}
},
"webpack-merge": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.4.0.tgz",
- "integrity": "sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==",
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.2.tgz",
+ "integrity": "sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index f83036c6..df8a99c0 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^4.2.0",
- "webpack-merge": "^5.4.0"
+ "webpack-merge": "^5.7.2"
},
"jest": {
"moduleFileExtensions": [