Skip to content

Commit 8529c13

Browse files
authored
Merge branch 'develop' into ci/parameterize-binary-branch
2 parents 2b684c4 + c394410 commit 8529c13

File tree

101 files changed

+843
-626
lines changed

Some content is hidden

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

101 files changed

+843
-626
lines changed

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ jobs:
134134
resource_class: small
135135
steps:
136136
- cancel-draft-prs
137-
- checkout
137+
- checkout:
138+
method: blobless
138139
- restore-src-checksum-cache
139140
- persist-to-workspace-and-exit-early
140141
- pack-workflows

.circleci/src/pipeline/@pipeline.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,10 @@ chrome-stable-version: &chrome-stable-version "141.0.7390.107"
99
chrome-beta-version: &chrome-beta-version "142.0.7444.34"
1010
firefox-stable-version: &firefox-stable-version "142.0"
1111
base-internal-trixie: &base-internal-trixie cypress/base-internal:22.19.0-trixie
12-
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry-trixie
12+
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry
1313
# Lowest Node.js version we support of the minimum major version supported
1414
# See https://docs.cypress.io/app/get-started/install-cypress#Nodejs
1515
base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0
16-
ubuntu-2004-current: &ubuntu-2004-current ubuntu-2004:2024.11.1
17-
ubuntu-2004-older: &ubuntu-2004-older ubuntu-2004:2024.05.1
1816

1917
parameters:
2018
publish-binary-branch:
@@ -123,7 +121,7 @@ commands:
123121
name: Set environment variable to determine whether or not to persist artifacts
124122
command: |
125123
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
126-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/fix_builds" ]]; then
124+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "chore/remove_unused_anchors" ]]; then
127125
export SHOULD_PERSIST_ARTIFACTS=true
128126
fi' >> "$BASH_ENV"
129127
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
@@ -1465,7 +1463,8 @@ jobs:
14651463
default: false
14661464
resource_class: << parameters.resource_class >>
14671465
steps:
1468-
- checkout
1466+
- checkout:
1467+
method: full
14691468
- install-required-node
14701469
- verify-build-setup:
14711470
executor: << parameters.executor >>

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

Lines changed: 2 additions & 2 deletions
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: [ 'ryanm/fix/issue-with-sourcemaps', << pipeline.git.branch >> ]
7+
- equal: [ 'chore/remove_unused_anchors', << pipeline.git.branch >> ]
88
- matches:
99
pattern: /^release\/\d+\.\d+\.\d+$/
1010
value: << pipeline.git.branch >>
@@ -309,7 +309,7 @@ linux-x64:
309309
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
310310
- 'update-v8-snapshot-cache-on-develop'
311311
- 'feat/cy-prompt'
312-
context: test-runner:npm-release
312+
context: [test-runner:npm-release, org-npm-credentials]
313313
requires:
314314
- ready-to-release
315315

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
- external-pr-build
6464
- approve-contributor-pr
6565
- verify-release-readiness:
66-
context: test-runner:npm-release
66+
context: [test-runner:npm-release, org-npm-credentials]
6767
requires:
6868
- internal-pr-build
6969
- external-pr-build

cli/CHANGELOG.md

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

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

614
**Features:**
715

