Skip to content

Commit 33c7b76

Browse files
Merge branch 'develop' into feat/cy-prompt
2 parents 6a4aa1e + bf03a20 commit 33c7b76

File tree

26 files changed

+346
-50
lines changed

26 files changed

+346
-50
lines changed

.circleci/cache-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# Bump this version to force CI to re-create the cache from scratch.
2-
9-30-2026
2+
10-2-2025

.circleci/src/pipeline/@pipeline.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ version: 2.1
88
chrome-stable-version: &chrome-stable-version "140.0.7339.207"
99
chrome-beta-version: &chrome-beta-version "141.0.7390.30"
1010
firefox-stable-version: &firefox-stable-version "142.0"
11-
base-internal-bullseye: &base-internal-bullseye cypress/base-internal:22.18.0-bullseye
12-
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.18.0-yarn-berry
13-
base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:22.15.1
11+
base-internal-bullseye: &base-internal-bullseye cypress/base-internal:22.19.0-bullseye
12+
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry
13+
# Lowest Node.js version we support of the minimum major version supported
14+
# See https://docs.cypress.io/app/get-started/install-cypress#Nodejs
15+
base-internal-minimum-node: &base-internal-minimum-node cypress/base-internal:20.15.0
1416
ubuntu-2004-current: &ubuntu-2004-current ubuntu-2004:2024.11.1
1517
ubuntu-2004-older: &ubuntu-2004-older ubuntu-2004:2024.05.1
1618

@@ -599,9 +601,9 @@ commands:
599601
if [[ ! -f better_sqlite3.node ]]; then
600602
set -x
601603
apt update && apt install -y docker.io
602-
docker run -d --name better-sqlite3-builder cypress/base-internal:22.18.0-glibc-2.31 /bin/bash -c "sleep 1000000000"
604+
docker run -d --name better-sqlite3-builder cypress/base-internal:22.19.0-glibc-2.31 /bin/bash -c "sleep 1000000000"
603605
docker cp ~/cypress/node_modules/better-sqlite3 better-sqlite3-builder:/better-sqlite3
604-
docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 36.8.1 --include-regex 'better_sqlite3.node$'"
606+
docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 37.6.0 --include-regex 'better_sqlite3.node$'"
605607
docker cp better-sqlite3-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node
606608
docker rm -f better-sqlite3-builder
607609
cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node
@@ -2594,14 +2596,14 @@ jobs:
25942596
# force installing the freshly built binary
25952597
command: CYPRESS_INSTALL_BINARY=/root/cypress/cypress.zip npm i
25962598
/root/cypress/cypress.tgz
2597-
- run:
2598-
name: Cypress version
2599-
working_directory: test-binary
2600-
command: $(yarn bin cypress) version
26012599
- run:
26022600
name: Verify Cypress binary
26032601
working_directory: test-binary
26042602
command: $(yarn bin cypress) verify
2603+
- run:
2604+
name: Cypress version
2605+
working_directory: test-binary
2606+
command: $(yarn bin cypress) version
26052607
- run:
26062608
name: Cypress help
26072609
working_directory: test-binary
@@ -2611,6 +2613,7 @@ jobs:
26112613
working_directory: test-binary
26122614
command: $(yarn bin cypress) info
26132615

2616+
# Test NPM module on minimum node version we support
26142617
test-npm-module-on-minimum-node-version:
26152618
<<: *defaults
26162619
resource_class: small
@@ -2634,9 +2637,13 @@ jobs:
26342637
working_directory: test-binary
26352638
command: npx cypress verify
26362639
- run:
2637-
name: Print Cypress version
2640+
name: Cypress version
26382641
working_directory: test-binary
26392642
command: npx cypress version
2643+
- run:
2644+
name: Cypress help
2645+
working_directory: test-binary
2646+
command: npx cypress help
26402647
- run:
26412648
name: Cypress info
26422649
working_directory: test-binary

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.18.0
1+
22.19.0

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.18.0
1+
22.19.0

