Skip to content

Commit b60b46a

Browse files
authored
Merge branch 'develop' into ci/parameterize-persist-artifacts
2 parents dd6e949 + b9401a6 commit b60b46a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1205
-870
lines changed

.circleci/src/pipeline/@pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ version: 2.1
55
# the new location and/or names:
66
# - ./scripts/github-actions/update-browser-versions.js
77

8-
chrome-stable-version: &chrome-stable-version "141.0.7390.107"
9-
chrome-beta-version: &chrome-beta-version "142.0.7444.34"
8+
chrome-stable-version: &chrome-stable-version "142.0.7444.175"
9+
chrome-beta-version: &chrome-beta-version "143.0.7499.25"
1010
firefox-stable-version: &firefox-stable-version "142.0"
1111
base-internal-trixie: &base-internal-trixie cypress/base-internal:22.19.0-trixie
1212
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry

.circleci/src/pipeline/workflows/@main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ linux-x64:
44
- equal: [ develop, << pipeline.git.branch >> ]
55
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
66
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
7-
- equal: [ 'feat/support_next_16', << pipeline.git.branch >> ]
7+
- equal: [ 'fix/angular_dep_resolution_windows', << pipeline.git.branch >> ]
88
- matches:
99
pattern: /^release\/\d+\.\d+\.\d+$/
1010
value: << pipeline.git.branch >>

.github/ISSUE_TEMPLATE/1-bug-report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ body:
55
attributes:
66
value: |
77
## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support!
8-
9-
### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions).
8+
9+
### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions).
1010
Issues in the Cypress repo are reserved for bugs and feature requests only. Questions on how to use Cypress will be closed.
1111
- type: textarea
1212
id: current-behavior
1313
attributes:
1414
label: Current behavior
15-
description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting).
15+
description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://docs.cypress.io/app/references/troubleshooting).
1616
placeholder: Currently...
1717
validations:
1818
required: true

