Skip to content

Commit

Permalink
build(deps): bump webpack-merge from 5.1.3 to 5.1.4 (#1957)
Browse files Browse the repository at this point in the history
* build(deps): bump webpack-merge from 5.1.3 to 5.1.4

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.1.3 to 5.1.4.
- [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.1.3...v5.1.4)

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

* 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 Sep 15, 2020
1 parent 6be0ac0 commit 4f7da84
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.42.0",
"webpack-dev-middleware": "^3.7.2",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^5.1.3",
"webpack-merge": "^5.1.4",
"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.42.0",
"webpack-dev-middleware": "^3.7.2",
"webpack-hot-middleware": "^2.25.0",
"webpack-merge": "^5.1.3"
"webpack-merge": "^5.1.4"
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10099,10 +10099,10 @@ webpack-log@^2.0.0:
ansi-colors "^3.0.0"
uuid "^3.3.2"

webpack-merge@^5.1.3:
version "5.1.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.3.tgz#e5570b0bfa654915340f1e348c93a6fd16d7a820"
integrity sha512-fz/xHgfHyxq3uzGGrMryPnpPZ6x3vF1tHtws6vYwYX+8e6Dw+4U4r6rXuEPCqtSwmUIeD8hniWwFem+5FVLjzg==
webpack-merge@^5.1.4:
version "5.1.4"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.1.4.tgz#a2c3a0c38ac2c02055c47bb1d42de1f072f1aea4"
integrity sha512-LSmRD59mxREGkCBm9PCW3AaV4doDqxykGlx1NvioEE0FgkT2GQI54Wyvg39ptkiq2T11eRVoV39udNPsQvK+QQ==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"
Expand Down

0 comments on commit 4f7da84

Please sign in to comment.