8-
- Added a 'Self-healed' badge to the Command Log when `cy.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).
9-
- `cy.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).
16+
- 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).
17+
- [`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).
1018

1119
**Bugfixes:**
1220

1321
- Fixed an issue where command snapshots were not correctly displayed in Studio. Addressed in [#32808](https://github.com/cypress-io/cypress/pull/32808).
1422
- Chrome's autofill popup is now disabled when filling address and credit card forms during test execution. We also added some other Chrome flags and preferences that are common when automating browsers. Fixes [#25608](https://github.com/cypress-io/cypress/issues/25608). Addressed in [#32811](https://github.com/cypress-io/cypress/pull/32811).
1523
- Fixed an issue where grouped command text jumps up and down when expanding and collapsing in the command log. Addressed in [#32757](https://github.com/cypress-io/cypress/pull/32757).
1624
- Fixed an issue with grouped console prop items having a hard to read blue color in the console log and duplicate `:` characters being displayed. Addressed in [#32776](https://github.com/cypress-io/cypress/pull/32776).
17-
- Added more context to the error message shown when `cy.prompt()` fails to download. Addressed in [#32822](https://github.com/cypress-io/cypress/pull/32822).
25+
- Added more context to the error message shown when [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt) fails to download. Addressed in [#32822](https://github.com/cypress-io/cypress/pull/32822).
1826
- Fixed an issue where absolute file paths were not correctly determined from the source map when the source map root was updated. Fixes [#32809](https://github.com/cypress-io/cypress/issues/32809).
1927

2028
**Misc:**
@@ -23,6 +31,8 @@ _Released 11/4/2025 (PENDING)_
2331
- 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).
2432
- 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).
2533
- 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).
34+
- 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)
35+
- 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).
2636

2737
**Dependency Updates:**
2838

@@ -46,7 +56,7 @@ _Released 10/17/2025_
4656
**Misc:**
4757

4858
- Browser detection in Cypress now always prefers 64-bit browser installs to 32-bit browser installs. Addressed in [#32656](https://github.com/cypress-io/cypress/pull/32656).
49-
- Update code button styles and rename Get Code for Code on cy.prompt. Addressed in [#32745](https://github.com/cypress-io/cypress/pull/32745).
59+
- Update code button styles and rename Get Code for Code on [`cy.prompt()`](https://docs.cypress.io/api/commands/prompt). Addressed in [#32745](https://github.com/cypress-io/cypress/pull/32745).
5060

5161
**Dependency Updates:**
5262

@@ -66,15 +76,15 @@ _Released 10/7/2025_
6676
**Bugfixes:**
6777

6878
- Fixed a regression introduced in [`15.0.0`](https://docs.cypress.io/guides/references/changelog#15-0-0) where `dbus` connection error messages appear in docker containers when launching Cypress. Fixes [#32290](https://github.com/cypress-io/cypress/issues/32290).
69-
- Fixed code frames in `cy.origin` so that failed commands will show the correct line/column within the corresponding spec file. Addressed in [#32597](https://github.com/cypress-io/cypress/pull/32597).
79+
- Fixed code frames in [`cy.origin()`](https://docs.cypress.io/api/commands/origin) so that failed commands will show the correct line/column within the corresponding spec file. Addressed in [#32597](https://github.com/cypress-io/cypress/pull/32597).
7080
- Fixed Cypress cloud requests so that they properly verify SSL certificates. Addressed in [#32629](https://github.com/cypress-io/cypress/pull/32629).
7181

7282
**Misc:**
7383

7484
- Added a dropdown menu in the Command Log that includes actions like Open in IDE and Add New Test in Studio, along with test preferences such as Auto-Scroll and Hide HTTP Requests. Addresses [#32556](https://github.com/cypress-io/cypress/issues/32556) and [#32558](https://github.com/cypress-io/cypress/issues/32558). Addressed in [#32611](https://github.com/cypress-io/cypress/pull/32611).
7585
- Updated the Studio test editing header to include a Back button. This change ensures the Specs button remains functional for expanding or collapsing the specs panel. Addresses [#32556](https://github.com/cypress-io/cypress/issues/32556) and [#32558](https://github.com/cypress-io/cypress/issues/32558). Addressed in [#32611](https://github.com/cypress-io/cypress/pull/32611).
7686
- Fixed the Studio panel resizing when dragging. Addressed in [#32584](https://github.com/cypress-io/cypress/pull/32584).
77-
- The Next button now maintains consistent visibility during stepping sessions when using `cy.pause`, staying visible but disabled when no immediate next command is available, providing clear visual feedback to users about stepping state. Addresses [#32476](https://github.com/cypress-io/cypress/issues/32476). Addressed in [#32536](https://github.com/cypress-io/cypress/pull/32536).
87+
- The Next button now maintains consistent visibility during stepping sessions when using [`cy.pause()`](https://docs.cypress.io/api/commands/pause), staying visible but disabled when no immediate next command is available, providing clear visual feedback to users about stepping state. Addresses [#32476](https://github.com/cypress-io/cypress/issues/32476). Addressed in [#32536](https://github.com/cypress-io/cypress/pull/32536).
7888

7989
**Dependency Updates:**
8090

@@ -111,7 +121,7 @@ _Released 9/9/2025_
111121

112122
**Bugfixes:**
113123

114-
- We now properly partition the `host` with `port` when caching family DNS lookups. This resolves issues where some `localhost` URLs were not resolving in `cy.visit()` in Cypress when they should have. Fixes [#25397](https://github.com/cypress-io/cypress/issues/25397). Addressed in [#32403](https://github.com/cypress-io/cypress/pull/32403).
124+
- We now properly partition the `host` with `port` when caching family DNS lookups. This resolves issues where some `localhost` URLs were not resolving in [`cy.visit()`](https://docs.cypress.io/api/commands/visit) in Cypress when they should have. Fixes [#25397](https://github.com/cypress-io/cypress/issues/25397). Addressed in [#32403](https://github.com/cypress-io/cypress/pull/32403).
115125

116126
**Dependency Updates:**
117127

@@ -123,7 +133,7 @@ _Released 09/02/2025_
123133

124134
**Features:**
125135

126-
- Expanded `cy.press()` to support more key types. Addresses [#31051](https://github.com/cypress-io/cypress/issues/31051) and [#31488](https://github.com/cypress-io/cypress/issues/31488). Addressed in [#31496](https://github.com/cypress-io/cypress/pull/31496).
136+
- Expanded [`cy.press()`](https://docs.cypress.io/api/commands/press) to support more key types. Addresses [#31051](https://github.com/cypress-io/cypress/issues/31051) and [#31488](https://github.com/cypress-io/cypress/issues/31488). Addressed in [#31496](https://github.com/cypress-io/cypress/pull/31496).
127137

128138
**Bugfixes:**
129139

cli/types/cypress.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6476,7 +6476,7 @@ declare namespace Cypress {
64766476
}
64776477

64786478
interface Exec {
6479-
code: number
6479+
exitCode: number
64806480
stdout: string
64816481
stderr: string
64826482
}

guides/esm-migration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ When migrating some of these projects away from the `ts-node` entry [see `@packa
8989
- [x] npm/puppeteer ✅ **COMPLETED**
9090
- [x] npm/vite-dev-server ✅ **COMPLETED**
9191
- [ ] npm/webpack-batteries-included-preprocessor
92-
- [ ] npm/webpack-dev-server
92+
- [x] npm/webpack-dev-server**COMPLETED**
9393
- [ ] npm/webpack-preprocessor
9494

9595
##### Binary Packages

npm/cypress-schematic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@angular-devkit/schematics-cli": "^20.1.6",
2121
"@angular/cli": "^20.1.6",
2222
"@schematics/angular": "^20.1.6",
23-
"@types/chai-enzyme": "0.6.13",
23+
"@types/chai-enzyme": "0.6.14",
2424
"@types/mocha": "8.0.3",
2525
"@types/node": "^22.18.7",
2626
"eslint": "^9.31.0",

npm/mount-utils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"devDependencies": {
1515
"@packages/eslint-config": "0.0.0-development",
1616
"@rollup/plugin-commonjs": "^17.1.0",
17-
"@rollup/plugin-node-resolve": "^11.1.1",
17+
"@rollup/plugin-node-resolve": "^11.2.1",
1818
"eslint": "^9.31.0",
1919
"rollup": "3.29.5",
2020
"rollup-plugin-dts": "5.0.0",

npm/vite-dev-server/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
# [@cypress/vite-dev-server-v7.0.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v7.0.0...@cypress/vite-dev-server-v7.0.1) (2025-11-04)
2+
3+
4+
### Bug Fixes
5+
6+
* ensure that absolute paths can be found via source maps ([#32820](https://github.com/cypress-io/cypress/issues/32820)) ([e6e91a0](https://github.com/cypress-io/cypress/commit/e6e91a0c976eee43ad23b4dc654e83fe29016856))
7+
18
# [@cypress/vite-dev-server-v7.0.0](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v6.0.3...@cypress/vite-dev-server-v7.0.0) (2025-08-08)
29

310

0 commit comments

Comments
 (0)