mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-05 06:58:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4801 from wallabag/dependabot/npm_and_yarn/webpack-merge-5.4.1

Browse source 
Bump webpack-merge from 5.4.0 to 5.4.1
This commit is contained in:
Jérémy Benoist 2020-12-09 06:21:50 +01:00 committed by GitHub
commit 0d86db1cc5
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-cli": "^4.2.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.3.0" "webpack-merge": "^5.4.1"
}, },
"dependencies": { "dependencies": {
"annotator": "wallabag/annotator#master", "annotator": "wallabag/annotator#master",

8
yarn.lock
View file

@ -6988,10 +6988,10 @@ webpack-merge@^4.2.2:
dependencies: dependencies:
lodash "^4.17.15" lodash "^4.17.15"
webpack-merge@^5.3.0: webpack-merge@^5.4.1:
version "5.4.0" version "5.4.1"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.0.tgz#81bef0a7d23fc1e6c24b06ad8bf22ddeb533a3a3" resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.1.tgz#1cfd7386b1876b69c17bbf72abc4325604decefc"
integrity sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ== integrity sha512-ubwNFcKJjm5BwPH1U8ZHTMaq2+XJqyvcfWXXU6yv4IIWWPWAFvgicok8VK1OiA7iYhl33aJxL5hvwTuZuNBIHw==
dependencies: dependencies:
clone-deep "^4.0.1" clone-deep "^4.0.1"
wildcard "^2.0.0" wildcard "^2.0.0"