Merge pull request #2375 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.2.0

Bump webpack-merge from 5.1.4 to 5.2.0
This commit is contained in:
Julius Härtl
2020-10-07 16:08:03 +02:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View File

@@ -21899,9 +21899,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",

View File

@@ -110,7 +110,7 @@
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0",
"webpack-merge": "^5.1.4"
"webpack-merge": "^5.2.0"
},
"jest": {
"moduleFileExtensions": [