Merge pull request #4879 from wallabag/dependabot/npm_and_yarn/webpack-merge-5.7.3

This commit is contained in:
Jérémy Benoist 2020-12-28 05:30:00 +01:00 committed by GitHub
commit 621c105dcb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -64,7 +64,7 @@
"webpack-cli": "^4.3.0", "webpack-cli": "^4.3.0",
"webpack-dev-server": "^3.11.0", "webpack-dev-server": "^3.11.0",
"webpack-manifest-plugin": "^3.0.0", "webpack-manifest-plugin": "^3.0.0",
"webpack-merge": "^5.7.2" "webpack-merge": "^5.7.3"
}, },
"dependencies": { "dependencies": {
"annotator": "wallabag/annotator#master", "annotator": "wallabag/annotator#master",

View file

@ -6957,10 +6957,10 @@ webpack-merge@^4.2.2:
dependencies: dependencies:
lodash "^4.17.15" lodash "^4.17.15"
webpack-merge@^5.7.2: webpack-merge@^5.7.3:
version "5.7.2" version "5.7.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.2.tgz#55320baf05d8be068ff8112be72c04d7c14a9abd" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.3.tgz#2a0754e1877a25a8bbab3d2475ca70a052708213"
integrity sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg== integrity sha512-6/JUQv0ELQ1igjGDzHkXbVDRxkfA57Zw7PfiupdLFJYrgFqY5ZP8xxbpp2lU3EPwYx89ht5Z/aDkD40hFCm5AA==
dependencies: dependencies:
clone-deep "^4.0.1" clone-deep "^4.0.1"
wildcard "^2.0.0" wildcard "^2.0.0"