devol
/
wallabag
mirror of https://github.com/wallabag/wallabag.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4834 from wallabag/dependabot/npm_and_yarn/webpack-merge-5.7.0 

Bump webpack-merge from 5.5.0 to 5.7.0
This commit is contained in:
Jérémy Benoist 2020-12-14 10:06:13 +01:00 committed by GitHub
parent c6f3f27b84 61e0101771
commit 7245b8b611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

8
yarn.lock
View File

@ -6992,10 +6992,10 @@ webpack-merge@^4.2.2:
dependencies:
lodash "^4.17.15"
webpack-merge@^5.5.0:
version "5.5.0"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.5.0.tgz#18b860249ee3f940ed1607c6b0cf1912b27dbf44"
integrity sha512-EYKu2To70zpXh65y+ERG/8TbOy0YxPERP1hGvl5nnx7zY0HLZU57zNRlIowiPYQ8lI7kXsCHa5owKMgv/ImW/w==
webpack-merge@^5.7.0:
version "5.7.0"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.0.tgz#004dec31f7a875e590c9731e5bdcd3efad0f2715"
integrity sha512-UryoMJGRMwOOh/ie4NXZC1OtT0mkA7Ny2+C/MkWOwTRG+jVNEwChVV/+x8rd+ga2mVLeQ0m+QmzLAg7N36+oag==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"