Skip to content

Commit

Permalink
build(deps): bump webpack-merge from 5.3.0 to 5.4.0 (#2037)
Browse files Browse the repository at this point in the history
* build(deps): bump webpack-merge from 5.3.0 to 5.4.0

Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.3.0 to 5.4.0.
- [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.3.0...v5.4.0)

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 Nov 17, 2020
1 parent b2961cf commit b83edf4
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.1.4",
"webpack-merge": "^5.4.0",
"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.1.4"
"webpack-merge": "^5.4.0"
}
}
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10433,10 +10433,10 @@ webpack-hot-middleware@^2.25.0:
querystring "^0.2.0"
strip-ansi "^3.0.0"

webpack-merge@^5.1.4:
version "5.3.0"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.3.0.tgz#a80df44d35fabace680bf430a19fda9ec49ed8eb"
integrity sha512-4PtsBAWnmJULIJYviiPq4BxwAykbAgGMheyEVaemj2bJI54h+p/gnlbXZEH2EM0IYC3blOE1Qm6kzKlc06N1UQ==
webpack-merge@^5.4.0:
version "5.4.0"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.4.0.tgz#81bef0a7d23fc1e6c24b06ad8bf22ddeb533a3a3"
integrity sha512-/scBgu8LVPlHDgqH95Aw1xS+L+PHrpHKOwYVGFaNOQl4Q4wwwWDarwB1WdZAbLQ24SKhY3Awe7VZGYAdp+N+gQ==
dependencies:
clone-deep "^4.0.1"
wildcard "^2.0.0"
Expand Down

0 comments on commit b83edf4

Please sign in to comment.