cypress 3.1.4 → 3.3.1

package/lib/exec/xvfb.js

@@ -1,15 +1,24 @@
 'use strict';
 
+var _templateObject = _taggedTemplateLiteral(['\n        DISPLAY environment variable is set to ', ' on Linux\n        Assuming this DISPLAY points at working X11 server,\n        Cypress will not spawn own Xvfb\n\n        NOTE: if the X11 server is NOT working, Cypress will exit without explanation,\n          see ', '\n        Solution: Unset the DISPLAY variable and try again:\n          DISPLAY= npx cypress run ...\n      '], ['\n        DISPLAY environment variable is set to ', ' on Linux\n        Assuming this DISPLAY points at working X11 server,\n        Cypress will not spawn own Xvfb\n\n        NOTE: if the X11 server is NOT working, Cypress will exit without explanation,\n          see ', '\n        Solution: Unset the DISPLAY variable and try again:\n          DISPLAY= npx cypress run ...\n      ']);
+
+function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 var os = require('os');
 var Promise = require('bluebird');
 var Xvfb = require('@cypress/xvfb');
-var R = require('ramda');
+
+var _require = require('common-tags'),
+    stripIndent = _require.stripIndent;
+
 var debug = require('debug')('cypress:cli');
 var debugXvfb = require('debug')('cypress:xvfb');
 
