summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>2020-09-12 17:07:40 +0000
committerGitHub <noreply@github.com>2020-09-12 17:07:40 +0000
commit7163dff86a68f5d933ab920d058961efb1bbdae8 (patch)
tree05183b6809b45871160e4cac4795fb79f5986db8
parentab2379013a9cbe25bb2860b95c00e3398ba088d3 (diff)
Bump webpack-merge from 5.1.3 to 5.1.4
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.3 to 5.1.4. - [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.1.3...v5.1.4) 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 a6554f35..7031fd04 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16160,9 +16160,9 @@
}
},
"webpack-merge": {
- "version": "5.1.3",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.3.tgz",
- "integrity": "sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==",
+ "version": "5.1.4",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
+ "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index 76dbf067..41d867eb 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
"vue-template-compiler": "^2.6.10",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.11",
- "webpack-merge": "^5.1.3"
+ "webpack-merge": "^5.1.4"
},
"jest": {
"moduleFileExtensions": [