aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 09345746863..a8f39b84ddd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9718,9 +9718,9 @@
}
},
"webpack-merge": {
- "version": "5.1.4",
- "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.4.tgz",
- "integrity": "sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.2.0.tgz",
+ "integrity": "sha512-QBglJBg5+lItm3/Lopv8KDDK01+hjdg2azEwi/4vKJ8ZmGPdtJsTpjtNNOW3a4WiqzXdCATtTudOZJngE7RKkA==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",
diff --git a/package.json b/package.json
index ad48397dfee..15d407a20c9 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
- "webpack-merge": "^5.1.4",
+ "webpack-merge": "^5.2.0",
"webpack-node-externals": "^2.5.2"
},
"browserslist": [