Merge branch 'develop' into electron-bump-version

Author: jennifer-shehane

.circleci/config.yml

@@ -12,6 +12,11 @@ workflows:
                 requires:
                   - pack-workflows
 
+parameters:
+  publish-binary-branch:
+    type: string
+    default: main
+
 commands:
   persist:
     steps:
@@ -154,7 +159,3 @@ jobs:
                 fi
           - continuation/continue:
               configuration_path: .circleci/packed/pipeline.yml
-
-
-  
-

.circleci/src/pipeline/@pipeline.yml

@@ -5,15 +5,20 @@ version: 2.1
 # the new location and/or names:
 # - ./scripts/github-actions/update-browser-versions.js
 
-chrome-stable-version: &chrome-stable-version "141.0.7390.107"
-chrome-beta-version: &chrome-beta-version "142.0.7444.34"
+chrome-stable-version: &chrome-stable-version "142.0.7444.175"
+chrome-beta-version: &chrome-beta-version "143.0.7499.25"
 firefox-stable-version: &firefox-stable-version "142.0"
 base-internal-trixie: &base-internal-trixie cypress/base-internal:22.20.0-trixie
 base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.20.0-yarn-berry
 # Lowest Node.js version we support of the minimum major version supported
 # See https://docs.cypress.io/app/get-started/install-cypress#Nodejs
 base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0
 
+parameters:
+  publish-binary-branch:
+    type: string
+    default: main
+
 orbs:
   browser-tools: circleci/[email protected]
 
@@ -116,7 +121,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" != "chore/remove_unused_anchors" ]]; then
+            echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "fix/angular_dep_resolution_windows" ]]; 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
@@ -1364,19 +1369,6 @@ commands:
           paths:
             - cypress/cypress.zip
 
-  trigger-publish-binary-pipeline:
-    steps:
-      - run:
-          name: "Trigger publish-binary pipeline"
-          command: |
-            source ./scripts/ensure-node.sh
-            echo $SHOULD_PERSIST_ARTIFACTS
-            node ./scripts/binary/trigger-publish-binary-pipeline.js
-      - persist_to_workspace:
-          root: ~/
-          paths:
-            - triggered_pipeline.json
-
   build-cypress-npm-package:
     parameters:
       executor:
@@ -2141,6 +2133,7 @@ jobs:
 
   driver-integration-tests-electron:
     <<: *defaults
+    resource_class: medium+
     parallelism: 5
     steps:
       - run-driver-integration-tests:
@@ -2470,7 +2463,8 @@ jobs:
       - restore_cached_workspace
       - check-if-binary-exists
       - setup_should_persist_artifacts
-      - trigger-publish-binary-pipeline
+      - trigger-publish-binary-pipeline:
+          target-repo-branch: << pipeline.parameters.publish-binary-branch >>
 
   get-published-artifacts:
     <<: *defaults

.circleci/src/pipeline/commands/trigger-publish-binary-pipeline.yml

