cypress 9.2.0 → 9.4.0

package/lib/tasks/verify.js

@@ -37,7 +37,7 @@ const xvfb = require('../exec/xvfb');
 
 const state = require('./state');
 
-const VERIFY_TEST_RUNNER_TIMEOUT_MS = process.env.CYPRESS_VERIFY_TIMEOUT || 30000;
+const VERIFY_TEST_RUNNER_TIMEOUT_MS = +util.getEnv('CYPRESS_VERIFY_TIMEOUT') || 30000;
 
 const checkExecutable = binaryDir => {
   const executable = state.getPathToExecutable(binaryDir);
@@ -86,9 +86,9 @@ const runSmokeTest = (binaryDir, options) => {
 
   const needsXvfb = xvfb.isNeeded();
   debug('needs Xvfb?', needsXvfb);
-  /**
-   * Spawn Cypress running smoke test to check if all operating system
-   * dependencies are good.
+  /**
+   * Spawn Cypress running smoke test to check if all operating system
+   * dependencies are good.
    */
 
   const spawn = linuxWithDisplayEnv => {
@@ -329,14 +329,14 @@ const start = (options = {}) => {
 };
 
 const isLinuxLike = () => os.platform() !== 'win32';
-/**
- * Returns true if running on a system where Electron needs "--no-sandbox" flag.
- * @see https://crbug.com/638180
- *
- * On Debian we had problems running in sandbox even for non-root users.
- * @see https://github.com/cypress-io/cypress/issues/5434
- * Seems there is a lot of discussion around this issue among Electron users
- * @see https://github.com/electron/electron/issues/17972
+/**
+ * Returns true if running on a system where Electron needs "--no-sandbox" flag.
+ * @see https://crbug.com/638180
+ *
+ * On Debian we had problems running in sandbox even for non-root users.
+ * @see https://github.com/cypress-io/cypress/issues/5434
+ * Seems there is a lot of discussion around this issue among Electron users
+ * @see https://github.com/electron/electron/issues/17972
 */
 
 

package/lib/util.js

@@ -42,21 +42,23 @@ const supportsColor = require('supports-color');
 
 const isInstalledGlobally = require('is-installed-globally');
 
-const pkg = require(path.join(__dirname, '..', 'package.json'));
-
 const logger = require('./logger');
 
 const debug = require('debug')('cypress:cli');
 
 const fs = require('./fs');
 
+const semver = require('semver');
+
+const pkg = require(path.join(__dirname, '..', 'package.json'));
+
 const issuesUrl = 'https://github.com/cypress-io/cypress/issues';
 const getosAsync = Promise.promisify(getos);
-/**
- * Returns SHA512 of a file
- *
- * Implementation lifted from https://github.com/sindresorhus/hasha
- * but without bringing that dependency (since hasha is Node v8+)
+/**
+ * Returns SHA512 of a file
+ *
+ * Implementation lifted from https://github.com/sindresorhus/hasha
+ * but without bringing that dependency (since hasha is Node v8+)
  */
 
 const getFileChecksum = filename => {
@@ -90,21 +92,21 @@ const stringify = val => {
 function normalizeModuleOptions(options = {}) {
   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
+/**
+ * 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
  */
 
 
 const 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
-  ```
+/**
+   * 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
+  ```
    */
 
 
@@ -136,12 +138,12 @@ function stdoutLineMatches(expectedLine, stdout) {
   const lines = stdout.split('\n').map(val => val.trim());
   return lines.some(line => line === expectedLine);
 }
-/**
- * Confirms if given value is a valid CYPRESS_INTERNAL_ENV value. Undefined values
- * are valid, because the system can set the default one.
- *
- * @param {string} value
- * @example util.isValidCypressInternalEnvValue(process.env.CYPRESS_INTERNAL_ENV)
+/**
+ * Confirms if given value is a valid CYPRESS_INTERNAL_ENV value. Undefined values
+ * are valid, because the system can set the default one.
+ *
+ * @param {string} value
+ * @example util.isValidCypressInternalEnvValue(process.env.CYPRESS_INTERNAL_ENV)
  */
 
 
@@ -155,21 +157,21 @@ function isValidCypressInternalEnvValue(value) {
   const names = ['development', 'test', 'staging', 'production'];
   return _.includes(names, value);
 }
-/**
- * Confirms if given value is a non-production CYPRESS_INTERNAL_ENV value.
- * Undefined values are valid, because the system can set the default one.
- *
- * @param {string} value
- * @example util.isNonProductionCypressInternalEnvValue(process.env.CYPRESS_INTERNAL_ENV)
+/**
+ * Confirms if given value is a non-production CYPRESS_INTERNAL_ENV value.
+ * Undefined values are valid, because the system can set the default one.
+ *
+ * @param {string} value
+ * @example util.isNonProductionCypressInternalEnvValue(process.env.CYPRESS_INTERNAL_ENV)
  */
 
 
 function isNonProductionCypressInternalEnvValue(value) {
   return !_.isUndefined(value) && value !== 'production';
 }
-/**
- * Prints NODE_OPTIONS using debug() module, but only
- * if DEBUG=cypress... is set
+/**
+ * Prints NODE_OPTIONS using debug() module, but only
+ * if DEBUG=cypress... is set
  */
 
 
@@ -184,19 +186,19 @@ function printNodeOptions(log = debug) {
     log('NODE_OPTIONS is not set');
   }
 }
-/**
- * Removes double quote characters
- * from the start and end of the given string IF they are both present
- *
- * @param {string} str Input string
- * @returns {string} Trimmed string or the original string if there are no double quotes around it.
- * @example
-  ```
-  dequote('"foo"')
-  // returns string 'foo'
-  dequote('foo')
-  // returns string 'foo'
-  ```
+/**
+ * Removes double quote characters
+ * from the start and end of the given string IF they are both present
+ *
+ * @param {string} str Input string
+ * @returns {string} Trimmed string or the original string if there are no double quotes around it.
+ * @example
+  ```
+  dequote('"foo"')
+  // returns string 'foo'
+  dequote('foo')
+  // returns string 'foo'
+  ```
  */
 
 
@@ -232,9 +234,9 @@ const parseOpts = opts => {
   debug('parsed cli options %o', cleanOpts);
   return cleanOpts;
 };
-/**
- * Copy of packages/server/lib/browsers/utils.ts
- * because we need same functionality in CLI to show the path :(
+/**
+ * Copy of packages/server/lib/browsers/utils.ts
+ * because we need same functionality in CLI to show the path :(
  */
 
 
@@ -267,17 +269,31 @@ const util = {
     .mapValues(value => {
       // stringify to 1 or 0
       return value ? '1' : '0';
-    }).extend(util.getOriginalNodeOptions(options)).value();
+    }).extend(util.getOriginalNodeOptions()).value();
   },
 
-  getOriginalNodeOptions(options) {
+  getOriginalNodeOptions() {
+    const opts = {};
+
     if (process.env.NODE_OPTIONS) {
-      return {
-        ORIGINAL_NODE_OPTIONS: process.env.NODE_OPTIONS
-      };
+      opts.ORIGINAL_NODE_OPTIONS = process.env.NODE_OPTIONS;
+    } // https://github.com/cypress-io/cypress/issues/18914
+    // Node 17+ ships with OpenSSL 3 by default, so we may need the option
+    // --openssl-legacy-provider so that webpack@4 can use the legacy MD4 hash
+    // function. This option doesn't exist on Node <17 or when it is built
+    // against OpenSSL 1, so we have to detect Node's major version and check
+    // which version of OpenSSL it was built against before spawning the plugins
+    // process.
+    // To be removed when the Cypress binary pulls in the @cypress/webpack-batteries-included-preprocessor
+    // version that has been updated to webpack >= 5.61, which no longer relies on
+    // Node's builtin crypto.hash function.
+
+
+    if (process.versions && semver.satisfies(process.versions.node, '>=17.0.0') && process.versions.openssl.startsWith('3.')) {
+      opts.ORIGINAL_NODE_OPTIONS = `${opts.ORIGINAL_NODE_OPTIONS || ''} --openssl-legacy-provider`;
     }
 
-    return {};
+    return opts;
   },
 
   getForceTty() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "9.2.0",
+  "version": "9.4.0",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -10,16 +10,17 @@
     "@cypress/request": "^2.88.10",
     "@cypress/xvfb": "^1.2.4",
     "@types/node": "^14.14.31",
-    "@types/sinonjs__fake-timers": "^6.0.2",
+    "@types/sinonjs__fake-timers": "8.1.1",
     "@types/sizzle": "^2.3.2",
     "arch": "^2.2.0",
     "blob-util": "^2.0.2",
-    "bluebird": "3.7.2",
+    "bluebird": "^3.7.2",
+    "buffer": "^5.6.0",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.0",
     "check-more-types": "^2.24.0",
     "cli-cursor": "^3.1.0",
-    "cli-table3": "~0.6.0",
+    "cli-table3": "~0.6.1",
     "commander": "^5.1.0",
     "common-tags": "^1.8.0",
     "dayjs": "^1.10.4",
@@ -43,10 +44,10 @@
     "pretty-bytes": "^5.6.0",
     "proxy-from-env": "1.0.0",
     "request-progress": "^3.0.0",
+    "semver": "^7.3.2",
     "supports-color": "^8.1.1",
     "tmp": "~0.2.1",
     "untildify": "^4.0.0",
-    "url": "^0.11.0",
     "yauzl": "^2.10.0"
   },
   "files": [

package/types/chai/index.d.ts

@@ -1949,8 +1949,8 @@ declare module "chai" {
     export = chai;
 }
 
-// const a = 1; a.should(1); doesn't work with Cypress
-// https://github.com/cypress-io/cypress/issues/16548
-// interface Object {
-//     should: Chai.Assertion;
-// }
+// const a = 1; a.should(1); doesn't work with Cypress
+// https://github.com/cypress-io/cypress/issues/16548
+// interface Object {
+//     should: Chai.Assertion;
+// }

package/types/cy-blob-util.d.ts

@@ -1,13 +1,13 @@
-// Shim definition to export a namespace. Cypress is actually a global module
-// so import/export isn't allowed there. We import here and define a global module
-// so that Cypress can get and use the Blob type
-
-// tslint:disable-next-line:no-implicit-dependencies
-import * as blobUtil from 'blob-util'
-
-export = BlobUtil
-export as namespace BlobUtil
-
-declare namespace BlobUtil {
-  type BlobUtilStatic = typeof blobUtil
-}
+// Shim definition to export a namespace. Cypress is actually a global module
+// so import/export isn't allowed there. We import here and define a global module
+// so that Cypress can get and use the Blob type
+
+// tslint:disable-next-line:no-implicit-dependencies
+import * as blobUtil from 'blob-util'
+
+export = BlobUtil
+export as namespace BlobUtil
+
+declare namespace BlobUtil {
+  type BlobUtilStatic = typeof blobUtil
+}

package/types/cy-bluebird.d.ts

@@ -1,12 +1,12 @@
-// Shim definition to export a namespace. Cypress is actually a global module
-// so import/export isn't allowed there. We import here and define a global module
-// so that Cypress can get and use the Blob type
-import ImportedBluebird = require('./bluebird')
-
-export = Bluebird
-export as namespace Bluebird
-
-declare namespace Bluebird {
-  type BluebirdStatic = typeof ImportedBluebird
-  interface Promise<T> extends ImportedBluebird<T> {}
-}
+// Shim definition to export a namespace. Cypress is actually a global module
+// so import/export isn't allowed there. We import here and define a global module
+// so that Cypress can get and use the Blob type
+import ImportedBluebird = require('./bluebird')
+
+export = Bluebird
+export as namespace Bluebird
+
+declare namespace Bluebird {
+  type BluebirdStatic = typeof ImportedBluebird
+  interface Promise<T> extends ImportedBluebird<T> {}
+}

package/types/cy-chai.d.ts

@@ -1,10 +1,10 @@
-// Shim definition to export a namespace. Cypress is actually a global module
-// so import/export isn't allowed there. We import here and define a global module
-/// <reference path="./chai/index.d.ts" />
-declare namespace Chai {
-  interface Include {
-    html(html: string): Assertion
-    text(text: string): Assertion
-    value(text: string): Assertion
-  }
-}
+// Shim definition to export a namespace. Cypress is actually a global module
+// so import/export isn't allowed there. We import here and define a global module
+/// <reference path="./chai/index.d.ts" />
+declare namespace Chai {
+  interface Include {
+    html(html: string): Assertion
+    text(text: string): Assertion
+    value(text: string): Assertion
+  }
+}

package/types/cy-http.d.ts

@@ -1,13 +1,13 @@
-/**
- * This file should be deleted as soon as the serever
- * TODO: delete this file when ResolvedDevServerConfig.server is converted to closeServer
- */
-
-/// <reference types="node" />
-import * as cyUtilsHttp from 'http'
-export = cyUtilsHttp
-/**
- * namespace created to bridge nodeJs.http typings so that
- * we can type http Server in CT
- */
-export as namespace cyUtilsHttp
+/**
+ * This file should be deleted as soon as the serever
+ * TODO: delete this file when ResolvedDevServerConfig.server is converted to closeServer
+ */
+
+/// <reference types="node" />
+import * as cyUtilsHttp from 'http'
+export = cyUtilsHttp
+/**
+ * namespace created to bridge nodeJs.http typings so that
+ * we can type http Server in CT
+ */
+export as namespace cyUtilsHttp

package/types/cy-minimatch.d.ts

@@ -1,96 +1,96 @@
-// I was trying to avoid relying on "import" of actual module from "minimatch"
-// because it would not work in test project, and the only reliable way
-// to get around type errors finally was to copy the minimal minimatch function
-// definition from "minimatch/index.d.ts" here and just keep it in our code
-
-export = Minimatch
-export as namespace Minimatch
-
-interface MinimatchOptions {
-  /**
-   * Dump a ton of stuff to stderr.
-   *
-   * @default false
-   */
-  debug?: boolean
-
-  /**
-   * Do not expand {a,b} and {1..3} brace sets.
-   *
-   * @default false
-   */
-  nobrace?: boolean
-
-  /**
-   * Disable ** matching against multiple folder names.
-   *
-   * @default false
-   */
-  noglobstar?: boolean
-
-  /**
-   * Allow patterns to match filenames starting with a period,
-   * even if the pattern does not explicitly have a period in that spot.
-   *
-   * @default false
-   */
-  dot?: boolean
-
-  /**
-   * Disable "extglob" style patterns like +(a|b).
-   *
-   * @default false
-   */
-  noext?: boolean
-
-  /**
-   * Perform a case-insensitive match.
-   *
-   * @default false
-   */
-  nocase?: boolean
-
-  /**
-   * When a match is not found by minimatch.match,
-   * return a list containing the pattern itself if this option is set.
-   * Otherwise, an empty list is returned if there are no matches.
-   *
-   * @default false
-   */
-  nonull?: boolean
-
-  /**
-   * If set, then patterns without slashes will be matched against
-   * the basename of the path if it contains slashes.
-   *
-   * @default false
-   */
-  matchBase?: boolean
-
-  /**
-   * Suppress the behavior of treating #
-   * at the start of a pattern as a comment.
-   *
-   * @default false
-   */
-  nocomment?: boolean
-
-  /**
-   * Suppress the behavior of treating a leading ! character as negation.
-   *
-   * @default false
-   */
-  nonegate?: boolean
-
-  /**
-   * Returns from negate expressions the same as if they were not negated.
-   * (Ie, true on a hit, false on a miss.)
-   *
-   * @default false
-   */
-  flipNegate?: boolean
-}
-
-declare namespace Minimatch {
-  function minimatch(target: string, pattern: string, options?: MinimatchOptions): boolean
-}
+// I was trying to avoid relying on "import" of actual module from "minimatch"
+// because it would not work in test project, and the only reliable way
+// to get around type errors finally was to copy the minimal minimatch function
+// definition from "minimatch/index.d.ts" here and just keep it in our code
+
+export = Minimatch
+export as namespace Minimatch
+
+interface MinimatchOptions {
+  /**
+   * Dump a ton of stuff to stderr.
+   *
+   * @default false
+   */
+  debug?: boolean
+
+  /**
+   * Do not expand {a,b} and {1..3} brace sets.
+   *
+   * @default false
+   */
+  nobrace?: boolean
+
+  /**
+   * Disable ** matching against multiple folder names.
+   *
+   * @default false
+   */
+  noglobstar?: boolean
+
+  /**
+   * Allow patterns to match filenames starting with a period,
+   * even if the pattern does not explicitly have a period in that spot.
+   *
+   * @default false
+   */
+  dot?: boolean
+
+  /**
+   * Disable "extglob" style patterns like +(a|b).
+   *
+   * @default false
+   */
+  noext?: boolean
+
+  /**
+   * Perform a case-insensitive match.
+   *
+   * @default false
+   */
+  nocase?: boolean
+
+  /**
+   * When a match is not found by minimatch.match,
+   * return a list containing the pattern itself if this option is set.
+   * Otherwise, an empty list is returned if there are no matches.
+   *
+   * @default false
+   */
+  nonull?: boolean
+
+  /**
+   * If set, then patterns without slashes will be matched against
+   * the basename of the path if it contains slashes.
+   *
+   * @default false
+   */
+  matchBase?: boolean
+
+  /**
+   * Suppress the behavior of treating #
+   * at the start of a pattern as a comment.
+   *
+   * @default false
+   */
+  nocomment?: boolean
+
+  /**
+   * Suppress the behavior of treating a leading ! character as negation.
+   *
+   * @default false
+   */
+  nonegate?: boolean
+
+  /**
+   * Returns from negate expressions the same as if they were not negated.
+   * (Ie, true on a hit, false on a miss.)
+   *
+   * @default false
+   */
+  flipNegate?: boolean
+}
+
+declare namespace Minimatch {
+  function minimatch(target: string, pattern: string, options?: MinimatchOptions): boolean
+}

package/types/cypress-eventemitter.d.ts

@@ -1,29 +1,33 @@
-// Cypress, cy, Log inherits EventEmitter.
-type EventEmitter2 = import("eventemitter2").EventEmitter2
-
-interface EventEmitter extends EventEmitter2 {
-  proxyTo: (cy: Cypress.cy) => null
-  emitMap: (eventName: string, args: any[]) => Array<(...args: any[]) => any>
-  emitThen: (eventName: string, args: any[]) => Bluebird.BluebirdStatic
-}
-
-// Copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/events.d.ts
-// to avoid type conflict.
-interface NodeEventEmitter {
-  addListener(event: string | symbol, listener: (...args: any[]) => void): this
-  on(event: string | symbol, listener: (...args: any[]) => void): this
-  once(event: string | symbol, listener: (...args: any[]) => void): this
-  removeListener(event: string | symbol, listener: (...args: any[]) => void): this
-  off(event: string | symbol, listener: (...args: any[]) => void): this
-  removeAllListeners(event?: string | symbol): this
-  setMaxListeners(n: number): this
-  getMaxListeners(): number
-  listeners(event: string | symbol): Array<(...args: any[]) => void>
-  rawListeners(event: string | symbol): Array<(...args: any[]) => void>
-  emit(event: string | symbol, ...args: any[]): boolean
-  listenerCount(type: string | symbol): number
-  // Added in Node 6...
-  prependListener(event: string | symbol, listener: (...args: any[]) => void): this
-  prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this
-  eventNames(): Array<string | symbol>
-}
+// Cypress, cy, Log inherits EventEmitter.
+type EventEmitter2 = import("eventemitter2").EventEmitter2
+
+interface EventEmitter extends EventEmitter2 {
+  proxyTo: (cy: Cypress.cy) => null
+  emitMap: (eventName: string, args: any[]) => Array<(...args: any[]) => any>
+  emitThen: (eventName: string, args: any[]) => Bluebird.BluebirdStatic
+}
+
+// Copied from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/events.d.ts
+// to avoid type conflict.
+interface NodeEventEmitter {
+  addListener(event: string | symbol, listener: (...args: any[]) => void): this
+  on(event: string | symbol, listener: (...args: any[]) => void): this
+  once(event: string | symbol, listener: (...args: any[]) => void): this
+  removeListener(event: string | symbol, listener: (...args: any[]) => void): this
+  off(event: string | symbol, listener: (...args: any[]) => void): this
+  removeAllListeners(event?: string | symbol): this
+  setMaxListeners(n: number): this
+  getMaxListeners(): number
+  listeners(event: string | symbol): Array<(...args: any[]) => void>
+  rawListeners(event: string | symbol): Array<(...args: any[]) => void>
+  emit(event: string | symbol, ...args: any[]): boolean
+  listenerCount(type: string | symbol): number
+  // Added in Node 6...
+  prependListener(event: string | symbol, listener: (...args: any[]) => void): this
+  prependOnceListener(event: string | symbol, listener: (...args: any[]) => void): this
+  eventNames(): Array<string | symbol>
+}
+
+// We use the Buffer class for dealing with binary data, especially around the
+// selectFile interface.
+type BufferType = import("buffer/").Buffer

package/types/cypress-expect.d.ts

@@ -1,3 +1,3 @@
-// Cypress adds chai expect and assert to global
-declare const expect: Chai.ExpectStatic
-declare const assert: Chai.AssertStatic
+// Cypress adds chai expect and assert to global
+declare const expect: Chai.ExpectStatic
+declare const assert: Chai.AssertStatic