Merge pull request #596 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.0

This commit is contained in:
dependabot[bot] 2020-12-15 14:18:14 +00:00 committed by GitHub
commit 247f37617f
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

@ -12965,9 +12965,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.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==",
"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.6.1",
"webpack-merge": "^5.7.0",
"workbox-webpack-plugin": "^5.1.4"
}
}