cypress 12.1.0 → 12.2.0

package/lib/util.js

@@ -1,75 +1,48 @@
 "use strict";
 
 const _ = require('lodash');
-
 const arch = require('arch');
-
 const os = require('os');
-
 const ospath = require('ospath');
-
 const crypto = require('crypto');
-
 const la = require('lazy-ass');
-
 const is = require('check-more-types');
-
 const tty = require('tty');
-
 const path = require('path');
-
 const isCi = require('is-ci');
-
 const execa = require('execa');
-
 const getos = require('getos');
-
 const chalk = require('chalk');
-
 const Promise = require('bluebird');
-
 const cachedir = require('cachedir');
-
 const logSymbols = require('log-symbols');
-
 const executable = require('executable');
-
 const {
   stripIndent
 } = require('common-tags');
-
 const supportsColor = require('supports-color');
-
 const isInstalledGlobally = require('is-installed-globally');
-
 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+)
  */
-
 const getFileChecksum = filename => {
   la(is.unemptyString(filename), 'expected filename', filename);
-
   const hashStream = () => {
     const s = crypto.createHash('sha512');
     s.setEncoding('hex');
     return s;
   };
-
   return new Promise((resolve, reject) => {
     const stream = fs.createReadStream(filename);
     stream.on('error', reject).pipe(hashStream()).on('error', reject).on('finish', function () {
@@ -77,30 +50,26 @@ const getFileChecksum = filename => {
     });
   });
 };
-
 const getFileSize = filename => {
   la(is.unemptyString(filename), 'expected filename', filename);
   return fs.statAsync(filename).get('size');
 };
-
 const isBrokenGtkDisplayRe = /Gtk: cannot open display/;
-
 const stringify = val => {
   return _.isObject(val) ? JSON.stringify(val) : 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
  */
-
-
 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:
@@ -108,19 +77,16 @@ const isLinux = () => {
   [1005:0509/184205.663837:WARNING:browser_main_loop.cc(258)] Gtk: cannot open display: 99
   ```
    */
-
-
 const isBrokenGtkDisplay = str => {
   return isBrokenGtkDisplayRe.test(str);
 };
-
 const isPossibleLinuxWithIncorrectDisplay = () => {
   return isLinux() && process.env.DISPLAY;
 };
-
 const 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
+  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`
 
     ${logSymbols.warning} Warning: Cypress failed to start.
@@ -133,11 +99,11 @@ const logBrokenGtkDisplayWarning = () => {
   `);
   logger.warn();
 };
-
 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.
@@ -145,18 +111,17 @@ function stdoutLineMatches(expectedLine, stdout) {
  * @param {string} value
  * @example util.isValidCypressInternalEnvValue(process.env.CYPRESS_INTERNAL_ENV)
  */
-
-
 function isValidCypressInternalEnvValue(value) {
   if (_.isUndefined(value)) {
     // will get default value
     return true;
-  } // names of config environments, see "packages/server/config/app.json"
-
+  }
 
+  // names of config environments, see "packages/server/config/app.json"
   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.
@@ -164,28 +129,25 @@ function isValidCypressInternalEnvValue(value) {
  * @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
  */
-
-
 function printNodeOptions(log = debug) {
   if (!log.enabled) {
     return;
   }
-
   if (process.env.NODE_OPTIONS) {
     log('NODE_OPTIONS=%s', process.env.NODE_OPTIONS);
   } else {
     log('NODE_OPTIONS is not set');
   }
 }
+
 /**
  * Removes double quote characters
  * from the start and end of the given string IF they are both present
@@ -200,75 +162,63 @@ function printNodeOptions(log = debug) {
   // returns string 'foo'
   ```
  */
-
-
 const dequote = str => {
   la(is.string(str), 'expected a string to remove double quotes', str);
-
   if (str.length > 1 && str[0] === '"' && str[str.length - 1] === '"') {
     return str.substr(1, str.length - 2);
   }
-
   return str;
 };
-
 const parseOpts = opts => {
   opts = _.pick(opts, 'browser', 'cachePath', 'cacheList', 'cacheClear', 'cachePrune', 'ciBuildId', 'ct', 'component', 'config', 'configFile', 'cypressVersion', 'destination', 'detached', 'dev', 'e2e', 'exit', 'env', 'force', 'global', 'group', 'headed', 'headless', 'inspect', 'inspectBrk', 'key', 'path', 'parallel', 'port', 'project', 'quiet', 'reporter', 'reporterOptions', 'record', 'runProject', 'spec', 'tag');
-
   if (opts.exit) {
     opts = _.omit(opts, 'exit');
-  } // some options might be quoted - which leads to unexpected results
-  // remove double quotes from certain options
-
+  }
 
-  const cleanOpts = { ...opts
+  // some options might be quoted - which leads to unexpected results
+  // remove double quotes from certain options
+  const cleanOpts = {
+    ...opts
   };
   const toDequote = ['group', 'ciBuildId'];
-
   for (const prop of toDequote) {
     if (_.has(opts, prop)) {
       cleanOpts[prop] = dequote(opts[prop]);
     }
   }
-
   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 :(
  */
-
-
 const getApplicationDataFolder = (...paths) => {
   const {
     env
-  } = process; // allow overriding the app_data folder
+  } = process;
 
+  // allow overriding the app_data folder
   let folder = env.CYPRESS_CONFIG_ENV || env.CYPRESS_INTERNAL_ENV || 'development';
   const PRODUCT_NAME = pkg.productName || pkg.name;
   const OS_DATA_PATH = ospath.data();
   const ELECTRON_APP_DATA_PATH = path.join(OS_DATA_PATH, PRODUCT_NAME);
-
   if (process.env.CYPRESS_INTERNAL_E2E_TESTING_SELF) {
     folder = `${folder}-e2e-test`;
   }
-
   const p = path.join(ELECTRON_APP_DATA_PATH, 'cy', folder, ...paths);
   return p;
 };
-
 const util = {
   normalizeModuleOptions,
   parseOpts,
   isValidCypressInternalEnvValue,
   isNonProductionCypressInternalEnvValue,
   printNodeOptions,
-
   isCi() {
     return isCi;
   },
-
   getEnvOverrides(options = {}) {
     return _.chain({}).extend(util.getEnvColors()).extend(util.getForceTty()).omitBy(_.isUndefined) // remove undefined values
     .mapValues(value => {
@@ -276,33 +226,30 @@ const util = {
       return value ? '1' : '0';
     }).extend(util.getOriginalNodeOptions()).value();
   },
-
   getOriginalNodeOptions() {
     const opts = {};
-
     if (process.env.NODE_OPTIONS) {
       opts.ORIGINAL_NODE_OPTIONS = process.env.NODE_OPTIONS;
-    } // https://github.com/cypress-io/cypress/issues/18914
+    }
+
+    // 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') && semver.satisfies(process.versions.openssl, '>=3', {
       includePrerelease: true
     })) {
       opts.ORIGINAL_NODE_OPTIONS = `${opts.ORIGINAL_NODE_OPTIONS || ''} --openssl-legacy-provider`;
     }
-
     return opts;
   },
-
   getForceTty() {
     return {
       FORCE_STDIN_TTY: util.isTty(process.stdin.fd),
@@ -310,7 +257,6 @@ const util = {
       FORCE_STDERR_TTY: util.isTty(process.stderr.fd)
     };
   },
-
   getEnvColors() {
     const sc = util.supportsColor();
     return {
@@ -319,106 +265,90 @@ const util = {
       MOCHA_COLORS: sc ? true : undefined
     };
   },
-
   isTty(fd) {
     return tty.isatty(fd);
   },
-
   supportsColor() {
     // if we've been explictly told not to support
     // color then turn this off
     if (process.env.NO_COLOR) {
       return false;
-    } // https://github.com/cypress-io/cypress/issues/1747
-    // always return true in CI providers
-
+    }
 
+    // https://github.com/cypress-io/cypress/issues/1747
+    // always return true in CI providers
     if (process.env.CI) {
       return true;
-    } // ensure that both stdout and stderr support color
-
+    }
 
+    // ensure that both stdout and stderr support color
     return Boolean(supportsColor.stdout) && Boolean(supportsColor.stderr);
   },
-
   cwd() {
     return process.cwd();
   },
-
   pkgBuildInfo() {
     return pkg.buildInfo;
   },
-
   pkgVersion() {
     return pkg.version;
   },
-
   exit(code) {
     process.exit(code);
   },
-
   logErrorExit1(err) {
     logger.error(err.message);
     process.exit(1);
   },
-
   dequote,
-
   titleize(...args) {
     // prepend first arg with space
     // and pad so that all messages line up
-    args[0] = _.padEnd(` ${args[0]}`, 24); // get rid of any falsy values
+    args[0] = _.padEnd(` ${args[0]}`, 24);
 
+    // get rid of any falsy values
     args = _.compact(args);
     return chalk.blue(...args);
   },
-
   calculateEta(percent, elapsed) {
     // returns the number of seconds remaining
+
     // if we're at 100% already just return 0
     if (percent === 100) {
       return 0;
-    } // take the percentage and divide by one
+    }
+
+    // take the percentage and divide by one
     // and multiple that against elapsed
     // subtracting what's already elapsed
-
-
     return elapsed * (1 / (percent / 100)) - elapsed;
   },
-
   convertPercentToPercentage(num) {
     // convert a percent with values between 0 and 1
     // with decimals, so that it is between 0 and 100
     // and has no decimal places
     return Math.round(_.isFinite(num) ? num * 100 : 0);
   },
-
   secsRemaining(eta) {
     // calculate the seconds reminaing with no decimal places
     return (_.isFinite(eta) ? eta / 1000 : 0).toFixed(0);
   },
-
   setTaskTitle(task, title, renderer) {
     // only update the renderer title when not running in CI
     if (renderer === 'default' && task.title !== title) {
       task.title = title;
     }
   },
-
   isInstalledGlobally() {
     return isInstalledGlobally;
   },
-
   isSemver(str) {
     return /^(\d+\.)?(\d+\.)?(\*|\d+)$/.test(str);
   },
-
   isExecutableAsync(filePath) {
     return Promise.resolve(executable(filePath));
   },
-
   isLinux,
-
   getOsVersionAsync() {
     return Promise.try(() => {
       if (isLinux()) {
@@ -428,11 +358,9 @@ const util = {
           return os.release();
         });
       }
-
       return os.release();
     });
   },
-
   async getPlatformInfo() {
     const [version, osArch] = await Promise.all([util.getOsVersionAsync(), this.getRealArch()]);
     return stripIndent`
@@ -440,25 +368,21 @@ const util = {
       Cypress Version: ${util.pkgVersion()}
     `;
   },
-
   _cachedArch: undefined,
-
   /**
    * Attempt to return the real system arch (not process.arch, which is only the Node binary's arch)
    */
   async getRealArch() {
     if (this._cachedArch) return this._cachedArch;
-
     async function _getRealArch() {
-      const osPlatform = os.platform(); // eslint-disable-next-line no-restricted-syntax
-
+      const osPlatform = os.platform();
+      // eslint-disable-next-line no-restricted-syntax
       const osArch = os.arch();
       debug('detecting arch %o', {
         osPlatform,
         osArch
       });
       if (osArch === 'arm64') return 'arm64';
-
       if (osPlatform === 'darwin') {
         // could possibly be x64 node on arm64 darwin, check if we are being translated by Rosetta
         // https://stackoverflow.com/a/65347893/3474615
@@ -470,7 +394,6 @@ const util = {
         });
         if (stdout === '1') return 'arm64';
       }
-
       if (osPlatform === 'linux') {
         // could possibly be x64 node on arm64 linux, check the "machine hardware name"
         // list of names for reference: https://stackoverflow.com/a/45125525/3474615
@@ -481,17 +404,15 @@ const util = {
           stdout
         });
         if (['aarch64_be', 'aarch64', 'armv8b', 'armv8l'].includes(stdout)) return 'arm64';
-      } // eslint-disable-next-line no-restricted-syntax
-
+      }
 
