Merge branch 'develop' into feat/cy-prompt

Author: ryanthemanuel

.circleci/workflows.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
-chrome-stable-version: &chrome-stable-version "137.0.7151.55"
-chrome-beta-version: &chrome-beta-version "138.0.7204.4"
+chrome-stable-version: &chrome-stable-version "137.0.7151.68"
+chrome-beta-version: &chrome-beta-version "138.0.7204.15"
 firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:

cli/CHANGELOG.md

@@ -1,7 +1,19 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
+## 14.5.0
+
+_Released 6/17/2025 (PENDING)_
+
+**Features:**
+
+- Install Cypress `win32-x64` binary on Windows `win32-arm64` systems. Cypress runs in emulation. Addresses [#30252](https://github.com/cypress-io/cypress/issues/30252).
+
+**Bugfixes:**
+
+- Fixed an issue when using `Cypress.stop()` where a run may be aborted prior to receiving the required runner events causing Test Replay to not be available. Addresses [#31781](https://github.com/cypress-io/cypress/issues/31781).
+
 ## 14.4.1
 
-_Released 6/3/2025 (PENDING)_
+_Released 6/3/2025_
 
 **Bugfixes:**
 

cli/lib/tasks/download.js

@@ -61,6 +61,12 @@ const prepend = (arch, urlPath, version) => {
   const platform = os.platform()
   const pathTemplate = util.getEnv('CYPRESS_DOWNLOAD_PATH_TEMPLATE', true)
 
+  if ((platform === 'win32') && (arch === 'arm64')) {
+    debug(`detected platform ${platform} architecture ${arch} combination`)
+    arch = 'x64'
+    debug(`overriding to download ${platform}-${arch} instead`)
+  }
+
   return pathTemplate
     ? (
       pathTemplate

cli/lib/tasks/install.js

@@ -19,7 +19,15 @@ const verbose = require('../VerboseRenderer')
 const { buildInfo, version } = require('../../package.json')
 
 function _getBinaryUrlFromBuildInfo (arch, { commitSha, commitBranch }) {
-  return `https://cdn.cypress.io/beta/binary/${version}/${os.platform()}-${arch}/${commitBranch}-${commitSha}/cypress.zip`
+  const platform = os.platform()
+
+  if ((platform === 'win32') && (arch === 'arm64')) {
+    debug(`detected platform ${platform} architecture ${arch} combination`)
+    arch = 'x64'
+    debug(`overriding to download ${platform}-${arch} pre-release binary instead`)
+  }
+
+  return `https://cdn.cypress.io/beta/binary/${version}/${platform}-${arch}/${commitBranch}-${commitSha}/cypress.zip`
 }
 
 const alreadyInstalledMsg = () => {
@@ -138,7 +146,7 @@ const downloadAndUnzip = ({ version, installDir, downloadDir }) => {
 
 const validateOS = () => {
   return util.getPlatformInfo().then((platformInfo) => {
-    return platformInfo.match(/(win32-x64|linux-x64|linux-arm64|darwin-x64|darwin-arm64)/)
+    return platformInfo.match(/(win32-x64|win32-arm64|linux-x64|linux-arm64|darwin-x64|darwin-arm64)/)
   })
 }
 

cli/test/lib/tasks/install_spec.js

@@ -502,5 +502,12 @@ describe('/lib/tasks/install', function () {
       expect(install._getBinaryUrlFromBuildInfo('x64', buildInfo))
       .to.eq(`https://cdn.cypress.io/beta/binary/0.0.0-development/linux-x64/aBranchName-abc123/cypress.zip`)
     })
+
+    it('overrides win32-arm64 to win32-x64 for pre-release', () => {
+      os.platform.returns('win32')
+
+      expect(install._getBinaryUrlFromBuildInfo('arm64', buildInfo))
+      .to.eq(`https://cdn.cypress.io/beta/binary/0.0.0-development/win32-x64/aBranchName-abc123/cypress.zip`)
+    })
   })
 })

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "14.4.0",
+  "version": "14.4.1",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {

packages/driver/src/cypress/runner.ts

@@ -556,6 +556,24 @@ const overrideRunnerHook = (Cypress, _runner, getTestById, getTest, setTest, get
 
         testAfterRun(test, Cypress)
         await testAfterRunAsync(test, Cypress)
+
+        // if the user has stopped the run, we need to abort,
+        // this needs to happen after the test:after:run events have fired
+        // to ensure protocol can properly handle the abort
+        if (_runner.stopped) {
+          // abort the run
+          _runner.abort()
+
+          // emit the final 'end' event
+          // since our reporter depends on this event
+          // and mocha may never fire this because our
+          // runnable may never finish
+          _runner.emit('end')
+
+          // remove all the listeners
+          // so no more events fire
+          _runner.removeAllListeners()
+        }
       })]
 
     return newArgs
@@ -1916,19 +1934,6 @@ export default {
         }
 
         _runner.stopped = true
-
-        // abort the run
-        _runner.abort()
-
-        // emit the final 'end' event
-        // since our reporter depends on this event
-        // and mocha may never fire this because our
-        // runnable may never finish
-        _runner.emit('end')
-
-        // remove all the listeners
-        // so no more events fire
-        _runner.removeAllListeners()
       },
 
       getDisplayPropsForLog: LogUtils.getDisplayProps,

packages/example/package.json

@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "cross-env": "6.0.3",
-    "cypress-example-kitchensink": "4.0.0",
+    "cypress-example-kitchensink": "5.0.0",
     "gh-pages": "5.0.0",
     "gulp": "4.0.2",
     "gulp-clean": "0.4.0",

packages/server/lib/cloud/protocol.ts

