cypress 10.4.0 → 10.7.0

package/react/dist/mount.d.ts

@@ -1,7 +1,8 @@
 /// <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>;
 export declare function unmount(options?: {
     log: boolean;
-}): Cypress.Chainable<JQuery<HTMLElement>>;
+}): Cypress.Chainable<undefined>;

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,17 +1,11 @@
 /// <reference types="cypress" />
+/// <reference types="cypress" />
 import type React from 'react';
 import type { StyleOptions } from '@cypress/mount-utils';
 export interface UnmountArgs {
     log: boolean;
     boundComponentMessage?: string;
 }
-export interface InternalUnmountOptionsReact {
-    unmount: (el: HTMLElement) => boolean;
-}
-export interface InternalUnmountOptionsReact18 {
-    unmount: () => boolean;
-}
-export declare type InternalUnmountOptions = InternalUnmountOptionsReact | InternalUnmountOptionsReact18;
 export declare type MountOptions = Partial<StyleOptions & MountReactComponentOptions>;
 export interface MountReactComponentOptions {
     alias: string;
@@ -31,6 +25,7 @@ export interface InternalMountOptions {
     reactDom: typeof import('react-dom');
     render: (reactComponent: ReturnType<typeof React.createElement>, el: HTMLElement, reactDomToUse: typeof import('react-dom')) => void;
     unmount: (options: UnmountArgs) => void;
+    cleanup: () => boolean;
 }
 export interface MountReturn {
     /**

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,7 @@
   },
   "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",
     "cypress": "0.0.0-development",
@@ -26,9 +25,8 @@
     "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",
-    "typescript": "^4.2.3",
+    "semver": "^7.3.2",
+    "typescript": "^4.7.4",
     "vite": "3.0.3",
     "vite-plugin-require-transform": "1.0.3"
   },

package/react18/CHANGELOG.md

@@ -0,0 +1,13 @@
+# [@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)
+
+
+### Features
+
+* React 18 support ([#22876](https://github.com/cypress-io/cypress/issues/22876)) ([f0d3a48](https://github.com/cypress-io/cypress/commit/f0d3a4867907bf6e60468510daa883ccc8dcfb63))

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

@@ -16,66 +16,39 @@ 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;
-    var n = Object.create(null);
-    if (e) {
-        Object.keys(e).forEach(function (k) {
-            if (k !== 'default') {
-                var d = Object.getOwnPropertyDescriptor(e, k);
-                Object.defineProperty(n, k, d.get ? d : {
-                    enumerable: true,
-                    get: function () { return e[k]; }
-                });
-            }
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
         });
-    }
-    n["default"] = e;
-    return Object.freeze(n);
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
 }
 
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
-/******************************************************************************
-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
@@ -87,13 +60,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;
             }
         }
@@ -252,13 +225,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 lastMountedReactDom;
+let mountCleanup;
 /**
  * Create an `mount` function. Performs all the non-React-version specific
  * behavior related to mounting. The React-version-specific code
@@ -268,41 +241,40 @@ var lastMountedReactDom;
  * 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;
-        lastMountedReactDom = reactDomToUse;
-        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__namespace.createElement(options.strict ? React__namespace.StrictMode : React__namespace.Fragment, props, jsx);
+        const reactComponent = React__namespace.createElement(options.strict ? React__namespace.StrictMode : React__namespace.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({
@@ -311,7 +283,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,
@@ -325,10 +297,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 });
         })
@@ -346,39 +318,31 @@ 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, internalUnmountOptions) {
-    return cy.then(function () {
-        return cy.get(ROOT_SELECTOR, { log: false }).then(function ($el) {
-            var _a;
-            if (lastMountedReactDom) {
-                internalUnmountOptions.unmount($el[0]);
-                var wasUnmounted = internalUnmountOptions.unmount($el[0]);
-                if (wasUnmounted && options.log) {
-                    Cypress.log({
-                        name: 'unmount',
-                        type: 'parent',
-                        message: [(_a = options.boundComponentMessage) !== null && _a !== void 0 ? _a : 'Unmounted component'],
-                        consoleProps: function () {
-                            return {
-                                description: 'Unmounts React component',
-                                parent: $el[0],
-                                home: 'https://github.com/cypress-io/cypress',
-                            };
-                        },
-                    });
-                }
-            }
-        });
+const makeUnmountFn = (options) => {
+    return cy.then(() => {
+        var _a;
+        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: () => {
+                    return {
+                        description: 'Unmounts React component',
+                        parent: getContainerEl().parentNode,
+                        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
-var preMountCleanup = function () {
-    var el = getContainerEl();
-    if (el && lastMountedReactDom) {
-        lastMountedReactDom.unmountComponentAtNode(el);
-    }
+const preMountCleanup = () => {
+    mountCleanup === null || mountCleanup === void 0 ? void 0 : mountCleanup();
 };
 // 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,
@@ -393,29 +357,247 @@ var preMountCleanup = function () {
 // @see npm/react/cypress/component/advanced/set-timeout-example/loading-indicator-spec.js
 setupHooks(preMountCleanup);
 
-var root;
-function mount(jsx, options, rerenderKey) {
-    if (options === void 0) { options = {}; }
-    var internalOptions = {
+const debug = (
+  typeof process === 'object' &&
+  process.env &&
+  process.env.NODE_DEBUG &&
+  /\bsemver\b/i.test(process.env.NODE_DEBUG)
+) ? (...args) => console.error('SEMVER', ...args)
+  : () => {};
+
+var debug_1 = debug;
+
+// Note: this is the semver.org version of the spec that it implements
+// Not necessarily the package version of this code.
+const SEMVER_SPEC_VERSION = '2.0.0';
+
+const MAX_LENGTH$1 = 256;
+const MAX_SAFE_INTEGER$1 = Number.MAX_SAFE_INTEGER ||
+/* istanbul ignore next */ 9007199254740991;
+
+// Max safe segment length for coercion.
+const MAX_SAFE_COMPONENT_LENGTH = 16;
+
+var constants = {
+  SEMVER_SPEC_VERSION,
+  MAX_LENGTH: MAX_LENGTH$1,
+  MAX_SAFE_INTEGER: MAX_SAFE_INTEGER$1,
+  MAX_SAFE_COMPONENT_LENGTH,
+};
+
+function createCommonjsModule(fn) {
+  var module = { exports: {} };
+	return fn(module, module.exports), module.exports;
+}
+
+createCommonjsModule(function (module, exports) {
+const { MAX_SAFE_COMPONENT_LENGTH } = constants;
+
+exports = module.exports = {};
+
+// The actual regexps go on exports.re
+const re = exports.re = [];
+const src = exports.src = [];
+const t = exports.t = {};
+let R = 0;
+
+const createToken = (name, value, isGlobal) => {
+  const index = R++;
+  debug_1(name, index, value);
+  t[name] = index;
+  src[index] = value;
+  re[index] = new RegExp(value, isGlobal ? 'g' : undefined);
+};
+
+// The following Regular Expressions can be used for tokenizing,
+// validating, and parsing SemVer version strings.
+
+// ## Numeric Identifier
+// A single `0`, or a non-zero digit followed by zero or more digits.
+
+createToken('NUMERICIDENTIFIER', '0|[1-9]\\d*');
+createToken('NUMERICIDENTIFIERLOOSE', '[0-9]+');
+
+// ## Non-numeric Identifier
+// Zero or more digits, followed by a letter or hyphen, and then zero or
+// more letters, digits, or hyphens.
+
+createToken('NONNUMERICIDENTIFIER', '\\d*[a-zA-Z-][a-zA-Z0-9-]*');
+
+// ## Main Version
+// Three dot-separated numeric identifiers.
+
+createToken('MAINVERSION', `(${src[t.NUMERICIDENTIFIER]})\\.` +
+                   `(${src[t.NUMERICIDENTIFIER]})\\.` +
+                   `(${src[t.NUMERICIDENTIFIER]})`);
+
+createToken('MAINVERSIONLOOSE', `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` +
+                        `(${src[t.NUMERICIDENTIFIERLOOSE]})\\.` +
+                        `(${src[t.NUMERICIDENTIFIERLOOSE]})`);
+
+// ## Pre-release Version Identifier
+// A numeric identifier, or a non-numeric identifier.
+
+createToken('PRERELEASEIDENTIFIER', `(?:${src[t.NUMERICIDENTIFIER]
+}|${src[t.NONNUMERICIDENTIFIER]})`);
+
+createToken('PRERELEASEIDENTIFIERLOOSE', `(?:${src[t.NUMERICIDENTIFIERLOOSE]
+}|${src[t.NONNUMERICIDENTIFIER]})`);
+
+// ## Pre-release Version
+// Hyphen, followed by one or more dot-separated pre-release version
+// identifiers.
+
+createToken('PRERELEASE', `(?:-(${src[t.PRERELEASEIDENTIFIER]
+}(?:\\.${src[t.PRERELEASEIDENTIFIER]})*))`);
+
+createToken('PRERELEASELOOSE', `(?:-?(${src[t.PRERELEASEIDENTIFIERLOOSE]
+}(?:\\.${src[t.PRERELEASEIDENTIFIERLOOSE]})*))`);
+
+// ## Build Metadata Identifier
+// Any combination of digits, letters, or hyphens.
+
+createToken('BUILDIDENTIFIER', '[0-9A-Za-z-]+');
+
+// ## Build Metadata
+// Plus sign, followed by one or more period-separated build metadata
+// identifiers.
+
+createToken('BUILD', `(?:\\+(${src[t.BUILDIDENTIFIER]
+}(?:\\.${src[t.BUILDIDENTIFIER]})*))`);
+
+// ## Full Version String
+// A main version, followed optionally by a pre-release version and
+// build metadata.
+
+// Note that the only major, minor, patch, and pre-release sections of
+// the version string are capturing groups.  The build metadata is not a
+// capturing group, because it should not ever be used in version
+// comparison.
+
+createToken('FULLPLAIN', `v?${src[t.MAINVERSION]
+}${src[t.PRERELEASE]}?${
+  src[t.BUILD]}?`);
+
+createToken('FULL', `^${src[t.FULLPLAIN]}$`);
+
+// like full, but allows v1.2.3 and =1.2.3, which people do sometimes.
+// also, 1.0.0alpha1 (prerelease without the hyphen) which is pretty
+// common in the npm registry.
+createToken('LOOSEPLAIN', `[v=\\s]*${src[t.MAINVERSIONLOOSE]
+}${src[t.PRERELEASELOOSE]}?${
+  src[t.BUILD]}?`);
+
+createToken('LOOSE', `^${src[t.LOOSEPLAIN]}$`);
+
+createToken('GTLT', '((?:<|>)?=?)');
+
+// Something like "2.*" or "1.2.x".
+// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Only the first item is strictly required.
+createToken('XRANGEIDENTIFIERLOOSE', `${src[t.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`);
+createToken('XRANGEIDENTIFIER', `${src[t.NUMERICIDENTIFIER]}|x|X|\\*`);
+
+createToken('XRANGEPLAIN', `[v=\\s]*(${src[t.XRANGEIDENTIFIER]})` +
+                   `(?:\\.(${src[t.XRANGEIDENTIFIER]})` +
+                   `(?:\\.(${src[t.XRANGEIDENTIFIER]})` +
+                   `(?:${src[t.PRERELEASE]})?${
+                     src[t.BUILD]}?` +
+                   `)?)?`);
+
+createToken('XRANGEPLAINLOOSE', `[v=\\s]*(${src[t.XRANGEIDENTIFIERLOOSE]})` +
+                        `(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})` +
+                        `(?:\\.(${src[t.XRANGEIDENTIFIERLOOSE]})` +
+                        `(?:${src[t.PRERELEASELOOSE]})?${
+                          src[t.BUILD]}?` +
+                        `)?)?`);
+
+createToken('XRANGE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAIN]}$`);
+createToken('XRANGELOOSE', `^${src[t.GTLT]}\\s*${src[t.XRANGEPLAINLOOSE]}$`);
+
+// Coercion.
+// Extract anything that could conceivably be a part of a valid semver
+createToken('COERCE', `${'(^|[^\\d])' +
+              '(\\d{1,'}${MAX_SAFE_COMPONENT_LENGTH}})` +
+              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
+              `(?:\\.(\\d{1,${MAX_SAFE_COMPONENT_LENGTH}}))?` +
+              `(?:$|[^\\d])`);
+createToken('COERCERTL', src[t.COERCE], true);
+
+// Tilde ranges.
+// Meaning is "reasonably at or greater than"
+createToken('LONETILDE', '(?:~>?)');
+
+createToken('TILDETRIM', `(\\s*)${src[t.LONETILDE]}\\s+`, true);
+exports.tildeTrimReplace = '$1~';
+
+createToken('TILDE', `^${src[t.LONETILDE]}${src[t.XRANGEPLAIN]}$`);
+createToken('TILDELOOSE', `^${src[t.LONETILDE]}${src[t.XRANGEPLAINLOOSE]}$`);
+
+// Caret ranges.
+// Meaning is "at least and backwards compatible with"
+createToken('LONECARET', '(?:\\^)');
+
+createToken('CARETTRIM', `(\\s*)${src[t.LONECARET]}\\s+`, true);
+exports.caretTrimReplace = '$1^';
+
+createToken('CARET', `^${src[t.LONECARET]}${src[t.XRANGEPLAIN]}$`);
+createToken('CARETLOOSE', `^${src[t.LONECARET]}${src[t.XRANGEPLAINLOOSE]}$`);
+
+// A simple gt/lt/eq thing, or just "" to indicate "any version"
+createToken('COMPARATORLOOSE', `^${src[t.GTLT]}\\s*(${src[t.LOOSEPLAIN]})$|^$`);
+createToken('COMPARATOR', `^${src[t.GTLT]}\\s*(${src[t.FULLPLAIN]})$|^$`);
+
+// An expression to strip any whitespace between the gtlt and the thing
+// it modifies, so that `> 1.2.3` ==> `>1.2.3`
+createToken('COMPARATORTRIM', `(\\s*)${src[t.GTLT]
+}\\s*(${src[t.LOOSEPLAIN]}|${src[t.XRANGEPLAIN]})`, true);
+exports.comparatorTrimReplace = '$1$2$3';
+
+// Something like `1.2.3 - 1.2.4`
+// Note that these all use the loose form, because they'll be
+// checked against either the strict or loose comparator form
+// later.
+createToken('HYPHENRANGE', `^\\s*(${src[t.XRANGEPLAIN]})` +
+                   `\\s+-\\s+` +
+                   `(${src[t.XRANGEPLAIN]})` +
+                   `\\s*$`);
+
+createToken('HYPHENRANGELOOSE', `^\\s*(${src[t.XRANGEPLAINLOOSE]})` +
+                        `\\s+-\\s+` +
+                        `(${src[t.XRANGEPLAINLOOSE]})` +
+                        `\\s*$`);
+
+// Star ranges basically just allow anything at all.
+createToken('STAR', '(<|>)?=?\\s*\\*');
+// >=0.0.0 is like a star
+createToken('GTE0', '^\\s*>=\\s*0\\.0\\.0\\s*$');
+createToken('GTE0PRE', '^\\s*>=\\s*0\\.0\\.0-0\\s*$');
+});
+
+// @ts-expect-error
+let root;
+const cleanup = () => {
+    if (root) {
+        root.unmount();
+        return true;
+    }
+    return false;
+};
+function mount(jsx, options = {}, rerenderKey) {
+    const internalOptions = {
         reactDom: ReactDOM__default["default"],
-        render: function (reactComponent, el) {
+        render: (reactComponent, el) => {
             root = ReactDOM__default["default"].createRoot(el);
             return root.render(reactComponent);
         },
-        unmount: unmount,
+        unmount,
+        cleanup,
     };
-    return makeMountFn('mount', jsx, __assign({ ReactDom: ReactDOM__default["default"] }, options), rerenderKey, internalOptions);
+    return makeMountFn('mount', jsx, Object.assign({ ReactDom: ReactDOM__default["default"] }, options), rerenderKey, internalOptions);
 }
-function unmount(options) {
-    if (options === void 0) { options = { log: true }; }
-    var internalOptions = {
-        // type is ReturnType<typeof ReactDOM.createRoot>
-        unmount: function () {
-            root.unmount();
-            return true;
-        },
-    };
-    return makeUnmountFn(options, internalOptions);
+function unmount(options = { log: true }) {
+    return makeUnmountFn(options);
 }
 
 exports.mount = mount;