Merge pull request #5854 from webpack/ci/unit-integration

separate integration and unit tests, use codecov flags

.istanbul.yml

@@ -0,0 +1,3 @@
+instrumentation:
+  excludes:
+    - "**/*.runtime.js"

.travis.yml

@@ -17,16 +17,19 @@ matrix:
       env: NO_WATCH_TESTS=1 JOB_PART=lint
     - os: linux
       node_js: "8"
-      env: NO_WATCH_TESTS=1 JOB_PART=test
+      env: NO_WATCH_TESTS=1 JOB_PART=integration
+    - os: linux
+      node_js: "8"
+      env: NO_WATCH_TESTS=1 JOB_PART=unit
     - os: linux
       node_js: "6"
-      env: NO_WATCH_TESTS=1 JOB_PART=test
+      env: NO_WATCH_TESTS=1 JOB_PART=integration
     - os: linux
       node_js: "4"
-      env: NO_WATCH_TESTS=1 JOB_PART=test
+      env: NO_WATCH_TESTS=1 JOB_PART=integration
     - os: osx
       node_js: "8"
-      env: NO_WATCH_TESTS=1 JOB_PART=test
+      env: NO_WATCH_TESTS=1 JOB_PART=integration
   allow_failures:
     - os: osx
   fast_finish: true
@@ -38,7 +41,7 @@ script: npm run travis:$JOB_PART
 
 after_success:
   - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
