Merge branch 'develop' into issue-30198

Author: true2fik

.circleci/cache-version.txt

@@ -1,3 +1,3 @@
 # Bump this version to force CI to re-create the cache from scratch.
 
-5-12-2025
+5-14-2025

.circleci/workflows.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
-chrome-stable-version: &chrome-stable-version "136.0.7103.92"
-chrome-beta-version: &chrome-beta-version "137.0.7151.15"
+chrome-stable-version: &chrome-stable-version "136.0.7103.113"
+chrome-beta-version: &chrome-beta-version "137.0.7151.27"
 firefox-stable-version: &firefox-stable-version "137.0"
 
 orbs:
@@ -38,7 +38,7 @@ mainBuildFilters: &mainBuildFilters
         - /^release\/\d+\.\d+\.\d+$/
         # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
         - 'update-v8-snapshot-cache-on-develop'
-        - 'fix/top_framebust_window_location'
+        - 'misc/chore/fix_sinon_chai_rewrite'
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -49,7 +49,7 @@ macWorkflowFilters: &darwin-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'fix/top_framebust_window_location', << pipeline.git.branch >> ]
+      - equal: [ 'misc/throw_error_on_extension_chrome_137', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -60,7 +60,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'fix/top_framebust_window_location', << pipeline.git.branch >> ]
+      - equal: [ 'misc/throw_error_on_extension_chrome_137', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -83,7 +83,7 @@ windowsWorkflowFilters: &windows-workflow-filters
       - equal: [ develop, << pipeline.git.branch >> ]
       # use the following branch as well to ensure that v8 snapshot cache updates are fully tested
       - equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
-      - equal: [ 'fix/top_framebust_window_location', << pipeline.git.branch >> ]
+      - equal: [ 'misc/throw_error_on_extension_chrome_137', << pipeline.git.branch >> ]
       - matches:
           pattern: /^release\/\d+\.\d+\.\d+$/
           value: << pipeline.git.branch >>
@@ -157,7 +157,7 @@ commands:
           name: Set environment variable to determine whether or not to persist artifacts
           command: |
             echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
-            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/top_framebust_window_location" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "misc/throw_error_on_extension_chrome_137" ]]; then
                 export SHOULD_PERSIST_ARTIFACTS=true
             fi' >> "$BASH_ENV"
   # You must run `setup_should_persist_artifacts` command and be using bash before running this command

cli/CHANGELOG.md

@@ -15,13 +15,16 @@ _Released 5/20/2025 (PENDING)_
 
 **Misc:**
 
+- Chrome 137+ no longer supports `--load-extension` in branded Chrome, breaking the `@cypress/puppeteer` plugin in `open` mode and headed `run` mode and [`launchOptions.extensions`](https://docs.cypress.io/api/node-events/browser-launch-api#Add-browser-extensions). We recommend using Electron, Chrome for Testing or Chromium to continue using these features. See Cypress Docker image examples for [Chrome for Testing](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chrome-for-testing) and [Chromium](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chromium). Addresses [#31702](https://github.com/cypress-io/cypress/issues/31702) and [#31703](https://github.com/cypress-io/cypress/issues/31703).
 - Cursor is now available as an IDE option for opening files in Cypress, if it is installed on your system. Addressed in [#31691](https://github.com/cypress-io/cypress/pull/31691).
 - The error shown when the `--record` flag is missing has been updated to be shorter. Addressed in [#31676](https://github.com/cypress-io/cypress/pull/31676).
 - Added timeout field to EnqueuedCommandAttributes type. Addresses [#30198](https://github.com/cypress-io/cypress/issues/30198).
 
 **Dependency Updates:**
 
+- Upgraded `@sinonjs/fake-timers` from `8.1.0` to `9.1.2`. Addressed in [#31725](https://github.com/cypress-io/cypress/pull/31725).
 - Upgraded `trash` from `5.2.0` to `7.2.0`. Addressed in [#31667](https://github.com/cypress-io/cypress/pull/31667).
+- Upgraded `webdriver` from `9.11.0` to `9.14.0`. Addressed in [#31689](https://github.com/cypress-io/cypress/pull/31689).
 
 ## 14.3.3
 

cli/package.json

@@ -83,7 +83,7 @@
     "@types/minimatch": "3.0.5",
     "@types/mocha": "8.0.3",
     "@types/sinon": "9.0.9",
-    "@types/sinon-chai": "3.2.5",
+    "@types/sinon-chai": "3.2.12",
     "chai": "3.5.0",
     "chai-as-promised": "7.1.1",
     "chai-string": "1.5.0",

cli/scripts/post-install.js

@@ -71,7 +71,7 @@ makeReferenceTypesCommentRelative('chai', '../chai/index.d.ts', sinonChaiFilenam
 makeReferenceTypesCommentRelative('sinon', '../sinon/index.d.ts', sinonChaiFilename)
 
 // and an import sinon line to be changed to relative path
-shell.sed('-i', 'from \'sinon\';', 'from \'../sinon\';', sinonChaiFilename)
+shell.sed('-i', 'from \"sinon\";', 'from \"../sinon\";', sinonChaiFilename)
 
 // copy experimental network stubbing type definitions
 // so users can import: `import 'cypress/types/net-stubbing'`

npm/eslint-plugin-dev/package.json

@@ -23,7 +23,7 @@
     "eslint-plugin-mocha": "^8.2.0",
     "eslint-plugin-promise": "^4.2.1",
     "sinon": "^7.3.2",
-    "sinon-chai": "^3.3.0"
+    "sinon-chai": "^3.7.0"
   },
   "peerDependencies": {
     "@babel/eslint-parser": "^7.25.1",

npm/puppeteer/CHANGELOG.md

@@ -1,3 +1,5 @@
+# [@cypress/puppeteer-v0.1.6](https://github.com/cypress-io/cypress/compare/@cypress/puppeteer-v0.1.5...@cypress/puppeteer-v0.1.6) (2025-05-16)
+
 # [@cypress/puppeteer-v0.1.5](https://github.com/cypress-io/cypress/compare/@cypress/puppeteer-v0.1.4...@cypress/puppeteer-v0.1.5) (2024-06-07)
 
 

npm/puppeteer/README.md

@@ -46,7 +46,7 @@ Before using `@cypress/puppeteer`, ensure the following requirements are met:
 
 - Cypress 13.6.0+ is required.
 - Only Chromium-based browsers are supported, such as Chrome for Testing, Chromium, and Electron.
-- Chrome-branded browsers (e.g., standard Chrome) are not supported in version 137+ due to Chrome's removal of the `--load-extension` flag. We recommend using Chrome for Testing or Chromium instead. See Cypress Docker image examples for [Chrome for Testing](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chrome-for-testing) and [Chromium](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chromium).
+- Chrome-branded browsers (e.g., standard Chrome) are not supported in version 137+ due to Chrome's removal of the `--load-extension` flag. We recommend using Electron, Chrome for Testing or Chromium instead. See Cypress Docker image examples for [Chrome for Testing](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chrome-for-testing) and [Chromium](https://github.com/cypress-io/cypress-docker-images/tree/master/examples/chromium). Note this change only applies to headed applications such as `cypress open` or `cypress run --headed`. The plugin will work as expected in `cypress run` mode in any version of Chrome.
 
 ## Usage
 

npm/puppeteer/src/plugin/setup.ts

@@ -63,6 +63,11 @@ export function setup (options: SetupOptions) {
 
   try {
     options.on('after:browser:launch', (browser: Cypress.Browser, options: Cypress.AfterBrowserLaunchDetails) => {
+      if (Number(browser.majorVersion) >= 137 && browser.name === 'chrome' && browser.isHeaded) {
+        // @see https://github.com/cypress-io/cypress/issues/31703
+        throw pluginError('@cypress/puppeteer does not work in Google Chrome v137 and higher in cypress open mode (or headed run mode). If you need to use @cypress/puppeteer in headed mode, please use Electron, Chrome for Testing, Chromium, or another Chrome variant that supports loading extensions.')
+      }
+
       cypressBrowser = browser
       debuggerUrl = options.webSocketDebuggerUrl
     })

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

@@ -274,6 +274,17 @@ describe('#setup', () => {
       await task({ name: testTask, args: [] })
       expect(activateMainTabExport.activateMainTab).not.to.be.called
     })
+
+    it('catastrophically fails when the browser is Google Chrome Branded 137 and up and we are running in headed mode', async () => {
+      setup({ on, onMessage, puppeteer: mockPuppeteer as PuppeteerNode })
+      expect(() => {
+        on.withArgs('after:browser:launch').yield({ family: 'chromium', isHeaded: true, name: 'chrome', majorVersion: '137' }, { webSocketDebuggerUrl: 'ws://debugger' })
+      }).to.throw('@cypress/puppeteer does not work in Google Chrome v137 and higher in cypress open mode (or headed run mode). If you need to use @cypress/puppeteer in headed mode, please use Electron, Chrome for Testing, Chromium, or another Chrome variant that supports loading extensions.')
+
+      expect(() => {
+        on.withArgs('after:browser:launch').yield({ family: 'chromium', isHeaded: true, name: 'chrome', majorVersion: '141' }, { webSocketDebuggerUrl: 'ws://debugger' })
+      }).to.throw('@cypress/puppeteer does not work in Google Chrome v137 and higher in cypress open mode (or headed run mode). If you need to use @cypress/puppeteer in headed mode, please use Electron, Chrome for Testing, Chromium, or another Chrome variant that supports loading extensions.')
+    })
   })
 
   describe('validation', () => {

npm/webpack-preprocessor/package.json

@@ -39,7 +39,7 @@
     "proxyquire": "2.1.3",
     "semantic-release": "22.0.12",
     "sinon": "^9.0.0",
-    "sinon-chai": "^3.5.0",
+    "sinon-chai": "^3.7.0",
     "snap-shot-it": "7.9.10",
     "ts-node": "^10.9.2",
     "webpack": "^5.39.0"

package.json

@@ -117,7 +117,7 @@
     "@types/react-dom": "18.3.1",
     "@types/request-promise": "4.1.45",
     "@types/send": "^0.17.1",
-    "@types/sinon-chai": "3.2.3",
+    "@types/sinon-chai": "3.2.12",
     "@types/through2": "^2.0.36",
     "@types/underscore.string": "0.0.38",
     "@typescript-eslint/eslint-plugin": "7.2.0",
@@ -199,6 +199,7 @@
     "semver": "^7.7.1",
     "shelljs": "0.8.5",
     "sinon": "7.3.2",
+    "sinon-chai": "3.7.0",
     "snap-shot-it": "7.9.10",
     "stop-only": "3.4.1",
     "strip-ansi": "6.0.1",

packages/data-context/package.json

@@ -86,7 +86,7 @@
     "@types/parse-glob": "3.0.29",
     "@types/prettier": "2.4.3",
     "@types/sinon": "10.0.11",
-    "@types/sinon-chai": "3.2.8",
+    "@types/sinon-chai": "3.2.12",
     "@types/stringify-object": "^3.0.0",
     "mocha": "7.0.1",
     "mocha-junit-reporter": "2.2.0",

packages/driver/package.json

@@ -34,7 +34,7 @@
     "@packages/telemetry": "0.0.0-development",
     "@packages/ts": "0.0.0-development",
     "@packages/types": "0.0.0-development",
-    "@sinonjs/fake-timers": "8.1.0",
+    "@sinonjs/fake-timers": "9.1.2",
     "@types/chai": "5.0.1",
     "@types/chai-subset": "1.3.5",
     "@types/common-tags": "^1.8.0",

packages/errors/__snapshot-html__/CHROME_137_LOAD_EXTENSION_NOT_SUPPORTED.html

@@ -98,6 +98,10 @@ export const AllCypressErrors = {
 
         This option will not have an effect in ${fmt.off(_.capitalize(browser))}. Tests that rely on web security being disabled will not run as expected.`
   },
+  CHROME_137_LOAD_EXTENSION_NOT_SUPPORTED: () => {
+    return errTemplate`\
+        Google Chrome v137 and higher does not allow loading extensions via --load-extension. If you need to load an extension to test with Cypress, please use Chrome for Testing, Chromium, or another Chrome variant that supports loading extensions.`
+  },
   BROWSER_UNSUPPORTED_LAUNCH_OPTION: (browser: string, options: string[]) => {
     return errTemplate`\
         Warning: The following browser launch options were provided but are not supported by ${fmt.highlightSecondary(browser)}

packages/errors/src/errors.ts

@@ -346,6 +346,11 @@ describe('visual error templates', () => {
         default: [err],
       }
     },
+    CHROME_137_LOAD_EXTENSION_NOT_SUPPORTED: () => {
+      return {
+        default: [],
+      }
+    },
     CHROME_WEB_SECURITY_NOT_SUPPORTED: () => {
       return {
         default: ['firefox'],

packages/errors/test/unit/visualSnapshotErrors_spec.ts

@@ -34,7 +34,7 @@
     "mock-require": "3.0.3",
     "rimraf": "5.0.10",
     "sinon": "7.3.2",
-    "sinon-chai": "3.3.0",
+    "sinon-chai": "3.7.0",
     "ts-loader": "9.5.2",
     "webextension-polyfill": "0.4.0",
     "webpack": "^5.88.2"

packages/extension/package.json

@@ -1132,6 +1132,7 @@ enum ErrorTypeEnum {
   CDP_FIREFOX_DEPRECATED
   CDP_RETRYING_CONNECTION
   CDP_VERSION_TOO_OLD
+  CHROME_137_LOAD_EXTENSION_NOT_SUPPORTED
   CHROME_WEB_SECURITY_NOT_SUPPORTED
   CLOUD_ALREADY_COMPLETE
   CLOUD_API_RESPONSE_FAILED_RETRYING

packages/graphql/schemas/schema.graphql

@@ -33,7 +33,7 @@
     "mocha": "3.5.3",
     "sinon": "1.17.7",
     "sinon-as-promised": "4.0.3",
-    "sinon-chai": "3.3.0",
+    "sinon-chai": "3.7.0",
     "ssl-root-cas": "1.3.1",
     "supertest": "4.0.2"
   },

packages/https-proxy/package.json

@@ -34,7 +34,7 @@
     "mocha": "3.5.3",
     "mock-fs": "5.4.0",
     "sinon": "^10.0.0",
-    "sinon-chai": "3.4.0",
+    "sinon-chai": "3.7.0",
     "typescript": "~5.4.5"
   },
   "files": [

packages/launcher/package.json

@@ -37,7 +37,7 @@
     "express": "4.21.0",
     "mocha": "6.2.2",
     "sinon": "7.3.1",
-    "sinon-chai": "3.3.0",
+    "sinon-chai": "3.7.0",
     "typescript": "~5.4.5"
   },
   "files": [

packages/network/package.json

@@ -30,7 +30,7 @@
     "mocha": "3.5.3",
     "nock": "13.2.9",
     "sinon": "9.0.2",
-    "sinon-chai": "3.5.0",
+    "sinon-chai": "3.7.0",
     "snap-shot-it": "7.9.10"
   },
   "files": [

packages/rewriter/package.json

@@ -13,6 +13,7 @@ import type {
 } from 'webdriver/build/bidi/localTypes'
 
 import { bidiKeyPress } from '../automation/commands/key_press'
+import type Protocol from 'devtools-protocol'
 
 const debug = debugModule('cypress:server:browsers:bidi_automation')
 const debugVerbose = debugModule('cypress-verbose:server:browsers:bidi_automation')
@@ -178,7 +179,7 @@ export class BidiAutomation {
       headers: parsedHeaders,
       resourceType,
       originalResourceType: params.request.initiatorType || params.request.destination,
-      initiator: params.initiator,
+      initiator: params.initiator as Protocol.Network.Initiator,
       // Since we are NOT using CDP, we set the values to 0 to indicate that we do not have this information.
       // This is important when determining pre-request timeout and removal behavior
       cdpRequestWillBeSentTimestamp: 0,

packages/server/lib/browsers/bidi_automation.ts

@@ -145,6 +145,14 @@ const _normalizeArgExtensions = function (extPath, args, pluginExtensions, brows
     return arg.includes(LOAD_EXTENSION)
   })
 
+  if (loadExtension || pluginExtensions.length > 0) {
+    // @see https://github.com/cypress-io/cypress/issues/31702
+    if (Number(browser.majorVersion) >= 137 && browser.name === 'chrome') {
+      // eslint-disable-next-line no-console
+      errors.warning('CHROME_137_LOAD_EXTENSION_NOT_SUPPORTED')
+    }
+  }
+
   if (loadExtension) {
     args = _.without(args, loadExtension)
 

packages/server/lib/browsers/chrome.ts

@@ -135,7 +135,7 @@
     "url-parse": "1.5.10",
     "uuid": "8.3.2",
     "wait-port": "1.1.0",
-    "webdriver": "9.11.0",
+    "webdriver": "9.14.0",
     "webpack-virtual-modules": "0.5.0",
     "widest-line": "3.1.0"
   },

packages/server/package.json

@@ -0,0 +1,18 @@
+diff --git a/node_modules/@wdio/protocols/build/index.js b/node_modules/@wdio/protocols/build/index.js
+index 374e3dd..9c820d0 100644
+--- a/node_modules/@wdio/protocols/build/index.js
++++ b/node_modules/@wdio/protocols/build/index.js
+@@ -5276,9 +5276,11 @@ var gecko_default = {
+       ],
+       parameters: [
+         {
+-          name: "addon",
++          // cypress uses 'path' over 'addon' to avoid zipping the extension,
++          // which is easier for cypress to incorporate and doesn't break users
++          name: "path",
+           type: "string",
+-          description: "base64 string of the add on file",
++          description: "path to the extension",
+           required: true
+         },
+         {