Merge pull request #4545 from wallabag/dependabot/npm_and_yarn/webpack-merge-5.1.3

Bump webpack-merge from 5.1.2 to 5.1.3
This commit is contained in:
Jérémy Benoist 2020-08-31 06:18:22 +02:00 committed by GitHub
commit 2dd679d892
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -61,7 +61,7 @@
"webpack-cli": "^3.3.12", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.11.0", "webpack-dev-server": "^3.11.0",
"webpack-manifest-plugin": "^2.2.0", "webpack-manifest-plugin": "^2.2.0",
"webpack-merge": "^5.1.2" "webpack-merge": "^5.1.3"
}, },
"dependencies": { "dependencies": {
"annotator": "wallabag/annotator#master", "annotator": "wallabag/annotator#master",

View File

@ -7546,10 +7546,10 @@ webpack-manifest-plugin@^2.2.0:
object.entries "^1.1.0" object.entries "^1.1.0"
tapable "^1.0.0" tapable "^1.0.0"
webpack-merge@^5.1.2: webpack-merge@^5.1.3:
version "5.1.2" version "5.1.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.2.tgz#21dc1ed0e860c305cf5a07a48750f53a99750855" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.3.tgz#e5570b0bfa654915340f1e348c93a6fd16d7a820"
integrity sha512-/slG0Kh0OKTf0zxdFJlhQHzv8bU9gUYVK5DkBjB3i/yoc1Xx4ADG0KITGO5S/6cqn2Ug43+8VR6Sz8daA/c+5g== integrity sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==
dependencies: dependencies:
clone-deep "^4.0.1" clone-deep "^4.0.1"
wildcard "^2.0.0" wildcard "^2.0.0"