Merge branch 'develop' into ryanm/fix/error-message-when-downloading-cy-prompt

Author: ryanthemanuel

.circleci/src/pipeline/@pipeline.yml

@@ -1785,7 +1785,7 @@ jobs:
                   source ./scripts/ensure-node.sh
                   yarn lerna run types
             - sanitize-verify-and-store-mocha-results:
-                expectedResultCount: 5
+                expectedResultCount: 3
 
   verify-release-readiness:
     <<: *defaults

cli/CHANGELOG.md

@@ -9,8 +9,10 @@ _Released 10/20/2025 (PENDING)_
 
 **Bugfixes:**
 
-- Fixes an issue where grouped command text jumps up and down when expanding and collapsing in the command log. Addressed in [#32757](https://github.com/cypress-io/cypress/pull/32757).
-- Added more context to the error message shown when `cy.prompt()` fails to download. Addressed in [#](https://github.com/cypress-io/cypress/pull/).
+- Fixed an issue where grouped command text jumps up and down when expanding and collapsing in the command log. Addressed in [#32757](https://github.com/cypress-io/cypress/pull/32757).
+- Fixed an issue where command snapshots were not correctly displayed in Studio. Addressed in [#32808](https://github.com/cypress-io/cypress/pull/32808).
+- Fixed an issue with grouped console prop items having a hard to read blue color in the console log and duplicate `:` characters being displayed. Addressed in [#32776](https://github.com/cypress-io/cypress/pull/32776).
+- Added more context to the error message shown when `cy.prompt()` fails to download. Addressed in [#32822](https://github.com/cypress-io/cypress/pull/32822).
 
 **Misc:**
 

guides/esm-migration.md

@@ -12,7 +12,11 @@
 
 #### Notes
 
-When migrating some of these projects away from the `ts-node` entry [see `@packages/scaffold-config` example](https://github.com/cypress-io/cypress/blob/v15.2.0/packages/scaffold-config/index.js), it is somewhat difficult to make separate browser/node entries as the v8-snapshot [tsconfig.json](https://github.com/cypress-io/cypress/blob/v15.2.0/tooling/v8-snapshot/tsconfig.json) is using an older style of module resolution where the `exports` key inside a package's `package.json` is not well supported. Because of this, we need to find ways to bundle code that is needed internally in the browser vs in node without them being a part of the same bundle. This is a temporary work around until we are able to get every package being able to build as an ES Module, which as that point we can re assess how the Cypress binary is being built as well as v8-snapshots, and will allow us to reconfigure this packages to export content in a more proper fashion.
+When migrating some of these projects away from the `ts-node` entry [see `@packages/scaffold-config` example](https://github.com/cypress-io/cypress/blob/v15.2.0/packages/scaffold-config/index.js), it is somewhat difficult to make separate browser/node entries as the v8-snapshot [tsconfig.json](https://github.com/cypress-io/cypress/blob/v15.2.0/tooling/v8-snapshot/tsconfig.json) is using an older style of module resolution where the `exports` key inside a package's `package.json` is not well supported. Because of this, we need to find ways to bundle code that is needed internally in the browser vs in node without them being a part of the same bundle. This is a temporary work around until we are able to get every package being able to build as an ES Module, which as that point we can re assess how the Cypress binary is being built as well as v8-snapshots, and will allow us to reconfigure this packages to export content in a more proper fashion. We are currently doing something similar in the following packages:
+
+* `@packages/scaffold-config`
+* `@packages/socket`
+* `@packages/telemetry`
 
 #### Status
 
@@ -44,7 +48,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] packages/error ✅ **COMPLETED**
 - [x] packages/eslint-config ✅ **COMPLETED**
 - [ ] packages/example
-- [ ] packages/extension
+- [x] packages/extension ✅ **COMPLETED**
 - [ ] packages/frontend-shared **PARTIAL** - entry point is JS
 - [x] packages/electron ✅ **COMPLETED**
 - [x] packages/https-proxy - ✅ **COMPLETED**
@@ -63,7 +67,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] packages/runner ✅ **COMPLETED**
 - [x] packages/scaffold-config ✅ **COMPLETED**
 - [ ] packages/server **PARTIAL** - many source/test files in JS. highest priority
-- [ ] packages/socket **PARTIAL** - entry point is JS. Tests are JS
+- [x] packages/socket ✅ **COMPLETED**
 - [x] packages/stderr-filtering ✅ **COMPLETED**
 - [x] packages/telemetry ✅ **COMPLETED**
 - [ ] packages/ts **PARTIAL** - ultimate goal is removal and likely not worth the effort to convert
@@ -82,7 +86,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] npm/cypress-schematic ✅ **COMPLETED**
 - [ ] npm/eslint-plugin-dev
 - [x] npm/grep ✅ **COMPLETED** 
-- [ ] npm/puppeteer
+- [x] npm/puppeteer ✅ **COMPLETED** 
 - [x] npm/vite-dev-server ✅ **COMPLETED** 
 - [ ] npm/webpack-batteries-included-preprocessor
 - [ ] npm/webpack-dev-server
@@ -95,15 +99,15 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] packages/driver ✅ **COMPLETED**
 - [x] packages/electron ✅ **COMPLETED**
 - [x] packages/error ✅ **COMPLETED**
-- [ ] packages/extension
+- [x] packages/extension ✅ **COMPLETED**
 - [x] packages/https-proxy ✅ **COMPLETED**
 - [x] packages/electron ✅ **COMPLETED**
 - [x] packages/icons ✅ **COMPLETED**
 - [x] packages/launcher ✅ **COMPLETED**
 - [x] packages/net-stubbing ✅ **COMPLETED**
 - [x] packages/network ✅ **COMPLETED**
 - [x] packages/network-tools ✅ **COMPLETED**
-- [ ] packages/packherd-require
+- [x] packages/packherd-require ✅ **COMPLETED**
 - [x] packages/proxy ✅ **COMPLETED**
 - [x] packages/rewriter ✅ **COMPLETED**
 - [x] packages/scaffold-config ✅ **COMPLETED**

npm/puppeteer/.mocharc.json

@@ -1,12 +1,13 @@
 import { baseConfig } from '@packages/eslint-config'
 
-const allowDefaultProject = ['cypress.config.ts', 'eslint.config.ts', 'support/index.js']
+const allowDefaultProject = ['cypress.config.ts', 'eslint.config.ts', 'support/index.js', 'vitest.config.ts']
 
 export default [
   ...baseConfig,
   {
     languageOptions: {
       parserOptions: {
+        tsconfigRootDir: __dirname,
         projectService: {
           allowDefaultProject,
         },

npm/puppeteer/eslint.config.ts

@@ -12,8 +12,9 @@
     "cypress:run": "node ../../scripts/cypress.js run --browser chrome",
     "lint": "eslint",
     "semantic-release": "semantic-release",
-    "test": "mocha test/unit/*.spec.ts",
-    "test-watch": "yarn test & chokidar '**/*.ts' 'test/unit/*.ts' -c 'yarn test'",
+    "test-debug": "vitest --inspect-brk --no-file-parallelism --test-timeout=0 --hook-timeout=0",
+    "test": "vitest run",
+    "test-watch": "vitest --watch",
     "watch": "rimraf dist && tsc --watch"
   },
   "dependencies": {
@@ -23,17 +24,13 @@
   "devDependencies": {
     "@packages/eslint-config": "0.0.0-development",
     "@types/node": "^22.18.7",
-    "chai-as-promised": "^7.1.1",
     "chokidar": "^3.5.3",
     "eslint": "^9.31.0",
     "express": "4.21.0",
-    "mocha": "^9.2.2",
     "rimraf": "^6.0.1",
     "semantic-release": "22.0.12",
-    "sinon": "^13.0.1",
-    "sinon-chai": "^3.7.0",
-    "ts-node": "^10.9.2",
-    "typescript": "5.4.5"
+    "typescript": "5.4.5",
+    "vitest": "^3.2.4"
   },
   "peerDependencies": {
     "cypress": ">=13.6.0"

npm/puppeteer/package.json

@@ -2,7 +2,6 @@
   "compilerOptions": {
     "allowJs": true,
     "noEmit": true,
-    "types": ["mocha"]
   },
   "include": ["**/*.ts"],
 }

npm/puppeteer/test/tsconfig.json

@@ -1,15 +1,8 @@
-import { expect, use } from 'chai'
-import chaiAsPromised from 'chai-as-promised'
-import sinon from 'sinon'
-import sinonChai from 'sinon-chai'
+import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
 import type { Browser, Page } from 'puppeteer-core'
 import { activateMainTab, ACTIVATION_TIMEOUT } from '../../src/plugin/activateMainTab'
 
-use(chaiAsPromised)
-use(sinonChai)
-
 describe('activateMainTab', () => {
-  let clock: sinon.SinonFakeTimers
   let prevWin: Window
   let prevDoc: Document
   let prevTop: Window & typeof globalThis
@@ -22,14 +15,12 @@ describe('activateMainTab', () => {
   let mockPage: Partial<Page>
 
   beforeEach(() => {
-    clock = sinon.useFakeTimers()
-
+    vi.useFakeTimers()
     window = {
-      addEventListener: sinon.stub(),
-      removeEventListener: sinon.stub(),
+      addEventListener: vi.fn(),
+      removeEventListener: vi.fn(),
 
-      // @ts-ignore sinon gets confused about postMessage type declaration
-      postMessage: sinon.stub(),
+      postMessage: vi.fn(),
     }
 
     mockDocument = {
@@ -41,60 +32,66 @@ describe('activateMainTab', () => {
     // activateMainTab is eval'd in browser context, but the tests exec in a
     // node context. We don't necessarily need to do this swap, but it makes the
     // tests more portable.
-    // @ts-ignore
     prevWin = global.window
     prevDoc = global.document
-    // @ts-ignore
+    // @ts-expect-error
     prevTop = global.top
-    //@ts-ignore
+    // @ts-expect-error
     global.window = window
     global.document = mockDocument as Document
-    //@ts-ignore
+    // @ts-expect-error
     global.top = mockTop
 
     mockPage = {
-      evaluate: sinon.stub().callsFake((fn, ...args) => fn(...args)),
+      evaluate: vi.fn().mockImplementation((fn, ...args) => fn(...args)),
     }
 
     mockBrowser = {
-      pages: sinon.stub(),
+      pages: vi.fn(),
     }
   })
 
   afterEach(() => {
-    clock.restore()
-    // @ts-ignore
+    vi.clearAllTimers()
+    // @ts-expect-error
     global.window = prevWin
-    // @ts-ignore
     global.top = prevTop
     global.document = prevDoc
   })
 
   it('sends a tab activation request to the plugin, and resolves when the ack event is received', async () => {
-    const pagePromise = Promise.resolve([mockPage])
-
-    ;(mockBrowser.pages as sinon.SinonStub).returns(pagePromise)
-    const p = activateMainTab(mockBrowser as Browser)
+    vi.mocked(mockBrowser.pages).mockResolvedValue([mockPage] as Page[])
+    vi.mocked(window.addEventListener).mockImplementation((event, listener) => {
+      if (event === 'message') {
+        // @ts-expect-error
+        listener({ data: { message: 'cypress:extension:main:tab:activated' } })
+      }
+    })
 
-    await pagePromise
-    // @ts-ignore
-    window.addEventListener.withArgs('message').yield({ data: { message: 'cypress:extension:main:tab:activated' } })
-    expect(window.postMessage).to.be.calledWith({ message: 'cypress:extension:activate:main:tab' })
+    await activateMainTab(mockBrowser as Browser)
 
-    expect(p).to.eventually.be.true
+    expect(window.postMessage).toHaveBeenCalledExactlyOnceWith({ message: 'cypress:extension:activate:main:tab' })
   })
 
   it('sends a tab activation request to the plugin, and rejects if it times out', async () => {
-    const pagePromise = Promise.resolve([mockPage])
-
-    ;(mockBrowser.pages as sinon.SinonStub).returns(pagePromise)
-    await pagePromise
-
-    const p = activateMainTab(mockBrowser as Browser)
-
-    clock.tick(ACTIVATION_TIMEOUT + 1)
-
-    expect(p).to.be.rejected
+    vi.mocked(mockBrowser.pages).mockResolvedValue([mockPage] as Page[])
+
+    return new Promise<void>(async (resolve) => {
+      mockPage.evaluate = vi.fn().mockImplementation(async (fn, ...args) => {
+        try {
+          await fn(...args)
+        } catch (error) {
+          expect(window.removeEventListener).toHaveBeenCalledExactlyOnceWith('message', expect.any(Function))
+          expect(error).toBeUndefined()
+          resolve()
+        }
+      })
+
+        const activationPromise = activateMainTab(mockBrowser as Browser)
+
+        await vi.advanceTimersByTimeAsync(ACTIVATION_TIMEOUT + 1)
+        await activationPromise
+    })
   })
 
   describe('when cy in cy', () => {
@@ -103,16 +100,11 @@ describe('activateMainTab', () => {
     })
 
     it('does not try to send tab activation message', async () => {
-      const pagePromise = Promise.resolve([mockPage])
-
-      ;(mockBrowser.pages as sinon.SinonStub).returns(pagePromise)
-
-      const p = activateMainTab(mockBrowser as Browser)
+      vi.mocked(mockBrowser.pages).mockResolvedValue([mockPage] as Page[])
+      await activateMainTab(mockBrowser as Browser)
 
-      await pagePromise
-      expect(window.postMessage).not.to.be.called
-      expect(window.addEventListener).not.to.be.called
-      await p
+      expect(window.postMessage).not.toHaveBeenCalled()
+      expect(window.addEventListener).not.toHaveBeenCalled()
     })
   })
 })

npm/puppeteer/test/unit/activateMainTab.spec.ts

@@ -1,53 +1,49 @@
-import { expect, use } from 'chai'
-import chaiAsPromised from 'chai-as-promised'
-import sinon from 'sinon'
-import sinonChai from 'sinon-chai'
-
+import { describe, it, expect, vi } from 'vitest'
 import { retry } from '../../src/plugin'
 
-use(chaiAsPromised)
-use(sinonChai)
-
 describe('#retry', () => {
   it('returns result of passing 1st attempt', async () => {
-    const fn = sinon.stub().returns('passes 1st attempt')
+    const fn = vi.fn().mockReturnValue('passes 1st attempt')
     const result = await retry(fn)
 
-    expect(fn).to.be.calledOnce
-    expect(result).to.equal('passes 1st attempt')
+    expect(fn).toHaveBeenCalledOnce()
+    expect(result).toEqual('passes 1st attempt')
   })
 
   it('retries after delay and returns result of subsequent passing attempt', async () => {
-    const fn = sinon.stub()
+    const fn = vi.fn()
 
-    fn.onFirstCall().throws('fail')
-    fn.onSecondCall().returns('passes 2nd attempt')
+    fn.mockImplementationOnce(() => { throw new Error('fail') })
+    fn.mockImplementationOnce(() => { return 'passes 2nd attempt' })
 
     const result = await retry(fn, { delayBetweenTries: 1 })
 
-    expect(fn).to.be.calledTwice
-    expect(result).to.equal('passes 2nd attempt')
+    expect(fn).toHaveBeenCalledTimes(2)
+    expect(result).toEqual('passes 2nd attempt')
   })
 
   it('retries up to timeout and returns result of subsequent passing attempt', async () => {
-    const fn = sinon.stub()
+    const fn = vi.fn()
 
-    fn.throws('fail')
-    fn.onCall(5).returns('passes 5th attempt')
+    fn.mockImplementationOnce(() => { throw new Error('fail') })
+    fn.mockImplementationOnce(() => { throw new Error('fail') })
+    fn.mockImplementationOnce(() => { throw new Error('fail') })
+    fn.mockImplementationOnce(() => { throw new Error('fail') })
+    fn.mockImplementationOnce(() => { return 'passes 5th attempt' })
 
     const result = await retry(fn, { delayBetweenTries: 1 })
 
-    expect(fn.callCount).to.equal(6)
-    expect(result).to.equal('passes 5th attempt')
+    expect(fn).toHaveBeenCalledTimes(5)
+    expect(result).toEqual('passes 5th attempt')
   })
 
   it('fails if function does not pass before timeout', async () => {
-    const fn = sinon.stub().callsFake(() => {
+    const fn = vi.fn().mockImplementation(() => {
       throw new Error('fail')
     })
 
     await expect(
       retry(fn, { timeout: 5, delayBetweenTries: 1 }),
-    ).to.be.rejectedWith('Failed retrying after 5ms: fail')
+    ).rejects.toThrow('Failed retrying after 5ms: fail')
   })
 })