-var _require = require('../errors'),
-    throwFormErrorText = _require.throwFormErrorText,
-    errors = _require.errors;
+var _require2 = require('../errors'),
+    throwFormErrorText = _require2.throwFormErrorText,
+    errors = _require2.errors;
+
+var util = require('../util');
 
 var xvfb = Promise.promisifyAll(new Xvfb({
   timeout: 5000, // milliseconds
@@ -26,9 +35,9 @@ module.exports = {
   _xvfb: xvfb, // expose for testing
 
   start: function start() {
-    debug('Starting XVFB');
+    debug('Starting Xvfb');
 
-    return xvfb.startAsync().catch({ nonZeroExitCode: true }, throwFormErrorText(errors.nonZeroExitCodeXvfb)).catch(function (err) {
+    return xvfb.startAsync().return(null).catch({ nonZeroExitCode: true }, throwFormErrorText(errors.nonZeroExitCodeXvfb)).catch(function (err) {
       if (err.known) {
         throw err;
       }
@@ -37,18 +46,37 @@ module.exports = {
     });
   },
   stop: function stop() {
-    debug('Stopping XVFB');
+    debug('Stopping Xvfb');
 
-    return xvfb.stopAsync();
+    return xvfb.stopAsync().return(null).catch(function () {
+      // noop
+    });
   },
   isNeeded: function isNeeded() {
-    return os.platform() === 'linux' && !process.env.DISPLAY;
+    if (os.platform() !== 'linux') {
+      return false;
+    }
+
+    if (process.env.DISPLAY) {
+      var issueUrl = util.getGitHubIssueUrl(4034);
+
+      var message = stripIndent(_templateObject, process.env.DISPLAY, issueUrl);
+
+      debug(message);
+
+      return false;
+    }
+
+    debug('undefined DISPLAY environment variable');
+    debug('Cypress will spawn its own Xvfb');
+
+    return true;
   },
 
 
   // async method, resolved with Boolean
   verify: function verify() {
-    return xvfb.startAsync().then(R.T).catch(function (err) {
+    return xvfb.startAsync().return(true).catch(function (err) {
       debug('Could not verify xvfb: %s', err.message);
 
       return false;

package/lib/tasks/download.js

@@ -7,6 +7,7 @@ var _templateObject = _taggedTemplateLiteral(['\n    URL: ', '\n    ', '\n  '],
 
 function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
+var arch = require('arch');
 var la = require('lazy-ass');
 var is = require('check-more-types');
 var os = require('os');
@@ -29,6 +30,20 @@ var util = require('../util');
 
 var defaultBaseUrl = 'https://download.cypress.io/';
 
+var getRealOsArch = function getRealOsArch() {
+  // os.arch() returns the arch for which this node was compiled
+  // we want the operating system's arch instead: x64 or x86
+
+  var osArch = arch();
+
+  if (osArch === 'x86') {
+    // match process.platform output
+    return 'ia32';
+  }
+
+  return osArch;
+};
+
 var getBaseUrl = function getBaseUrl() {
   if (util.getEnv('CYPRESS_DOWNLOAD_MIRROR')) {
     var baseUrl = util.getEnv('CYPRESS_DOWNLOAD_MIRROR');
@@ -46,7 +61,7 @@ var getBaseUrl = function getBaseUrl() {
 var prepend = function prepend(urlPath) {
   var endpoint = url.resolve(getBaseUrl(), urlPath);
   var platform = os.platform();
-  var arch = os.arch();
+  var arch = getRealOsArch();
 
   return endpoint + '?platform=' + platform + '&arch=' + arch;
 };

package/lib/tasks/verify.js

@@ -1,11 +1,10 @@
 'use strict';
 
 var _templateObject = _taggedTemplateLiteral(['\n      Cypress executable not found at: ', '\n    '], ['\n      Cypress executable not found at: ', '\n    ']),
-    _templateObject2 = _taggedTemplateLiteral(['\n          Smoke failed.\n\n          Command was: ', '\n\n          Returned: ', '\n        '], ['\n          Smoke failed.\n\n          Command was: ', '\n\n          Returned: ', '\n        ']),
-    _templateObject3 = _taggedTemplateLiteral(['\n  It looks like this is your first time using Cypress: ', '\n  '], ['\n  It looks like this is your first time using Cypress: ', '\n  ']),
-    _templateObject4 = _taggedTemplateLiteral(['\n        ', ' You have set the environment variable: ', '', ':\n        \n              This overrides the default Cypress binary path used.\n        '], ['\n        ', ' You have set the environment variable: ', '', ':\n        \n              This overrides the default Cypress binary path used.\n        ']),
-    _templateObject5 = _taggedTemplateLiteral(['\n          The supplied binary path is not executable\n          '], ['\n          The supplied binary path is not executable\n          ']),
-    _templateObject6 = _taggedTemplateLiteral(['\n      \n      \n      ', ' Warning: Binary version ', ' does not match the expected package version ', '\n\n        These versions may not work properly together.\n      '], ['\n      \n      \n      ', ' Warning: Binary version ', ' does not match the expected package version ', '\n\n        These versions may not work properly together.\n      ']);
+    _templateObject2 = _taggedTemplateLiteral(['\n  It looks like this is your first time using Cypress: ', '\n  '], ['\n  It looks like this is your first time using Cypress: ', '\n  ']),
+    _templateObject3 = _taggedTemplateLiteral(['\n      ', ' You have set the environment variable:\n\n      ', '', '\n\n      This overrides the default Cypress binary path used.\n    '], ['\n      ', ' You have set the environment variable:\n\n      ', '', '\n\n      This overrides the default Cypress binary path used.\n    ']),
+    _templateObject4 = _taggedTemplateLiteral(['\n          The supplied binary path is not executable\n          '], ['\n          The supplied binary path is not executable\n          ']),
+    _templateObject5 = _taggedTemplateLiteral(['\n\n\n      ', ' Warning: Binary version ', ' does not match the expected package version ', '\n\n        These versions may not work properly together.\n      '], ['\n\n\n      ', ' Warning: Binary version ', ' does not match the expected package version ', '\n\n        These versions may not work properly together.\n      ']);
 
 function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
@@ -20,6 +19,7 @@ var _require = require('common-tags'),
 
 var Promise = require('bluebird');
 var logSymbols = require('log-symbols');
+var path = require('path');
 
 var _require2 = require('../errors'),
     throwFormErrorText = _require2.throwFormErrorText,
@@ -49,60 +49,110 @@ var checkExecutable = function checkExecutable(binaryDir) {
   });
 };
 
-var runSmokeTest = function runSmokeTest(binaryDir) {
-  debug('running smoke test');
-  var cypressExecPath = state.getPathToExecutable(binaryDir);
+var runSmokeTest = function runSmokeTest(binaryDir, options) {
+  var executable = state.getPathToExecutable(binaryDir);
 
-  debug('using Cypress executable %s', cypressExecPath);
+  var onSmokeTestError = function onSmokeTestError(smokeTestCommand, linuxWithDisplayEnv) {
+    return function (err) {
+      debug('Smoke test failed:', err);
 
-  var onXvfbError = function onXvfbError(err) {
-    debug('caught xvfb error %s', err.message);
+      var errMessage = err.stderr || err.message;
 
-    return throwFormErrorText(errors.missingXvfb)('Caught error trying to run XVFB: "' + err.message + '"');
-  };
+      debug('error message:', errMessage);
 
-  var onSmokeTestError = function onSmokeTestError(err) {
-    debug('Smoke test failed:', err);
+      if (err.timedOut) {
+        debug('error timedOut is true');
+
+        return throwFormErrorText(errors.smokeTestFailure(smokeTestCommand, true))(errMessage);
+      }
+
+      if (linuxWithDisplayEnv && util.isBrokenGtkDisplay(errMessage)) {
+        util.logBrokenGtkDisplayWarning();
+
+        return throwFormErrorText(errors.invalidSmokeTestDisplayError)(errMessage);
+      }
 
-    return throwFormErrorText(errors.missingDependency)(err.stderr || err.message);
+      return throwFormErrorText(errors.missingDependency)(errMessage);
+    };
   };
 
   var needsXvfb = xvfb.isNeeded();
 
-  debug('needs XVFB?', needsXvfb);
+  debug('needs Xvfb?', needsXvfb);
 
-  var spawn = function spawn() {
+  /**
+   * Spawn Cypress running smoke test to check if all operating system
+   * dependencies are good.
+   */
+  var spawn = function spawn(linuxWithDisplayEnv) {
     var random = _.random(0, 1000);
     var args = ['--smoke-test', '--ping=' + random];
-    var smokeTestCommand = cypressExecPath + ' ' + args.join(' ');
 
+    if (options.dev) {
+      executable = 'node';
+      args.unshift(path.resolve(__dirname, '..', '..', '..', 'scripts', 'start.js'));
+    }
+
+    var smokeTestCommand = executable + ' ' + args.join(' ');
+
+    debug('running smoke test');
+    debug('using Cypress executable %s', executable);
     debug('smoke test command:', smokeTestCommand);
 
-    return Promise.resolve(util.exec(cypressExecPath, args)).catch(onSmokeTestError).then(function (result) {
+    var env = _.extend({}, process.env, {
+      ELECTRON_ENABLE_LOGGING: true
+    });
+
+    var stdioOptions = _.extend({}, {
+      env: env,
+      timeout: options.smokeTestTimeout
+    });
+
+    return Promise.resolve(util.exec(executable, args, stdioOptions)).catch(onSmokeTestError(smokeTestCommand, linuxWithDisplayEnv)).then(function (result) {
+      // TODO: when execa > 1.1 is released
+      // change this to `result.all` for both stderr and stdout
       var smokeTestReturned = result.stdout;
 
       debug('smoke test stdout "%s"', smokeTestReturned);
 
       if (!util.stdoutLineMatches(String(random), smokeTestReturned)) {
-        debug('Smoke test failed:', result);
-        throw new Error(stripIndent(_templateObject2, smokeTestCommand, smokeTestReturned));
+        debug('Smoke test failed because could not find %d in:', random, result);
+
+        return throwFormErrorText(errors.smokeTestFailure(smokeTestCommand, false))(result.stderr || result.stdout);
       }
     });
   };
 
-  if (needsXvfb) {
-    return xvfb.start().catch(onXvfbError).then(spawn).finally(function () {
-      return xvfb.stop().catch(onXvfbError);
+  var spawnInXvfb = function spawnInXvfb(linuxWithDisplayEnv) {
+    return xvfb.start().then(function () {
+      return spawn(linuxWithDisplayEnv);
+    }).finally(xvfb.stop);
+  };
+
+  var userFriendlySpawn = function userFriendlySpawn(linuxWithDisplayEnv) {
+    debug('spawning, should retry on display problem?', Boolean(linuxWithDisplayEnv));
+
+    return spawn(linuxWithDisplayEnv).catch({ code: 'INVALID_SMOKE_TEST_DISPLAY_ERROR' }, function () {
+      return spawnInXvfb(linuxWithDisplayEnv);
     });
+  };
+
+  if (needsXvfb) {
+    return spawnInXvfb();
   }
 
-  return spawn();
+  // if we are on linux and there's already a DISPLAY
+  // set, then we may need to rerun cypress after
+  // spawning our own Xvfb server
+  var linuxWithDisplayEnv = util.isPossibleLinuxWithIncorrectDisplay();
+
+  return userFriendlySpawn(linuxWithDisplayEnv);
 };
 
-function testBinary(version, binaryDir) {
+function testBinary(version, binaryDir, options) {
   debug('running binary verification check', version);
 
-  logger.log(stripIndent(_templateObject3, chalk.cyan(version)));
+  logger.log(stripIndent(_templateObject2, chalk.cyan(version)));
 
   logger.log();
 
@@ -123,7 +173,7 @@ function testBinary(version, binaryDir) {
       debug('clearing out the verified version');
 
       return state.clearBinaryStateAsync(binaryDir).then(function () {
-        return Promise.all([runSmokeTest(binaryDir), Promise.resolve().delay(1500)] // good user experience
+        return Promise.all([runSmokeTest(binaryDir, options), Promise.resolve().delay(1500)] // good user experience
         );
       }).then(function () {
         debug('write verified: true');
@@ -138,9 +188,7 @@ function testBinary(version, binaryDir) {
   return tasks.run();
 }
 
-var maybeVerify = function maybeVerify(installedVersion, binaryDir) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
+var maybeVerify = function maybeVerify(installedVersion, binaryDir, options) {
   return state.getBinaryVerifiedAsync(binaryDir).then(function (isVerified) {
 
     debug('is Verified ?', isVerified);
@@ -154,7 +202,7 @@ var maybeVerify = function maybeVerify(installedVersion, binaryDir) {
     }
 
     if (shouldVerify) {
-      return testBinary(installedVersion, binaryDir).then(function () {
+      return testBinary(installedVersion, binaryDir, options).then(function () {
         if (options.welcomeMessage) {
           logger.log();
           logger.log('Opening Cypress...');
@@ -173,21 +221,27 @@ var start = function start() {
   var binaryDir = state.getBinaryDir(packageVersion);
 
   _.defaults(options, {
+    dev: false,
     force: false,
-    welcomeMessage: true
+    welcomeMessage: true,
+    smokeTestTimeout: 10000
   });
 
+  if (options.dev) {
+    return runSmokeTest('', options);
+  }
+
   var parseBinaryEnvVar = function parseBinaryEnvVar() {
     var envBinaryPath = util.getEnv('CYPRESS_RUN_BINARY');
 
     debug('CYPRESS_RUN_BINARY exists, =', envBinaryPath);
-    logger.log(stripIndent(_templateObject4, chalk.yellow('Note:'), chalk.white('CYPRESS_RUN_BINARY='), chalk.cyan(envBinaryPath)));
+    logger.log(stripIndent(_templateObject3, chalk.yellow('Note:'), chalk.white('CYPRESS_RUN_BINARY='), chalk.cyan(envBinaryPath)));
     logger.log();
 
     return util.isExecutableAsync(envBinaryPath).then(function (isExecutable) {
       debug('CYPRESS_RUN_BINARY is executable? :', isExecutable);
       if (!isExecutable) {
-        return throwFormErrorText(errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))(stripIndent(_templateObject5));
+        return throwFormErrorText(errors.CYPRESS_RUN_BINARY.notValid(envBinaryPath))(stripIndent(_templateObject4));
       }
     }).then(function () {
       return state.parseRealPlatformBinaryFolderAsync(envBinaryPath);
@@ -230,7 +284,7 @@ var start = function start() {
       // in the package.json
       logger.log('Found binary version ' + chalk.green(binaryVersion) + ' installed in: ' + chalk.cyan(binaryDir));
       logger.log();
-      logger.warn(stripIndent(_templateObject6, logSymbols.warning, chalk.green(binaryVersion), chalk.green(packageVersion)));
+      logger.warn(stripIndent(_templateObject5, logSymbols.warning, chalk.green(binaryVersion), chalk.green(packageVersion)));
 
       logger.log();
     }
@@ -246,6 +300,5 @@ var start = function start() {
 };
 
 module.exports = {
-  start: start,
-  maybeVerify: maybeVerify
+  start: start
 };

package/lib/util.js

@@ -1,10 +1,16 @@
 'use strict';
 
+var _templateObject = _taggedTemplateLiteral(['\n\n    ', ' Warning: Cypress failed to start.\n\n    This is likely due to a misconfigured DISPLAY environment variable.\n\n    DISPLAY was set to: "', '"\n\n    Cypress will attempt to fix the problem and rerun.\n  '], ['\n\n    ', ' Warning: Cypress failed to start.\n\n    This is likely due to a misconfigured DISPLAY environment variable.\n\n    DISPLAY was set to: "', '"\n\n    Cypress will attempt to fix the problem and rerun.\n  ']);
+
 function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } else { return Array.from(arr); } }
 
+function _taggedTemplateLiteral(strings, raw) { return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 var _ = require('lodash');
 var R = require('ramda');
 var os = require('os');
+var la = require('lazy-ass');
+var is = require('check-more-types');
 var tty = require('tty');
 var path = require('path');
 var _isCi = require('is-ci');
@@ -13,15 +19,24 @@ var getos = require('getos');
 var chalk = require('chalk');
 var Promise = require('bluebird');
 var cachedir = require('cachedir');
+var logSymbols = require('log-symbols');
 var executable = require('executable');
+
+var _require = require('common-tags'),
+    stripIndent = _require.stripIndent;
+
 var _supportsColor = require('supports-color');
 var _isInstalledGlobally = require('is-installed-globally');
 var pkg = require(path.join(__dirname, '..', 'package.json'));
 var logger = require('./logger');
 var debug = require('debug')('cypress:cli');
 
+var issuesUrl = 'https://github.com/cypress-io/cypress/issues';
+
 var getosAsync = Promise.promisify(getos);
 
+var isBrokenGtkDisplayRe = /Gtk: cannot open display/;
+
 var stringify = function stringify(val) {
   return _.isObject(val) ? JSON.stringify(val) : val;
 };
@@ -32,6 +47,37 @@ function normalizeModuleOptions() {
   return _.mapValues(options, stringify);
 }
 
+/**
+ * Returns true if the platform is Linux. We do a lot of different
+ * stuff on Linux (like Xvfb) and it helps to has readable code
+ */
+var isLinux = function isLinux() {
+  return os.platform() === 'linux';
+};
+
+/**
+   * If the DISPLAY variable is set incorrectly, when trying to spawn
+   * Cypress executable we get an error like this:
+  ```
+  [1005:0509/184205.663837:WARNING:browser_main_loop.cc(258)] Gtk: cannot open display: 99
+  ```
+   */
+var isBrokenGtkDisplay = function isBrokenGtkDisplay(str) {
+  return isBrokenGtkDisplayRe.test(str);
+};
+
+var isPossibleLinuxWithIncorrectDisplay = function isPossibleLinuxWithIncorrectDisplay() {
+  return isLinux() && process.env.DISPLAY;
+};
+
+var logBrokenGtkDisplayWarning = function logBrokenGtkDisplayWarning() {
+  debug('Cypress exited due to a broken gtk display because of a potential invalid DISPLAY env... retrying after starting Xvfb');
+
+  // if we get this error, we are on Linux and DISPLAY is set
+  logger.warn(stripIndent(_templateObject, logSymbols.warning, process.env.DISPLAY));
+  logger.warn();
+};
+
 function stdoutLineMatches(expectedLine, stdout) {
   var lines = stdout.split('\n').map(R.trim);
   var lineMatches = R.equals(expectedLine);
@@ -154,7 +200,7 @@ var util = {
   },
   setTaskTitle: function setTaskTitle(task, title, renderer) {
     // only update the renderer title when not running in CI
-    if (renderer === 'default') {
+    if (renderer === 'default' && task.title !== title) {
       task.title = title;
     }
   },
@@ -168,9 +214,13 @@ var util = {
   isExecutableAsync: function isExecutableAsync(filePath) {
     return Promise.resolve(executable(filePath));
   },
+
+
+  isLinux: isLinux,
+
   getOsVersionAsync: function getOsVersionAsync() {
     return Promise.try(function () {
-      if (os.platform() === 'linux') {
+      if (isLinux()) {
         return getosAsync().then(function (osInfo) {
           return [osInfo.dist, osInfo.release].join(' - ');
         }).catch(function () {
@@ -229,7 +279,22 @@ var util = {
 
   exec: execa,
 
-  stdoutLineMatches: stdoutLineMatches
+  stdoutLineMatches: stdoutLineMatches,
+
+  issuesUrl: issuesUrl,
+
+  isBrokenGtkDisplay: isBrokenGtkDisplay,
+
+  logBrokenGtkDisplayWarning: logBrokenGtkDisplayWarning,
+
+  isPossibleLinuxWithIncorrectDisplay: isPossibleLinuxWithIncorrectDisplay,
+
+  getGitHubIssueUrl: function getGitHubIssueUrl(number) {
+    la(is.positive(number), 'github issue should be a positive number', number);
+    la(_.isInteger(number), 'github issue should be an integer', number);
+
+    return issuesUrl + '/' + number;
+  }
 };
 
 module.exports = util;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "3.1.4",
+  "version": "3.3.1",
   "main": "index.js",
   "bin": {
     "cypress": "bin/cypress"
@@ -12,60 +12,45 @@
     "postinstall": "node index.js --exec install",
     "size": "t=\"$(npm pack .)\"; wc -c \"${t}\"; tar tvf \"${t}\"; rm \"${t}\";"
   },
-  "nyc": {
-    "exclude": [
-      "test",
-      "scripts"
-    ]
-  },
   "types": "types",
   "dependencies": {
     "@cypress/listr-verbose-renderer": "0.4.1",
-    "@cypress/xvfb": "1.2.3",
-    "@types/blob-util": "1.3.3",
-    "@types/bluebird": "3.5.18",
-    "@types/chai": "4.0.8",
-    "@types/chai-jquery": "1.1.35",
-    "@types/jquery": "3.3.6",
-    "@types/lodash": "4.14.87",
-    "@types/minimatch": "3.0.3",
-    "@types/mocha": "2.2.44",
-    "@types/sinon": "7.0.0",
-    "@types/sinon-chai": "2.7.29",
+    "@cypress/xvfb": "1.2.4",
+    "arch": "2.1.1",
     "bluebird": "3.5.0",
     "cachedir": "1.3.0",
-    "chalk": "2.4.1",
+    "chalk": "2.4.2",
     "check-more-types": "2.24.0",
-    "commander": "2.11.0",
-    "common-tags": "1.4.0",
-    "debug": "3.1.0",
+    "commander": "2.15.1",
+    "common-tags": "1.8.0",
+    "debug": "3.2.6",
     "execa": "0.10.0",
     "executable": "4.1.1",
-    "extract-zip": "1.6.6",
+    "extract-zip": "1.6.7",
     "fs-extra": "4.0.1",
-    "getos": "3.1.0",
-    "glob": "7.1.2",
-    "is-ci": "1.0.10",
+    "getos": "3.1.1",
+    "glob": "7.1.3",
+    "is-ci": "1.2.1",
     "is-installed-globally": "0.1.0",
     "lazy-ass": "1.6.0",
     "listr": "0.12.0",
     "lodash": "4.17.11",
     "log-symbols": "2.2.0",
     "minimist": "1.2.0",
-    "moment": "2.22.2",
+    "moment": "2.24.0",
     "ramda": "0.24.1",
-    "request": "2.87.0",
-    "request-progress": "0.3.1",
-    "supports-color": "5.1.0",
-    "tmp": "0.0.31",
+    "request": "2.88.0",
+    "request-progress": "0.4.0",
+    "supports-color": "5.5.0",
+    "tmp": "0.1.0",
     "url": "0.11.0",
-    "yauzl": "2.8.0"
+    "yauzl": "2.10.0"
   },
   "files": [
     "bin",
     "lib",
     "index.js",
-    "types/*.d.ts"
+    "types/**/*.d.ts"
   ],
   "description": "Cypress.io end to end testing tool",
   "author": "Brian Mann",

package/types/blob-util/LICENSE

@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

package/types/blob-util/README.md

@@ -0,0 +1,16 @@
+# Installation
+> `npm install --save @types/blob-util`
+
+# Summary
+This package contains type definitions for blob-util (https://github.com/nolanlawson/blob-util#readme).
+
+# Details
+Files were exported from https://www.github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/blob-util
+
+Additional Details
+ * Last updated: Wed, 25 Oct 2017 00:19:45 GMT
+ * Dependencies: none
+ * Global values: none
+
+# Credits
+These definitions were written by Max Battcher <https://github.com/WorldMaker>.