Skip to content

Commit

Permalink
Merge pull request #476 from sophiedeziel/dependabot/npm_and_yarn/web…
Browse files Browse the repository at this point in the history
…pack-merge-6.0.1

Bump webpack-merge from 5.10.0 to 6.0.1
  • Loading branch information
sophiedeziel authored Jan 3, 2025
2 parents ab470c3 + a94dd72 commit 3d5b14f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"webpack": "5",
"webpack-assets-manifest": "5",
"webpack-cli": "5",
"webpack-merge": "5"
"webpack-merge": "6"
},
"version": "0.1.0",
"babel": {
Expand Down
13 changes: 11 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6490,7 +6490,16 @@ webpack-dev-server@5:
webpack-dev-middleware "^7.4.2"
ws "^8.18.0"

webpack-merge@5, webpack-merge@^5.7.3:
webpack-merge@6:
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-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==
Expand Down Expand Up @@ -6680,7 +6689,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==
Expand Down

0 comments on commit 3d5b14f

Please sign in to comment.