cypress 10.1.0 → 10.3.1

package/lib/exec/open.js

@@ -86,8 +86,7 @@ module.exports = {
         const args = processOpenOptions(options);
         return spawn.start(args, {
           dev: options.dev,
-          detached: Boolean(options.detached),
-          stdio: 'inherit'
+          detached: Boolean(options.detached)
         });
       } catch (err) {
         if (err.details) {

package/lib/exec/spawn.js

@@ -36,8 +36,20 @@ const isRenderWorkerRe = /\.RenderWorker-/; // Chromium (which Electron uses) al
 // Failure to connect is expected and normal here, but users frequently misidentify these errors as the cause of their problems.
 // https://github.com/cypress-io/cypress/issues/19299
 
-const isDbusWarning = /Failed to connect to the bus:/;
-const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning];
+const isDbusWarning = /Failed to connect to the bus:/; // Electron began logging these on self-signed certs with 17.0.0-alpha.4.
+// Once this is fixed upstream this regex can be removed: https://github.com/electron/electron/issues/34583
+// Sample:
+// [3801:0606/152837.383892:ERROR:cert_verify_proc_builtin.cc(681)] CertVerifyProcBuiltin for www.googletagmanager.com failed:
+// ----- Certificate i=0 (OU=Cypress Proxy Server Certificate,O=Cypress Proxy CA,L=Internet,ST=Internet,C=Internet,CN=www.googletagmanager.com) -----
+// ERROR: No matching issuer found
+
+const isCertVerifyProcBuiltin = /(^\[.*ERROR:cert_verify_proc_builtin\.cc|^----- Certificate i=0 \(OU=Cypress Proxy|^ERROR: No matching issuer found$)/; // Electron logs a benign warning about WebSwapCGLLayer on MacOS v12 and Electron v18 due to a naming collision in shared libraries.
+// Once this is fixed upstream this regex can be removed: https://github.com/electron/electron/issues/33685
+// Sample:
+// objc[60540]: Class WebSwapCGLLayer is implemented in both /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/Frameworks/libANGLE-shared.dylib (0x7ffa5a006318) and /{path/to/app}/node_modules/electron/dist/Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib (0x10f8a89c8). One of the two will be used. Which one is undefined.
+
+const isMacOSElectronWebSwapCGLLayerWarning = /^objc\[\d+\]: Class WebSwapCGLLayer is implemented in both.*Which one is undefined\./;
+const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isMacOSElectronWebSwapCGLLayerWarning];
 
 const isGarbageLineWarning = str => {
   return _.some(GARBAGE_WARNINGS, re => {

package/lib/tasks/download.js

@@ -1,7 +1,5 @@
 "use strict";
 
-const arch = require('arch');
-
 const la = require('lazy-ass');
 
 const is = require('check-more-types');
@@ -76,29 +74,29 @@ const getCA = () => {
   });
 };
 
-const prepend = urlPath => {
+const prepend = (arch, urlPath) => {
   const endpoint = url.resolve(getBaseUrl(), urlPath);
   const platform = os.platform();
   const pathTemplate = util.getEnv('CYPRESS_DOWNLOAD_PATH_TEMPLATE', true);
-  return pathTemplate ? pathTemplate.replace(/\\?\$\{endpoint\}/, endpoint).replace(/\\?\$\{platform\}/, platform).replace(/\\?\$\{arch\}/, arch()) : `${endpoint}?platform=${platform}&arch=${arch()}`;
+  return pathTemplate ? pathTemplate.replace(/\\?\$\{endpoint\}/, endpoint).replace(/\\?\$\{platform\}/, platform).replace(/\\?\$\{arch\}/, arch) : `${endpoint}?platform=${platform}&arch=${arch}`;
 };
 
-const getUrl = version => {
+const getUrl = (arch, version) => {
   if (is.url(version)) {
     debug('version is already an url', version);
     return version;
   }
 
-  return version ? prepend(`desktop/${version}`) : prepend('desktop');
+  return version ? prepend(arch, `desktop/${version}`) : prepend(arch, 'desktop');
 };
 
 const statusMessage = err => {
   return err.statusCode ? [err.statusCode, err.statusMessage].join(' - ') : err.toString();
 };
 
-const prettyDownloadErr = (err, version) => {
+const prettyDownloadErr = (err, url) => {
   const msg = stripIndent`
-    URL: ${getUrl(version)}
+    URL: ${url}
     ${statusMessage(err)}
   `;
   debug(msg);
@@ -307,7 +305,7 @@ const downloadFromUrl = ({
  */
 
 
-const start = opts => {
+const start = async opts => {
   let {
     version,
     downloadDestination,
@@ -327,7 +325,8 @@ const start = opts => {
     };
   }
 
-  const versionUrl = getUrl(version);
+  const arch = await util.getRealArch();
+  const versionUrl = getUrl(arch, version);
   progress.throttle = 100;
   debug('needed Cypress version: %s', version);
   debug('source url %s', versionUrl);
@@ -347,7 +346,7 @@ const start = opts => {
       } : {})
     });
   }).catch(err => {
-    return prettyDownloadErr(err, version);
+    return prettyDownloadErr(err, versionUrl);
   });
 };
 

package/lib/tasks/install.js

@@ -2,8 +2,6 @@
 
 const _ = require('lodash');
 
-const arch = require('arch');
-
 const os = require('os');
 
 const path = require('path');
@@ -48,11 +46,11 @@ const {
   version
 } = require('../../package.json');
 
-function _getBinaryUrlFromBuildInfo({
+function _getBinaryUrlFromBuildInfo(arch, {
   commitSha,
   commitBranch
 }) {
-  return `https://cdn.cypress.io/beta/binary/${version}/${os.platform()}-${arch()}/${commitBranch}-${commitSha}/cypress.zip`;
+  return `https://cdn.cypress.io/beta/binary/${version}/${os.platform()}-${arch}/${commitBranch}-${commitSha}/cypress.zip`;
 }
 
 const alreadyInstalledMsg = () => {
@@ -154,7 +152,7 @@ const downloadAndUnzip = ({
 
 const validateOS = () => {
   return util.getPlatformInfo().then(platformInfo => {
-    return platformInfo.match(/(darwin|linux|win32)-x64/);
+    return platformInfo.match(/(win32-x64|linux-x64|linux-arm64|darwin-x64|darwin-arm64)/);
   });
 };
 /**
@@ -164,6 +162,7 @@ const validateOS = () => {
 
 
 function getVersionOverride({
+  arch,
   envVarVersion,
   buildInfo
 }) {
@@ -184,7 +183,7 @@ function getVersionOverride({
           * Commit Timestamp: ${buildInfo.commitDate}
       `));
     logger.log();
-    return _getBinaryUrlFromBuildInfo(buildInfo);
+    return _getBinaryUrlFromBuildInfo(arch, buildInfo);
   }
 }
 
@@ -226,7 +225,9 @@ const start = async (options = {}) => {
   }
 
   const pkgVersion = util.pkgVersion();
+  const arch = await util.getRealArch();
   const versionOverride = getVersionOverride({
+    arch,
     envVarVersion,
     buildInfo: options.buildInfo
   });

package/lib/util.js

@@ -433,19 +433,63 @@ const util = {
     });
   },
 
-  getPlatformInfo() {
-    return util.getOsVersionAsync().then(version => {
-      let osArch = arch();
+  async getPlatformInfo() {
+    const [version, osArch] = await Promise.all([util.getOsVersionAsync(), this.getRealArch()]);
+    return stripIndent`
+      Platform: ${os.platform()}-${osArch} (${version})
+      Cypress Version: ${util.pkgVersion()}
+    `;
+  },
+
+  _cachedArch: undefined,
 
-      if (osArch === 'x86') {
-        osArch = 'ia32';
+  /**
+   * 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 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
+        const {
+          stdout
+        } = await execa('sysctl', ['-n', 'sysctl.proc_translated']).catch(() => '');
+        debug('rosetta check result: %o', {
+          stdout
+        });
+        if (stdout === '1') return 'arm64';
       }
 
-      return stripIndent`
-        Platform: ${os.platform()}-${osArch} (${version})
-        Cypress Version: ${util.pkgVersion()}
-      `;
-    });
+      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
+        const {
+          stdout
+        } = await execa('uname', ['-m']).catch(() => '');
+        debug('arm uname -m result: %o ', {
+          stdout
+        });
+        if (['aarch64_be', 'aarch64', 'armv8b', 'armv8l'].includes(stdout)) return 'arm64';
+      } // eslint-disable-next-line no-restricted-syntax
+
+
+      const pkgArch = arch();
+      if (pkgArch === 'x86') return 'ia32';
+      return pkgArch;
+    }
+
+    return this._cachedArch = await _getRealArch();
   },
 
   // attention:

package/mount-utils/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [@cypress/mount-utils-v2.0.0](https://github.com/cypress-io/cypress/compare/@cypress/mount-utils-v1.0.2...@cypress/mount-utils-v2.0.0) (2022-06-13)
+
+
+### chore
+
+* prep npm packages for use with Cypress v10 ([b924d08](https://github.com/cypress-io/cypress/commit/b924d086ee2e2ccc93303731e001b2c9e9d0af17))
+
+
+### Features
+
+* embedding mount into the cypress binary (real dependency) ([#20930](https://github.com/cypress-io/cypress/issues/20930)) ([3fe5f50](https://github.com/cypress-io/cypress/commit/3fe5f50e7832a4bfb20df8e71648434eb7f263d5))
+* merging / delegating remote queries to cloud schema ([#17875](https://github.com/cypress-io/cypress/issues/17875)) ([94541d4](https://github.com/cypress-io/cypress/commit/94541d4f18591e8fa4b8702c39e92b0a7238aa5d))
+* swap the #__cy_root id selector to become data-cy-root for component mounting ([#20951](https://github.com/cypress-io/cypress/issues/20951)) ([0e7b555](https://github.com/cypress-io/cypress/commit/0e7b555f93fb403f431c5de4a07ae7ad6ac89ba2))
+
+
+### BREAKING CHANGES
+
+* new version of packages for Cypress v10
+
 # [@cypress/mount-utils-v1.0.2](https://github.com/cypress-io/cypress/compare/@cypress/mount-utils-v1.0.1...@cypress/mount-utils-v1.0.2) (2021-04-30)
 
 

package/mount-utils/dist/index.js

@@ -4,7 +4,7 @@ export const getContainerEl = () => {
     if (el) {
         return el;
     }
-    throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please use the mount utils to mount it properly`);
+    throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please add a root element with data-cy-root attribute to your "component-index.html" file so that Cypress can attach your component to the DOM.`);
 };
 /**
  * Remove any style or extra link elements from the iframe placeholder
@@ -120,6 +120,13 @@ export const injectStylesBeforeElement = (options, document, el) => {
     return insertLocalCssFiles(cssFiles, document, el, options.log);
 };
 export function setupHooks(optionalCallback) {
+    // Consumed by the framework "mount" libs. A user might register their own mount in the scaffolded 'commands.js'
+    // file that is imported by e2e and component support files by default. We don't want CT side effects to run when e2e
+    // testing so we early return.
+    // System test to verify CT side effects do not pollute e2e: system-tests/test/e2e_with_mount_import_spec.ts
+    if (Cypress.testingType !== 'component') {
+        return;
+    }
     // When running component specs, we cannot allow "cy.visit"
     // because it will wipe out our preparation work, and does not make much sense
     // thus we overwrite "cy.visit" to throw an error

package/mount-utils/package.json

@@ -2,7 +2,6 @@
   "name": "@cypress/mount-utils",
   "version": "0.0.0-development",
   "description": "Shared utilities for the various component testing adapters",
-  "private": true,
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc || echo 'built, with type errors'",
@@ -18,6 +17,7 @@
   "files": [
     "dist"
   ],
+  "types": "dist/index.d.ts",
   "license": "MIT",
   "repository": {
     "type": "git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "10.1.0",
+  "version": "10.3.1",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -72,15 +72,18 @@
   "exports": {
     ".": {
       "import": "./index.mjs",
-      "require": "./index.js"
+      "require": "./index.js",
+      "types": "./types/index.d.ts"
     },
     "./vue": {
       "import": "./vue/dist/cypress-vue.esm-bundler.js",
-      "require": "./vue/dist/cypress-vue.cjs.js"
+      "require": "./vue/dist/cypress-vue.cjs.js",
+      "types": "./vue/dist/index.d.ts"
     },
     "./vue2": {
       "import": "./vue2/dist/cypress-vue2.esm-bundler.js",
-      "require": "./vue2/dist/cypress-vue2.cjs.js"
+      "require": "./vue2/dist/cypress-vue2.cjs.js",
+      "types": "./vue2/dist/index.d.ts"
     },
     "./package.json": {
       "import": "./package.json",
@@ -88,21 +91,18 @@
     },
     "./react": {
       "import": "./react/dist/cypress-react.esm-bundler.js",
-      "require": "./react/dist/cypress-react.cjs.js"
+      "require": "./react/dist/cypress-react.cjs.js",
+      "types": "./react/dist/index.d.ts"
     },
     "./mount-utils": {
-      "require": "./mount-utils/dist/index.js"
+      "require": "./mount-utils/dist/index.js",
+      "types": "./mount-utils/dist/index.d.ts"
     }
   },
-  "workspaces": {
-    "nohoist": [
-      "@types/*"
-    ]
-  },
   "buildInfo": {
     "commitBranch": "develop",
-    "commitSha": "72e6b882bd3f09857baf70b3552fef4ce484ed4f",
-    "commitDate": "2022-06-10T16:14:18.000Z",
+    "commitSha": "0aebe4a47d49c94d519fc00af81967ed8da65483",
+    "commitDate": "2022-07-18T17:25:43.000Z",
     "stable": true
   },
   "description": "Cypress.io end to end testing tool",

package/react/CHANGELOG.md

@@ -1,3 +1,47 @@
+# [@cypress/react-v6.0.0](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.12.5...@cypress/react-v6.0.0) (2022-06-13)
+
+
+### Bug Fixes
+
+* open browser at correct time during lifecycle ([#19572](https://github.com/cypress-io/cypress/issues/19572)) ([bfc032a](https://github.com/cypress-io/cypress/commit/bfc032a2d42d0726b8a4a86aab1584bd4e69c3f0))
+* scaffold correct config file ([#19776](https://github.com/cypress-io/cypress/issues/19776)) ([8f32960](https://github.com/cypress-io/cypress/commit/8f32960ef803f539f065d41f01fff33bfe33ed5d))
+* scope config to current testing type ([#20677](https://github.com/cypress-io/cypress/issues/20677)) ([61f7cfc](https://github.com/cypress-io/cypress/commit/61f7cfc59284a2938e0a1c15d74ee75215ba5f8b))
+* terminal error message for non migrated config ([#21467](https://github.com/cypress-io/cypress/issues/21467)) ([3274da7](https://github.com/cypress-io/cypress/commit/3274da7842f5ef1ddad62b1c630d0ff9120e4289))
+* update scaffold template to use correct path ([#20047](https://github.com/cypress-io/cypress/issues/20047)) ([6e80359](https://github.com/cypress-io/cypress/commit/6e803597a379222cf936e5977c8314d693ee1912))
+* wire up scaffolded indexHtml to dev servers ([#20453](https://github.com/cypress-io/cypress/issues/20453)) ([3a8797e](https://github.com/cypress-io/cypress/commit/3a8797e54db9fd0ef93a14ddc71c138ba8251e53))
+* **react:** link to rerender example ([#19020](https://github.com/cypress-io/cypress/issues/19020)) ([552d3a1](https://github.com/cypress-io/cypress/commit/552d3a1c0073dae0bd1da0fc9fa8d140ec4f38dc))
+* **unified-desktop-gui branch:** initial installation on windows ([#18247](https://github.com/cypress-io/cypress/issues/18247)) ([8614e97](https://github.com/cypress-io/cypress/commit/8614e978029bcbf7155b7ae98ac54feb11f2e7f3))
+* **unify:** improve dev server config ergonomics ([#19957](https://github.com/cypress-io/cypress/issues/19957)) ([6a402a7](https://github.com/cypress-io/cypress/commit/6a402a70767f53e4c5ea54490a03a9983b2be10f))
+
+
+### chore
+
+* prep npm packages for use with Cypress v10 ([b924d08](https://github.com/cypress-io/cypress/commit/b924d086ee2e2ccc93303731e001b2c9e9d0af17))
+
+
+### Features
+
+* add devServer to config file ([#18962](https://github.com/cypress-io/cypress/issues/18962)) ([2573375](https://github.com/cypress-io/cypress/commit/2573375b5b6616efd2d213a94cd55fd8e0385864))
+* Add typings for new devServer config ([#18797](https://github.com/cypress-io/cypress/issues/18797)) ([e018a14](https://github.com/cypress-io/cypress/commit/e018a14c211bfcbdc4568a9a737f14f5c1686e35))
+* Deprecate run-ct / open-ct, and update all examples to use --ct instead ([#18422](https://github.com/cypress-io/cypress/issues/18422)) ([196e8f6](https://github.com/cypress-io/cypress/commit/196e8f62cc6d27974f235945cb5700624b3dae41))
+* embedding mount into the cypress binary (real dependency) ([#20930](https://github.com/cypress-io/cypress/issues/20930)) ([3fe5f50](https://github.com/cypress-io/cypress/commit/3fe5f50e7832a4bfb20df8e71648434eb7f263d5))
+* index.html configurability and storybook support ([#18242](https://github.com/cypress-io/cypress/issues/18242)) ([745b3ac](https://github.com/cypress-io/cypress/commit/745b3ac4518302983522daedf817623334feae5b))
+* ProjectLifecycleManager & general launchpad cleanup ([#19347](https://github.com/cypress-io/cypress/issues/19347)) ([4626f74](https://github.com/cypress-io/cypress/commit/4626f7481c9904fec484aa167a02e0197a3095c4))
+* remove testFiles reference ([#20565](https://github.com/cypress-io/cypress/issues/20565)) ([5670344](https://github.com/cypress-io/cypress/commit/567034459089d9d53dfab5556cb9369fb335c3db))
+* support specPattern, deprecate integrationFolder and componentFolder ([#19319](https://github.com/cypress-io/cypress/issues/19319)) ([792980a](https://github.com/cypress-io/cypress/commit/792980ac12746ef47b9c944ebe4c6c353a187ab2))
+* swap the #__cy_root id selector to become data-cy-root for component mounting ([#20951](https://github.com/cypress-io/cypress/issues/20951)) ([0e7b555](https://github.com/cypress-io/cypress/commit/0e7b555f93fb403f431c5de4a07ae7ad6ac89ba2))
+* update on-links ([#19235](https://github.com/cypress-io/cypress/issues/19235)) ([cc2d734](https://github.com/cypress-io/cypress/commit/cc2d7348185e2a090c60d92d9319ab460d8c7827))
+* Use .config files ([#18578](https://github.com/cypress-io/cypress/issues/18578)) ([081dd19](https://github.com/cypress-io/cypress/commit/081dd19cc6da3da229a7af9c84f62730c85a5cd6))
+* use devServer instad of startDevServer ([#20092](https://github.com/cypress-io/cypress/issues/20092)) ([8a6768f](https://github.com/cypress-io/cypress/commit/8a6768fee6f46b908c5a9daf23da8b804a6c627f))
+* Use plugins on config files ([#18798](https://github.com/cypress-io/cypress/issues/18798)) ([bb8251b](https://github.com/cypress-io/cypress/commit/bb8251b752ac44f1184f9160194cf12d41fc867f))
+* use supportFile by testingType ([#19364](https://github.com/cypress-io/cypress/issues/19364)) ([0366d4f](https://github.com/cypress-io/cypress/commit/0366d4fa8971e5e5189c6fd6450cc3c8d72dcfe1))
+* validate specPattern root level ([#19980](https://github.com/cypress-io/cypress/issues/19980)) ([5d52758](https://github.com/cypress-io/cypress/commit/5d52758d82c47033803c69c7858fc786a900faaf))
+
+
+### BREAKING CHANGES
+
+* new version of packages for Cypress v10
+
 # [@cypress/react-v5.12.5](https://github.com/cypress-io/cypress/compare/@cypress/react-v5.12.4...@cypress/react-v5.12.5) (2022-05-17)
 
 

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

@@ -29,7 +29,7 @@ var CypressReact = (function (exports, React, ReactDOM) {
     var React__namespace = /*#__PURE__*/_interopNamespace(React);
     var ReactDOM__namespace = /*#__PURE__*/_interopNamespace(ReactDOM);
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -106,7 +106,7 @@ var CypressReact = (function (exports, React, ReactDOM) {
         if (el) {
             return el;
         }
-        throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please use the mount utils to mount it properly`);
+        throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please add a root element with data-cy-root attribute to your "component-index.html" file so that Cypress can attach your component to the DOM.`);
     };
     /**
      * Remove any style or extra link elements from the iframe placeholder
@@ -222,6 +222,13 @@ var CypressReact = (function (exports, React, ReactDOM) {
         return insertLocalCssFiles(cssFiles, document, el, options.log);
     };
     function setupHooks(optionalCallback) {
+        // Consumed by the framework "mount" libs. A user might register their own mount in the scaffolded 'commands.js'
+        // file that is imported by e2e and component support files by default. We don't want CT side effects to run when e2e
+        // testing so we early return.
+        // System test to verify CT side effects do not pollute e2e: system-tests/test/e2e_with_mount_import_spec.ts
+        if (Cypress.testingType !== 'component') {
+            return;
+        }
         // When running component specs, we cannot allow "cy.visit"
         // because it will wipe out our preparation work, and does not make much sense
         // thus we overwrite "cy.visit" to throw an error
@@ -419,6 +426,14 @@ var CypressReact = (function (exports, React, ReactDOM) {
             return mount(element, __assign(__assign({}, defaultOptions), options));
         };
     };
+    // Side effects from "import { mount } from '@cypress/<my-framework>'" are annoying, we should avoid doing this
+    // by creating an explicit function/import that the user can register in their 'component.js' support file,
+    // such as:
+    //    import 'cypress/<my-framework>/support'
+    // or
+    //    import { registerCT } from 'cypress/<my-framework>'
+    //    registerCT()
+    // Note: This would be a breaking change
     // it is required to unmount component in beforeEach hook in order to provide a clean state inside test
     // because `mount` can be called after some preparation that can side effect unmount
     // @see npm/react/cypress/component/advanced/set-timeout-example/loading-indicator-spec.js

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

@@ -33,7 +33,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 var ReactDOM__namespace = /*#__PURE__*/_interopNamespace(ReactDOM);
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -110,7 +110,7 @@ const getContainerEl = () => {
     if (el) {
         return el;
     }
-    throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please use the mount utils to mount it properly`);
+    throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please add a root element with data-cy-root attribute to your "component-index.html" file so that Cypress can attach your component to the DOM.`);
 };
 /**
  * Remove any style or extra link elements from the iframe placeholder
@@ -226,6 +226,13 @@ const injectStylesBeforeElement = (options, document, el) => {
     return insertLocalCssFiles(cssFiles, document, el, options.log);
 };
 function setupHooks(optionalCallback) {
+    // Consumed by the framework "mount" libs. A user might register their own mount in the scaffolded 'commands.js'
+    // file that is imported by e2e and component support files by default. We don't want CT side effects to run when e2e
+    // testing so we early return.
+    // System test to verify CT side effects do not pollute e2e: system-tests/test/e2e_with_mount_import_spec.ts
+    if (Cypress.testingType !== 'component') {
+        return;
+    }
     // When running component specs, we cannot allow "cy.visit"
     // because it will wipe out our preparation work, and does not make much sense
     // thus we overwrite "cy.visit" to throw an error
@@ -423,6 +430,14 @@ var createMount = function (defaultOptions) {
         return mount(element, __assign(__assign({}, defaultOptions), options));
     };
 };
+// Side effects from "import { mount } from '@cypress/<my-framework>'" are annoying, we should avoid doing this
+// by creating an explicit function/import that the user can register in their 'component.js' support file,
+// such as:
+//    import 'cypress/<my-framework>/support'
+// or
+//    import { registerCT } from 'cypress/<my-framework>'
+//    registerCT()
+// Note: This would be a breaking change
 // it is required to unmount component in beforeEach hook in order to provide a clean state inside test
 // because `mount` can be called after some preparation that can side effect unmount
 // @see npm/react/cypress/component/advanced/set-timeout-example/loading-indicator-spec.js

package/react/dist/cypress-react.esm-bundler.js

@@ -8,7 +8,7 @@
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 
-/*! *****************************************************************************
+/******************************************************************************
 Copyright (c) Microsoft Corporation.
 
 Permission to use, copy, modify, and/or distribute this software for any
@@ -85,7 +85,7 @@ const getContainerEl = () => {
     if (el) {
         return el;
     }
-    throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please use the mount utils to mount it properly`);
+    throw Error(`No element found that matches selector ${ROOT_SELECTOR}. Please add a root element with data-cy-root attribute to your "component-index.html" file so that Cypress can attach your component to the DOM.`);
 };
 /**
  * Remove any style or extra link elements from the iframe placeholder
@@ -201,6 +201,13 @@ const injectStylesBeforeElement = (options, document, el) => {
     return insertLocalCssFiles(cssFiles, document, el, options.log);
 };
 function setupHooks(optionalCallback) {
+    // Consumed by the framework "mount" libs. A user might register their own mount in the scaffolded 'commands.js'
+    // file that is imported by e2e and component support files by default. We don't want CT side effects to run when e2e
+    // testing so we early return.
+    // System test to verify CT side effects do not pollute e2e: system-tests/test/e2e_with_mount_import_spec.ts
+    if (Cypress.testingType !== 'component') {
+        return;
+    }
     // When running component specs, we cannot allow "cy.visit"
     // because it will wipe out our preparation work, and does not make much sense
     // thus we overwrite "cy.visit" to throw an error
@@ -398,6 +405,14 @@ var createMount = function (defaultOptions) {
         return mount(element, __assign(__assign({}, defaultOptions), options));
     };
 };
+// Side effects from "import { mount } from '@cypress/<my-framework>'" are annoying, we should avoid doing this
+// by creating an explicit function/import that the user can register in their 'component.js' support file,
+// such as:
+//    import 'cypress/<my-framework>/support'
+// or
+//    import { registerCT } from 'cypress/<my-framework>'
+//    registerCT()
+// Note: This would be a breaking change
 // it is required to unmount component in beforeEach hook in order to provide a clean state inside test
 // because `mount` can be called after some preparation that can side effect unmount
 // @see npm/react/cypress/component/advanced/set-timeout-example/loading-indicator-spec.js

package/react/package.json

@@ -2,7 +2,6 @@
   "name": "@cypress/react",
   "version": "0.0.0-development",
   "description": "Test React components using Cypress",
-  "private": true,
   "main": "dist/cypress-react.cjs.js",
   "scripts": {
     "build": "rimraf dist && rollup -c rollup.config.js",
@@ -44,8 +43,7 @@
     "react-dom": "^=16.x || ^=17.x"
   },
   "files": [
-    "dist",
-    "support"
+    "dist"
   ],
   "types": "dist/index.d.ts",
   "license": "MIT",

package/types/cypress.d.ts

@@ -2941,7 +2941,7 @@ declare namespace Cypress {
     /**
      * Hosts mappings to IP addresses.
      */
-    hosts: null | string[]
+    hosts: null | {[key: string]: string}
     /**
      * Whether Cypress was launched via 'cypress open' (interactive mode)
      */
@@ -3003,7 +3003,7 @@ declare namespace Cypress {
     xhrUrl: string
   }
 
-  interface TestConfigOverrides extends Partial<Pick<ConfigOptions, 'animationDistanceThreshold' | 'blockHosts' | 'defaultCommandTimeout' | 'env' | 'execTimeout' | 'includeShadowDom' | 'numTestsKeptInMemory' | 'pageLoadTimeout' | 'redirectionLimit' | 'requestTimeout' | 'responseTimeout' | 'retries' | 'screenshotOnRunFailure' | 'slowTestThreshold' | 'scrollBehavior' | 'taskTimeout' | 'viewportHeight' | 'viewportWidth' | 'waitForAnimations' | 'experimentalSessionAndOrigin'>> {
+  interface TestConfigOverrides extends Partial<Pick<ConfigOptions, 'animationDistanceThreshold' | 'blockHosts' | 'defaultCommandTimeout' | 'env' | 'execTimeout' | 'includeShadowDom' | 'numTestsKeptInMemory' | 'pageLoadTimeout' | 'redirectionLimit' | 'requestTimeout' | 'responseTimeout' | 'retries' | 'screenshotOnRunFailure' | 'slowTestThreshold' | 'scrollBehavior' | 'taskTimeout' | 'viewportHeight' | 'viewportWidth' | 'waitForAnimations' | 'experimentalSessionAndOrigin'>>, Partial<Pick<ResolvedConfigOptions, 'baseUrl'>> {
     browser?: IsBrowserMatcher | IsBrowserMatcher[]
     keystrokeDelay?: number
   }
@@ -5500,7 +5500,7 @@ declare namespace Cypress {
 
   interface DevServerConfig {
     specs: Spec[]
-    config: ResolvedConfigOptions & RuntimeConfigOptions
+    cypressConfig: PluginConfigOptions
     devServerEvents: NodeJS.EventEmitter
   }