Merge branch 'develop' into keyboard-dialog-save-studio

Author: jennifer-shehane

.circleci/config.yml

@@ -129,7 +129,8 @@ jobs:
     resource_class: small
     steps:
         - cancel-draft-prs
-        - checkout
+        - checkout:
+            method: blobless
         - restore-src-checksum-cache
         - persist-to-workspace-and-exit-early
         - pack-workflows

.circleci/src/pipeline/@pipeline.yml

@@ -1473,7 +1473,8 @@ jobs:
         default: false
     resource_class: << parameters.resource_class >>
     steps:
-      - checkout
+      - checkout:
+          method: full
       - install-required-node
       - verify-build-setup:
           executor: << parameters.executor >>

cli/CHANGELOG.md

@@ -24,6 +24,7 @@ _Released 11/4/2025 (PENDING)_
 - Have cursor on hover of the AUT URL to show as pointer. Addresses [#32777](https://github.com/cypress-io/cypress/issues/32777). Addressed in [#32782](https://github.com/cypress-io/cypress/pull/32782).
 - WebKit now prefers a cookie's fully qualified `domain` when requesting a cookie value via [`cy.getCookie()`](https://docs.cypress.io/api/commands/getcookie). If none are found, the cookie's apex domain will be used as a fallback. Addresses [#29954](https://github.com/cypress-io/cypress/issues/29954), [#29973](https://github.com/cypress-io/cypress/issues/29973) and [#30392](https://github.com/cypress-io/cypress/issues/30392). Addressed in [#32852](https://github.com/cypress-io/cypress/pull/32852).
 - The keyboard shortcuts modal now displays the keyboard shortcut for saving Studio changes - `⌘` + `s` for Mac or `Ctrl` + `s` for Windows/Linux. Addressed [#32862](https://github.com/cypress-io/cypress/issues/32862). Addressed in [#32864](https://github.com/cypress-io/cypress/pull/32864).
+- The 'Next' tooltip style was updated. Addressed in [#32866](https://github.com/cypress-io/cypress/pull/32866).
 
 **Dependency Updates:**
 

packages/https-proxy/lib/index.ts

@@ -2,3 +2,5 @@ import { create as createProxy, reset as resetProxy } from './proxy'
 import { CA } from './ca'
 
 export { createProxy, resetProxy, CA }
+
+export type { Server } from './server'

packages/reporter/cypress/e2e/header.cy.ts

@@ -321,7 +321,7 @@ describe('header', () => {
 
       it('displays tooltip for next button', () => {
         cy.get('.next').trigger('mouseover')
-        cy.get('.cy-tooltip').should('have.text', `Next [N]:find`)
+        cy.get('.cy-tooltip').should('have.text', 'Next N : find')
       })
 
       it('emits runner:next when next button is clicked', () => {

packages/reporter/src/header/controls.tsx

@@ -56,7 +56,7 @@ const Controls: React.FC<Props> = observer(({ events = defaultEvents, appState }
       {(appState.isPaused || (appState.isRunning && appState.hasBeenPaused)) && (
         <Tooltip
           placement='bottom'
-          title={appState.nextCommandName ? <p>Next <span className='kbd'>[N]:</span>{appState.nextCommandName}</p> : <p>Step (not available)</p>}
+          title={appState.nextCommandName ? <p>Next <span className='kbd'>N</span> : {appState.nextCommandName}</p> : <p>Step (not available)</p>}
           className='cy-tooltip'
         >
           <div>

packages/reporter/src/test/test-model.ts

@@ -51,7 +51,6 @@ export default class Test extends Runnable {
   type = 'test'
 
   _callbackAfterUpdate: UpdateTestCallback | null = null
-  hooks: HookProps[]
   invocationDetails?: FileDetails
 
   attempts: Attempt[] = []

packages/server/lib/cache.ts

@@ -3,7 +3,7 @@ import Promise from 'bluebird'
 import { globalPubSub } from '@packages/data-context'
 import { fs } from './util/fs'
 import appData from './util/app_data'
-import FileUtil from './util/file'
+import { File as FileUtil } from './util/file'
 import type { Cache, CachedUser, Preferences, Cohort } from '@packages/types'
 
 interface Transaction {
@@ -55,6 +55,7 @@ export const cache = {
   },
 
   getProjectRoots (): Promise<string[]> {
+    // @ts-expect-error - transaction is untyped currently
     return fileUtil.transaction((tx: Transaction) => {
       return this._getProjects(tx).then((projects) => {
         const pathsToRemove = Promise.reduce(projects, (memo: string[], path: string) => {
@@ -76,6 +77,7 @@ export const cache = {
   },
 
   removeProject (path: string): Promise<void> {
+    // @ts-expect-error - transaction is untyped currently
     return fileUtil.transaction((tx: Transaction) => {
       return this._getProjects(tx).then((projects) => {
         return this._removeProjects(tx, projects, path)
@@ -84,6 +86,7 @@ export const cache = {
   },
 
   insertProject (path: string): Promise<void> {
+    // @ts-expect-error - transaction is untyped currently
     return fileUtil.transaction((tx: Transaction) => {
       return this._getProjects(tx).then((projects) => {
         // projects are sorted by most recently used, so add a project to
@@ -124,6 +127,7 @@ export const cache = {
   },
 
   insertProjectPreferences (projectTitle: string, projectPreferences: Preferences): Promise<void> {
+    // @ts-expect-error - transaction is untyped currently
     return fileUtil.transaction((tx: Transaction) => {
       return tx.get('PROJECT_PREFERENCES', {}).then((preferences) => {
         return tx.set('PROJECT_PREFERENCES', {
@@ -163,6 +167,7 @@ export const cache = {
   },
 
   insertCohort (cohort: Cohort): Promise<void> {
+    // @ts-expect-error - transaction is untyped currently
     return fileUtil.transaction((tx: Transaction) => {
       return tx.get('COHORTS', {}).then((cohorts) => {
         return tx.set('COHORTS', {

packages/server/lib/cloud/api/index.ts

@@ -40,6 +40,7 @@ import { isNonRetriableCertErrorCode } from '../network/non_retriable_cert_error
 
 const debug = debugModule('cypress:server:cloud:api')
 const debugProtocol = debugModule('cypress:server:protocol')
+const debugVerbose = debugModule('cypress-verbose:server:cloud:api')
 
 const THIRTY_SECONDS = humanInterval('30 seconds')
 const SIXTY_SECONDS = humanInterval('60 seconds')
@@ -164,7 +165,8 @@ const rp = request.defaults((params: CypressRequestOptions, callback) => {
       cacheResponse(resp, params)
     }
 
-    return debug('response %o', resp)
+    debug(`${params.method} ${params.url} response received`)
+    debugVerbose('response: %o', resp)
   })
 })
 

packages/server/lib/cloud/auth.ts

@@ -9,7 +9,7 @@ const url = require('url')
 const { shell } = require('electron')
 
 const machineId = require('./machine_id')
-const random = require('../util/random')
+import { id as randomId } from '../util/random'
 const user = require('./user')
 
 let app
@@ -29,7 +29,7 @@ const buildFullLoginUrl = (baseLoginUrl, server, utmSource, utmMedium, utmConten
   const { port } = server.address()
 
   if (!authState) {
-    authState = random.id(32)
+    authState = randomId(32)
   }
 
   const authUrl = url.parse(baseLoginUrl)