Merge pull request #24773 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.2

This commit is contained in:
dependabot-preview[bot] 2020-12-21 08:21:33 +00:00 committed by GitHub
commit d0fa143f01
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

@ -11002,9 +11002,9 @@
}
},
"webpack-merge": {
"version": "5.6.1",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.6.1.tgz",
"integrity": "sha512-5n19s1YcyQkBJkYtE+Tq3br/Ax6ofQjMA4U8PUfpcaRB2cvxJNoikUK4RQN3sEJt1Fl4Dym3qc2AnODgGK0vKg==",
"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",

View File

@ -127,7 +127,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^4.2.0",
"webpack-merge": "^5.6.1",
"webpack-merge": "^5.7.2",
"webpack-node-externals": "^2.5.2"
},
"browserslist": [