Merge branch 'develop' into release/14.0.0

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-12-04-24
+12-11-24

.gitignore

@@ -280,7 +280,9 @@ typings/
 # Output of 'npm pack'
 *.tgz
 
-# Yarn Integrity file
+# Yarn files that shouldn't be checked in
+.yarnrc
+.yarn/
 .yarn-integrity
 
 # dotenv environment variables file

browser-versions.json

@@ -1,5 +1,5 @@
 {
-  "chrome:beta": "132.0.6834.32",
-  "chrome:stable": "131.0.6778.108",
+  "chrome:beta": "132.0.6834.57",
+  "chrome:stable": "131.0.6778.204",
   "chrome:minimum": "64.0.3282.0"
 }

cli/CHANGELOG.md

@@ -66,15 +66,19 @@ in this [GitHub issue](https://github.com/cypress-io/cypress/issues/30447). Addr
 - Updated `react` from `17.0.2` to `18.3.1` and `react-dom` from `17.0.2` to `18.3.1`. Addresses [#30511](https://github.com/cypress-io/cypress/issues/30511).
 - Upgraded [`@vue/test-utils`](https://www.npmjs.com/package/@vue/test-utils) from `2.3.2` to `2.4.6`. Addresses [#26628](https://github.com/cypress-io/cypress/issues/26628).
 
-## 13.16.2
+## 13.17.0
 
-_Released 12/17/2024 (PENDING)_
+_Released 12/17/2024_
+
+**Features:**
+
+- Added official support for the [Google Chrome for Testing](https://github.com/GoogleChromeLabs/chrome-for-testing) browser. Assuming the browser is in a location where it can be [auto-detected](https://on.cypress.io/troubleshooting-launching-browsers), it can be launched by providing the `--browser chrome-for-testing` option. If it can't be auto-detected, the path to the browser can also be provided. Previously [customizing the available browsers](https://on.cypress.io/customize-browsers) was required. Addresses [#28123](https://github.com/cypress-io/cypress/issues/28123) and [#28554](https://github.com/cypress-io/cypress/issues/28554).
 
 **Bugfixes:**
 
 - Fixed an issue where targets may hang if `Network.enable` is not implemented for the target. Addresses [#29876](https://github.com/cypress-io/cypress/issues/29876).
 - Updated Firefox `userChrome.css` to correctly hide the toolbox during headless mode. Addresses [#30721](https://github.com/cypress-io/cypress/issues/30721).
-- Fixed an issue loading the `cypress.config.ts` file with Node.js version `22.12.0`. Addresses [#30715](https://github.com/cypress-io/cypress/issues/30715).
+- Fixed an issue loading the `cypress.config.ts` file with Node.js version `22.12.0` if it is loaded as an ESM. Addresses [#30715](https://github.com/cypress-io/cypress/issues/30715).
 
 **Misc:**
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cypress",
-  "version": "13.16.1",
+  "version": "13.17.0",
   "description": "Cypress is a next generation front end testing tool built for the modern web",
   "private": true,
   "scripts": {
@@ -213,7 +213,7 @@
   },
   "engines": {
     "node": ">=20.18.1",
-    "yarn": ">=1.22.17"
+    "yarn": ">=1.22.22"
   },
   "productName": "Cypress",
   "license": "MIT",

packages/app/cypress/e2e/top-nav.cy.ts

@@ -44,7 +44,7 @@ describe('App Top Nav Workflows', () => {
         .should('have.attr', 'src')
         .and('contain', 'firefox')
 
-        cy.findByTestId('top-nav-active-browser').should('contain', 'Firefox 5')
+        cy.findByTestId('top-nav-active-browser').should('contain', 'Firefox 6')
       })
     })
 
@@ -82,19 +82,19 @@ describe('App Top Nav Workflows', () => {
 
         cy.get('@browserItems').eq(1)
         .should('contain', 'Edge')
-        .and('contain', 'Version 8')
+        .and('contain', 'Version 9')
         .findByTestId('top-nav-browser-list-selected-item')
         .should('not.exist')
 
         cy.get('@browserItems').eq(2)
         .should('contain', 'Electron')
-        .and('contain', 'Version 12')
+        .and('contain', 'Version 13')
         .findByTestId('top-nav-browser-list-selected-item')
         .should('not.exist')
 
         cy.get('@browserItems').eq(3)
         .should('contain', 'Firefox')
-        .and('contain', 'Version 5')
+        .and('contain', 'Version 6')
         .findByTestId('top-nav-browser-list-selected-item')
         .should('not.exist')
       })

packages/app/src/debug/LayeredBrowserIcons.cy.tsx

@@ -2,7 +2,7 @@ import LayeredBrowserIcons from './LayeredBrowserIcons.vue'
 import type { BrowserType } from './LayeredBrowserIcons.vue'
 
 describe('<LayeredBrowserIcons/>', () => {
-  const browsers: BrowserType[] = ['CHROME', 'CHROME-CANARY', 'CHROME BETA', 'FIREFOX', 'WEBKIT', 'EDGE', 'ELECTRON']
+  const browsers: BrowserType[] = ['CHROME', 'CHROME BETA', 'CANARY', 'CHROME CANARY', 'CHROME FOR TESTING', 'CUSTOM CHROME FOR TESTING', 'CHROMIUM', 'CUSTOM CHROMIUM', 'EDGE', 'EDGE BETA', 'EDGE CANARY', 'EDGE DEV', 'ELECTRON', 'FIREFOX', 'FIREFOX DEVELOPER EDITION', 'FIREFOX NIGHTLY', 'WEBKIT']
 
   it('mounts correctly for single browser', () => {
     browsers.forEach((ele) => {
@@ -21,11 +21,11 @@ describe('<LayeredBrowserIcons/>', () => {
       <div class='bg-gray-50 p-[24px]'>
         <LayeredBrowserIcons browsers={browsers} />
         <LayeredBrowserIcons browsers={['CHROME', 'FIREFOX', 'EDGE']}/>
-        <LayeredBrowserIcons browsers={['CHROME-CANARY', 'WEBKIT', 'ELECTRON']} />
+        <LayeredBrowserIcons browsers={['CHROME CANARY', 'WEBKIT', 'ELECTRON']} />
         <LayeredBrowserIcons browsers={['FIREFOX', 'WEBKIT', 'EDGE']}/>
-        <LayeredBrowserIcons browsers={['FIREFOX', 'EDGE', 'CHROME-CANARY', 'WEBKIT']}/>
+        <LayeredBrowserIcons browsers={['FIREFOX', 'EDGE', 'CHROME CANARY', 'WEBKIT']}/>
         <LayeredBrowserIcons browsers={['EDGE', 'CHROME', 'WEBKIT', 'ELECTRON']}/>
-        <LayeredBrowserIcons browsers={['CHROME', 'CHROME BETA', 'CHROME-CANARY']} />
+        <LayeredBrowserIcons browsers={['CHROME', 'CHROME BETA', 'CHROME CANARY']} />
       </div>
     ))
 

packages/app/src/debug/LayeredBrowserIcons.vue

@@ -20,20 +20,19 @@
 
 <script lang="ts" setup>
 import { computed } from 'vue'
-import { IconBrowserChrome,
+import {
+  IconBrowserChrome,
+  IconBrowserChromeBeta,
   IconBrowserChromeCanary,
-  IconBrowserSafari,
   IconBrowserMozillaFirefox,
   IconBrowserEdge,
   IconBrowserWebkit,
   IconBrowserElectronLight,
-  IconBrowserChromeBeta,
+  IconGeneralGlobe,
 } from '@cypress-design/vue-icon'
 
-// Note: These browser names should map to the list of logoPaths found at https://github.com/cypress-io/cypress-services/blob/46073cb5c387af3b203404280a1664a85e233b93/packages/common/src/logos/getLogoPath.ts
-// Some of these are currently incorrect (ex: CHROME-CANARY).
-// We are also missing browsers from the list as well
-export type BrowserType = 'CHROME' | 'SAFARI' | 'FIREFOX' | 'CHROME-CANARY' | 'CHROME BETA' | 'EDGE' | 'WEBKIT' | 'ELECTRON'
+// Note: These browser names should map to the list of logoPaths found at https://github.com/cypress-io/cypress-services/blob/develop/packages/common/src/logos/getLogoPath.ts
+export type BrowserType = 'CHROME' | 'CHROME BETA' | 'CANARY' | 'CHROME CANARY' | 'CHROME FOR TESTING' | 'CUSTOM CHROME FOR TESTING' | 'CHROMIUM' | 'CUSTOM CHROMIUM' | 'EDGE' | 'EDGE BETA' | 'EDGE CANARY' | 'EDGE DEV' | 'ELECTRON' | 'FIREFOX' | 'FIREFOX DEVELOPER EDITION' | 'FIREFOX NIGHTLY' | 'WEBKIT'
 
 interface LayeredProps {
   browsers: BrowserType[]
@@ -45,7 +44,7 @@ const results = computed(() => {
   if (props.browsers) {
     return props.browsers.map((browserType) => {
       return {
-        icon: BROWSER_MAP[browserType],
+        icon: BROWSER_MAP[browserType] || IconGeneralGlobe,
         name: `browser-icon-${browserType.toLowerCase().replaceAll(' ', '_')}`,
       }
     })
@@ -54,15 +53,25 @@ const results = computed(() => {
   return []
 })
 
+// TODO: Add correct icons for firefox, edge, and chromium
 const BROWSER_MAP: Record<BrowserType, any> = {
   'CHROME': IconBrowserChrome,
   'CHROME BETA': IconBrowserChromeBeta,
-  'CHROME-CANARY': IconBrowserChromeCanary,
-  'SAFARI': IconBrowserSafari,
-  'FIREFOX': IconBrowserMozillaFirefox,
+  'CANARY': IconBrowserChromeCanary,
+  'CHROME CANARY': IconBrowserChromeCanary,
+  'CHROME FOR TESTING': IconBrowserChrome,
+  'CUSTOM CHROME FOR TESTING': IconBrowserChrome,
+  'CHROMIUM': IconGeneralGlobe,
+  'CUSTOM CHROMIUM': IconGeneralGlobe,
   'EDGE': IconBrowserEdge,
-  'WEBKIT': IconBrowserWebkit,
+  'EDGE BETA': IconBrowserEdge,
+  'EDGE CANARY': IconBrowserEdge,
+  'EDGE DEV': IconBrowserEdge,
   'ELECTRON': IconBrowserElectronLight,
+  'FIREFOX': IconBrowserMozillaFirefox,
+  'FIREFOX DEVELOPER EDITION': IconBrowserMozillaFirefox,
+  'FIREFOX NIGHTLY': IconBrowserMozillaFirefox,
+  'WEBKIT': IconBrowserWebkit,
 }
 
 </script>

packages/app/tsconfig.json

@@ -13,15 +13,13 @@
   ],
   "compilerOptions": {
     "noImplicitThis": true,
-    "useDefineForClassFields": true,
     "paths": {
       "@cy/i18n": ["../frontend-shared/src/locales/i18n"],
       "@cy/components/*": ["../frontend-shared/src/components/*"],
       "@cy/gql-components/*": ["../frontend-shared/src/gql-components/*"],
       "@cy/store/*": ["../frontend-shared/src/store/*"],
       "@packages/*": ["../*"]
     },
-    "allowJs": true,
     "types": [
       "cypress", 
       "cypress-real-events", 

packages/config/tsconfig.json

@@ -7,19 +7,9 @@
     "test"
   ],
   "compilerOptions": {
-    "strict": true,
     "allowJs": false,
     "rootDir": "src",
     "noImplicitAny": true,
-    "resolveJsonModule": true,
-    "experimentalDecorators": true,
-    "noUncheckedIndexedAccess": true,
-    "ignoreDeprecations": "5.0",
-    /* 
-     * TODO: remove importsNotUsedAsValues after typescript 5.5 and up as it will no longer work. If we want the same behavior
-     * as importsNotUsedAsValues, we need to use "verbatimModuleSyntax", which will require this package to be an ES Module.
-     */
-    "importsNotUsedAsValues": "error",
     "types": ["node"],
     "typeRoots": [
       "../../node_modules/@types"

packages/data-context/tsconfig.json

@@ -9,19 +9,8 @@
   ],
   "compilerOptions": {
     "lib": ["esnext"],
-    "strict": true,
     "allowJs": false,
     "noImplicitAny": true,
-    "resolveJsonModule": true,
-    "experimentalDecorators": true,
-    "noUnusedLocals": false,
-    "noUncheckedIndexedAccess": true,
-    "ignoreDeprecations": "5.0",
-    /* 
-     * TODO: remove importsNotUsedAsValues after typescript 5.5 and up as it will no longer work. If we want the same behavior
-     * as importsNotUsedAsValues, we need to use "verbatimModuleSyntax", which will require this package to be an ES Module.
-     */
-    "importsNotUsedAsValues": "error",
     "types": ["cypress"],
   }
 }

packages/driver/tsconfig.json

@@ -3,23 +3,15 @@
   "compilerOptions": {
     "target": "ES2016",
     "lib": ["ES2021", "DOM", "DOM.Iterable"],
-    "module": "commonjs",
     "allowJs": true,
-    "noImplicitAny": false,
     "noImplicitThis": false,
     "strictFunctionTypes": true,
     "preserveWatchOutput": true,
     "sourceMap": true,
-    "importHelpers": true,
     "strictNullChecks": true,
-    "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "skipLibCheck": true,
     "noEmit": true,
-    "noImplicitReturns": true,
-    "allowSyntheticDefaultImports": true,
     "outDir": "dist",
-    "esModuleInterop": true,
     "noErrorTruncation": true,
     "types": []
   },