Merge pull request #296 from allerta-vvf/dependabot/npm_and_yarn/server/resources/webpack-merge-5.8.0

Bump webpack-merge from 5.7.3 to 5.8.0 in /server/resources
This commit is contained in:
mergify[bot] 2021-06-08 06:40:33 +00:00 committed by GitHub
commit 49685b463e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions

View File

@ -51,7 +51,7 @@
"webpack": "^5.38.1",
"webpack-assets-manifest": "^5.0.6",
"webpack-inject-plugin": "^1.5.5",
"webpack-merge": "^5.7.3"
"webpack-merge": "^5.8.0"
},
"devDependencies": {
"speed-measure-webpack-plugin": "^1.5.0",
@ -5973,9 +5973,9 @@
}
},
"node_modules/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==",
"dependencies": {
"clone-deep": "^4.0.1",
"wildcard": "^2.0.0"
@ -10667,9 +10667,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==",
"requires": {
"clone-deep": "^4.0.1",
"wildcard": "^2.0.0"

View File

@ -56,7 +56,7 @@
"webpack": "^5.38.1",
"webpack-assets-manifest": "^5.0.6",
"webpack-inject-plugin": "^1.5.5",
"webpack-merge": "^5.7.3"
"webpack-merge": "^5.8.0"
},
"devDependencies": {
"speed-measure-webpack-plugin": "^1.5.0",