Skip to content

Commit

Permalink
Merge branch 'develop' into release/14.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jennifer-shehane authored Oct 30, 2024
2 parents b07868a + 018c2fc commit a3a975f
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 16 deletions.
2 changes: 1 addition & 1 deletion browser-versions.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"chrome:beta": "131.0.6778.13",
"chrome:stable": "130.0.6723.69",
"chrome:stable": "130.0.6723.91",
"chrome:minimum": "64.0.3282.0"
}
9 changes: 9 additions & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ _Released 12/3/2024 (PENDING)_
- Upgraded `electron` from `27.3.10` to `32.2.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547).
- Upgraded bundled Chromium version from `118.0.5993.159` to `128.0.6613.178`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547).


## 13.15.2

_Released 11/5/2024 (PENDING)_

**Dependency Updates:**

- Updated `@cypress/request` from `3.0.4` to `3.0.6`. Addressed in [#30488](https://github.com/cypress-io/cypress/pull/30488).

## 13.15.1

_Released 10/24/2024_
Expand Down
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"unit": "cross-env BLUEBIRD_DEBUG=1 NODE_ENV=test mocha --reporter mocha-multi-reporters --reporter-options configFile=../mocha-reporter-config.json"
},
"dependencies": {
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/xvfb": "^1.2.4",
"@types/sinonjs__fake-timers": "8.1.1",
"@types/sizzle": "^2.3.2",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"@aws-sdk/client-s3": "3.485.0",
"@aws-sdk/credential-providers": "3.53.0",
"@babel/eslint-parser": "7.25.1",
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/request-promise": "^5.0.0",
"@electron/fuses": "1.8.0",
"@electron/notarize": "^2.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/https-proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"devDependencies": {
"@cypress/debugging-proxy": "2.0.1",
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/request-promise": "^5.0.0",
"@packages/network": "0.0.0-development",
"@packages/ts": "0.0.0-development",
Expand Down
2 changes: 1 addition & 1 deletion packages/network/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"devDependencies": {
"@cypress/debugging-proxy": "2.0.1",
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/request-promise": "^5.0.0",
"@packages/https-proxy": "0.0.0-development",
"@packages/socket": "0.0.0-development",
Expand Down
2 changes: 1 addition & 1 deletion packages/proxy/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"utf8-stream": "0.0.0"
},
"devDependencies": {
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/request-promise": "^5.0.0",
"@cypress/sinon-chai": "2.9.1",
"@packages/resolve-dist": "0.0.0-development",
Expand Down
2 changes: 1 addition & 1 deletion packages/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"@babel/parser": "7.25.3",
"@cypress/commit-info": "2.2.0",
"@cypress/get-windows-proxy": "1.6.2",
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/request-promise": "^5.0.0",
"@cypress/vite-dev-server": "0.0.0-development",
"@cypress/webpack-batteries-included-preprocessor": "0.0.0-development",
Expand Down
2 changes: 1 addition & 1 deletion system-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@babel/preset-env": "7.25.3",
"@cypress/commit-info": "2.2.0",
"@cypress/debugging-proxy": "2.0.1",
"@cypress/request": "^3.0.4",
"@cypress/request": "^3.0.6",
"@cypress/request-promise": "^5.0.0",
"@cypress/sinon-chai": "2.9.1",
"@cypress/webpack-preprocessor": "0.0.0-development",
Expand Down
44 changes: 36 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2796,18 +2796,18 @@
stealthy-require "^1.1.1"
tough-cookie "^4.1.3"

"@cypress/request@^3.0.4":
version "3.0.4"
resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.4.tgz#03ce5269e41ac02183d36e8571ee7a1e3457442b"
integrity sha512-eqNHMsxEXuit0sRvvWoGG3/4+Q5qwqjKARWXKM/KoSsKvTNBwWt8pwspg5+TniP3POAZcPPx0O8CiEIQ4e6NWg==
"@cypress/request@^3.0.6":
version "3.0.6"
resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.6.tgz#f5580add6acee0e183b4d4e07eff4f31327ae12b"
integrity sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==
dependencies:
aws-sign2 "~0.7.0"
aws4 "^1.8.0"
caseless "~0.12.0"
combined-stream "~1.0.6"
extend "~3.0.2"
forever-agent "~0.6.1"
form-data "~2.5.0"
form-data "~4.0.0"
http-signature "~1.4.0"
is-typedarray "~1.0.0"
isstream "~0.1.2"
Expand All @@ -2816,7 +2816,7 @@
performance-now "^2.1.0"
qs "6.13.0"
safe-buffer "^5.1.2"
tough-cookie "^4.1.3"
tough-cookie "^5.0.0"
tunnel-agent "^0.6.0"
uuid "^8.3.2"

Expand Down Expand Up @@ -16713,7 +16713,7 @@ forever-agent@~0.6.1:
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=

form-data@4.0.0, form-data@^4.0.0:
form-data@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
Expand All @@ -16722,7 +16722,7 @@ form-data@4.0.0, form-data@^4.0.0:
combined-stream "^1.0.8"
mime-types "^2.1.12"

form-data@^2.3.1, form-data@^2.5.0, form-data@~2.5.0:
form-data@^2.3.1, form-data@^2.5.0:
version "2.5.1"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4"
integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA==
Expand All @@ -16740,6 +16740,15 @@ form-data@^3.0.0:
combined-stream "^1.0.8"
mime-types "^2.1.12"

form-data@^4.0.0, form-data@~4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.1.tgz#ba1076daaaa5bfd7e99c1a6cb02aa0a5cff90d48"
integrity sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==
dependencies:
asynckit "^0.4.0"
combined-stream "^1.0.8"
mime-types "^2.1.12"

form-data@~2.3.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
Expand Down Expand Up @@ -30147,6 +30156,18 @@ title-case@^3.0.3:
dependencies:
tslib "^2.0.3"

tldts-core@^6.1.57:
version "6.1.57"
resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-6.1.57.tgz#2cc6e6af3d0807ad616900300083930efa81b57d"
integrity sha512-lXnRhuQpx3zU9EONF9F7HfcRLvN1uRYUBIiKL+C/gehC/77XTU+Jye6ui86GA3rU6FjlJ0triD1Tkjt2F/2lEg==

tldts@^6.1.32:
version "6.1.57"
resolved "https://registry.yarnpkg.com/tldts/-/tldts-6.1.57.tgz#5d91d257ac945837358fe3954343fc01122fbad7"
integrity sha512-Oy7yDXK8meJl8vPMOldzA+MtueAJ5BrH4l4HXwZuj2AtfoQbLjmTJmjNWPUcAo+E/ibHn7QlqMS0BOcXJFJyHQ==
dependencies:
tldts-core "^6.1.57"

tmp-promise@^3.0.2:
version "3.0.3"
resolved "https://registry.yarnpkg.com/tmp-promise/-/tmp-promise-3.0.3.tgz#60a1a1cc98c988674fcbfd23b6e3367bdeac4ce7"
Expand Down Expand Up @@ -30277,6 +30298,13 @@ tough-cookie@4.1.3, tough-cookie@^4.1.3:
universalify "^0.2.0"
url-parse "^1.5.3"

tough-cookie@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-5.0.0.tgz#6b6518e2b5c070cf742d872ee0f4f92d69eac1af"
integrity sha512-FRKsF7cz96xIIeMZ82ehjC3xW2E+O2+v11udrDYewUbszngYhsGa8z6YUMMzO9QJZzzyd0nGGXnML/TReX6W8Q==
dependencies:
tldts "^6.1.32"

tough-cookie@~2.5.0:
version "2.5.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
Expand Down

4 comments on commit a3a975f

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on a3a975f Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.0/linux-arm64/release/14.0.0-a3a975fc1c822376e554998ac8f8c58e870cb5ec/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on a3a975f Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.0/linux-x64/release/14.0.0-a3a975fc1c822376e554998ac8f8c58e870cb5ec/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on a3a975f Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin arm64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.0/darwin-arm64/release/14.0.0-a3a975fc1c822376e554998ac8f8c58e870cb5ec/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on a3a975f Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the win32 x64 version of the Test Runner.

Learn more about this pre-release build at https://on.cypress.io/advanced-installation#Install-pre-release-version

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/14.0.0/win32-x64/release/14.0.0-a3a975fc1c822376e554998ac8f8c58e870cb5ec/cypress.tgz

Please sign in to comment.