feat: React 18 support

circle.yml

@@ -27,7 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - global-mode-issue
+        - "lmiller/react-adapters"
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -38,7 +38,7 @@ macWorkflowFilters: &darwin-workflow-filters
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ 'global-mode-issue', << pipeline.git.branch >> ]
     - matches:
-          pattern: "-release$"
+          pattern: "lmiller/react-adapters"
           value: << pipeline.git.branch >>
 
 linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
@@ -126,7 +126,7 @@ commands:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "global-mode-issue" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "lmiller/react-adapters" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi

cli/.gitignore

@@ -17,5 +17,5 @@ build
 # the sync-exported-npm-with-cli.js script
 vue
 vue2
-react
+react*
 mount-utils

cli/package.json

@@ -107,7 +107,8 @@
     "mount-utils",
     "vue",
     "react",
-    "vue2"
+    "vue2",
+    "react18"
   ],
   "bin": {
     "cypress": "bin/cypress"
@@ -141,6 +142,11 @@
       "require": "./react/dist/cypress-react.cjs.js",
       "types": "./react/dist/index.d.ts"
     },
+    "./react18": {
+      "import": "./react18/dist/cypress-react.esm-bundler.js",
+      "require": "./react18/dist/cypress-react.cjs.js",
+      "types": "./react18/dist/index.d.ts"
+    },
     "./mount-utils": {
       "require": "./mount-utils/dist/index.js",
       "types": "./mount-utils/dist/index.d.ts"

cli/scripts/post-build.js

@@ -9,6 +9,7 @@ shell.set('-e') // any error is fatal
 const npmModulesToCopy = [
   'mount-utils',
   'react',
+  'react18',
   'vue',
   'vue2',
 ]

npm/react/rollup.config.js

@@ -1,8 +1,9 @@
-import ts from 'rollup-plugin-typescript2'
-import resolve from '@rollup/plugin-node-resolve'
-import commonjs from '@rollup/plugin-commonjs'
+// CommonJS to easily share across packages
+const ts = require('rollup-plugin-typescript2')
+const { default: resolve } = require('@rollup/plugin-node-resolve')
+const commonjs = require('@rollup/plugin-commonjs')
 
-import pkg from './package.json'
+const pkg = require('./package.json')
 
 const banner = `
 /**
@@ -16,17 +17,29 @@ function createEntry (options) {
   const {
     format,
     input,
-    isBrowser,
   } = options
 
   const config = {
     input,
     external: [
       'react',
       'react-dom',
+      'react-dom/client',
     ],
     plugins: [
-      resolve(), commonjs(),
+      resolve(),
+      commonjs(),
+      ts({
+        check: format === 'es',
+        tsconfigOverride: {
+          compilerOptions: {
+            declaration: format === 'es',
+            target: 'es5',
+            module: format === 'cjs' ? 'es2015' : 'esnext',
+          },
+          exclude: ['tests'],
+        },
+      }),
     ],
     output: {
       banner,
@@ -36,43 +49,26 @@ function createEntry (options) {
       globals: {
         react: 'React',
         'react-dom': 'ReactDOM',
+        'react-dom/client': 'ReactDOM/client',
       },
     },
   }
 
   if (format === 'es') {
     config.output.file = pkg.module
-    if (isBrowser) {
-      config.output.file = pkg.unpkg
-    }
   }
 
   if (format === 'cjs') {
     config.output.file = pkg.main
   }
 
+  // eslint-disable-next-line no-console
   console.log(`Building ${format}: ${config.output.file}`)
 
-  config.plugins.push(
-    ts({
-      check: format === 'es' && isBrowser,
-      tsconfigOverride: {
-        compilerOptions: {
-          declaration: format === 'es',
-          target: 'es5', // not sure what this should be?
-          module: format === 'cjs' ? 'es2015' : 'esnext',
-        },
-        exclude: ['tests'],
-      },
-    }),
-  )
-
   return config
 }
 
-export default [
-  createEntry({ format: 'es', input: 'src/index.ts', isBrowser: false }),
-  createEntry({ format: 'es', input: 'src/index.ts', isBrowser: true }),
-  createEntry({ format: 'iife', input: 'src/index.ts', isBrowser: true }),
-  createEntry({ format: 'cjs', input: 'src/index.ts', isBrowser: false }),
+module.exports = [
+  createEntry({ format: 'es', input: 'src/index.ts' }),
+  createEntry({ format: 'cjs', input: 'src/index.ts' }),
 ]

npm/react/src/createMount.ts

@@ -0,0 +1,207 @@
+import * as React from 'react'
+import ReactDOM from 'react-dom'
+import getDisplayName from './getDisplayName'
+import {
+  injectStylesBeforeElement,
+  getContainerEl,
+  ROOT_SELECTOR,
+  setupHooks,
+} from '@cypress/mount-utils'
+import type { InternalMountOptions, InternalUnmountOptions, MountOptions, MountReturn, UnmountArgs } from './types'
+
+/**
+ * Inject custom style text or CSS file or 3rd party style resources
+ */
+const injectStyles = (options: MountOptions) => {
+  return (): HTMLElement => {
+    const el = getContainerEl()
+
+    return injectStylesBeforeElement(options, document, el)
+  }
+}
+
+export let lastMountedReactDom: (typeof ReactDOM) | undefined
+
+/**
+ * Create an `mount` function. Performs all the non-React-version specific
+ * behavior related to mounting. The React-version-specific code
+ * is injected. This helps us to maintain a consistent public API
+ * and handle breaking changes in React's rendering API.
+ *
+ * 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.
+ */
+export const makeMountFn = (
+  type: 'mount' | 'rerender',
+  jsx: React.ReactNode,
+  options: MountOptions = {},
+  rerenderKey?: string,
+  internalMountOptions?: InternalMountOptions,
+): globalThis.Cypress.Chainable<MountReturn> => {
+  if (!internalMountOptions) {
+    throw Error('internalMountOptions must be provided with `render` and `reactDom` parameters')
+  }
+
+  // Get the display name property via the component constructor
+  // @ts-ignore FIXME
+  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(() => {
+    const reactDomToUse = internalMountOptions.reactDom
+
+    lastMountedReactDom = reactDomToUse
+
+    const el = getContainerEl()
+
+    if (!el) {
+      throw new Error(
+        [
+          `[@cypress/react] 🔥 Hmm, cannot find root element to mount the component. Searched for ${ROOT_SELECTOR}`,
+        ].join(' '),
+      )
+    }
+
+    const key = rerenderKey ??
+        // @ts-ignore provide unique key to the the wrapped component to make sure we are rerendering between tests
+        (Cypress?.mocha?.getRunner()?.test?.title as string || '') + Math.random()
+    const props = {
+      key,
+    }
+
+    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
+    const userComponent = (reactComponent.props as {
+      key: string
+      children: React.ReactNode
+    }).children
+
+    internalMountOptions.render(reactComponent, el, reactDomToUse)
+
+    if (options.log !== false) {
+      Cypress.log({
+        name: type,
+        type: 'parent',
+        message: [message],
+        // @ts-ignore
+        $el: (el.children.item(0) as unknown) as JQuery<HTMLElement>,
+        consoleProps: () => {
+          return {
+            // @ts-ignore protect the use of jsx functional components use ReactNode
+            props: jsx.props,
+            description: type === 'mount' ? 'Mounts React component' : 'Rerenders mounted React component',
+            home: 'https://github.com/cypress-io/cypress',
+          }
+        },
+      }).snapshot('mounted').end()
+    }
+
+    return (
+      // Separate alias and returned value. Alias returns the component only, and the thenable returns the additional functions
+      cy.wrap<React.ReactNode>(userComponent, { log: false })
+      .as(displayName)
+      .then(() => {
+        return cy.wrap<MountReturn>({
+          component: userComponent,
+          rerender: (newComponent) => makeMountFn('rerender', newComponent, options, key, internalMountOptions),
+          unmount: internalMountOptions.unmount,
+        }, { log: false })
+      })
+      // by waiting, we delaying test execution for the next tick of event loop
+      // and letting hooks and component lifecycle methods to execute mount
+      // https://github.com/bahmutov/cypress-react-unit-test/issues/200
+      .wait(0, { log: false })
+    )
+  // Bluebird types are terrible. I don't think the return type can be carried without this cast
+  }) as unknown as globalThis.Cypress.Chainable<MountReturn>
+}
+
+/**
+ * Create an `unmount` function. Performs all the non-React-version specific
+ * behavior related to unmounting.
+ *
+ * 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.
+ */
+export const makeUnmountFn = (options: UnmountArgs, internalUnmountOptions: InternalUnmountOptions) => {
+  return cy.then(() => {
+    return cy.get(ROOT_SELECTOR, { log: false }).then(($el) => {
+      if (lastMountedReactDom) {
+        internalUnmountOptions.unmount($el[0])
+        const wasUnmounted = internalUnmountOptions.unmount($el[0])
+
+        if (wasUnmounted && options.log) {
+          Cypress.log({
+            name: 'unmount',
+            type: 'parent',
+            message: [options.boundComponentMessage ?? 'Unmounted component'],
+            consoleProps: () => {
+              return {
+                description: 'Unmounts React component',
+                parent: $el[0],
+                home: 'https://github.com/cypress-io/cypress',
+              }
+            },
+          })
+        }
+      }
+    })
+  })
+}
+
+// Cleanup before each run
+// NOTE: we cannot use unmount here because
+// we are not in the context of a test
+const preMountCleanup = () => {
+  const el = getContainerEl()
+
+  if (el && lastMountedReactDom) {
+    lastMountedReactDom.unmountComponentAtNode(el)
+  }
+}
+
+const _mount = (jsx: React.ReactNode, options: MountOptions = {}) => makeMountFn('mount', jsx, options)
+
+export const createMount = (defaultOptions: MountOptions) => {
+  return (
+    element: React.ReactElement,
+    options?: MountOptions,
+  ) => {
+    return _mount(element, { ...defaultOptions, ...options })
+  }
+}
+
+/** @deprecated Should be removed in the next major version */
+// TODO: Remove
+export default _mount
+
+export interface JSX extends Function {
+  displayName: string
+}
+
+// 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
+setupHooks(preMountCleanup)

npm/react/src/getDisplayName.ts

@@ -1,4 +1,4 @@
-import { JSX } from './mount'
+import { JSX } from './createMount'
 
 const cachedDisplayNames: WeakMap<JSX, string> = new WeakMap()
 

npm/react/src/index.ts

@@ -1,3 +1,7 @@
+export * from './createMount'
+
 export * from './mount'
 
 export * from './mountHook'
+
+export * from './types'