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

This commit is contained in:
dependabot[bot] 2020-12-19 02:12:36 +00:00 committed by GitHub
commit b1b56cc7b1
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

@ -13001,9 +13001,9 @@
}
},
"webpack-merge": {
"version": "5.7.0",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.0.tgz",
"integrity": "sha512-UryoMJGRMwOOh/ie4NXZC1OtT0mkA7Ny2+C/MkWOwTRG+jVNEwChVV/+x8rd+ga2mVLeQ0m+QmzLAg7N36+oag==",
"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

@ -98,7 +98,7 @@
"vue-template-compiler": "^2.6.12",
"webpack": "^4.44.2",
"webpack-cli": "^3.3.12",
"webpack-merge": "^5.7.0",
"webpack-merge": "^5.7.2",
"workbox-webpack-plugin": "^6.0.2"
}
}