cypress 6.9.0 → 6.9.1

package/lib/cli.js

@@ -143,7 +143,7 @@ const descriptions = {
   tag: 'named tag(s) for recorded runs in the Cypress Dashboard',
   version: 'prints Cypress version'
 };
-const knownCommands = ['cache', 'help', '-h', '--help', 'install', 'open', 'run', 'open-ct', 'run-ct', 'verify', '-v', '--version', 'version', 'info'];
+const knownCommands = ['cache', 'help', '-h', '--help', 'install', 'open', 'open-ct', 'run', 'run-ct', 'verify', '-v', '--version', 'version', 'info'];
 
 const text = description => {
   if (!descriptions[description]) {
@@ -317,30 +317,36 @@ module.exports = {
     program.option('-v, --version', text('version')).command('version').description(text('version')).action(() => {
       showVersions(args);
     });
-    program.command('open').usage('[options]').description('Opens Cypress in the interactive GUI.').option('-b, --browser <browser-path>', text('browserOpenMode')).option('-c, --config <config>', text('config')).option('-C, --config-file <config-file>', text('configFile')).option('-d, --detached [bool]', text('detached'), coerceFalse).option('-e, --env <env>', text('env')).option('--global', text('global')).option('-p, --port <port>', text('port')).option('-P, --project <project-path>', text('project')).option('--dev', text('dev'), coerceFalse).action(opts => {
-      debug('opening Cypress');
-
-      require('./exec/open').start(util.parseOpts(opts)).catch(util.logErrorExit1);
-    });
     addCypressRunCommand(program).action((...fnArgs) => {
       debug('running Cypress with args %o', fnArgs);
 
       require('./exec/run').start(parseVariableOpts(fnArgs, args)).then(util.exit).catch(util.logErrorExit1);
     });
-    program.command('open-ct').usage('[options]').description('Opens Cypress component testing interactive mode.').option('-b, --browser <browser-path>', text('browserOpenMode')).option('-c, --config <config>', text('config')).option('-C, --config-file <config-file>', text('configFile')).option('-d, --detached [bool]', text('detached'), coerceFalse).option('-e, --env <env>', text('env')).option('--global', text('global')).option('-p, --port <port>', text('port')).option('-P, --project <project-path>', text('project')).option('--dev', text('dev'), coerceFalse).action(opts => {
+    program // TODO make this command public once CT will be merged completely
+    .command('open-ct', {
+      hidden: true
+    }).usage('[options]').description('Opens Cypress component testing interactive mode.').option('-b, --browser <browser-path>', text('browserOpenMode')).option('-c, --config <config>', text('config')).option('-C, --config-file <config-file>', text('configFile')).option('-d, --detached [bool]', text('detached'), coerceFalse).option('-e, --env <env>', text('env')).option('--global', text('global')).option('-p, --port <port>', text('port')).option('-P, --project <project-path>', text('project')).option('--dev', text('dev'), coerceFalse).action(opts => {
       debug('opening Cypress');
 
       require('./exec/open').start(util.parseOpts(opts), {
         isComponentTesting: true
       }).catch(util.logErrorExit1);
     });
-    program.command('run-ct').usage('[options]').description('Runs all Cypress Component Testing suites').option('-b, --browser <browser-name-or-path>', text('browserRunMode')).option('--ci-build-id <id>', text('ciBuildId')).option('-c, --config <config>', text('config')).option('-C, --config-file <config-file>', text('configFile')).option('-e, --env <env>', text('env')).option('--group <name>', text('group')).option('-k, --key <record-key>', text('key')).option('--headed', text('headed')).option('--headless', text('headless')).option('--no-exit', text('exit')).option('--parallel', text('parallel')).option('-p, --port <port>', text('port')).option('-P, --project <project-path>', text('project')).option('-q, --quiet', text('quiet')).option('--record [bool]', text('record'), coerceFalse).option('-r, --reporter <reporter>', text('reporter')).option('-o, --reporter-options <reporter-options>', text('reporterOptions')).option('-s, --spec <spec>', text('spec')).option('-t, --tag <tag>', text('tag')).option('--dev', text('dev'), coerceFalse).action(opts => {
+    program // TODO make this command public once CT will be merged completely
+    .command('run-ct', {
+      hidden: true
+    }).usage('[options]').description('Runs all Cypress Component Testing suites').option('-b, --browser <browser-name-or-path>', text('browserRunMode')).option('--ci-build-id <id>', text('ciBuildId')).option('-c, --config <config>', text('config')).option('-C, --config-file <config-file>', text('configFile')).option('-e, --env <env>', text('env')).option('--group <name>', text('group')).option('-k, --key <record-key>', text('key')).option('--headed', text('headed')).option('--headless', text('headless')).option('--no-exit', text('exit')).option('--parallel', text('parallel')).option('-p, --port <port>', text('port')).option('-P, --project <project-path>', text('project')).option('-q, --quiet', text('quiet')).option('--record [bool]', text('record'), coerceFalse).option('-r, --reporter <reporter>', text('reporter')).option('-o, --reporter-options <reporter-options>', text('reporterOptions')).option('-s, --spec <spec>', text('spec')).option('-t, --tag <tag>', text('tag')).option('--dev', text('dev'), coerceFalse).action(opts => {
       debug('running Cypress run-ct');
 
       require('./exec/run').start(util.parseOpts(opts), {
         isComponentTesting: true
       }).then(util.exit).catch(util.logErrorExit1);
     });
+    program.command('open').usage('[options]').description('Opens Cypress in the interactive GUI.').option('-b, --browser <browser-path>', text('browserOpenMode')).option('-c, --config <config>', text('config')).option('-C, --config-file <config-file>', text('configFile')).option('-d, --detached [bool]', text('detached'), coerceFalse).option('-e, --env <env>', text('env')).option('--global', text('global')).option('-p, --port <port>', text('port')).option('-P, --project <project-path>', text('project')).option('--dev', text('dev'), coerceFalse).action(opts => {
+      debug('opening Cypress');
+
+      require('./exec/open').start(util.parseOpts(opts)).catch(util.logErrorExit1);
+    });
     program.command('install').usage('[options]').description('Installs the Cypress executable matching this package\'s version').option('-f, --force', text('forceInstall')).action(opts => {
       require('./tasks/install').start(util.parseOpts(opts)).catch(util.logErrorExit1);
     });

package/lib/exec/open.js

@@ -45,7 +45,7 @@ module.exports = {
     }
 
     if (isComponentTesting) {
-      args.push('--testing-type', 'component');
+      args.push('--componentTesting');
     }
 
     debug('opening from options %j', options);

package/lib/exec/run.js

@@ -201,7 +201,7 @@ module.exports = {
       }
 
       if (isComponentTesting) {
-        args.push('--testing-type', 'component');
+        args.push('--componentTesting');
       }
 
       debug('run to spawn.start args %j', args);

package/lib/util.js

@@ -212,7 +212,7 @@ const dequote = str => {
 };
 
 const parseOpts = opts => {
-  opts = _.pick(opts, 'browser', 'cachePath', 'cacheList', 'cacheClear', 'cachePrune', 'ciBuildId', 'config', 'configFile', 'cypressVersion', 'destination', 'detached', 'dev', 'exit', 'env', 'force', 'global', 'group', 'headed', 'headless', 'key', 'path', 'parallel', 'port', 'project', 'quiet', 'reporter', 'reporterOptions', 'record', 'runProject', 'spec', 'tag');
+  opts = _.pick(opts, 'browser', 'cachePath', 'cacheList', 'cacheClear', 'cachePrune', 'ciBuildId', 'componentTesting', 'config', 'configFile', 'cypressVersion', 'destination', 'detached', 'dev', 'exit', 'env', 'force', 'global', 'group', 'headed', 'headless', 'key', 'path', 'parallel', 'port', 'project', 'quiet', 'reporter', 'reporterOptions', 'record', 'runProject', 'spec', 'tag');
 
   if (opts.exit) {
     opts = _.omit(opts, 'exit');
@@ -263,7 +263,33 @@ const util = {
     .mapValues(value => {
       // stringify to 1 or 0
       return value ? '1' : '0';
-    }).value();
+    }).extend(util.getNodeOptions(options)).value();
+  },
+
+  getNodeOptions(options, nodeVersion) {
+    if (!nodeVersion) {
+      nodeVersion = Number(process.versions.node.split('.')[0]);
+    }
+
+    if (options.dev && nodeVersion < 12) {
+      // `node` is used instead of Electron when --dev is passed, so this won't work if Node is too old
+      debug('NODE_OPTIONS=--max-http-header-size could not be set because we\'re in dev mode and Node is < 12.0.0');
+      return;
+    } // https://github.com/cypress-io/cypress/issues/5431
+
+
+    const NODE_OPTIONS = `--max-http-header-size=${1024 ** 2}`;
+
+    if (_.isString(process.env.NODE_OPTIONS)) {
+      return {
+        NODE_OPTIONS: `${NODE_OPTIONS} ${process.env.NODE_OPTIONS}`,
+        ORIGINAL_NODE_OPTIONS: process.env.NODE_OPTIONS || ''
+      };
+    }
+
+    return {
+      NODE_OPTIONS
+    };
   },
 
   getForceTty() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -10,11 +10,11 @@
     "@cypress/listr-verbose-renderer": "^0.4.1",
     "@cypress/request": "^2.88.5",
     "@cypress/xvfb": "^1.2.4",
-    "@types/node": "^14.14.31",
-    "@types/sinonjs__fake-timers": "^6.0.2",
+    "@types/node": "12.12.50",
+    "@types/sinonjs__fake-timers": "^6.0.1",
     "@types/sizzle": "^2.3.2",
-    "arch": "^2.2.0",
-    "blob-util": "^2.0.2",
+    "arch": "^2.1.2",
+    "blob-util": "2.0.2",
     "bluebird": "^3.7.2",
     "cachedir": "^2.3.0",
     "chalk": "^4.1.0",
@@ -22,26 +22,27 @@
     "cli-table3": "~0.6.0",
     "commander": "^5.1.0",
     "common-tags": "^1.8.0",
-    "dayjs": "^1.10.4",
+    "dayjs": "^1.9.3",
     "debug": "4.3.2",
-    "eventemitter2": "^6.4.3",
-    "execa": "4.1.0",
+    "eventemitter2": "^6.4.2",
+    "execa": "^4.0.2",
     "executable": "^4.1.1",
     "extract-zip": "^1.7.0",
-    "fs-extra": "^9.1.0",
+    "fs-extra": "^9.0.1",
     "getos": "^3.2.1",
-    "is-ci": "^3.0.0",
-    "is-installed-globally": "~0.4.0",
+    "is-ci": "^2.0.0",
+    "is-installed-globally": "^0.3.2",
     "lazy-ass": "^1.6.0",
     "listr": "^0.14.3",
-    "lodash": "^4.17.21",
+    "lodash": "^4.17.19",
     "log-symbols": "^4.0.0",
     "minimist": "^1.2.5",
+    "moment": "^2.29.1",
     "ospath": "^1.2.2",
-    "pretty-bytes": "^5.6.0",
+    "pretty-bytes": "^5.4.1",
     "ramda": "~0.27.1",
     "request-progress": "^3.0.0",
-    "supports-color": "^8.1.1",
+    "supports-color": "^7.2.0",
     "tmp": "~0.2.1",
     "untildify": "^4.0.0",
     "url": "^0.11.0",
@@ -58,7 +59,7 @@
     "cypress": "bin/cypress"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=10.0.0"
   },
   "types": "types",
   "description": "Cypress.io end to end testing tool",

package/types/chai/index.d.ts

@@ -466,7 +466,7 @@ declare namespace Chai {
         equal<T>(actual: T, expected: T, message?: string): void;
 
         /**
-         * Asserts non-strict inequality (!=) of actual and expected.
+         * Asserts non-strict inequality (==) of actual and expected.
          *
          * @type T   Type of the objects.
          * @param actual   Actual value.
@@ -486,7 +486,7 @@ declare namespace Chai {
         strictEqual<T>(actual: T, expected: T, message?: string): void;
 
         /**
-         * Asserts strict inequality (!==) of actual and expected.
+         * Asserts strict inequality (==) of actual and expected.
          *
          * @type T   Type of the objects.
          * @param actual   Actual value.

package/types/cy-moment.d.ts

@@ -0,0 +1,7 @@
+import moment = require('moment')
+export = Moment
+export as namespace Moment
+
+declare namespace Moment {
+  type MomentStatic = typeof moment
+}

package/types/cypress.d.ts

@@ -113,7 +113,7 @@ declare namespace Cypress {
 
   /**
    * Spec type for the given test. "integration" is the default, but
-   * tests run using `open-ct` will be "component"
+   * tests run using experimentalComponentTesting will be "component"
    *
    * @see https://on.cypress.io/experiments
    */
@@ -177,6 +177,18 @@ declare namespace Cypress {
      * @see https://on.cypress.io/minimatch
      */
     minimatch: typeof Minimatch.minimatch
+    /**
+     * @deprecated Will be removed in a future version.
+     * Consider including your own datetime formatter in your tests.
+     *
+     * Cypress automatically includes moment.js and exposes it as Cypress.moment.
+     *
+     * @see https://on.cypress.io/moment
+     * @see http://momentjs.com/
+     * @example
+     *    const todaysDate = Cypress.moment().format("MMM DD, YYYY")
+     */
+    moment: Moment.MomentStatic
     /**
      * Cypress automatically includes Bluebird and exposes it as Cypress.Promise.
      *
@@ -515,18 +527,6 @@ declare namespace Cypress {
      * @see https://on.cypress.io/catalog-of-events#App-Events
      */
     off: Actions
-
-    /**
-     * Trigger action
-     * @private
-     */
-    action: (action: string, ...args: any[]) => void
-
-    /**
-     * Load  files
-     * @private
-     */
-    onSpecWindow: (window: Window, specList: string[] | Array<() => Promise<void>>) => void
   }
 
   type CanReturnChainable = void | Chainable | Promise<unknown>
@@ -1784,7 +1784,7 @@ declare namespace Cypress {
     /**
      * Run a task in Node via the plugins file.
      *
-     * @see https://on.cypress.io/api/task
+     * @see https://on.cypress.io/task
      */
     task<S = unknown>(event: string, arg?: any, options?: Partial<Loggable & Timeoutable>): Chainable<S>
 
@@ -1812,12 +1812,6 @@ declare namespace Cypress {
      * @see https://on.cypress.io/then
      */
     then<S>(options: Partial<Timeoutable>, fn: (this: ObjectLike, currentSubject: Subject) => PromiseLike<S>): Chainable<S>
-    /**
-     * Enables you to work with the subject yielded from the previous command / promise.
-     *
-     * @see https://on.cypress.io/then
-     */
-    then<S extends HTMLElement>(fn: (this: ObjectLike, currentSubject: Subject) => S): Chainable<JQuery<S>>
     /**
      * Enables you to work with the subject yielded from the previous command / promise.
      *
@@ -1830,12 +1824,6 @@ declare namespace Cypress {
      * @see https://on.cypress.io/then
      */
     then<S>(fn: (this: ObjectLike, currentSubject: Subject) => S): ThenReturn<Subject, S>
-    /**
-     * Enables you to work with the subject yielded from the previous command / promise.
-     *
-     * @see https://on.cypress.io/then
-     */
-     then<S extends HTMLElement>(options: Partial<Timeoutable>, fn: (this: ObjectLike, currentSubject: Subject) => S): Chainable<JQuery<S>>
     /**
      * Enables you to work with the subject yielded from the previous command / promise.
      *
@@ -1884,7 +1872,7 @@ declare namespace Cypress {
      *  // or use this shortcut
      *  cy.tick(5000).invoke('restore')
      */
-    tick(milliseconds: number, options?: Partial<Loggable>): Chainable<Clock>
+    tick(milliseconds: number): Chainable<Clock>
 
     /**
      * Get the `document.title` property of the page that is currently active.
@@ -2150,21 +2138,6 @@ declare namespace Cypress {
     ```
      */
     writeFile<C extends FileContents>(filePath: string, contents: C, options?: Partial<WriteFileOptions>): Chainable<C>
-    /**
-     * Write to a file with the specified encoding and contents.
-     *
-     * An `encoding` option in `options` will override the `encoding` argument.
-     *
-     * @see https://on.cypress.io/writefile
-    ```
-    cy.writeFile('path/to/ascii.txt', 'Hello World', 'utf8', {
-      flag: 'a+',
-    }).then((text) => {
-      expect(text).to.equal('Hello World') // true
-    })
-    ```
-     */
-    writeFile<C extends FileContents>(filePath: string, contents: C, encoding: Encodings, options?: Partial<WriteFileOptions>): Chainable<C>
 
     /**
      * jQuery library bound to the AUT
@@ -2522,11 +2495,6 @@ declare namespace Cypress {
      * @default "cypress/plugins/index.js"
      */
     pluginsFile: string | false
-    /**
-     * The application under test cannot redirect more than this limit.
-     * @default 20
-     */
-    redirectionLimit: number
     /**
      * If `nodeVersion === 'system'` and a `node` executable is found, this will be the full filesystem path to that executable.
      * @default null
@@ -2640,18 +2608,6 @@ declare namespace Cypress {
      * @default false
      */
     includeShadowDom: boolean
-
-    /**
-     * Override default config options for Component Testing runner.
-     * @default {}
-     */
-    component: ResolvedConfigOptions
-
-    /**
-     * Override default config options for E2E Testing runner.
-     * @default {}
-     */
-    e2e: ResolvedConfigOptions
   }
 
   /**
@@ -2680,6 +2636,10 @@ declare namespace Cypress {
      * Path to folder containing component test files.
      */
     componentFolder: string
+    /**
+     * Whether component testing is enabled.
+     */
+    experimentalComponentTesting: boolean
     /**
      * Hosts mappings to IP addresses.
      */
@@ -2772,10 +2732,6 @@ declare namespace Cypress {
     * Absolute path to the root of the project
     */
     projectRoot: string
-    /**
-     * Type of test and associated runner that was launched.
-     */
-    testingType: 'e2e' | 'component'
     /**
      * Cypress version.
      */
@@ -5204,7 +5160,7 @@ declare namespace Cypress {
    */
   interface Actions {
     /**
-     * Fires when an uncaught exception or unhandled rejection occurs in your application. If it's an unhandled rejection, the rejected promise will be the 3rd argument.
+     * Fires when an uncaught exception occurs in your application.
      * Cypress will fail the test when this fires.
      * Return `false` from this event and Cypress will not fail the test. Also useful for debugging purposes because the actual `error` instance is provided to you.
      * @see https://on.cypress.io/catalog-of-events#App-Events
@@ -5230,7 +5186,7 @@ declare namespace Cypress {
       })
     ```
      */
-    (action: 'uncaught:exception', fn: (error: Error, runnable: Mocha.Runnable, promise?: Promise<any>) => false | void): Cypress
+    (action: 'uncaught:exception', fn: (error: Error, runnable: Mocha.Runnable) => false | void): Cypress
     /**
      * Fires when your app calls the global `window.confirm()` method.
      * Cypress will auto accept confirmations. Return `false` from this event and the confirmation will be canceled.
@@ -5469,7 +5425,7 @@ declare namespace Cypress {
     allRequestResponses: any[]
     body: any
     duration: number
-    headers: { [key: string]: string | string[] }
+    headers: { [key: string]: string }
     isOkStatusCode: boolean
     redirects?: string[]
     redirectedToUrl?: string

package/types/index.d.ts

@@ -9,6 +9,7 @@
 
 /// <reference path="./cy-blob-util.d.ts" />
 /// <reference path="./cy-bluebird.d.ts" />
+/// <reference path="./cy-moment.d.ts" />
 /// <reference path="./cy-minimatch.d.ts" />
 /// <reference path="./cy-chai.d.ts" />
 /// <reference path="./lodash/index.d.ts" />

package/types/net-stubbing.ts

@@ -68,37 +68,19 @@ type Method =
     | 'unlink'
     | 'unlock'
     | 'unsubscribe'
+
 export namespace CyHttpMessages {
   export interface BaseMessage {
-    /**
-     * The body of the HTTP message.
-     * If a JSON Content-Type was used and the body was valid JSON, this will be an object.
-     * If the body was binary content, this will be a buffer.
-     */
-    body: any
-    /**
-     * The headers of the HTTP message.
-     */
+    body?: any
     headers: { [key: string]: string }
+    url: string
+    method?: Method
+    httpVersion?: string
   }
 
   export type IncomingResponse = BaseMessage & {
-    /**
-     * The HTTP status code of the response.
-     */
     statusCode: number
-    /**
-     * The HTTP status message.
-     */
     statusMessage: string
-    /**
-     * Kilobits per second to send 'body'.
-     */
-    throttleKbps?: number
-    /**
-     * Milliseconds to delay before the response is sent.
-     */
-    delay?: number
   }
 
   export type IncomingHttpResponse = IncomingResponse & {
@@ -115,30 +97,14 @@ export namespace CyHttpMessages {
     /**
      * Wait for `delay` milliseconds before sending the response to the client.
      */
-    setDelay: (delay: number) => IncomingHttpResponse
+    delay: (delay: number) => IncomingHttpResponse
     /**
      * Serve the response at `throttleKbps` kilobytes per second.
      */
-    setThrottle: (throttleKbps: number) => IncomingHttpResponse
+    throttle: (throttleKbps: number) => IncomingHttpResponse
   }
 
   export type IncomingRequest = BaseMessage & {
-    /**
-     * Request HTTP method (GET, POST, ...).
-     */
-    method: string
-    /**
-     * Request URL.
-     */
-    url: string
-    /**
-     * The HTTP version used in the request. Read only.
-     */
-    httpVersion: string
-    /**
-     * If provided, the number of milliseconds before an upstream response to this request
-     * will time out and cause an error. By default, `responseTimeout` from config is used.
-     */
     responseTimeout?: number
     /**
      * Set if redirects should be followed when this request is made. By default, requests will
@@ -152,17 +118,11 @@ export namespace CyHttpMessages {
     alias?: string
   }
 
-  export interface IncomingHttpRequest extends IncomingRequest, InterceptionEvents {
+  export interface IncomingHttpRequest extends IncomingRequest {
     /**
      * Destroy the request and respond with a network error.
      */
     destroy(): void
-    /**
-     * Send the request outgoing, skipping any other request handlers.
-     * If a function is passed, the request will be sent outgoing, and the function will be called
-     * with the response from the upstream server.
-     */
-    continue(interceptor?: HttpResponseInterceptor): void
     /**
      * Control the response to this request.
      * If a function is passed, the request will be sent outgoing, and the function will be called
@@ -185,14 +145,6 @@ export namespace CyHttpMessages {
      */
     redirect(location: string, statusCode?: number): void
   }
-
-  export interface ResponseComplete {
-    finalResBody?: BaseMessage['body']
-  }
-
-  export interface NetworkError {
-    error: any
-  }
 }
 
 export interface DictMatcher<T> {
@@ -223,49 +175,14 @@ export type HttpResponseInterceptor = (res: CyHttpMessages.IncomingHttpResponse)
  */
 export type NumberMatcher = number | number[]
 
-/**
- * Metadata for a subscription for an interception event.
- */
-export interface Subscription {
-  /**
-   * If not defined, this is a default subscription.
-   */
-  id?: string
-  routeId: string
-  eventName: string
-  await: boolean
-  skip?: boolean
-}
-
-interface InterceptionEvents {
-  /**
-   * Emitted before `response` and before any `req.continue` handlers.
-   * Modifications to `res` will be applied to the incoming response.
-   * If a promise is returned from `cb`, it will be awaited before processing other event handlers.
-   */
-  on(eventName: 'before:response', cb: HttpResponseInterceptor): Interception
-  /**
-   * Emitted after `before:response` and after any `req.continue` handlers - before the response is sent to the browser.
-   * Modifications to `res` will be applied to the incoming response.
-   * If a promise is returned from `cb`, it will be awaited before processing other event handlers.
-   */
-  on(eventName: 'response', cb: HttpResponseInterceptor): Interception
-  /**
-   * Emitted once the response to a request has finished sending to the browser.
-   * Modifications to `res` have no impact.
-   * If a promise is returned from `cb`, it will be awaited before processing other event handlers.
-   */
-  on(eventName: 'after:response', cb: (res: CyHttpMessages.IncomingResponse) => void | Promise<void>): Interception
-}
-
 /**
  * Request/response cycle.
  */
-export interface Interception extends InterceptionEvents {
+export interface Interception {
   id: string
-  routeId: string
+  routeHandlerId: string
   /* @internal */
-  log?: any
+  log: any
   request: CyHttpMessages.IncomingRequest
   /**
    * Was `cy.wait()` used to wait on this request?
@@ -273,6 +190,8 @@ export interface Interception extends InterceptionEvents {
    */
   requestWaited: boolean
   response?: CyHttpMessages.IncomingResponse
+  /* @internal */
+  responseHandler?: HttpResponseInterceptor
   /**
    * The error that occurred during this request.
    */
@@ -284,11 +203,6 @@ export interface Interception extends InterceptionEvents {
   responseWaited: boolean
   /* @internal */
   state: InterceptionState
-  /* @internal */
-  subscriptions: Array<{
-    subscription: Subscription
-    handler: (data: any) => Promise<void> | void
-  }>
 }
 
 export type InterceptionState =
@@ -336,17 +250,16 @@ export interface RouteMatcherOptionsGeneric<S> {
    * If 'false', only HTTP requests will be matched.
    */
   https?: boolean
+  /**
+   * If `true`, will match the supplied `url` against incoming `path`s.
+   * Requires a `url` argument. Cannot be used with a `path` argument.
+   */
+  matchUrlAgainstPath?: boolean
   /**
    * Match against the request's HTTP method.
    * @default '*'
    */
   method?: S
-  /**
-   * If `true`, this will pass the request on to the next `RouteMatcher` after the request handler completes.
-   * Can only be used with a dynamic request handler.
-   * @default false
-   */
-  middleware?: boolean
   /**
    * Match on request path after the hostname, including query params.
    */
@@ -379,7 +292,7 @@ export type RouteHandler = string | StaticResponse | RouteHandlerController | ob
 /**
  * Describes a response that will be sent back to the browser to fulfill the request.
  */
-export type StaticResponse = GenericStaticResponse<string, string | object | boolean | null> & {
+export type StaticResponse = GenericStaticResponse<string, string | object> & {
   /**
    * Milliseconds to delay before the response is sent.
    * @deprecated Use `delay` instead of `delayMs`.
@@ -419,7 +332,7 @@ export interface GenericStaticResponse<Fixture, Body> {
   /**
    * Milliseconds to delay before the response is sent.
    */
-  delay?: number
+   delay?: number
 }
 
 /**
@@ -459,8 +372,6 @@ interface WaitOptions {
 
 declare global {
   namespace Cypress {
-    // TODO: Why is Subject unused?
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     interface Chainable<Subject = any> {
       /**
        * Use `cy.intercept()` to stub and intercept HTTP requests and responses.
@@ -474,7 +385,7 @@ declare global {
        *    })
        * @example
        *    cy.intercept('https://localhost:7777/some-response', (req) => {
-       *      req.continue(res => {
+       *      req.reply(res => {
        *        res.body = 'some new body'
        *      })
        *    })
@@ -489,16 +400,13 @@ declare global {
        */
       intercept(method: Method, url: RouteMatcher, response?: RouteHandler): Chainable<null>
       /**
-       * Use `cy.intercept()` to stub and intercept HTTP requests and responses.
-       *
-       * @see https://on.cypress.io/intercept
-       *
-       * @example
-       *    cy.intercept('/fruits', { middleware: true }, (req) => { ... })
-       *
-       * @param mergeRouteMatcher Additional route matcher options to merge with `url`. Typically used for middleware.
+       * @deprecated Use `cy.intercept()` instead.
+       */
+      route2(url: RouteMatcher, response?: RouteHandler): Chainable<null>
+      /**
+       * @deprecated Use `cy.intercept()` instead.
        */
-      intercept(url: string, mergeRouteMatcher: Omit<RouteMatcherOptions, 'url'>, response: RouteHandler): Chainable<null>
+      route2(method: Method, url: RouteMatcher, response?: RouteHandler): Chainable<null>
       /**
        * Wait for a specific request to complete.
        *