-  - cat ./coverage/coverage.json | node_modules/codecov.io/bin/codecov.io.js
+  - bash <(curl -s https://codecov.io/bash) -F $JOB_PART
   - rm -rf ./coverage
 
 notifications:

appveyor.yml

@@ -9,15 +9,15 @@ branches:
 init:
   - git config --global core.autocrlf input
 
-clone_depth: 50
-
 # what combinations to test
 environment:
   matrix:
     - nodejs_version: 8
-      job_part: test
+      job_part: unit
+    - nodejs_version: 8
+      job_part: integration
     - nodejs_version: 6
-      job_part: test
+      job_part: integration
 
 install:
   - ps: Install-Product node $env:nodejs_version x64
@@ -36,3 +36,4 @@ test_script:
   - npm --version
   - yarn --version
   - cmd: npm run appveyor:%job_part%
+  - cmd: npm install -g codecov && codecov -F %job_part%

codecov.yml

@@ -6,12 +6,29 @@ coverage:
   range: "70...100"
   status:
     project:
-      default:
+      default: off
+      integration:
+        flags: integration
         target: auto
+      unit:
+        flags: unit
+        target: 0%
     patch:
-      default:
+      default: off
-        target: auto
+      integration:
+        flags: integration
+        target: 90%
+        base: pr
+      unit:
+        flags: unit
+        target: 0%
+        base: pr
     changes:
-      default:
+      default: off
-        branches: null
+      integration:
-comment: off
+        flags: integration
+        target: 0%
+      unit:
+        flags: unit
+        target: 0%
+comment: off

open-bot.yaml

@@ -59,7 +59,7 @@ rules:
 
 
 
-# Report specific error message if mocha fails
+# Report specific error message if mocha for integration tests fails
 - filters:
     ensure:
       value: "{{report_ci}}"
@@ -71,7 +71,7 @@ rules:
       state: "failed"
       allow_failure: false
       config:
-        env: JOB_PART=test
+        env: JOB_PART=integration
     fetch: travis_job.log
     string_cleanup:
       id: logResult
@@ -97,6 +97,46 @@ rules:
 
 
 
+# Report specific error message if mocha for unit tests fails
+- filters:
+    ensure:
+      value: "{{report_ci}}"
+      equals: yep
+    commit: true
+    status:
+      context: "continuous-integration/travis-ci/pr"
+    travis_job:
+      state: "failed"
+      allow_failure: false
+      config:
+        env: JOB_PART=unit
+    fetch: travis_job.log
+    string_cleanup:
+      id: logResult
+      value: "{{{fetch}}}"
+      remove:
+        - "^[\\s\\S]+?\\d+\\s+pending\n+"
+        - "npm ERR!.*\n"
+        - "\n*=============================================================================\n[\\s\\S]*"
+  actions:
+    comment:
+      identifier: "ci-result"
+      message: |-
+        @{{commit.author.login}} Please review the following output log for errors:
+
+        ``` text
+        {{{logResult}}}
+        ```
+
+        Instead of updating these (outdated?) unit tests, you can choose to delete them and add integration tests instead. That would be great.
+
+        See [complete report here]({{status.target_url}}).
+    set:
+      id: report_ci
+      value: nope
+
+
+
 # Report specific error message if linting fails
 - filters:
     ensure:
@@ -164,7 +204,7 @@ rules:
     pull_request:
       mergeable: true
     status:
-      context: "codecov/patch"
+      context: "codecov/patch/integration"
     ensure:
       value: "{{status.state}}"
       equals: "success"
@@ -181,7 +221,7 @@ rules:
     pull_request:
       mergeable: true
     status:
-      context: "codecov/patch"
+      context: "codecov/patch/integration"
     ensure:
       value: "{{status.state}}"
       equals: "failure"
@@ -193,7 +233,7 @@ rules:
     pull_request:
       mergeable: true
     status:
-      context: "codecov/patch"
+      context: "codecov/patch/integration"
     ensure:
       value: "{{status.state}}"
       equals: "failure"

package.json

@@ -33,7 +33,6 @@
     "benchmark": "^2.1.1",
     "bundle-loader": "~0.5.0",
     "codacy-coverage": "^2.0.1",
-    "codecov.io": "^0.1.2",
     "coffee-loader": "~0.7.1",
     "coffee-script": "^1.10.0",
     "coveralls": "^2.11.2",
@@ -58,6 +57,7 @@
     "raw-loader": "~0.5.0",
     "react": "^15.2.1",
     "react-dom": "^15.2.1",
+    "rimraf": "^2.6.2",
     "script-loader": "~0.7.0",
     "should": "^11.1.1",
     "simple-git": "^1.65.0",
@@ -89,13 +89,17 @@
     "schemas/"
   ],
   "scripts": {
-    "test": "mocha test/*.test.js --max-old-space-size=4096 --harmony --check-leaks",
+    "test": "mocha test/*.test.js test/*.unittest.js --max-old-space-size=4096 --harmony --trace-deprecation --check-leaks",
-    "travis:test": "npm run cover:min",
+    "test:integration": "mocha test/*.test.js --max-old-space-size=4096 --harmony --trace-deprecation --check-leaks",
+    "test:unit": "mocha test/*.unittest.js --max-old-space-size=4096 --harmony --trace-deprecation --check-leaks",
+    "travis:integration": "npm run cover:init && npm run cover:integration && npm run cover:report-min",
+    "travis:unit": "npm run cover:init && npm run cover:unit && npm run cover:report-min",
     "travis:lint": "npm run lint-files && npm run nsp",
     "travis:benchmark": "npm run benchmark",
-    "appveyor:test": "node node_modules\\mocha\\bin\\mocha --max-old-space-size=4096 --harmony test/*.test.js",
+    "appveyor:integration": "npm run cover:init && npm run cover:integration && npm run cover:report-min",
+    "appveyor:unit": "npm run cover:init && npm run cover:unit && npm run cover:report-min",
     "appveyor:benchmark": "npm run benchmark",
-    "circleci:test": "node node_modules/mocha/bin/mocha --max-old-space-size=4096 --harmony test/*.test.js",
+    "circleci:test": "node node_modules/mocha/bin/mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.test.js test/*.unittest.js",
     "circleci:lint": "npm run lint-files && npm run nsp",
     "build:examples": "cd examples && node buildAll.js",
     "pretest": "npm run lint-files",
@@ -104,9 +108,14 @@
     "fix": "npm run lint -- --fix",
     "beautify-lint": "beautify-lint \"lib/**/*.js\" \"hot/**/*.js\" \"bin/**/*.js\" \"benchmark/*.js\" \"test/*.js\"",
     "nsp": "nsp check --output summary",
-    "benchmark": "mocha --max-old-space-size=4096 --harmony test/*.benchmark.js -R spec",
+    "benchmark": "mocha --max-old-space-size=4096 --harmony --trace-deprecation test/*.benchmark.js -R spec",
-    "cover": "node --max-old-space-size=4096 --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' node_modules/mocha/bin/_mocha -- test/*.test.js",
+    "cover": "npm run cover:init && npm run cover:all && npm run cover:report",
-    "cover:min": "node --max-old-space-size=4096 --harmony ./node_modules/istanbul/lib/cli.js cover -x '**/*.runtime.js' --report lcovonly node_modules/mocha/bin/_mocha -- test/*.test.js",
+    "cover:init": "rimraf coverage",
+    "cover:all": "node --max-old-space-size=4096 --harmony --trace-deprecation ./node_modules/istanbul/lib/cli.js cover --report none node_modules/mocha/bin/_mocha -- test/*.test.js test/*.unittest.js",
+    "cover:integration": "node --max-old-space-size=4096 --harmony --trace-deprecation ./node_modules/istanbul/lib/cli.js cover --report none node_modules/mocha/bin/_mocha -- test/*.test.js",
+    "cover:unit": "node --max-old-space-size=4096 --harmony --trace-deprecation ./node_modules/istanbul/lib/cli.js cover --report none node_modules/mocha/bin/_mocha -- test/*.unittest.js",
+    "cover:report": "istanbul report",
+    "cover:report-min": "istanbul report --report lcovonly",
     "publish-patch": "npm run lint && npm run beautify-lint && mocha && npm version patch && git push && git push --tags && npm publish"
   }
 }

