Merge pull request #22151 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.1.1

Bump webpack-merge from 5.0.9 to 5.1.1
This commit is contained in:
Roeland Jago Douma 2020-08-11 14:33:31 +02:00 committed by GitHub
commit a7875c2431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View File

@ -10213,9 +10213,9 @@
}
},
"webpack-merge": {
"version": "5.0.9",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.0.9.tgz",
"integrity": "sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==",
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.1.1.tgz",
"integrity": "sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",

View File

@ -124,7 +124,7 @@
"vue-template-compiler": "^2.6.11",
"webpack": "^4.44.1",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.0.9",
"webpack-merge": "^5.1.1",
"webpack-node-externals": "^2.5.1"
},
"browserslist": [