cypress 10.5.0 → 10.8.0

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

@@ -9,46 +9,19 @@ import * as React from 'react';
 import React__default from 'react';
 import ReactDOM from 'react-dom';
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-
-var cachedDisplayNames = new WeakMap();
+const cachedDisplayNames = new WeakMap();
 /**
  * Gets the display name of the component when possible.
  * @param type {JSX} The type object returned from creating the react element.
  * @param fallbackName {string} The alias, or fallback name to use when the name cannot be derived.
  * @link https://github.com/facebook/react-devtools/blob/master/backend/getDisplayName.js
  */
-function getDisplayName(type, fallbackName) {
-    if (fallbackName === void 0) { fallbackName = 'Unknown'; }
-    var nameFromCache = cachedDisplayNames.get(type);
+function getDisplayName(type, fallbackName = 'Unknown') {
+    const nameFromCache = cachedDisplayNames.get(type);
     if (nameFromCache != null) {
         return nameFromCache;
     }
-    var displayName = null;
+    let displayName = null;
     // The displayName property is not guaranteed to be a string.
     // It's only safe to use for our purposes if it's a string.
     // github.com/facebook/react-devtools/issues/803
@@ -60,13 +33,13 @@ function getDisplayName(type, fallbackName) {
     }
     // Facebook-specific hack to turn "Image [from Image.react]" into just "Image".
     // We need displayName with module name for error reports but it clutters the DevTools.
-    var match = displayName.match(/^(.*) \[from (.*)\]$/);
+    const match = displayName.match(/^(.*) \[from (.*)\]$/);
     if (match) {
-        var componentName = match[1];
-        var moduleName = match[2];
+        const componentName = match[1];
+        const moduleName = match[2];
         if (componentName && moduleName) {
             if (moduleName === componentName ||
-                moduleName.startsWith(componentName + ".")) {
+                moduleName.startsWith(`${componentName}.`)) {
                 displayName = componentName;
             }
         }
@@ -225,13 +198,13 @@ function setupHooks(optionalCallback) {
 /**
  * Inject custom style text or CSS file or 3rd party style resources
  */
-var injectStyles = function (options) {
-    return function () {
-        var el = getContainerEl();
+const injectStyles = (options) => {
+    return () => {
+        const el = getContainerEl();
         return injectStylesBeforeElement(options, document, el);
     };
 };
-var mountCleanup;
+let mountCleanup;
 /**
  * Create an `mount` function. Performs all the non-React-version specific
  * behavior related to mounting. The React-version-specific code
@@ -241,41 +214,40 @@ var mountCleanup;
  * This is designed to be consumed by `npm/react{16,17,18}`, and other React adapters,
  * or people writing adapters for third-party, custom adapters.
  */
-var makeMountFn = function (type, jsx, options, rerenderKey, internalMountOptions) {
-    if (options === void 0) { options = {}; }
+const makeMountFn = (type, jsx, options = {}, rerenderKey, internalMountOptions) => {
     if (!internalMountOptions) {
         throw Error('internalMountOptions must be provided with `render` and `reactDom` parameters');
     }
     mountCleanup = internalMountOptions.cleanup;
     // Get the display name property via the component constructor
     // @ts-ignore FIXME
-    var componentName = getDisplayName(jsx.type, options.alias);
-    var displayName = options.alias || componentName;
-    var jsxComponentName = "<" + componentName + " ... />";
-    var message = options.alias
-        ? jsxComponentName + " as \"" + options.alias + "\""
+    const componentName = getDisplayName(jsx.type, options.alias);
+    const displayName = options.alias || componentName;
+    const jsxComponentName = `<${componentName} ... />`;
+    const message = options.alias
+        ? `${jsxComponentName} as "${options.alias}"`
         : jsxComponentName;
     return cy
         .then(injectStyles(options))
-        .then(function () {
+        .then(() => {
         var _a, _b, _c;
-        var reactDomToUse = internalMountOptions.reactDom;
-        var el = getContainerEl();
+        const reactDomToUse = internalMountOptions.reactDom;
+        const el = getContainerEl();
         if (!el) {
             throw new Error([
-                "[@cypress/react] \uD83D\uDD25 Hmm, cannot find root element to mount the component. Searched for " + ROOT_SELECTOR,
+                `[@cypress/react] 🔥 Hmm, cannot find root element to mount the component. Searched for ${ROOT_SELECTOR}`,
             ].join(' '));
         }
-        var key = rerenderKey !== null && rerenderKey !== void 0 ? rerenderKey : 
+        const key = rerenderKey !== null && rerenderKey !== void 0 ? rerenderKey : 
         // @ts-ignore provide unique key to the the wrapped component to make sure we are rerendering between tests
         (((_c = (_b = (_a = Cypress === null || Cypress === void 0 ? void 0 : Cypress.mocha) === null || _a === void 0 ? void 0 : _a.getRunner()) === null || _b === void 0 ? void 0 : _b.test) === null || _c === void 0 ? void 0 : _c.title) || '') + Math.random();
-        var props = {
-            key: key,
+        const props = {
+            key,
         };
-        var reactComponent = React.createElement(options.strict ? React.StrictMode : React.Fragment, props, jsx);
+        const reactComponent = React.createElement(options.strict ? React.StrictMode : React.Fragment, props, jsx);
         // since we always surround the component with a fragment
         // let's get back the original component
-        var userComponent = reactComponent.props.children;
+        const userComponent = reactComponent.props.children;
         internalMountOptions.render(reactComponent, el, reactDomToUse);
         if (options.log !== false) {
             Cypress.log({
@@ -284,7 +256,7 @@ var makeMountFn = function (type, jsx, options, rerenderKey, internalMountOption
                 message: [message],
                 // @ts-ignore
                 $el: el.children.item(0),
-                consoleProps: function () {
+                consoleProps: () => {
                     return {
                         // @ts-ignore protect the use of jsx functional components use ReactNode
                         props: jsx.props,
@@ -298,10 +270,10 @@ var makeMountFn = function (type, jsx, options, rerenderKey, internalMountOption
         // Separate alias and returned value. Alias returns the component only, and the thenable returns the additional functions
         cy.wrap(userComponent, { log: false })
             .as(displayName)
-            .then(function () {
+            .then(() => {
             return cy.wrap({
                 component: userComponent,
-                rerender: function (newComponent) { return makeMountFn('rerender', newComponent, options, key, internalMountOptions); },
+                rerender: (newComponent) => makeMountFn('rerender', newComponent, options, key, internalMountOptions),
                 unmount: internalMountOptions.unmount,
             }, { log: false });
         })
@@ -319,16 +291,16 @@ var makeMountFn = function (type, jsx, options, rerenderKey, internalMountOption
  * This is designed to be consumed by `npm/react{16,17,18}`, and other React adapters,
  * or people writing adapters for third-party, custom adapters.
  */
-var makeUnmountFn = function (options) {
-    return cy.then(function () {
+const makeUnmountFn = (options) => {
+    return cy.then(() => {
         var _a;
-        var wasUnmounted = mountCleanup === null || mountCleanup === void 0 ? void 0 : mountCleanup();
+        const wasUnmounted = mountCleanup === null || mountCleanup === void 0 ? void 0 : mountCleanup();
         if (wasUnmounted && options.log) {
             Cypress.log({
                 name: 'unmount',
                 type: 'parent',
                 message: [(_a = options.boundComponentMessage) !== null && _a !== void 0 ? _a : 'Unmounted component'],
-                consoleProps: function () {
+                consoleProps: () => {
                     return {
                         description: 'Unmounts React component',
                         parent: getContainerEl().parentNode,
@@ -342,16 +314,13 @@ var makeUnmountFn = function (options) {
 // Cleanup before each run
 // NOTE: we cannot use unmount here because
 // we are not in the context of a test
-var preMountCleanup = function () {
+const preMountCleanup = () => {
     mountCleanup === null || mountCleanup === void 0 ? void 0 : mountCleanup();
 };
-var _mount = function (jsx, options) {
-    if (options === void 0) { options = {}; }
-    return makeMountFn('mount', jsx, options);
-};
-var createMount = function (defaultOptions) {
-    return function (element, options) {
-        return _mount(element, __assign(__assign({}, defaultOptions), options));
+const _mount = (jsx, options = {}) => makeMountFn('mount', jsx, options);
+const createMount = (defaultOptions) => {
+    return (element, options) => {
+        return _mount(element, Object.assign(Object.assign({}, defaultOptions), options));
     };
 };
 // Side effects from "import { mount } from '@cypress/<my-framework>'" are annoying, we should avoid doing this
@@ -911,45 +880,43 @@ var semver = SemVer;
 const major = (a, loose) => new semver(a, loose).major;
 var major_1 = major;
 
-var lastReactDom;
-var cleanup = function () {
+let lastReactDom;
+const cleanup = () => {
     if (lastReactDom) {
-        var root = getContainerEl();
+        const root = getContainerEl();
         lastReactDom.unmountComponentAtNode(root);
         return true;
     }
     return false;
 };
-function mount(jsx, options, rerenderKey) {
-    if (options === void 0) { options = {}; }
+function mount(jsx, options = {}, rerenderKey) {
     if (major_1(React__default.version) === 18) {
-        var 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.';
+        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: message });
+        Cypress.log({ name: 'warning', message });
     }
-    var internalOptions = {
+    const internalOptions = {
         reactDom: ReactDOM,
-        render: function (reactComponent, el, reactDomToUse) {
+        render: (reactComponent, el, reactDomToUse) => {
             lastReactDom = (reactDomToUse || ReactDOM);
             return lastReactDom.render(reactComponent, el);
         },
-        unmount: unmount,
-        cleanup: cleanup,
+        unmount,
+        cleanup,
     };
-    return makeMountFn('mount', jsx, __assign({ ReactDom: ReactDOM }, options), rerenderKey, internalOptions);
+    return makeMountFn('mount', jsx, Object.assign({ ReactDom: ReactDOM }, options), rerenderKey, internalOptions);
 }
-function unmount(options) {
-    if (options === void 0) { options = { log: true }; }
+function unmount(options = { log: true }) {
     return makeUnmountFn(options);
 }
 
 // mounting hooks inside a test component mostly copied from
 // https://github.com/testing-library/react-hooks-testing-library/blob/master/src/pure.js
 function resultContainer() {
-    var value = null;
-    var error = null;
-    var resolvers = [];
-    var result = {
+    let value = null;
+    let error = null;
+    const resolvers = [];
+    const result = {
         get current() {
             if (error) {
                 throw error;
@@ -960,23 +927,21 @@ function resultContainer() {
             return error;
         },
     };
-    var updateResult = function (val, err) {
-        if (err === void 0) { err = null; }
+    const updateResult = (val, err = null) => {
         value = val;
         error = err;
-        resolvers.splice(0, resolvers.length).forEach(function (resolve) { return resolve(); });
+        resolvers.splice(0, resolvers.length).forEach((resolve) => resolve());
     };
     return {
-        result: result,
-        addResolver: function (resolver) {
+        result,
+        addResolver: (resolver) => {
             resolvers.push(resolver);
         },
-        setValue: function (val) { return updateResult(val); },
-        setError: function (err) { return updateResult(undefined, err); },
+        setValue: (val) => updateResult(val),
+        setError: (err) => updateResult(undefined, err),
     };
 }
-function TestHook(_a) {
-    var callback = _a.callback, onError = _a.onError, children = _a.children;
+function TestHook({ callback, onError, children }) {
     try {
         children(callback());
     }
@@ -994,14 +959,14 @@ function TestHook(_a) {
  * Mounts a React hook function in a test component for testing.
  *
  */
-var mountHook = function (hookFn) {
-    var _a = resultContainer(), result = _a.result, setValue = _a.setValue, setError = _a.setError;
-    var componentTest = React.createElement(TestHook, {
+const mountHook = (hookFn) => {
+    const { result, setValue, setError } = resultContainer();
+    const componentTest = React.createElement(TestHook, {
         callback: hookFn,
         onError: setError,
         children: setValue,
     });
-    return mount(componentTest).then(function () { return result; });
+    return mount(componentTest).then(() => result);
 };
 
 export { createMount, makeMountFn, makeUnmountFn, mount, mountHook, unmount };

package/react/dist/mount.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+/// <reference types="cypress" />
 import React from 'react';
 import type { MountOptions } from './types';
 export declare function mount(jsx: React.ReactNode, options?: MountOptions, rerenderKey?: string): Cypress.Chainable<import("./types").MountReturn>;

package/react/dist/mountHook.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+/// <reference types="cypress" />
 declare type MountHookResult<T> = {
     readonly current: T | null | undefined;
     readonly error: Error | null;

package/react/dist/types.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="cypress" />
+/// <reference types="cypress" />
 import type React from 'react';
 import type { StyleOptions } from '@cypress/mount-utils';
 export interface UnmountArgs {

package/react/package.json

@@ -4,7 +4,7 @@
   "description": "Test React components using Cypress",
   "main": "dist/cypress-react.cjs.js",
   "scripts": {
-    "build": "rimraf dist && rollup -c rollup.config.js",
+    "build": "rimraf dist && rollup -c rollup.config.mjs",
     "postbuild": "node ../../scripts/sync-exported-npm-with-cli.js",
     "build-prod": "yarn build",
     "cy:open": "node ../../scripts/cypress.js open --component",
@@ -16,8 +16,6 @@
   },
   "devDependencies": {
     "@cypress/mount-utils": "0.0.0-development",
-    "@rollup/plugin-commonjs": "^17.1.0",
-    "@rollup/plugin-node-resolve": "^11.1.1",
     "@types/semver": "7.3.9",
     "@vitejs/plugin-react": "1.3.1",
     "axios": "0.21.2",
@@ -27,11 +25,9 @@
     "react-dom": "16.8.6",
     "react-router": "6.0.0-alpha.1",
     "react-router-dom": "6.0.0-alpha.1",
-    "rollup": "^2.38.5",
-    "rollup-plugin-typescript2": "^0.29.0",
     "semver": "^7.3.2",
-    "typescript": "^4.2.3",
-    "vite": "3.0.3",
+    "typescript": "^4.7.4",
+    "vite": "3.1.0",
     "vite-plugin-require-transform": "1.0.3"
   },
   "peerDependencies": {

package/react18/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@cypress/react18-v1.1.0](https://github.com/cypress-io/cypress/compare/@cypress/react18-v1.0.1...@cypress/react18-v1.1.0) (2022-08-30)
+
+
+### Features
+
+* adding svelte component testing support ([#23553](https://github.com/cypress-io/cypress/issues/23553)) ([f6eaad4](https://github.com/cypress-io/cypress/commit/f6eaad40e1836fa9db87c60defa5ae6f390c8fd8))
+
+# [@cypress/react18-v1.0.1](https://github.com/cypress-io/cypress/compare/@cypress/react18-v1.0.0...@cypress/react18-v1.0.1) (2022-08-15)
+
+
+### Bug Fixes
+
+* **react18:** unmount component with react18 API ([#23204](https://github.com/cypress-io/cypress/issues/23204)) ([eab950b](https://github.com/cypress-io/cypress/commit/eab950bec013f9caf5836e3fa58670fde25e2684))
+
 # @cypress/react18-v1.0.0 (2022-08-11)