test/BinTestCases.test.js

@@ -4,7 +4,17 @@
 const should = require("should");
 const path = require("path");
 const fs = require("fs");
-const spawn = require("child_process").spawn;
+const child_process = require("child_process");
+
+function spawn(args, options) {
+	if(process.env.running_under_istanbul) {
+		args = [require.resolve("istanbul/lib/cli.js"), "cover", "--report", "none", "--print", "none", "--include-pid", "--dir", path.resolve("coverage"), "--", require.resolve("./helpers/exec-in-directory.js"), options.cwd].concat(args);
+		options = Object.assign({}, options, {
+			cwd: undefined
+		});
+	}
+	return child_process.spawn(process.execPath, args, options);
+}
 
 function loadOptsFile(optsPath) {
 	// Options file parser from Mocha
@@ -73,7 +83,7 @@ describe("BinTestCases", function() {
 					describe(testName, function() {
 						it("should run successfully", function(done) {
 							this.timeout(10000);
-							const child = spawn(process.execPath, [cmd].concat(args), opts);
+							const child = spawn([cmd].concat(args), opts);
 
 							child.on("close", function(code) {
 								env.code = code;
@@ -100,7 +110,7 @@ describe("BinTestCases", function() {
 								const stderr = convertToArrayOfLines(env.stderr);
 								testAssertions(stdout, stderr, done);
 								child.kill();
-							}, 3000); // wait a little to get an output
+							}, 8000); // wait a little to get an output
 						});
 					});
 				} else {
@@ -108,7 +118,7 @@ describe("BinTestCases", function() {
 						before(function(done) {
 							this.timeout(20000);
 
-							const child = spawn(process.execPath, [cmd].concat(args), opts);
+							const child = spawn([cmd].concat(args), opts);
 
 							child.on("close", function(code) {
 								env.code = code;

test/ModuleDependencyError.unittest.js

@@ -24,7 +24,7 @@ describe("ModuleDependencyError", () => {
 
 		it("has a message property", () => env.moduleDependencyError.message.should.be.exactly("Location Error Message"));
 
-		it("has a details property", () => env.moduleDependencyError.details.should.containEql(path.join("test", "ModuleDependencyError.test.js:")));
+		it("has a details property", () => env.moduleDependencyError.details.should.containEql(path.join("test", "ModuleDependencyError.unittest.js:")));
 
 		it("has an origin property", () => env.moduleDependencyError.origin.should.be.exactly("myModule"));
 

test/Stats.unittest.js

@@ -0,0 +1,89 @@
+/*globals describe it */
+"use strict";
+
+require("should");
+
+const Stats = require("../lib/Stats");
+
+describe("Stats", () => {
+	describe("Error Handling", () => {
+		describe("does have", () => {
+			it("hasErrors", () => {
+				const mockStats = new Stats({
+					errors: ["firstError"],
+					hash: "1234"
+				});
+				mockStats.hasErrors().should.be.ok();
+			});
+			it("hasWarnings", () => {
+				const mockStats = new Stats({
+					warnings: ["firstError"],
+					hash: "1234"
+				});
+				mockStats.hasWarnings().should.be.ok();
+			});
+		});
+		describe("does not have", () => {
+			it("hasErrors", () => {
+				const mockStats = new Stats({
+					errors: [],
+					hash: "1234"
+				});
+				mockStats.hasErrors().should.not.be.ok();
+			});
+			it("hasWarnings", () => {
+				const mockStats = new Stats({
+					warnings: [],
+					hash: "1234"
+				});
+				mockStats.hasWarnings().should.not.be.ok();
+			});
+		});
+		it("formatError handles string errors", () => {
+			const mockStats = new Stats({
+				errors: ["firstError"],
+				warnings: [],
+				assets: [],
+				entrypoints: {},
+				chunks: [],
+				modules: [],
+				children: [],
+				hash: "1234",
+				mainTemplate: {
+					getPublicPath: () => "path"
+				}
+			});
+			const obj = mockStats.toJson();
+			obj.errors[0].should.be.equal("firstError");
+		});
+	});
+	describe("Presets", () => {
+		describe("presetToOptions", () => {
+			it("returns correct object with 'Normal'", () => {
+				Stats.presetToOptions("Normal").should.eql({});
+			});
+			it("truthy values behave as 'normal'", () => {
+				const normalOpts = Stats.presetToOptions("normal");
+				Stats.presetToOptions("pizza").should.eql(normalOpts);
+				Stats.presetToOptions(true).should.eql(normalOpts);
+				Stats.presetToOptions(1).should.eql(normalOpts);
+
+				Stats.presetToOptions("verbose").should.not.eql(normalOpts);
+				Stats.presetToOptions(false).should.not.eql(normalOpts);
+			});
+			it("returns correct object with 'none'", () => {
+				Stats.presetToOptions("none").should.eql({
+					all: false
+				});
+			});
+			it("falsy values behave as 'none'", () => {
+				const noneOpts = Stats.presetToOptions("none");
+				Stats.presetToOptions("").should.eql(noneOpts);
+				Stats.presetToOptions(null).should.eql(noneOpts);
+				Stats.presetToOptions().should.eql(noneOpts);
+				Stats.presetToOptions(0).should.eql(noneOpts);
+				Stats.presetToOptions(false).should.eql(noneOpts);
+			});
+		});
+	});
+});

test/StatsTestCases.test.js

@@ -13,9 +13,8 @@ const tests = fs.readdirSync(base).filter(testName =>
 	fs.existsSync(path.join(base, testName, "index.js")) ||
 	fs.existsSync(path.join(base, testName, "webpack.config.js"))
 );
-const Stats = require("../lib/Stats");
 
-describe("Stats", () => {
+describe("StatsTestCases", () => {
 	tests.forEach(testName => {
 		it("should print correct stats for " + testName, (done) => {
 			let options = {
@@ -100,84 +99,4 @@ describe("Stats", () => {
 			});
 		});
 	});
-	describe("Error Handling", () => {
-		describe("does have", () => {
-			it("hasErrors", () => {
-				const mockStats = new Stats({
-					errors: ["firstError"],
-					hash: "1234"
-				});
-				mockStats.hasErrors().should.be.ok();
-			});
-			it("hasWarnings", () => {
-				const mockStats = new Stats({
-					warnings: ["firstError"],
-					hash: "1234"
-				});
-				mockStats.hasWarnings().should.be.ok();
-			});
-		});
-		describe("does not have", () => {
-			it("hasErrors", () => {
-				const mockStats = new Stats({
-					errors: [],
-					hash: "1234"
-				});
-				mockStats.hasErrors().should.not.be.ok();
-			});
-			it("hasWarnings", () => {
-				const mockStats = new Stats({
-					warnings: [],
-					hash: "1234"
-				});
-				mockStats.hasWarnings().should.not.be.ok();
-			});
-		});
-		it("formatError handles string errors", () => {
-			const mockStats = new Stats({
-				errors: ["firstError"],
-				warnings: [],
-				assets: [],
-				entrypoints: {},
-				chunks: [],
-				modules: [],
-				children: [],
-				hash: "1234",
-				mainTemplate: {
-					getPublicPath: () => "path"
-				}
-			});
-			const obj = mockStats.toJson();
-			obj.errors[0].should.be.equal("firstError");
-		});
-	});
-	describe("Presets", () => {
-		describe("presetToOptions", () => {
-			it("returns correct object with 'Normal'", () => {
-				Stats.presetToOptions("Normal").should.eql({});
-			});
-			it("truthy values behave as 'normal'", () => {
-				const normalOpts = Stats.presetToOptions("normal");
-				Stats.presetToOptions("pizza").should.eql(normalOpts);
-				Stats.presetToOptions(true).should.eql(normalOpts);
-				Stats.presetToOptions(1).should.eql(normalOpts);
-
-				Stats.presetToOptions("verbose").should.not.eql(normalOpts);
-				Stats.presetToOptions(false).should.not.eql(normalOpts);
-			});
-			it("returns correct object with 'none'", () => {
-				Stats.presetToOptions("none").should.eql({
-					all: false
-				});
-			});
-			it("falsy values behave as 'none'", () => {
-				const noneOpts = Stats.presetToOptions("none");
-				Stats.presetToOptions("").should.eql(noneOpts);
-				Stats.presetToOptions(null).should.eql(noneOpts);
-				Stats.presetToOptions().should.eql(noneOpts);
-				Stats.presetToOptions(0).should.eql(noneOpts);
-				Stats.presetToOptions(false).should.eql(noneOpts);
-			});
-		});
-	});
 });

test/WebpackError.unittest.js

@@ -23,7 +23,7 @@ describe("WebpackError", () => {
 		const errorArr = errorStr.split("\n");
 
 		errorArr[0].should.equal("CustomError: CustomMessage");
-		errorArr[1].should.containEql("WebpackError.test.js");
+		errorArr[1].should.containEql("WebpackError.unittest.js");
 		errorArr[errorArr.length - 1].should.equal("CustomDetails");
 	});
 });

test/helpers/exec-in-directory.js

@@ -0,0 +1,8 @@
+"use strict";
+
+const dir = process.argv[2];
+const bin = process.argv[3];
+process.argv.splice(1, 2);
+process.chdir(dir);
+
+require(bin);

yarn.lock

@@ -196,10 +196,6 @@ asn1.js@^4.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-asn1@0.1.11:
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.1.11.tgz#559be18376d08a4ec4dbe80877d27818639b2df7"
-
 asn1@~0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86"
@@ -208,10 +204,6 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
 
-assert-plus@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.1.5.tgz#ee74009413002d84cec7219c6ac811812e723160"
-
 assert-plus@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"
@@ -236,10 +228,6 @@ async@^2.1.2, async@^2.4.1:
   dependencies:
     lodash "^4.14.0"
 
-async@~0.9.0:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.2.tgz#aea74d5e61c1f899613bf64bda66d4c78f2fd17d"
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -255,10 +243,6 @@ autoprefixer@^6.3.1:
     postcss "^5.2.16"
     postcss-value-parser "^3.2.3"
 
-aws-sign2@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.5.0.tgz#c57103f7a17fc037f02d7c2e64b602ea223f7d63"
-
 aws-sign2@~0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f"
@@ -317,12 +301,6 @@ binary-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-1.9.0.tgz#66506c16ce6f4d6928a5b3cd6a33ca41e941e37b"
 
-bl@~0.9.0:
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-0.9.5.tgz#c06b797af085ea00bc527afc8efcf11de2232054"
-  dependencies:
-    readable-stream "~1.0.26"
-
 block-stream@*:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/block-stream/-/block-stream-0.0.9.tgz#13ebfe778a03205cfe03751481ebb4b3300c126a"
@@ -341,12 +319,6 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.7"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.7.tgz#ddb048e50d9482790094c13eb3fcfc833ce7ab46"
 
-boom@0.4.x:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/boom/-/boom-0.4.2.tgz#7a636e9ded4efcefb19cef4947a3c67dfaee911b"
-  dependencies:
-    hoek "0.9.x"
-
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
@@ -499,10 +471,6 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-caseless@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.6.0.tgz#8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"
-
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -641,13 +609,6 @@ code-point-at@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
 
-codecov.io@^0.1.2:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/codecov.io/-/codecov.io-0.1.6.tgz#59dfd02da1ff31c2fb2b952ad8ad16fd3781b728"
-  dependencies:
-    request "2.42.0"
-    urlgrey "0.4.0"
-
 coffee-loader@~0.7.1:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/coffee-loader/-/coffee-loader-0.7.3.tgz#fadbc6efd6fc7ecc88c5b3046a2c292066bcb54a"
@@ -704,12 +665,6 @@ combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-combined-stream@~0.0.4:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-0.0.7.tgz#0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"
-  dependencies:
-    delayed-stream "0.0.5"
-
 commander@2.8.x:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -846,12 +801,6 @@ cross-spawn@^5.0.1, cross-spawn@^5.1.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cryptiles@0.2.x:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-0.2.2.tgz#ed91ff1f17ad13d3748288594f8a48a0d26f325c"
-  dependencies:
-    boom "0.4.x"
-
 cryptiles@2.x.x:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8"
@@ -967,10 +916,6 @@ csso@~2.3.1:
     clap "^1.0.9"
     source-map "^0.5.3"
 
-ctype@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/ctype/-/ctype-0.5.3.tgz#82c18c2461f74114ef16c135224ad0b9144ca12f"
-
 cvss@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/cvss/-/cvss-1.0.2.tgz#df67e92bf12a796f49e928799c8db3ba74b9fcd6"
@@ -1013,10 +958,6 @@ decamelize@^1.0.0, decamelize@^1.1.1, decamelize@^1.1.2:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
 
-deep-equal@~0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-0.1.2.tgz#b246c2b80a570a47c11be1d9bd1070ec878b87ce"
-
 deep-extend@~0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f"
@@ -1029,10 +970,6 @@ defined@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
 
-defined@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-0.0.0.tgz#f35eea7d705e933baf13b2f03b3f83d921403b3e"
-
 del@^2.0.2:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
@@ -1045,10 +982,6 @@ del@^2.0.2:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-delayed-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-0.0.5.tgz#d4b1f43a93e8296dfe02694f4680bc37a313c73f"
-
 delayed-stream@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
@@ -1103,10 +1036,6 @@ domain-browser@^1.1.1:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc"
 
-duplexer@~0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
-
 ecc-jsbn@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz#0fc73a9ed5f0d53c38193398523ef7e543777505"
@@ -1555,22 +1484,10 @@ for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
-forever-agent@~0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.5.2.tgz#6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
 
-form-data@~0.1.0:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-0.1.4.tgz#91abd788aba9702b1aabfa8bc01031a2ac9e3b12"
-  dependencies:
-    async "~0.9.0"
-    combined-stream "~0.0.4"
-    mime "~1.2.11"
-
 form-data@~2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.4.tgz#33c183acf193276ecaa98143a69e94bfee1750d1"
@@ -1815,15 +1732,6 @@ hash.js@^1.0.0, hash.js@^1.0.3:
     inherits "^2.0.3"
     minimalistic-assert "^1.0.0"
 
-hawk@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/hawk/-/hawk-1.1.1.tgz#87cd491f9b46e4e2aeaca335416766885d2d1ed9"
-  dependencies:
-    boom "0.4.x"
-    cryptiles "0.2.x"
-    hoek "0.9.x"
-    sntp "0.2.x"
-
 hawk@~3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4"
@@ -1841,10 +1749,6 @@ hmac-drbg@^1.0.0:
     minimalistic-assert "^1.0.0"
     minimalistic-crypto-utils "^1.0.1"
 
-hoek@0.9.x:
-  version "0.9.1"
-  resolved "https://registry.yarnpkg.com/hoek/-/hoek-0.9.1.tgz#3d322462badf07716ea7eb85baf88079cddce505"
-
 hoek@2.x.x:
   version "2.16.3"
   resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed"
@@ -1864,14 +1768,6 @@ http-errors@~1.3.1:
     inherits "~2.0.1"
     statuses "1"
 
-http-signature@~0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-0.10.1.tgz#4fbdac132559aa8323121e540779c0a012b27e66"
-  dependencies:
-    asn1 "0.1.11"
-    assert-plus "^0.1.5"
-    ctype "0.5.3"
-
 http-signature@~1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf"
@@ -2273,7 +2169,7 @@ json-stable-stringify@^1.0.1:
   dependencies:
     jsonify "~0.0.0"
 
-json-stringify-safe@~5.0.0, json-stringify-safe@~5.0.1:
+json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
 
@@ -2566,10 +2462,6 @@ mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.6, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.27.0"
 
-mime-types@~1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-1.0.2.tgz#995ae1392ab8affcbfcb2641dd054e943c0d5dce"
-
 mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
@@ -2578,10 +2470,6 @@ mime@1.3.x, mime@^1.2.11, mime@^1.3.4:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.6.tgz#591d84d3653a6b0b4a3b9df8de5aa8108e72e5e0"
 
-mime@~1.2.11:
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.2.11.tgz#58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"
-
 mimic-fn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
@@ -2723,10 +2611,6 @@ node-pre-gyp@^0.6.36:
     tar "^2.2.1"
     tar-pack "^3.4.0"
 
-node-uuid@~1.4.0:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-
 nodesecurity-npm-utils@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/nodesecurity-npm-utils/-/nodesecurity-npm-utils-5.0.0.tgz#05aa30de30ca8c845c4048e94fd78e5e08b55ed9"
@@ -2811,10 +2695,6 @@ number-is-nan@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
 
-oauth-sign@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.4.0.tgz#f22956f31ea7151a821e5f2fb32c113cad8b9f69"
-
 oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
@@ -3362,10 +3242,6 @@ qs@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-4.0.0.tgz#c31d9b74ec27df75e543a86c78728ed8d4623607"
 
-qs@~1.2.0:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-1.2.2.tgz#19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"
-
 qs@~6.3.0:
   version "6.3.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c"
@@ -3469,15 +3345,6 @@ readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.0.3"
     util-deprecate "~1.0.1"
 
-readable-stream@~1.0.26:
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
 readdirp@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.1.0.tgz#4ed0ad060df3073300c48440373f72d1cc642d78"
@@ -3551,27 +3418,6 @@ request-promise@^0.x:
     lodash "^3.10.0"
     request "^2.34"
 
-request@2.42.0:
-  version "2.42.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.42.0.tgz#572bd0148938564040ac7ab148b96423a063304a"
-  dependencies:
-    bl "~0.9.0"
-    caseless "~0.6.0"
-    forever-agent "~0.5.0"
-    json-stringify-safe "~5.0.0"
-    mime-types "~1.0.1"
-    node-uuid "~1.4.0"
-    qs "~1.2.0"
-    tunnel-agent "~0.4.0"
-  optionalDependencies:
-    aws-sign2 "~0.5.0"
-    form-data "~0.1.0"
-    hawk "1.1.1"
-    http-signature "~0.10.0"
-    oauth-sign "~0.4.0"
-    stringstream "~0.0.4"
-    tough-cookie ">=0.12.0"
-
 request@2.79.0:
   version "2.79.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.79.0.tgz#4dfe5bf6be8b8cdc37fcf93e04b65577722710de"
@@ -3660,12 +3506,6 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-resumer@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/resumer/-/resumer-0.0.0.tgz#f1e8f461e4064ba39e82af3cdc2a8c893d076759"
-  dependencies:
-    through "~2.3.4"
-
 right-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/right-align/-/right-align-0.1.3.tgz#61339b722fe6a3515689210d24e14c96148613ef"
@@ -3678,6 +3518,12 @@ rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.6.1:
   dependencies:
     glob "^7.0.5"
 
+rimraf@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7"
@@ -3872,12 +3718,6 @@ slice-ansi@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
 
-sntp@0.2.x:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/sntp/-/sntp-0.2.4.tgz#fb885f18b0f3aad189f824862536bceeec750900"
-  dependencies:
-    hoek "0.9.x"
-
 sntp@1.x.x:
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198"
@@ -3934,12 +3774,6 @@ spdx-license-ids@^1.0.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz#c9df7a3424594ade6bd11900d596696dc06bac57"
 
-split@~0.2.10:
-  version "0.2.10"
-  resolved "https://registry.yarnpkg.com/split/-/split-0.2.10.tgz#67097c601d697ce1368f418f06cd201cf0521a57"
-  dependencies:
-    through "2"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -3973,12 +3807,6 @@ stream-browserify@^2.0.1:
     inherits "~2.0.1"
     readable-stream "^2.0.2"
 
-stream-combiner@~0.0.2:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14"
-  dependencies:
-    duplexer "~0.1.1"
-
 stream-http@^2.3.1:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.7.2.tgz#40a050ec8dc3b53b33d9909415c02c0bf1abfbad"
@@ -4008,7 +3836,7 @@ string-width@^2.0.0, string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@^0.10.25, string_decoder@~0.10.x:
+string_decoder@^0.10.25:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
@@ -4111,19 +3939,6 @@ tapable@^0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-0.2.7.tgz#e46c0daacbb2b8a98b9b0cea0f4052105817ed5c"
 
-tape@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tape/-/tape-2.3.0.tgz#0dfeec709227fbcc9170abe7f046962b271431db"
-  dependencies:
-    deep-equal "~0.1.0"
-    defined "~0.0.0"
-    inherits "~2.0.1"
-    jsonify "~0.0.0"
-    resumer "~0.0.0"
-    split "~0.2.10"
-    stream-combiner "~0.0.2"
-    through "~2.3.4"
-
 tar-pack@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.0.tgz#23be2d7f671a8339376cbdb0b8fe3fdebf317984"
@@ -4153,7 +3968,7 @@ text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
-through@2, through@^2.3.6, through@~2.3.4:
+through@^2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -4179,7 +3994,7 @@ topo@1.x.x:
   dependencies:
     hoek "2.x.x"
 
-tough-cookie@>=0.12.0, tough-cookie@~2.3.0:
+tough-cookie@~2.3.0:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.3.tgz#0b618a5565b6dea90bf3425d04d55edc475a7561"
   dependencies:
@@ -4207,7 +4022,7 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
-tunnel-agent@~0.4.0, tunnel-agent@~0.4.1:
+tunnel-agent@~0.4.1:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
 
@@ -4304,12 +4119,6 @@ url@^0.11.0:
     punycode "1.3.2"
     querystring "0.2.0"
 
-urlgrey@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/urlgrey/-/urlgrey-0.4.0.tgz#f065357040fb35c3b311d4e5dc36484d96dbea06"
-  dependencies:
-    tape "2.3.0"
-
 util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"