Merge pull request #181 from unarxiv/renovate/webpack-merge-4.x

Update dependency webpack-merge to v4.2.1
autoai-org · Jan 5, 2019 · 1ab0526 · 1ab0526
2 parents 0d6fa95 + f6cfc63
commit 1ab0526
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/dashboard/package.json b/dashboard/package.json
@@ -86,7 +86,7 @@
     "webpack": "3.12.0",
     "webpack-bundle-analyzer": "2.13.1",
     "webpack-dev-server": "2.11.3",
-    "webpack-merge": "4.1.4"
+    "webpack-merge": "4.2.1"
   },
   "engines": {
     "node": ">= 6.0.0",

diff --git a/dashboard/yarn.lock b/dashboard/yarn.lock
@@ -9222,10 +9222,10 @@ webpack-dev-server@2.11.3:
     webpack-dev-middleware "1.12.2"
     yargs "6.6.0"
 
-webpack-merge@4.1.4:
-  version "4.1.4"
-  resolved "http://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.1.4.tgz#0fde38eabf2d5fd85251c24a5a8c48f8a3f4eb7b"
-  integrity sha512-TmSe1HZKeOPey3oy1Ov2iS3guIZjWvMT2BBJDzzT5jScHTjVC3mpjJofgueEzaEd6ibhxRDD6MIblDr8tzh8iQ==
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
   dependencies:
     lodash "^4.17.5"