Merge branch 'breaking/remove_angular_17_cursor' of github.com:cypress-io/cypress into breaking/remove_angular_17_cursor

Author: AtofStryker

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-4-7-2025-v1
+4-22-2025

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 setup: true
 
 orbs:
-  continuation: circleci/continuation@1.0.0
+  continuation: circleci/continuation@1.1.0
 
 jobs:
   verify-ci-should-run:

.circleci/workflows.yml

@@ -1,6 +1,6 @@
 version: 2.1
 
-chrome-stable-version: &chrome-stable-version "135.0.7049.95"
+chrome-stable-version: &chrome-stable-version "135.0.7049.114"
 chrome-beta-version: &chrome-beta-version "136.0.7103.33"
 firefox-stable-version: &firefox-stable-version "137.0"
 

cli/CHANGELOG.md

@@ -10,6 +10,27 @@ _Released 07/01/2025 (PENDING)_
 - Removed support for [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol) with the [firefox](https://www.mozilla.org/) browser. Addresses [#31189](https://github.com/cypress-io/cypress/issues/31189).
 - The Cypress configuration wizard for Component Testing supports TypeScript 5.0 or greater. Addresses [#31187](https://github.com/cypress-io/cypress/issues/31187).
 
+## 14.3.3
+
+_Released 5/6/2025 (PENDING)_
+
+**Misc:**
+
+- The URL in the Cypress App no longer displays a white background when the URL is loading. Fixes [#31556](https://github.com/cypress-io/cypress/issues/31556).
+
+## 14.3.2
+
+_Released 4/22/2025_
+
+**Bugfixes:**
+
+- Fixed an issue where auto scroll in the Cypress Command Log was not scrolling correctly. Fixes [#31530](https://github.com/cypress-io/cypress/issues/31530).
+- Fixed an issue where a message pointing users to the Cypress Cloud was not displaying on runs with failures in CI. Fixes [#31550](https://github.com/cypress-io/cypress/issues/31550).
+
+**Misc:**
+
+- The URL in the Cypress App no longer displays a white background when the URL is loading. Fixes [#31556](https://github.com/cypress-io/cypress/issues/31556).
+
 ## 14.3.1
 
 _Released 4/17/2025_

npm/react/package.json

@@ -28,7 +28,7 @@
     "react-router-dom": "6.28.0",
     "semver": "^7.7.1",
     "typescript": "~5.4.5",
-    "vite": "5.4.10",
+    "vite": "5.4.18",
     "vite-plugin-require-transform": "1.0.12"
   },
   "peerDependencies": {

npm/vite-dev-server/cypress/e2e/react.cy.ts

@@ -4,7 +4,8 @@ import dedent from 'dedent'
 
 type ProjectDirs = typeof fixtureDirs
 
-const VITE_REACT: ProjectDirs[number][] = ['vite4.5.5-react', 'vite5.4.10-react', 'vite6.0.0-react']
+// These versions should reflect the latest versions of each major version of Vite - update as needed
+const VITE_REACT: ProjectDirs[number][] = ['vite4.5.12-react', 'vite5.4.18-react', 'vite6.2.5-react']
 
 // Add to this list to focus on a particular permutation
 const ONLY_PROJECTS: ProjectDirs[number][] = []

npm/vite-dev-server/cypress/e2e/vite-dev-server.cy.ts

@@ -44,8 +44,8 @@ describe('Config options', () => {
   })
 
   it('supports supportFile = false', () => {
-    cy.scaffoldProject('vite6.0.0-react')
-    cy.openProject('vite6.0.0-react', ['--config-file', 'cypress-vite-no-support.config.ts', '--component'])
+    cy.scaffoldProject('vite6.2.5-react')
+    cy.openProject('vite6.2.5-react', ['--config-file', 'cypress-vite-no-support.config.ts', '--component'])
     cy.startAppServer('component')
 
     cy.visitApp()
@@ -59,8 +59,8 @@ describe('Config options', () => {
   it('supports serving files with whitespace', () => {
     const specWithWhitespace = 'spec with whitespace.cy.jsx'
 
-    cy.scaffoldProject('vite6.0.0-react')
-    cy.openProject('vite6.0.0-react', ['--config-file', 'cypress-vite.config.ts', '--component'])
+    cy.scaffoldProject('vite6.2.5-react')
+    cy.openProject('vite6.2.5-react', ['--config-file', 'cypress-vite.config.ts', '--component'])
     cy.startAppServer('component')
 
     cy.withCtx(async (ctx, { specWithWhitespace }) => {
@@ -77,8 +77,8 @@ describe('Config options', () => {
   })
 
   it('supports @cypress/vite-dev-server', () => {
-    cy.scaffoldProject('vite6.0.0-react')
-    cy.openProject('vite6.0.0-react', ['--config-file', 'cypress-vite-dev-server-function.config.ts', '--component'])
+    cy.scaffoldProject('vite6.2.5-react')
+    cy.openProject('vite6.2.5-react', ['--config-file', 'cypress-vite-dev-server-function.config.ts', '--component'])
     cy.startAppServer('component')
 
     cy.visitApp()
@@ -89,8 +89,8 @@ describe('Config options', () => {
   })
 
   it('supports viteConfig as an async function', () => {
-    cy.scaffoldProject('vite6.0.0-react')
-    cy.openProject('vite6.0.0-react', ['--config-file', 'cypress-vite-async-function-config.config.ts', '--component'])
+    cy.scaffoldProject('vite6.2.5-react')
+    cy.openProject('vite6.2.5-react', ['--config-file', 'cypress-vite-async-function-config.config.ts', '--component'])
     cy.startAppServer('component')
 
     cy.visitApp()
@@ -120,8 +120,8 @@ describe('sourcemaps', () => {
       })
     `
 
-    cy.scaffoldProject('vite6.0.0-react')
-    cy.openProject('vite6.0.0-react', ['--config-file', 'cypress-vite.config.ts', '--component'])
+    cy.scaffoldProject('vite6.2.5-react')
+    cy.openProject('vite6.2.5-react', ['--config-file', 'cypress-vite.config.ts', '--component'])
     cy.startAppServer('component')
 
     cy.withCtx(async (ctx, o) => {

npm/vite-dev-server/package.json

@@ -27,9 +27,9 @@
     "mocha": "^9.2.2",
     "sinon": "^13.0.1",
     "ts-node": "^10.9.2",
-    "vite-4": "npm:vite@^4.5.3",
-    "vite-5": "npm:vite@^5.2.8",
-    "vite-6": "npm:vite@^6.0.0",
+    "vite-4": "npm:vite@^4.5.12",
+    "vite-5": "npm:vite@^5.4.18",
+    "vite-6": "npm:vite@^6.2.5",
     "vite-plugin-inspect": "0.8.4"
   },
   "peerDependencies": {

npm/vite-plugin-cypress-esm/package.json

@@ -24,7 +24,7 @@
     "react-dom": "18.3.1",
     "react-router": "6.28.0",
     "react-router-dom": "6.28.0",
-    "vite": "5.2.11"
+    "vite": "5.4.18"
   },
   "files": [
     "dist",

npm/vue/package.json

@@ -25,7 +25,7 @@
     "globby": "^11.0.1",
     "tailwindcss": "1.1.4",
     "typescript": "~5.4.5",
-    "vite": "5.2.11",
+    "vite": "5.4.18",
     "vue": "3.2.47",
     "vue-i18n": "9.13.1",
     "vue-router": "^4.0.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "14.3.1",
+  "version": "14.3.2",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {
@@ -102,7 +102,6 @@
     "@types/bluebird": "3.5.29",
     "@types/chai-enzyme": "0.6.7",
     "@types/debug": "4.1.7",
-    "@types/detect-port": "^1.3.5",
     "@types/enzyme-adapter-react-16": "1.0.5",
     "@types/fluent-ffmpeg": "^2.1.18",
     "@types/fs-extra": "^9.0.13",
@@ -141,7 +140,7 @@
     "debug": "^4.3.4",
     "dedent": "^0.7.0",
     "del": "3.0.0",
-    "detect-port": "^1.6.1",
+    "detect-port": "^2.1.0",
     "electron": "33.2.1",
     "electron-builder": "^25.1.8",
     "enzyme-adapter-react-16": "1.12.1",

packages/app/cypress/e2e/studio/helper.ts

@@ -1,15 +1,21 @@
-export function launchStudio ({ specName = 'spec.cy.js', createNewTest = false, cliArgs = [''], enableCloudStudio = false } = {}) {
-  cy.scaffoldProject('experimental-studio')
-  cy.openProject('experimental-studio', cliArgs, {
+import type { ProjectFixtureDir } from '@tooling/system-tests'
+
+export function loadProjectAndRunSpec ({ projectName = 'experimental-studio' as ProjectFixtureDir, specName = 'spec.cy.js', cliArgs = [''], enableCloudStudio = false, specSelector = 'data-cy-row' } = {}) {
+  cy.scaffoldProject(projectName)
+  cy.openProject(projectName, cliArgs, {
     cloudStudio: enableCloudStudio,
   })
 
   cy.startAppServer('e2e')
   cy.visitApp()
   cy.specsPageIsVisible()
-  cy.get(`[data-cy-row="${specName}"]`).click()
+  cy.get(`[${specSelector}="${specName}"]`).click()
 
   cy.waitForSpecToFinish()
+}
+
+export function launchStudio ({ specName = 'spec.cy.js', createNewTest = false, cliArgs = [''], enableCloudStudio = false } = {}) {
+  loadProjectAndRunSpec({ specName, cliArgs, enableCloudStudio })
 
   // Should not show "Studio Commands" until we've started a new Studio session.
   cy.get('[data-cy="hook-name-studio commands"]').should('not.exist')

packages/app/cypress/e2e/studio/studio.cy.ts

@@ -1,4 +1,4 @@
-import { launchStudio } from './helper'
+import { launchStudio, loadProjectAndRunSpec } from './helper'
 import pDefer from 'p-defer'
 
 describe('Cypress Studio', () => {
@@ -22,6 +22,34 @@ describe('Cypress Studio', () => {
     })
   }
 
+  function assertClosingPanelWithoutChanges () {
+    // Cypress re-runs after you cancel Studio.
+    // Original spec should pass
+    cy.waitForSpecToFinish({ passCount: 1 })
+
+    cy.get('.command').should('have.length', 1)
+
+    // Assert the spec was executed without any new commands.
+    cy.get('.command-name-visit').within(() => {
+      cy.contains('visit')
+      cy.contains('cypress/e2e/index.html')
+    })
+
+    cy.findByTestId('hook-name-studio commands').should('not.exist')
+
+    cy.withCtx(async (ctx) => {
+      const spec = await ctx.actions.file.readFileInProject('cypress/e2e/spec.cy.js')
+
+      // No change, since we closed studio
+      expect(spec.trim().replace(/\r/g, '')).to.eq(`
+describe('studio functionality', () => {
+  it('visits a basic html page', () => {
+    cy.visit('cypress/e2e/index.html')
+  })
+})`.trim())
+    })
+  }
+
   context('cloud studio', () => {
     it('loads the studio page', () => {
       launchStudio({ enableCloudStudio: true })
@@ -33,28 +61,16 @@ describe('Cypress Studio', () => {
       })
     })
 
-    it('displays Studio header', () => {
-      launchStudio({ enableCloudStudio: true })
+    it('does not display Studio button when not using cloud studio', () => {
+      loadProjectAndRunSpec({ })
 
-      cy.viewport(1500, 1000)
-      cy.get('[data-cy="studio-toolbar"]').should('be.visible')
-      cy.percySnapshot()
+      cy.get('[data-cy="studio-button"]').should('not.exist')
     })
 
     it('immediately loads the studio panel', () => {
       const deferred = pDefer()
 
-      cy.scaffoldProject('experimental-studio')
-      cy.openProject('experimental-studio', [], {
-        cloudStudio: true,
-      })
-
-      cy.startAppServer('e2e')
-      cy.visitApp()
-      cy.specsPageIsVisible()
-      cy.get('[data-cy-row="spec.cy.js"]').click()
-
-      cy.waitForSpecToFinish()
+      loadProjectAndRunSpec({ enableCloudStudio: true })
 
       cy.findByTestId('studio-panel').should('not.exist')
 
@@ -73,6 +89,8 @@ describe('Cypress Studio', () => {
       cy.get('[data-cy="hook-name-studio commands"]').should('not.exist')
       // cloud studio is loaded immediately
       cy.findByTestId('studio-panel').then(() => {
+        // check for the loading panel from the app first
+        cy.get('[data-cy="loading-studio-panel"]').should('be.visible')
         // we've verified the studio panel is loaded, now resolve the promise so the test can finish
         deferred.resolve()
       })
@@ -86,6 +104,28 @@ describe('Cypress Studio', () => {
       cy.findByTestId('studio-panel')
       cy.get('[data-cy="hook-name-studio commands"]')
     })
+
+    it('closes studio panel when clicking studio button (from the cloud)', () => {
+      launchStudio({ enableCloudStudio: true })
+
+      cy.get('[data-cy="studio-header-studio-button"]').click()
+
+      assertClosingPanelWithoutChanges()
+    })
+
+    it('opens studio panel to new test when clicking on studio button (from the app) next to url', () => {
+      cy.viewport(1500, 1000)
+      loadProjectAndRunSpec({ enableCloudStudio: true })
+      // studio button should be visible when using cloud studio
+      cy.get('[data-cy="studio-button"]').should('be.visible').click()
+      cy.get('[data-cy="studio-panel"]').should('be.visible')
+
+      cy.contains('New Test')
+
+      cy.get('[data-cy="studio-url-prompt"]').should('not.exist')
+
+      cy.percySnapshot()
+    })
   })
 
   it('updates an existing test with an action', () => {
@@ -364,31 +404,7 @@ describe('studio functionality', () => {
 
     cy.findByTestId('studio-toolbar-controls').findByTestId('close-studio').click()
 
-    // Cypress re-runs after you cancel Studio.
-    // Original spec should pass
-    cy.waitForSpecToFinish({ passCount: 1 })
-
-    cy.get('.command').should('have.length', 1)
-
-    // Assert the spec was executed without any new commands.
-    cy.get('.command-name-visit').within(() => {
-      cy.contains('visit')
-      cy.contains('cypress/e2e/index.html')
-    })
-
-    cy.findByTestId('hook-name-studio commands').should('not.exist')
-
-    cy.withCtx(async (ctx) => {
-      const spec = await ctx.actions.file.readFileInProject('cypress/e2e/spec.cy.js')
-
-      // No change, since we closed studio
-      expect(spec.trim().replace(/\r/g, '')).to.eq(`
-describe('studio functionality', () => {
-  it('visits a basic html page', () => {
-    cy.visit('cypress/e2e/index.html')
-  })
-})`.trim())
-    })
+    assertClosingPanelWithoutChanges()
   })
 
   it('removes pending commands when restarting studio', () => {
@@ -434,14 +450,7 @@ describe('studio functionality', () => {
   })
 
   it('creates a new test from an empty spec', () => {
-    cy.scaffoldProject('experimental-studio')
-    cy.openProject('experimental-studio')
-    cy.startAppServer('e2e')
-    cy.visitApp()
-    cy.specsPageIsVisible()
-    cy.get(`[title="empty.cy.js"]`).should('be.visible').click()
-
-    cy.waitForSpecToFinish()
+    loadProjectAndRunSpec({ specName: 'empty.cy.js', specSelector: 'title' })
 
     cy.contains('Create test with Cypress Studio').click()
     cy.findByTestId('aut-url').as('urlPrompt')
@@ -685,13 +694,7 @@ describe('studio functionality', () => {
   })
 
   it('does not create a new test if the Save test modal is closed', () => {
-    cy.scaffoldProject('experimental-studio')
-    cy.openProject('experimental-studio')
-    cy.startAppServer('e2e')
-    cy.visitApp()
-    cy.specsPageIsVisible()
-    cy.get(`[title="empty.cy.js"]`).should('be.visible')
-    cy.get(`[title="empty.cy.js"]`).click()
+    loadProjectAndRunSpec({ specName: 'empty.cy.js', specSelector: 'title' })
 
     cy.waitForSpecToFinish()