cli/CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ _Released 10/7/2025 (PENDING)_
2121
- 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).
2222
- Fixed the Studio panel resizing when dragging. Addressed in [#32584](https://github.com/cypress-io/cypress/pull/32584).
2323

24+
**Dependency Updates:**
25+
26+
- Upgraded `electron` from `36.8.1` to `37.6.0`. Addressed in [#32607](https://github.com/cypress-io/cypress/pull/32607).
27+
- Upgraded bundled Node.js version from `22.18.0` to `22.19.0`. Addressed in [#32607](https://github.com/cypress-io/cypress/pull/32607).
28+
- Upgraded bundled Chromium version from `136.0.7103.177` to `138.0.7204.251`. Addressed in [#32607](https://github.com/cypress-io/cypress/pull/32607).
29+
2430
## 15.3.0
2531

2632
_Released 9/23/2025_
@@ -40,12 +46,6 @@ _Released 9/23/2025_
4046
- Test hook names now correctly display with a semi-bold font weight. Addresses [#32477](https://github.com/cypress-io/cypress/issues/32477). Addressed in [#32491](https://github.com/cypress-io/cypress/pull/32491).
4147
- Updated the Cypress Studio panel to not show bottom border. Addresses [#32478](https://github.com/cypress-io/cypress/issues/32478).
4248

43-
**Dependency Updates:**
44-
45-
- Upgraded `electron` from `36.4.0` to `36.8.1`. Addressed in [#32371](https://github.com/cypress-io/cypress/pull/32371).
46-
- Upgraded bundled Node.js version from `22.15.1` to `22.18.0`. Addressed in [#32371](https://github.com/cypress-io/cypress/pull/32371).
47-
- Upgraded bundled Chromium version from `136.0.7103.149` to `136.0.7103.177`. Addressed in [#32371](https://github.com/cypress-io/cypress/pull/32371).
48-
4949
## 15.2.0
5050

5151
_Released 9/9/2025_

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ services:
3131
- .:/opt/cypress
3232
ci:
3333
# This should mirror the image used in workflows.yml
34-
image: cypress/base-internal:22.18.0-bullseye
34+
image: cypress/base-internal:22.19.0-bullseye
3535
ports:
3636
- 5566:5566
3737
- 5567:5567

npm/cypress-schematic/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# [@cypress/schematic-v4.1.4](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v4.1.3...@cypress/schematic-v4.1.4) (2025-10-03)
2+
13
# [@cypress/schematic-v4.1.3](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v4.1.2...@cypress/schematic-v4.1.3) (2025-09-18)
24

35
# [@cypress/schematic-v4.1.2](https://github.com/cypress-io/cypress/compare/@cypress/schematic-v4.1.1...@cypress/schematic-v4.1.2) (2025-09-02)

npm/cypress-schematic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@schematics/angular": "^20.1.6",
2323
"@types/chai-enzyme": "0.6.13",
2424
"@types/mocha": "8.0.3",
25-
"@types/node": "^22.18.0",
25+
"@types/node": "^22.18.7",
2626
"eslint": "^9.31.0",
2727
"typescript": "~5.4.5",
2828
"vitest": "^3.2.4"

npm/puppeteer/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# [@cypress/puppeteer-v0.1.8](https://github.com/cypress-io/cypress/compare/@cypress/puppeteer-v0.1.7...@cypress/puppeteer-v0.1.8) (2025-10-03)
2+
13
# [@cypress/puppeteer-v0.1.7](https://github.com/cypress-io/cypress/compare/@cypress/puppeteer-v0.1.6...@cypress/puppeteer-v0.1.7) (2025-09-18)
24

35
# [@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)

npm/puppeteer/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
},
2323
"devDependencies": {
2424
"@packages/eslint-config": "0.0.0-development",
25-
"@types/node": "^22.18.0",
25+
"@types/node": "^22.18.7",
2626
"chai-as-promised": "^7.1.1",
2727
"chokidar": "^3.5.3",
2828
"eslint": "^9.31.0",

0 commit comments

Comments
 (0)