cypress 9.2.1 → 9.4.1

package/lib/tasks/download.js

@@ -8,7 +8,7 @@ const is = require('check-more-types');
 
 const os = require('os');
 
-const Url = require('url');
+const url = require('url');
 
 const path = require('path');
 
@@ -77,9 +77,10 @@ const getCA = () => {
 };
 
 const prepend = urlPath => {
-  const endpoint = Url.resolve(getBaseUrl(), urlPath);
+  const endpoint = url.resolve(getBaseUrl(), urlPath);
   const platform = os.platform();
-  return `${endpoint}?platform=${platform}&arch=${arch()}`;
+  const pathTemplate = util.getEnv('CYPRESS_DOWNLOAD_PATH_TEMPLATE');
+  return pathTemplate ? pathTemplate.replace('${endpoint}', endpoint).replace('${platform}', platform).replace('${arch}', arch()) : `${endpoint}?platform=${platform}&arch=${arch()}`;
 };
 
 const getUrl = version => {
@@ -300,7 +301,7 @@ const downloadFromUrl = ({
   });
 };
 /**
- * Download Cypress.zip from external url to local file.
+ * Download Cypress.zip from external versionUrl to local file.
  * @param [string] version Could be "3.3.0" or full URL
  * @param [string] downloadDestination Local filename to save as
  */
@@ -326,17 +327,17 @@ const start = opts => {
     };
   }
 
-  const url = getUrl(version);
+  const versionUrl = getUrl(version);
   progress.throttle = 100;
   debug('needed Cypress version: %s', version);
-  debug('source url %s', url);
+  debug('source url %s', versionUrl);
   debug(`downloading cypress.zip to "${downloadDestination}"`); // ensure download dir exists
 
   return fs.ensureDirAsync(path.dirname(downloadDestination)).then(() => {
     return getCA();
   }).then(ca => {
     return downloadFromUrl({
-      url,
+      url: versionUrl,
       downloadDestination,
       progress,
       ca,

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);

package/lib/util.js

@@ -42,14 +42,16 @@ 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);
 /**
@@ -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.1",
+  "version": "9.4.1",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -10,11 +10,12 @@
     "@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",
@@ -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/cypress-eventemitter.d.ts

@@ -27,3 +27,7 @@ interface NodeEventEmitter {
   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.d.ts

@@ -231,6 +231,15 @@ declare namespace Cypress {
      *    Cypress.Blob.method()
      */
     Blob: BlobUtil.BlobUtilStatic
+    /**
+     * Cypress automatically includes a Buffer library and exposes it as Cypress.Buffer.
+     *
+     * @see https://on.cypress.io/buffer
+     * @see https://github.com/feross/buffer
+     * @example
+     *    Cypress.Buffer.method()
+     */
+    Buffer: BufferType
     /**
      * Cypress automatically includes minimatch and exposes it as Cypress.minimatch.
      *
@@ -662,6 +671,20 @@ declare namespace Cypress {
      */
     as(alias: string): Chainable<Subject>
 
+    /**
+     * Select a file with the given <input> element, or drag and drop a file over any DOM subject.
+     *
+     * @param {FileReference} files - The file(s) to select or drag onto this element.
+     * @see https://on.cypress.io/selectfile
+     * @example
+     *    cy.get('input[type=file]').selectFile(Cypress.Buffer.from('text'))
+     *    cy.get('input[type=file]').selectFile({
+     *      fileName: 'users.json',
+     *      fileContents: [{name: 'John Doe'}]
+     *    })
+     */
+    selectFile(files: FileReference | FileReference[], options?: Partial<SelectFileOptions>): Chainable<Subject>
+
     /**
      * Blur a focused element. This element must currently be in focus.
      * If you want to ensure an element is focused before blurring,
@@ -2466,6 +2489,17 @@ declare namespace Cypress {
     scrollBehavior: scrollBehaviorOptions
   }
 
+  interface SelectFileOptions extends Loggable, Timeoutable, ActionableOptions {
+    /**
+     * Which user action to perform. `select` matches selecting a file while
+     * `drag-drop` matches dragging files from the operating system into the
+     * document.
+     *
+     * @default 'select'
+     */
+    action: 'select' | 'drag-drop'
+  }
+
   interface BlurOptions extends Loggable, Forceable { }
 
   interface CheckOptions extends Loggable, Timeoutable, ActionableOptions {
@@ -5641,6 +5675,18 @@ declare namespace Cypress {
     stderr: string
   }
 
+  type FileReference = string | BufferType | FileReferenceObject
+  interface FileReferenceObject {
+    /*
+     * Buffers will be used as-is, while strings will be interpreted as an alias or a file path.
+     * All other types will have `Buffer.from(JSON.stringify())` applied.
+     */
+    contents: any
+    fileName?: string
+    mimeType?: string
+    lastModified?: number
+  }
+
   interface LogAttrs {
     url: string
     consoleProps: ObjectLike