Skip to content

Commit

Permalink
build(deps): bump webpack-merge from 5.0.9 to 5.1.1 (#1883)
Browse files Browse the repository at this point in the history
* build(deps): bump webpack-merge from 5.0.9 to 5.1.0

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.0.9 to 5.1.0.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](survivejs/webpack-merge@v5.0.9...v5.1.0)

Signed-off-by: dependabot[bot] <support@github.com>

* Finish upgrading via bolt

* build(deps): upgrade webpack-merge to ^5.1.1

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mark Lee <electronjs@lazymalevolence.com>
  • Loading branch information
3 people authored Aug 4, 2020
1 parent 02a0ed2 commit b0ca86a
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 @@ -75,7 +75,7 @@
"webpack": "^4.42.0",
"webpack-dev-middleware": "^3.7.2",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^5.0.9",
"webpack-merge": "^5.1.1",
"which": "^2.0.2",
"xterm": "^4.8.1",
"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 @@ -30,6 +30,6 @@
"webpack": "^4.42.0",
"webpack-dev-middleware": "^3.7.2",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^5.0.9"
"webpack-merge": "^5.1.1"
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9677,10 +9677,10 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"

webpack-merge@^5.0.9:
version "5.0.9"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.0.9.tgz#d5e0e0ae564ae704836d747893bdd2741544bf31"
integrity sha512-P4teh6O26xIDPugOGX61wPxaeP918QOMjmzhu54zTVcLtOS28ffPWtnv+ilt3wscwBUCL2WNMnh97XkrKqt9Fw==
webpack-merge@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.1.tgz#c79f36b4ad39a597c3bb780f809b514d65d85d01"
integrity sha512-UhIkHAVqeG9EqFfYo7dRELrVfH6HYaOTYM7ssKCwfIIHYnWepGVOFp1E166GwgPGFqV6M68UgRiKOERjVOKIXA==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"
Expand Down

0 comments on commit b0ca86a

Please sign in to comment.