.github/ISSUE_TEMPLATE/3-install-issue.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ body:
66
attributes:
77
value: |
88
## If you are a customer of Cypress Cloud please utilize our [Support Portal](https://www.cypress.io/support/) for our fastest support!
9-
9+
1010
### Have a question? 👉 [Ask in chat](https://on.cypress.io/chat) or [start a new discussion](https://github.com/cypress-io/cypress/discussions).
1111
1212
If you're behind a corporate proxy, make sure to [configure it properly](https://on.cypress.io/proxy-configuration) before install.
1313
- type: textarea
1414
id: current-behavior
1515
attributes:
1616
label: Current behavior
17-
description: Please provide a description including screenshots, stack traces, DEBUG logs, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting)
17+
description: Please provide a description including screenshots, stack traces, DEBUG logs, etc. [Troubleshooting tips](https://docs.cypress.io/app/references/troubleshooting)
1818
placeholder: When I try to download Cypress...
1919
validations:
2020
required: true
2121
- type: textarea
2222
id: debug-logs
2323
attributes:
2424
label: Debug logs
25-
description: Include DEBUG logs setting [`DEBUG=cypress:*`](https://on.cypress.io/troubleshooting#Print-DEBUG-logs/). Include npm/yarn logs if applicable.
25+
description: Include DEBUG logs setting [`DEBUG=cypress:*`](https://docs.cypress.io/app/references/troubleshooting#Print-DEBUG-logs/). Include npm/yarn logs if applicable.
2626
placeholder: Debug logs
2727
render: Text
2828
- type: input

.github/ISSUE_TEMPLATE/5-cy-prompt-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
id: current-behavior
1212
attributes:
1313
label: Current behavior
14-
description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://on.cypress.io/troubleshooting).
14+
description: Please provide a description including screenshots, stack traces, etc. [Troubleshooting tips](https://docs.cypress.io/app/references/troubleshooting).
1515
placeholder: Currently...
1616
validations:
1717
required: true

.github/workflows/update-browser-versions.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ on:
77
jobs:
88
update-browser-versions:
99
runs-on: ubuntu-latest
10+
permissions:
11+
pull-requests: write
1012
env:
1113
CYPRESS_BOT_APP_ID: ${{ secrets.CYPRESS_BOT_APP_ID }}
1214
BASE_BRANCH: develop
@@ -47,7 +49,7 @@ jobs:
4749
- name: Determine name of new branch and if it already exists
4850
id: check-branch
4951
env:
50-
BRANCH_NAME: update-chrome-stable-from-${{ steps.get-versions.outputs.current_stable_version }}-beta-from-${{ steps.get-versions.outputs.current_beta_version }}
52+
BRANCH_NAME: update-chrome-stable-from-${{ steps.get-versions.outputs.latest_stable_version }}-beta-from-${{ steps.get-versions.outputs.latest_beta_version }}
5153
run: |
5254
echo "branch_name=${{ env.BRANCH_NAME }}" >> $GITHUB_OUTPUT
5355
echo "branch_exists=$(git show-ref --verify --quiet refs/remotes/origin/${{ env.BRANCH_NAME }} && echo 'true')" >> $GITHUB_OUTPUT
@@ -127,5 +129,4 @@ jobs:
127129
branchName: '${{ steps.check-branch.outputs.branch_name }}',
128130
description: '${{ steps.get-versions.outputs.description }}',
129131
body: 'This PR was auto-generated to update the version(s) of Chrome for driver tests',
130-
addToProjectBoard: true,
131132
})

cli/CHANGELOG.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
<!-- See the ../guides/writing-the-cypress-changelog.md for details on writing the changelog. -->
2+
## 15.7.1
3+
4+
_Released 12/2/2025 (PENDING)_
5+
6+
**Performance:**
7+
8+
- 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).
9+
210
## 15.7.0
311

4-
_Released 11/18/2025 (PENDING)_
12+
_Released 11/19/2025_
513

614
**Performance:**
715

@@ -15,9 +23,8 @@ _Released 11/18/2025 (PENDING)_
1523

1624
- 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).
1725
- 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).
18-
- 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)
19-
- 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)
20-
26+
- 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).
27+
- 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).
2128

2229
**Misc:**
2330

guides/release-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ _Note: It is advisable to notify the team that the `develop` branch is locked do
196196
- [cypress-realworld-app](https://github.com/cypress-io/cypress-realworld-app/issues/41)
197197
- [cypress-example-recipes](https://github.com/cypress-io/cypress-example-recipes/issues/225)
198198
199-
26. Be sure to rotate the `NPM_TOKEN` variable inside the `org-npm-credentials` context inside CircleCI.
199+
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.
200200
201201
Take a break, you deserve it! 👉😎👉
202202

guides/studio-development.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ To ensure that we get the same results from our Studio AI calls every time, we s
7070

7171
```js
7272
const aiOutput = 'cy.get(\'button\').should(\'have.text\', \'Increment\')'
73-
cy.mockNodeCloudStreamingRequest({
73+
cy.mockNodeCloudRequest({
7474
url: '/studio/testgen/n69px6/generate',
7575
method: 'post',
7676
body: { recommendations: [{ content: aiOutput }] },

npm/webpack-dev-server/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# [@cypress/webpack-dev-server-v5.2.1](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v5.2.0...@cypress/webpack-dev-server-v5.2.1) (2025-11-19)
2+
3+
4+
### Bug Fixes
5+
6+
* make sure angular project configs can resolve correctly on windows ([#32971](https://github.com/cypress-io/cypress/issues/32971)) ([71a393e](https://github.com/cypress-io/cypress/commit/71a393ee566dd5eff4e0579fdc6a23bf73cffa51))
7+
18
# [@cypress/webpack-dev-server-v5.2.0](https://github.com/cypress-io/cypress/compare/@cypress/webpack-dev-server-v5.1.5...@cypress/webpack-dev-server-v5.2.0) (2025-11-19)
29

310

0 commit comments

Comments
 (0)