Skip to content

Commit 682a11e

Browse files
authored
Merge branch 'develop' into mabel/issue-12026-handle-snapshots-in-studio
2 parents ab821a5 + 3f45167 commit 682a11e

File tree

14 files changed

+26
-22
lines changed

14 files changed

+26
-22
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-
10-15-2025
2+
10-15-2025-devtools

.circleci/config.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ jobs:
129129
resource_class: small
130130
steps:
131131
- cancel-draft-prs
132-
- checkout
132+
- checkout:
133+
method: blobless
133134
- restore-src-checksum-cache
134135
- persist-to-workspace-and-exit-early
135136
- pack-workflows

.circleci/src/pipeline/@pipeline.yml

Lines changed: 4 additions & 3 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 "140.0.7339.207"
9-
chrome-beta-version: &chrome-beta-version "141.0.7390.30"
8+
chrome-stable-version: &chrome-stable-version "141.0.7390.107"
9+
chrome-beta-version: &chrome-beta-version "142.0.7444.34"
1010
firefox-stable-version: &firefox-stable-version "142.0"
1111
base-internal-bullseye: &base-internal-bullseye cypress/base-internal:22.19.0-bullseye
1212
base-internal-yarn-berry: &base-internal-yarn-berry cypress/base-internal:22.19.0-yarn-berry
@@ -1474,7 +1474,8 @@ jobs:
14741474
resource_class: << parameters.resource_class >>
14751475
steps:
14761476
- update_known_hosts
1477-
- checkout
1477+
- checkout:
1478+
method: blobless
14781479
- install-required-node
14791480
- verify-build-setup:
14801481
executor: << parameters.executor >>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@
280280
"@definitelytyped/typescript-versions": "0.1.7",
281281
"@types/react": "18.3.12",
282282
"browserify-sign": "4.2.2",
283-
"devtools-protocol": "0.0.1459876",
283+
"devtools-protocol": "0.0.1528500",
284284
"node-abi": "4.9.0",
285285
"vue-template-compiler": "2.6.12"
286286
},

packages/frontend-shared/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"pinia": "2.0.0-rc.14"
3030
},
3131
"devDependencies": {
32-
"@antfu/utils": "^0.7.8",
32+
"@antfu/utils": "^0.7.10",
3333
"@babel/code-frame": "7.27.1",
3434
"@cypress-design/css": "^1.1.0",
3535
"@faker-js/faker": "9.6.0",

packages/proxy/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@packages/types": "0.0.0-development",
4646
"@types/express": "4.17.2",
4747
"@types/supertest": "2.0.10",
48-
"devtools-protocol": "0.0.1459876",
48+
"devtools-protocol": "0.0.1528500",
4949
"express": "4.21.0",
5050
"supertest": "6.0.1",
5151
"typescript": "~5.4.5"

packages/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
"chai-subset": "1.6.0",
183183
"chai-uuid": "1.0.6",
184184
"chrome-har-capturer": "0.14.2",
185-
"devtools-protocol": "0.0.1459876",
185+
"devtools-protocol": "0.0.1528500",
186186
"esbuild": "^0.25.2",
187187
"eslint": "^9.31.0",
188188
"eventsource": "2.0.2",

packages/socket/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"@packages/types": "0.0.0-development",
3131
"@types/uuid": "8.3.2",
3232
"cross-env": "7.0.3",
33-
"devtools-protocol": "0.0.1459876",
33+
"devtools-protocol": "0.0.1528500",
3434
"resolve-pkg": "2.0.0",
3535
"vitest": "^3.2.4"
3636
},

packages/types/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"@types/node": "22.18.7",
2323
"axios": "^1.8.3",
2424
"better-sqlite3": "11.10.0",
25-
"devtools-protocol": "0.0.1459876",
25+
"devtools-protocol": "0.0.1528500",
2626
"express": "4.21.0",
2727
"rimraf": "^6.0.1",
2828
"socket.io": "4.0.1",

system-tests/test-binary/node_versions_spec.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ describe('binary node versions', () => {
3333
'cypress/base:22.12.0',
3434
'cypress/base:22.19.0',
3535
'cypress/base:24.0.0',
36+
'cypress/base:25.0.0',
3637
].forEach(smokeTestDockerImage)
3738
})
3839

@@ -45,6 +46,7 @@ describe('type: module', () => {
4546
'cypress/base:22.12.0',
4647
'cypress/base:22.19.0',
4748
'cypress/base:24.0.0',
49+
'cypress/base:25.0.0',
4850
].forEach((dockerImage) => {
4951
systemTests.it(`can run in ${dockerImage}`, {
5052
withBinary: true,

0 commit comments

Comments
 (0)