mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-22 07:36:33 +00:00
Merge pull request #7573 from wallabag/dependabot/npm_and_yarn/webpack-merge-6.0.1
Bump webpack-merge from 5.10.0 to 6.0.1
This commit is contained in:
commit
bb1d97284f
2 changed files with 12 additions and 3 deletions
|
@ -71,7 +71,7 @@
|
|||
"webpack-cli": "^5.1.4",
|
||||
"webpack-dev-server": "^5.0.4",
|
||||
"webpack-manifest-plugin": "^5.0.0",
|
||||
"webpack-merge": "^5.10.0"
|
||||
"webpack-merge": "^6.0.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@fontsource/atkinson-hyperlegible": "^5.0.20",
|
||||
|
|
13
yarn.lock
13
yarn.lock
|
@ -5678,7 +5678,7 @@ webpack-manifest-plugin@^5.0.0:
|
|||
tapable "^2.0.0"
|
||||
webpack-sources "^2.2.0"
|
||||
|
||||
webpack-merge@^5.10.0, webpack-merge@^5.7.3:
|
||||
webpack-merge@^5.7.3:
|
||||
version "5.10.0"
|
||||
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
|
||||
integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
|
||||
|
@ -5687,6 +5687,15 @@ webpack-merge@^5.10.0, webpack-merge@^5.7.3:
|
|||
flat "^5.0.2"
|
||||
wildcard "^2.0.0"
|
||||
|
||||
webpack-merge@^6.0.1:
|
||||
version "6.0.1"
|
||||
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-6.0.1.tgz#50c776868e080574725abc5869bd6e4ef0a16c6a"
|
||||
integrity sha512-hXXvrjtx2PLYx4qruKl+kyRSLc52V+cCvMxRjmKwoA+CBbbF5GfIBtR6kCvl0fYGqTUPKB+1ktVmTHqMOzgCBg==
|
||||
dependencies:
|
||||
clone-deep "^4.0.1"
|
||||
flat "^5.0.2"
|
||||
wildcard "^2.0.1"
|
||||
|
||||
webpack-sources@^2.2.0:
|
||||
version "2.3.1"
|
||||
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.1.tgz#570de0af163949fe272233c2cefe1b56f74511fd"
|
||||
|
@ -5780,7 +5789,7 @@ which@^2.0.1:
|
|||
dependencies:
|
||||
isexe "^2.0.0"
|
||||
|
||||
wildcard@^2.0.0:
|
||||
wildcard@^2.0.0, wildcard@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
|
||||
integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
|
||||
|
|
Loading…
Reference in a new issue