+      // eslint-disable-next-line no-restricted-syntax
       const pkgArch = arch();
       if (pkgArch === 'x86') return 'ia32';
       return pkgArch;
     }
-
     return this._cachedArch = await _getRealArch();
   },
-
   // attention:
   // when passing relative path to NPM post install hook, the current working
   // directory is set to the `node_modules/cypress` folder
@@ -500,17 +421,14 @@ const util = {
     if (path.isAbsolute(filename)) {
       return filename;
     }
-
     return path.join(process.cwd(), '..', '..', filename);
   },
-
   getEnv(varName, trim) {
     la(is.unemptyString(varName), 'expected environment variable name, not', varName);
     const configVarName = `npm_config_${varName}`;
     const configVarNameLower = configVarName.toLowerCase();
     const packageConfigVarName = `npm_package_config_${varName}`;
     let result;
-
     if (process.env.hasOwnProperty(varName)) {
       debug(`Using ${varName} from environment variable`);
       result = process.env[varName];
@@ -523,7 +441,9 @@ const util = {
     } else if (process.env.hasOwnProperty(packageConfigVarName)) {
       debug(`Using ${varName} from package.json config`);
       result = process.env[packageConfigVarName];
-    } // environment variables are often set double quotes to escape characters
+    }
+
+    // environment variables are often set double quotes to escape characters
     // and on Windows it can lead to weird things: for example
     //  set FOO="C:\foo.txt" && node -e "console.log('>>>%s<<<', process.env.FOO)"
     // will print
@@ -532,32 +452,25 @@ const util = {
     // so for sanity sake we should first trim whitespace characters and remove
     // double quotes around environment strings if the caller is expected to
     // use this environment string as a file path
-
-
     return trim ? dequote(_.trim(result)) : result;
   },
-
   getCacheDir() {
     return cachedir('Cypress');
   },
-
   isPostInstall() {
     return process.env.npm_lifecycle_event === 'postinstall';
   },
-
   exec: execa,
   stdoutLineMatches,
   issuesUrl,
   isBrokenGtkDisplay,
   logBrokenGtkDisplayWarning,
   isPossibleLinuxWithIncorrectDisplay,
-
   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}`;
   },
-
   getFileChecksum,
   getFileSize,
   getApplicationDataFolder

package/mount-utils/package.json

@@ -15,8 +15,8 @@
   "devDependencies": {
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-node-resolve": "^11.1.1",
-    "rollup": "^2.38.5",
-    "rollup-plugin-dts": "^4.2.3",
+    "rollup": "3.7.3",
+    "rollup-plugin-dts": "5.0.0",
     "rollup-plugin-typescript2": "^0.29.0",
     "typescript": "^4.7.4"
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "12.1.0",
+  "version": "12.2.0",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -118,8 +118,8 @@
   },
   "buildInfo": {
     "commitBranch": "develop",
-    "commitSha": "8888cd9e211e608f9bbac81478667b2877dab76e",
-    "commitDate": "2022-12-12T20:42:46.000Z",
+    "commitSha": "ebf57a82e6d9912e0eac2f0b9f620b950eb5893c",
+    "commitDate": "2022-12-20T01:56:10.000Z",
     "stable": true
   },
   "description": "Cypress is a next generation front end testing tool built for the modern web",

package/react/dist/cypress-react.cjs.js

@@ -7,15 +7,10 @@
 
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var React = require('react');
 var ReactDOM = require('react-dom');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
+function _interopNamespaceDefault(e) {
   var n = Object.create(null);
   if (e) {
     Object.keys(e).forEach(function (k) {
@@ -28,13 +23,11 @@ function _interopNamespace(e) {
       }
     });
   }
-  n["default"] = e;
+  n.default = e;
   return Object.freeze(n);
 }
 
-var React__namespace = /*#__PURE__*/_interopNamespace(React);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
+var React__namespace = /*#__PURE__*/_interopNamespaceDefault(React);
 
 /**
  * Gets the display name of the component when possible.
@@ -829,7 +822,7 @@ const cleanup = () => {
  * }
  */
 function mount(jsx, options = {}, rerenderKey) {
-    if (major_1(React__default["default"].version) === 18) {
+    if (major_1(React.version) === 18) {
         const message = '[cypress/react]: You are using `cypress/react`, which is designed for React <= 17. Consider changing to `cypress/react18`, which is designed for React 18.';
         console.error(message);
         Cypress.log({ name: 'warning', message });
@@ -837,15 +830,15 @@ function mount(jsx, options = {}, rerenderKey) {
     // Remove last mounted component if cy.mount is called more than once in a test
     cleanup();
     const internalOptions = {
-        reactDom: ReactDOM__default["default"],
+        reactDom: ReactDOM,
         render: (reactComponent, el, reactDomToUse) => {
-            lastReactDom = (reactDomToUse || ReactDOM__default["default"]);
+            lastReactDom = (reactDomToUse || ReactDOM);
             return lastReactDom.render(reactComponent, el);
         },
         unmount: internalUnmount,
         cleanup,
     };
-    return makeMountFn('mount', jsx, Object.assign({ ReactDom: ReactDOM__default["default"] }, options), rerenderKey, internalOptions);
+    return makeMountFn('mount', jsx, Object.assign({ ReactDom: ReactDOM }, options), rerenderKey, internalOptions);
 }
 /**
  * Unmounts the component from the DOM.

package/react/package.json

@@ -28,7 +28,7 @@
     "react-router-dom": "6.0.0-alpha.1",
     "semver": "^7.3.2",
     "typescript": "^4.7.4",
-    "vite": "3.1.0",
+    "vite": "4.0.1",
     "vite-plugin-require-transform": "1.0.3"
   },
   "peerDependencies": {