Merge pull request #3122 from nextcloud/dependabot/npm_and_yarn/master/webpack-merge-5.8.0

Bump webpack-merge from 5.7.3 to 5.8.0
This commit is contained in:
Julius Härtl
2021-06-09 14:37:46 +02:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

6
package-lock.json generated
View File

@@ -20823,9 +20823,9 @@
}
},
"webpack-merge": {
"version": "5.7.3",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.7.3.tgz",
"integrity": "sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==",
"version": "5.8.0",
"resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz",
"integrity": "sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==",
"dev": true,
"requires": {
"clone-deep": "^4.0.1",

View File

@@ -115,7 +115,7 @@
"webpack": "^5.38.1",
"webpack-cli": "^4.7.0",
"webpack-dev-server": "^3.11.2",
"webpack-merge": "^5.7.3"
"webpack-merge": "^5.8.0"
},
"jest": {
"moduleFileExtensions": [