@@ -20,7 +20,7 @@ const routes = require('./routes')
 const debug = Debug('cypress:server:protocol')
 const debugVerbose = Debug('cypress-verbose:server:protocol')
 
-const CAPTURE_ERRORS = !process.env.CYPRESS_LOCAL_PROTOCOL_PATH
+const CAPTURE_ERRORS = !process.env.CYPRESS_LOCAL_PROTOCOL_PATH && !process.env.CYPRESS_LOCAL_STUDIO_PATH
 const DELETE_DB = !process.env.CYPRESS_LOCAL_PROTOCOL_PATH
 
 export const DB_SIZE_LIMIT = 5000000000

packages/server/lib/cloud/studio/StudioLifecycleManager.ts

@@ -18,6 +18,10 @@ import { ensureStudioBundle } from './ensure_studio_bundle'
 import chokidar from 'chokidar'
 import { readFile } from 'fs/promises'
 import { getCloudMetadata } from '../get_cloud_metadata'
+import { initializeTelemetryReporter, reportTelemetry } from './telemetry/TelemetryReporter'
+import { telemetryManager } from './telemetry/TelemetryManager'
+import { BUNDLE_LIFECYCLE_MARK_NAMES, BUNDLE_LIFECYCLE_TELEMETRY_GROUP_NAMES } from './telemetry/constants/bundle-lifecycle'
+import { INITIALIZATION_TELEMETRY_GROUP_NAMES } from './telemetry/constants/initialization'
 
 const debug = Debug('cypress:server:studio-lifecycle-manager')
 const routes = require('../routes')
@@ -98,6 +102,11 @@ export class StudioLifecycleManager {
       // Clean up any registered listeners
       this.listeners = []
 
+      telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.BUNDLE_LIFECYCLE_END)
+      reportTelemetry(BUNDLE_LIFECYCLE_TELEMETRY_GROUP_NAMES.COMPLETE_BUNDLE_LIFECYCLE, {
+        success: false,
+      })
+
       return null
     })
 
@@ -112,6 +121,12 @@ export class StudioLifecycleManager {
   }
 
   isStudioReady (): boolean {
+    if (!this.studioManager) {
+      telemetryManager.addGroupMetadata(INITIALIZATION_TELEMETRY_GROUP_NAMES.INITIALIZE_STUDIO, {
+        studioRequestedBeforeReady: true,
+      })
+    }
+
     return !!this.studioManager
   }
 
@@ -143,10 +158,21 @@ export class StudioLifecycleManager {
     let studioPath: string
     let studioHash: string
 
+    initializeTelemetryReporter({
+      projectSlug: projectId,
+      cloudDataSource,
+    })
+
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.BUNDLE_LIFECYCLE_START)
+
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.POST_STUDIO_SESSION_START)
     const studioSession = await postStudioSession({
       projectId,
     })
 
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.POST_STUDIO_SESSION_END)
+
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.ENSURE_STUDIO_BUNDLE_START)
     if (!process.env.CYPRESS_LOCAL_STUDIO_PATH) {
       // The studio hash is the last part of the studio URL, after the last slash and before the extension
       studioHash = studioSession.studioUrl.split('/').pop()?.split('.')[0]
@@ -170,11 +196,15 @@ export class StudioLifecycleManager {
       studioHash = 'local'
     }
 
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.ENSURE_STUDIO_BUNDLE_END)
+
     const serverFilePath = path.join(studioPath, 'server', 'index.js')
 
     const script = await readFile(serverFilePath, 'utf8')
     const studioManager = new StudioManager()
 
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.STUDIO_MANAGER_SETUP_START)
+
     const { cloudUrl, cloudHeaders } = await getCloudMetadata(cloudDataSource)
 
     await studioManager.setup({
@@ -192,11 +222,18 @@ export class StudioLifecycleManager {
       shouldEnableStudio: this.cloudStudioRequested,
     })
 
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.STUDIO_MANAGER_SETUP_END)
+
     if (studioManager.status === 'ENABLED') {
       debug('Cloud studio is enabled - setting up protocol')
       const protocolManager = new ProtocolManager()
+
+      telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.STUDIO_PROTOCOL_GET_START)
       const script = await api.getCaptureProtocolScript(studioSession.protocolUrl)
 
+      telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.STUDIO_PROTOCOL_GET_END)
+
+      telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.STUDIO_PROTOCOL_PREPARE_START)
       await protocolManager.prepareProtocol(script, {
         runId: 'studio',
         projectId: cfg.projectId,
@@ -212,6 +249,8 @@ export class StudioLifecycleManager {
         mode: 'studio',
       })
 
+      telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.STUDIO_PROTOCOL_PREPARE_END)
+
       studioManager.protocolManager = protocolManager
     } else {
       debug('Cloud studio is not enabled - skipping protocol setup')
@@ -222,6 +261,11 @@ export class StudioLifecycleManager {
     this.callRegisteredListeners()
     this.updateStatus(studioManager.status)
 
+    telemetryManager.mark(BUNDLE_LIFECYCLE_MARK_NAMES.BUNDLE_LIFECYCLE_END)
+    reportTelemetry(BUNDLE_LIFECYCLE_TELEMETRY_GROUP_NAMES.COMPLETE_BUNDLE_LIFECYCLE, {
+      success: true,
+    })
+
     return studioManager
   }
 
@@ -275,8 +319,14 @@ export class StudioLifecycleManager {
         cloudDataSource,
         cfg,
         debugData,
+      }).then((studioManager) => {
+        // eslint-disable-next-line no-console
+        console.log('Studio manager reloaded')
+
+        return studioManager
       }).catch((error) => {
-        debug('Error during reload of studio manager: %o', error)
+        // eslint-disable-next-line no-console
+        console.error('Error during reload of studio manager: %o', error)
 
         return null
       })