Skip to content

Commit

Permalink
build(deps): bump webpack-merge from 5.7.0 to 5.7.2 (electron#2096)
Browse files Browse the repository at this point in the history
* build(deps): bump webpack-merge from 5.7.0 to 5.7.2

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.7.0 to 5.7.2.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](survivejs/webpack-merge@v5.7.0...v5.7.2)

Signed-off-by: dependabot[bot] <[email protected]>

* Finish upgrading via bolt

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
  • Loading branch information
dependabot[bot] and dependabot[bot] authored Dec 17, 2020
1 parent a5b11e9 commit 4824af6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"webpack": "^4.44.2",
"webpack-dev-middleware": "^4.0.2",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^5.7.0",
"webpack-merge": "^5.7.2",
"which": "^2.0.2",
"xterm": "^4.9.0",
"xterm-addon-fit": "^0.4.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/plugin/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"webpack": "^4.44.2",
"webpack-dev-middleware": "^4.0.2",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^5.7.0"
"webpack-merge": "^5.7.2"
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10436,10 +10436,10 @@ webpack-hot-middleware@^2.25.0:
querystring "^0.2.0"
strip-ansi "^3.0.0"

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==
webpack-merge@^5.7.2:
version "5.7.2"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.7.2.tgz#55320baf05d8be068ff8112be72c04d7c14a9abd"
integrity sha512-7o7qjwcIB6lqHX0VZA2Vxcp8RHftW1LNcaB6t87PEpco/VPlG0Wn9DnvgmcJ0nZU578/vKQfhDSLTF0EZ+pFAg==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"
Expand Down

0 comments on commit 4824af6

Please sign in to comment.