@@ -0,0 +1,74 @@
+parameters:
+  target-repo-branch:
+    type: string
+    default: main
+
+steps:
+  - run:
+      name: Trigger publish-binary pipeline
+      command: |
+        if [[ -z "$CIRCLE_TOKEN" ]] || \
+          [[ -z "$CIRCLE_SHA1" ]] || \
+          [[ -z "$CIRCLE_JOB" ]] || \
+          [[ -z "$CIRCLE_WORKFLOW_ID" ]] || \
+          [[ -z "$CIRCLE_BUILD_URL" ]] || \
+          [[ -z "$CIRCLE_BRANCH" ]]; then
+          
+          echo "Missing required environment variables. Skipping pipeline trigger."
+          exit 1
+        fi
+        if [[ -n "$SHOULD_PERSIST_ARTIFACTS" && "$SHOULD_PERSIST_ARTIFACTS" != "true" && "$SHOULD_PERSIST_ARTIFACTS" != "false" ]]; then
+          echo "SHOULD_PERSIST_ARTIFACTS must be true, false, or undefined. Skipping pipeline trigger."
+          exit 1
+        fi
+        if [[ -z $(which node) ]] || [[ -z $(which curl) ]] || [[ -z $(which jq) ]]; then
+          echo "Missing required commands. Skipping pipeline trigger. Ensure jq, curl, and node are installed."
+          exit 1
+        fi
+        echo "Determining next binary version..."
+        export NEXT_VERSION=$(node ./scripts/get-next-version.js)
+        if [[ $? != 0 ]]; then
+          echo "Failed to determine next binary version. Skipping pipeline trigger."
+          exit 1
+        fi
+        echo "Next binary version: $NEXT_VERSION"
+        export BODY=$(cat \<<JSON_BODY_EOF
+        {
+          "branch": "<< parameters.target-repo-branch >>",
+          "parameters": {
+            "temp_dir": "${TMPDIR:-/tmp}",
+            "sha": "$CIRCLE_SHA1",
+            "job_name": "$CIRCLE_JOB",
+            "triggered_workflow_id": "$CIRCLE_WORKFLOW_ID",
+            "triggered_job_url": "$CIRCLE_BUILD_URL",
+            "branch": "$CIRCLE_BRANCH",
+            "should_persist_artifacts": ${SHOULD_PERSIST_ARTIFACTS:-false},
+            "binary_version": "$NEXT_VERSION"
+          }
+        }
+        JSON_BODY_EOF
+        )
+        if [[ $? != 0 ]]; then
+          echo "Failed to compose the request body. Skipping pipeline trigger."
+          exit 1
+        fi
+
+        echo "Triggering new pipeline in cypress-publish-binary project on branch << parameters.target-repo-branch >>..."
+        curl -X POST \
+          -o ~/triggered_pipeline.json \
+          -H "Circle-Token: $CIRCLE_TOKEN" \
+          -H "Content-Type: application/json" \
+          -d "$BODY" \
+          https://circleci.com/api/v2/project/github/cypress-io/cypress-publish-binary/pipeline
+
+        if [[ $? != 0 ]]; then
+          echo "Failed to trigger new pipeline. Skipping pipeline trigger."
+          exit 1
+        fi
+
+        echo "Pipeline saved to triggered_pipeline.json"
+        echo "Triggered pipeline: https://app.circleci.com/pipelines/github/cypress-io/cypress-publish-binary/$(jq -r '.number' ~/triggered_pipeline.json)"
+  - persist_to_workspace:
+      root: ~/
+      paths:
+        - triggered_pipeline.json

.circleci/src/pipeline/workflows/pull-request.yml

@@ -317,9 +317,10 @@ jobs:
         - publish-binary
       requires:
         - node_modules_install
-        - approve-contributor-pr
         - internal-pr-build
-        - external-pr-build
+      filters:
+        branches:
+          ignore: /^pull\/[0-9]+/
   - wait-for-binary-publish:
       type: approval
       requires:

cli/CHANGELOG.md

@@ -1,11 +1,43 @@
 <!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
