cypress 7.4.0 → 7.5.0

package/lib/tasks/install.js

@@ -12,7 +12,9 @@ const chalk = require('chalk');
 
 const debug = require('debug')('cypress:cli');
 
-const Listr = require('listr');
+const {
+  Listr
+} = require('listr2');
 
 const verbose = require('@cypress/listr-verbose-renderer');
 
@@ -179,7 +181,9 @@ const downloadAndUnzip = ({
   logger.log(`Installing Cypress ${chalk.gray(`(version: ${version})`)}`);
   logger.log();
   const tasks = new Listr([{
-    title: util.titleize('Downloading Cypress'),
+    options: {
+      title: util.titleize('Downloading Cypress')
+    },
     task: (ctx, task) => {
       // as our download progresses indicate the status
       progress.onProgress = progessify(task, 'Downloading Cypress');
@@ -201,7 +205,9 @@ const downloadAndUnzip = ({
     installDir,
     rendererOptions
   }), {
-    title: util.titleize('Finishing Installation'),
+    options: {
+      title: util.titleize('Finishing Installation')
+    },
     task: (ctx, task) => {
       const cleanup = () => {
         debug('removing zip file %s', downloadDestination);
@@ -213,7 +219,9 @@ const downloadAndUnzip = ({
         util.setTaskTitle(task, util.titleize(chalk.green('Finished Installation'), chalk.gray(installDir)), rendererOptions.renderer);
       });
     }
-  }], rendererOptions); // start the tasks!
+  }], {
+    rendererOptions
+  }); // start the tasks!
 
   return Promise.resolve(tasks.run());
 };
@@ -361,7 +369,9 @@ const start = (options = {}) => {
           zipFilePath: absolutePath,
           installDir,
           rendererOptions
-        })], rendererOptions).run();
+        })], {
+          rendererOptions
+        }).run();
       }
 
       if (options.force) {
@@ -396,7 +406,9 @@ const unzipTask = ({
   rendererOptions
 }) => {
   return {
-    title: util.titleize('Unzipping Cypress'),
+    options: {
+      title: util.titleize('Unzipping Cypress')
+    },
     task: (ctx, task) => {
       // as our unzip progresses indicate the status
       progress.onProgress = progessify(task, 'Unzipping Cypress');

package/lib/tasks/verify.js

@@ -4,7 +4,9 @@ const _ = require('lodash');
 
 const chalk = require('chalk');
 
-const Listr = require('listr');
+const {
+  Listr
+} = require('listr2');
 
 const debug = require('debug')('cypress:cli');
 
@@ -184,7 +186,9 @@ function testBinary(version, binaryDir, options) {
     renderer
   };
   const tasks = new Listr([{
-    title: util.titleize('Verifying Cypress can run', chalk.gray(binaryDir)),
+    options: {
+      title: util.titleize('Verifying Cypress can run', chalk.gray(binaryDir))
+    },
     task: (ctx, task) => {
       debug('clearing out the verified version');
       return state.clearBinaryStateAsync(binaryDir).then(() => {
@@ -197,7 +201,9 @@ function testBinary(version, binaryDir, options) {
         util.setTaskTitle(task, util.titleize(chalk.green('Verified Cypress!'), chalk.gray(binaryDir)), rendererOptions.renderer);
       });
     }
-  }], rendererOptions);
+  }], {
+    rendererOptions
+  });
   return tasks.run();
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "7.4.0",
+  "version": "7.5.0",
   "main": "index.js",
   "scripts": {
     "postinstall": "node index.js --exec install",
@@ -33,7 +33,7 @@
     "is-ci": "^3.0.0",
     "is-installed-globally": "~0.4.0",
     "lazy-ass": "^1.6.0",
-    "listr": "^0.14.3",
+    "listr2": "^3.8.3",
     "lodash": "^4.17.21",
     "log-symbols": "^4.0.0",
     "minimist": "^1.2.5",

package/types/chai/index.d.ts

@@ -1949,6 +1949,8 @@ declare module "chai" {
     export = chai;
 }
 
-interface Object {
-    should: Chai.Assertion;
-}
+// const a = 1; a.should(1); doesn't work with Cypress
+// https://github.com/cypress-io/cypress/issues/16548
+// interface Object {
+//     should: Chai.Assertion;
+// }

package/types/cypress-npm-api.d.ts

@@ -160,7 +160,7 @@ declare namespace CypressCommandLine {
      * Specify the type of tests to execute.
      * @default "e2e"
      */
-    testingType: 'e2e' | 'component'
+    testingType: Cypress.TestingType
   }
 
   // small utility types to better express meaning of other types

package/types/cypress.d.ts

@@ -8,6 +8,7 @@ declare namespace Cypress {
   type RequestBody = string | object
   type ViewportOrientation = 'portrait' | 'landscape'
   type PrevSubject = 'optional' | 'element' | 'document' | 'window'
+  type TestingType = 'e2e' | 'component'
   type PluginConfig = (on: PluginEvents, config: PluginConfigOptions) => void | ConfigOptions | Promise<ConfigOptions>
 
   interface CommandOptions {
@@ -251,6 +252,11 @@ declare namespace Cypress {
      */
     LocalStorage: LocalStorage
 
+    /**
+     * Current testing type, determined by the Test Runner chosen to run.
+     */
+    testingType: TestingType
+
     /**
      * Fire automation:request event for internal use.
      */
@@ -1464,7 +1470,7 @@ declare namespace Cypress {
      * @example
      *    cy.request('http://dev.local/seed')
      */
-    request(url: string, body?: RequestBody): Chainable<Response>
+    request<T = any>(url: string, body?: RequestBody): Chainable<Response<T>>
     /**
      * Make an HTTP request with specific method.
      *
@@ -1472,7 +1478,7 @@ declare namespace Cypress {
      * @example
      *    cy.request('POST', 'http://localhost:8888/users', {name: 'Jane'})
      */
-    request(method: HttpMethod, url: string, body?: RequestBody): Chainable<Response>
+    request<T = any>(method: HttpMethod, url: string, body?: RequestBody): Chainable<Response<T>>
     /**
      * Make an HTTP request with specific behavior.
      *
@@ -1483,7 +1489,7 @@ declare namespace Cypress {
      *      followRedirect: false // turn off following redirects
      *    })
      */
-    request(options: Partial<RequestOptions>): Chainable<Response>
+    request<T = any>(options: Partial<RequestOptions>): Chainable<Response<T>>
 
     /**
      * Get the root DOM element.
@@ -2799,7 +2805,7 @@ declare namespace Cypress {
     /**
      * Type of test and associated runner that was launched.
      */
-    testingType: 'e2e' | 'component'
+    testingType: TestingType
     /**
      * Cypress version.
      */
@@ -5496,9 +5502,9 @@ declare namespace Cypress {
     consoleProps(): ObjectLike
   }
 
-  interface Response {
+  interface Response<T> {
     allRequestResponses: any[]
-    body: any
+    body: T
     duration: number
     headers: { [key: string]: string | string[] }
     isOkStatusCode: boolean