Skip to content

Commit

Permalink
chore(deps): update dependency webpack-merge to v4.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot authored and renovate[bot] committed Aug 1, 2018
1 parent 4f36eee commit 6c21d82
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion advanced/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"webpack": "3.12.0",
"webpack-bundle-analyzer": "2.13.1",
"webpack-dev-server": "2.11.2",
"webpack-merge": "4.1.3"
"webpack-merge": "4.1.4"
},
"engines": {
"node": ">= 6.0.0",
Expand Down
6 changes: 3 additions & 3 deletions advanced/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5979,9 +5979,9 @@ webpack-dev-server@2.11.2:
webpack-dev-middleware "1.12.2"
yargs "6.6.0"

webpack-merge@4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.3.tgz#8aaff2108a19c29849bc9ad2a7fd7fce68e87c4a"
webpack-merge@4.1.4:
version "4.1.4"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
dependencies:
lodash "^4.17.5"

Expand Down
2 changes: 1 addition & 1 deletion basic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"webpack": "3.12.0",
"webpack-bundle-analyzer": "2.13.1",
"webpack-dev-server": "2.11.2",
"webpack-merge": "4.1.3"
"webpack-merge": "4.1.4"
},
"engines": {
"node": ">= 6.0.0",
Expand Down
6 changes: 3 additions & 3 deletions basic/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6319,9 +6319,9 @@ webpack-dev-server@2.11.2:
webpack-dev-middleware "1.12.2"
yargs "6.6.0"

webpack-merge@4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.3.tgz#8aaff2108a19c29849bc9ad2a7fd7fce68e87c4a"
webpack-merge@4.1.4:
version "4.1.4"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
dependencies:
lodash "^4.17.5"

Expand Down
2 changes: 1 addition & 1 deletion minimal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"webpack": "3.12.0",
"webpack-bundle-analyzer": "2.13.1",
"webpack-dev-server": "2.11.2",
"webpack-merge": "4.1.3"
"webpack-merge": "4.1.4"
},
"engines": {
"node": ">= 6.0.0",
Expand Down
6 changes: 3 additions & 3 deletions minimal/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6295,9 +6295,9 @@ webpack-dev-server@2.11.2:
webpack-dev-middleware "1.12.2"
yargs "6.6.0"

webpack-merge@4.1.3:
version "4.1.3"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.3.tgz#8aaff2108a19c29849bc9ad2a7fd7fce68e87c4a"
webpack-merge@4.1.4:
version "4.1.4"
resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
dependencies:
lodash "^4.17.5"

Expand Down

0 comments on commit 6c21d82

Please sign in to comment.