Merge commit 'ceef5be' into version-3

This commit is part of the `master` branch, the merge commit of PR #131
webpack-contrib · Dec 9, 2017 · 40c06e7 · 40c06e7
2 parents 57b341f + ceef5be
commit 40c06e7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/packages/plugin/package.json b/packages/plugin/package.json
@@ -40,7 +40,7 @@
  "lodash": "^4.17.4",
  "mkdirp": "^0.5.1",
  "opener": "^1.4.3",
- "ws": "^2.3.1"
+ "ws": "^3.3.1"
  },
  "devDependencies": {
  "babel-core": "6.24.1",

diff --git a/packages/reporter-treemap/package.json b/packages/reporter-treemap/package.json
@@ -37,7 +37,7 @@
  "express": "^4.15.2",
  "mkdirp": "^0.5.1",
  "opener": "^1.4.3",
- "ws": "^2.3.1"
+ "ws": "^3.3.1"
  },
  "devDependencies": {
  "babel-core": "6.24.1",

diff --git a/yarn.lock b/yarn.lock
@@ -232,6 +232,10 @@ async-each@^1.0.0:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
 
+async-limiter@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
+
 async@^1.4.0, async@^1.5.0, async@^1.5.2:
  version "1.5.2"
  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -5277,10 +5281,6 @@ safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
  version "5.1.1"
  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-safe-buffer@~5.0.1:
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
-
 samsam@1.x, samsam@^1.1.3:
  version "1.2.1"
  resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.2.1.tgz#edd39093a3184370cb859243b2bdf255e7d8ea67"
@@ -6309,11 +6309,13 @@ write@^0.2.1:
  dependencies:
  mkdirp "^0.5.1"
 
-ws@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/ws/-/ws-2.3.1.tgz#6b94b3e447cb6a363f785eaf94af6359e8e81c80"
+ws@^3.3.1:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.1.tgz#d97e34dee06a1190c61ac1e95f43cb60b78cf939"
  dependencies:
  safe-buffer "~5.0.1"
+ async-limiter "~1.0.0"
+ safe-buffer "~5.1.0"
  ultron "~1.1.0"
 
 "xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.1: