Merge branch 'develop' of https://github.com/cypress-io/cypress into …

…develop

browser-versions.json

@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "128.0.6613.27",
+  "chrome:beta": "128.0.6613.36",
   "chrome:stable": "127.0.6533.119",
   "chrome:minimum": "64.0.3282.0"
 }

cli/CHANGELOG.md

@@ -1,7 +1,23 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
+## 13.14.0
+
+_Released 8/27/2024 (PENDING)_
+
+**Performance:**
+
+- Fixed a potential memory leak in the Cypress server when re-connecting to an unintentionally disconnected CDP connection. Fixes [#29744](https://github.com/cypress-io/cypress/issues/29744). Addressed in [#29988](https://github.com/cypress-io/cypress/pull/29988)
+
+**Features:**
+
+- Added a `CYPRESS_SKIP_VERIFY` flag to enable suppressing Cypress verification checks. Addresses [#22243](https://github.com/cypress-io/cypress/issues/22243).
+
+**Dependency Updates:**
+
+- Updated `detect-port` from `1.3.0` to `1.6.1`. Addressed in [#30038](https://github.com/cypress-io/cypress/pull/30038).
+
 ## 13.13.3
 
-_Released 8/13/2024_
+_Released 8/14/2024_
 
 **Bugfixes:**
 

cli/lib/tasks/verify.js

@@ -258,8 +258,15 @@ const start = (options = {}) => {
     force: false,
     welcomeMessage: true,
     smokeTestTimeout: VERIFY_TEST_RUNNER_TIMEOUT_MS,
+    skipVerify: util.getEnv('CYPRESS_SKIP_VERIFY') === 'true',
   })
 
+  if (options.skipVerify) {
+    debug('skipping verification of the Cypress app')
+
+    return Promise.resolve()
+  }
+
   if (options.dev) {
     return runSmokeTest('', options)
   }

cli/test/lib/tasks/verify_spec.js

@@ -97,6 +97,16 @@ context('lib/tasks/verify', () => {
     expect(newVerifyInstance.VERIFY_TEST_RUNNER_TIMEOUT_MS).to.eql(DEFAULT_VERIFY_TIMEOUT)
   })
 
+  it('returns early when `CYPRESS_SKIP_VERIFY` is set to true', () => {
+    process.env.CYPRESS_SKIP_VERIFY = 'true'
+    delete require.cache[require.resolve(`${lib}/tasks/verify`)]
+    const newVerifyInstance = require(`${lib}/tasks/verify`)
+
+    return newVerifyInstance.start().then((result) => {
+      expect(result).to.eq(undefined)
+    })
+  })
+
   it('logs error and exits when no version of Cypress is installed', () => {
     return verify
     .start()

package.json

@@ -101,7 +101,7 @@
     "@types/chai-enzyme": "0.6.7",
     "@types/classnames": "2.2.9",
     "@types/debug": "4.1.7",
-    "@types/detect-port": "^1.3.1",
+    "@types/detect-port": "^1.3.5",
     "@types/enzyme-adapter-react-16": "1.0.5",
     "@types/execa": "0.9.0",
     "@types/fluent-ffmpeg": "^2.1.18",
@@ -143,7 +143,7 @@
     "debug": "^4.3.4",
     "dedent": "^0.7.0",
     "del": "3.0.0",
-    "detect-port": "^1.3.0",
+    "detect-port": "^1.6.1",
     "electron": "27.3.10",
     "electron-builder": "^23.6.0",
     "enzyme-adapter-react-16": "1.12.1",

packages/driver/cypress/e2e/cy/timers.cy.js

@@ -1,7 +1,3 @@
-const startingIndex = Cypress.isBrowser('firefox') ? 1 : 0
-
-const timerNumber = (n) => n + startingIndex
-
 // NOTE: basically the same as a cy.wait(...) but uses setTimeout instead of Promise.delay
 // since firefox will sometimes have `Promise.delay(10)` fire faster than a `setTimeout(..., 1)`
 const cyWaitTimeout = (n) => cy.wrap(new Promise((resolve) => window.setTimeout(resolve, n)))
@@ -22,10 +18,6 @@ describe('driver/src/cy/timers', () => {
 
       const id1 = win.setTimeout(win.setBar, 1)
 
-      // the timer id is 1 by default since
-      // timers increment and always start at 0
-      expect(id1).to.eq(timerNumber(1))
-
       cy
       .window().its('bar').should('eq', 'bar')
       .log('setTimeout should not be called')
@@ -34,7 +26,7 @@ describe('driver/src/cy/timers', () => {
 
         const id2 = win.setTimeout(win.setBar, 2)
 
-        expect(id2).to.eq(timerNumber(2))
+        expect(id2).to.eq(id1 + 1)
 
         const ret = win.clearTimeout(id2)
 
@@ -73,10 +65,6 @@ describe('driver/src/cy/timers', () => {
 
       const id1 = win.setInterval(win.setBar, 1)
 
-      // the timer id is 1 by default since
-      // timers increment and always start at 0
-      expect(id1).to.eq(timerNumber(1))
-
       cy
       .window().its('bar').should('eq', 'bar')
       .log('setInterval should not be called')
@@ -87,7 +75,7 @@ describe('driver/src/cy/timers', () => {
 
         const id2 = win.setInterval(win.setBar, 2)
 
-        expect(id2).to.eq(timerNumber(2))
+        expect(id2).to.eq(id1 + 1)
 
         const ret = win.clearInterval(id2)
 
@@ -231,8 +219,6 @@ describe('driver/src/cy/timers', () => {
       .then(() => {
         const id1 = win.setTimeout(win.setBar, 1)
 
-        expect(id1).to.eq(timerNumber(1))
-
         cyWaitTimeout(1)
         .log('setTimeout should NOT have fired when paused')
         .window().its('bar').should('be.null')
@@ -252,7 +238,7 @@ describe('driver/src/cy/timers', () => {
         .then(() => {
           const id2 = win.setTimeout(win.setBar, 1)
 
-          expect(id2).to.eq(timerNumber(2))
+          expect(id2).to.eq(id1 + 1)
 
           const ret = win.clearTimeout(id2)
 
@@ -280,10 +266,6 @@ describe('driver/src/cy/timers', () => {
 
       const id1 = win.setTimeout(win.setBar, 10)
 
-      // the timer id is 1 by default since
-      // timers increment and always start at 0
-      expect(id1).to.eq(timerNumber(1))
-
       return cy.pauseTimers(true)
       .then(() => {
         cyWaitTimeout(10)
@@ -302,7 +284,7 @@ describe('driver/src/cy/timers', () => {
 
           const id2 = win.setInterval(win.setBar, 10)
 
-          expect(id2).to.eq(timerNumber(2))
+          expect(id2).to.eq(id1 + 1)
 
           return cy.pauseTimers(true)
           .then(() => {

packages/server/lib/browsers/browser-cri-client.ts

@@ -5,6 +5,7 @@ import Debug from 'debug'
 import type { Protocol } from 'devtools-protocol'
 import { _connectAsync, _getDelayMsForRetry } from './protocol'
 import * as errors from '../errors'
+import type { CypressError } from '@packages/errors'
 import { CriClient, DEFAULT_NETWORK_ENABLE_OPTIONS } from './cri-client'
 import { serviceWorkerClientEventHandler, serviceWorkerClientEventHandlerName } from '@packages/proxy/lib/http/util/service-worker-manager'
 import type { ProtocolManagerShape } from '@packages/types'
@@ -23,7 +24,7 @@ type BrowserCriClientOptions = {
   host: string
   port: number
   browserName: string
-  onAsynchronousError: Function
+  onAsynchronousError: (err: CypressError) => void
   protocolManager?: ProtocolManagerShape
   fullyManageTabs?: boolean
   onServiceWorkerClientEvent: ServiceWorkerEventHandler
@@ -33,7 +34,7 @@ type BrowserCriClientCreateOptions = {
   browserName: string
   fullyManageTabs?: boolean
   hosts: string[]
-  onAsynchronousError: Function
+  onAsynchronousError: (err: CypressError) => void
   onReconnect?: (client: CriClient) => void
   port: number
   protocolManager?: ProtocolManagerShape
@@ -181,7 +182,7 @@ export class BrowserCriClient {
   private host: string
   private port: number
   private browserName: string
-  private onAsynchronousError: Function
+  private onAsynchronousError: (err: CypressError) => void
   private protocolManager?: ProtocolManagerShape
   private fullyManageTabs?: boolean
   onServiceWorkerClientEvent: ServiceWorkerEventHandler
@@ -479,7 +480,7 @@ export class BrowserCriClient {
       browserCriClient.onClose = resolve
 
       // or when the browser's CDP ws connection is closed
-      browserClient.ws.once('close', () => {
+      browserClient.ws?.once('close', () => {
         resolve(false)
       })
     })