+## 15.7.1
+
+_Released 12/2/2025 (PENDING)_
+
+**Performance:**
+
+- Improved performance when viewing command snapshots in the Command Log. Element highlighting is now significantly faster, especially when highlighting multiple elements or complex pages. This is achieved by reducing redundant style calculations and batching DOM operations to minimize browser reflows. Addressed in [#32951](https://github.com/cypress-io/cypress/pull/32951).
+
+## 15.7.0
+
+_Released 11/19/2025_
+
+**Performance:**
+
+- Limits the number of matched elements that are tested for visibility when added to a command log entry. Fixes a crash scenario related to rapid successive DOM additions in conjunction with a large number of elements returned from a query. Addressed in [#32937](https://github.com/cypress-io/cypress/pull/32937).
+
+**Features:**
+
+- `Next.js` version 16 is now supported within component testing. Currently, `webpack` is used to bundle Next.js components. Turbopack, the [new default](https://nextjs.org/docs/app/guides/upgrading/version-16#turbopack-by-default) inside Next.js 16, is not yet supported within Cypress. Addresses [#32857](https://github.com/cypress-io/cypress/issues/32857).
+
+**Bugfixes:**
+
+- Fixed an issue where [`cy.wrap()`](https://docs.cypress.io/api/commands/wrap) would cause infinite recursion and freeze the Cypress App when called with objects containing circular references. Fixes [#24715](https://github.com/cypress-io/cypress/issues/24715). Addressed in [#32917](https://github.com/cypress-io/cypress/pull/32917).
+- Fixed an issue where top changes on test retries could cause attempt numbers to show up more than one time in the reporter and cause attempts to be lost in Test Replay. Addressed in [#32888](https://github.com/cypress-io/cypress/pull/32888).
+- Fixed an issue where stack traces that are used to determine a test's invocation details are sometimes incorrect. Addressed in [#32699](https://github.com/cypress-io/cypress/pull/32699).
+- Fixed an issue where larger than expected config values were causing issues in certain cases when recording to the Cypress Cloud. Addressed in [#32957](https://github.com/cypress-io/cypress/pull/32957).
+
+**Misc:**
+
+- 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 Cursor logo now correctly displays in the External editor dropdown. Addresses [#32062](https://github.com/cypress-io/cypress/issues/32062). Addressed in [#32911](https://github.com/cypress-io/cypress/pull/32911).
+
 ## 15.6.0
 
 _Released 11/4/2025_
 
 **Features:**
 
- - Added a 'Self-healed' badge to the Command Log when [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) steps automatically recover after the element they need is not found in the cache. Addressed in [#32802](https://github.com/cypress-io/cypress/pull/32802).
+- Added a 'Self-healed' badge to the Command Log when [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) steps automatically recover after the element they need is not found in the cache. Addressed in [#32802](https://github.com/cypress-io/cypress/pull/32802).
 - [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) will now show a warning in the `Get code` modal when there are unsaved changes in `Studio` that will be lost if the user saves the generated code. Addressed in [#32741](https://github.com/cypress-io/cypress/pull/32741).
 
 **Bugfixes:**
@@ -23,7 +55,6 @@ _Released 11/4/2025_
 - The hitbox for expanding a grouped command has been widened. Addresses [#32778](https://github.com/cypress-io/cypress/issues/32778). Addressed in [#32783](https://github.com/cypress-io/cypress/pull/32783).
 - 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 'Next' tooltip style was updated. Addressed in [#32866](https://github.com/cypress-io/cypress/pull/32866).
 - Make test name header sticky in studio mode and in the tests list. Addresses [#32591](https://github.com/cypress-io/cypress/issues/32591). Addressed in [#32840](https://github.com/cypress-io/cypress/pull/32840)
 - The [`cy.exec()`](https://docs.cypress.io/api/commands/exec) type now reflects the correct yielded response type of `exitCode`. Addresses [#32875](https://github.com/cypress-io/cypress/issues/32875). Addressed in [#32885](https://github.com/cypress-io/cypress/pull/32885).
 

cli/package.json

@@ -54,7 +54,6 @@
     "process": "^0.11.10",
     "proxy-from-env": "1.0.0",
     "request-progress": "^3.0.0",
-    "semver": "^7.7.1",
     "supports-color": "^8.1.1",
     "systeminformation": "5.27.7",
     "tmp": "~0.2.4",
@@ -74,7 +73,7 @@
     "@packages/root": "0.0.0-development",
     "@types/bluebird": "3.5.33",
     "@types/chai": "4.2.15",
-    "@types/chai-jquery": "1.1.40",
+    "@types/chai-jquery": "1.1.43",
     "@types/jquery": "3.3.31",
     "@types/lodash": "4.14.168",
     "@types/minimatch": "3.0.5",
@@ -90,6 +89,7 @@
     "mock-fs": "5.4.0",
     "nock": "13.2.9",
     "resolve-pkg": "2.0.0",
+    "semver": "^7.7.3",
     "shelljs": "0.8.5",
     "strip-ansi": "6.0.1",
     "tsx": "4.20.6",

guides/esm-migration.md

@@ -28,15 +28,15 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [ ] npm/eslint-plugin-dev
 - [x] npm/grep ✅ **COMPLETED** 
 - [x] npm/mount-utils ✅ **COMPLETED**  
-- [ ] npm/puppeteer **PARTIAL** 
+- [x] npm/puppeteer ✅ **COMPLETED** 
 - [x] npm/react ✅ **COMPLETED** 
 - [x] npm/svelte ✅ **COMPLETED** 
 - [x] npm/vite-dev-server ✅ **COMPLETED** 
 - [x] vite-plugin-cypress-esm ✅ **COMPLETED** 
 - [x] npm/vue ✅ **COMPLETED** 
-- [ ] npm/webpack-batteries-included-preprocessor
+- [x] npm/webpack-batteries-included-preprocessor ✅ **COMPLETED**
 - [x] npm/webpack-dev-server ✅ **COMPLETED** 
-- [ ] npm/webpack-preprocessor **PARTIAL** 
+- [x] npm/webpack-preprocessor ✅ **COMPLETED** 
 
 ##### Binary Packages
 
@@ -88,9 +88,9 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
 - [x] npm/grep ✅ **COMPLETED** 
 - [x] npm/puppeteer ✅ **COMPLETED** 
 - [x] npm/vite-dev-server ✅ **COMPLETED** 
-- [ ] npm/webpack-batteries-included-preprocessor
-- [ ] npm/webpack-dev-server
-- [ ] npm/webpack-preprocessor
+- [x] npm/webpack-batteries-included-preprocessor ✅ **COMPLETED** 
+- [x] npm/webpack-dev-server ✅ **COMPLETED** 
+- [x] npm/webpack-preprocessor ✅ **COMPLETED**
 
 ##### Binary Packages
 

guides/release-process.md

@@ -196,7 +196,7 @@ _Note: It is advisable to notify the team that the `develop` branch is locked do
     - [cypress-realworld-app](https://github.com/cypress-io/cypress-realworld-app/issues/41)
     - [cypress-example-recipes](https://github.com/cypress-io/cypress-example-recipes/issues/225)
 
-26. Be sure to rotate the `NPM_TOKEN` variable inside the `org-npm-credentials` context inside CircleCI.
+26. Be sure to rotate the `NPM_TOKEN` variable inside the `org-npm-credentials` context inside CircleCI. If an npm token was created when logging in, please delete this token now.
 
 Take a break, you deserve it! 👉😎👉
 

npm/cypress-schematic/package.json

@@ -20,7 +20,7 @@
     "@angular-devkit/schematics-cli": "^20.1.6",
     "@angular/cli": "^20.1.6",
     "@schematics/angular": "^20.1.6",
-    "@types/chai-enzyme": "0.6.13",
+    "@types/chai-enzyme": "0.6.14",
     "@types/mocha": "8.0.3",
     "@types/node": "^22.19.0",
     "eslint": "^9.31.0",

npm/mount-utils/package.json

@@ -14,7 +14,7 @@
   "devDependencies": {
     "@packages/eslint-config": "0.0.0-development",
     "@rollup/plugin-commonjs": "^17.1.0",
-    "@rollup/plugin-node-resolve": "^11.1.1",
+    "@rollup/plugin-node-resolve": "^11.2.1",
     "eslint": "^9.31.0",
     "rollup": "3.29.5",
     "rollup-plugin-dts": "5.0.0",