Skip to content

Commit f9ef960

Browse files
authored
chore(deps): upgrade electron to v21.0.0 (#23881)
1 parent 94eb70e commit f9ef960

File tree

7 files changed

+25
-31
lines changed

7 files changed

+25
-31
lines changed

.circleci/config.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ mainBuildFilters: &mainBuildFilters
2828
only:
2929
- develop
3030
- fix-ci-deps
31+
- issue-23843_electron_21_upgrade
3132

3233
# usually we don't build Mac app - it takes a long time
3334
# but sometimes we want to really confirm we are doing the right thing
@@ -37,6 +38,7 @@ macWorkflowFilters: &darwin-workflow-filters
3738
or:
3839
- equal: [ develop, << pipeline.git.branch >> ]
3940
- equal: [ 'correct-dashboard-results', << pipeline.git.branch >> ]
41+
- equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ]
4042
- matches:
4143
pattern: "-release$"
4244
value: << pipeline.git.branch >>
@@ -45,6 +47,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
4547
when:
4648
or:
4749
- equal: [ develop, << pipeline.git.branch >> ]
50+
- equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ]
4851
- matches:
4952
pattern: "-release$"
5053
value: << pipeline.git.branch >>
@@ -63,7 +66,7 @@ windowsWorkflowFilters: &windows-workflow-filters
6366
or:
6467
- equal: [ develop, << pipeline.git.branch >> ]
6568
- equal: [ linux-arm64, << pipeline.git.branch >> ]
66-
- equal: [ 'mikep/21720-ct-stack-traces', << pipeline.git.branch >> ]
69+
- equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ]
6770
- matches:
6871
pattern: "-release$"
6972
value: << pipeline.git.branch >>
@@ -72,7 +75,7 @@ executors:
7275
# the Docker image with Cypress dependencies and Chrome browser
7376
cy-doc:
7477
docker:
75-
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
78+
- image: cypress/browsers:node16.16.0-chrome106-ff99-edge
7679
# by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
7780
resource_class: medium
7881
environment:
@@ -82,7 +85,7 @@ executors:
8285
# Docker image with non-root "node" user
8386
non-root-docker-user:
8487
docker:
85-
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
88+
- image: cypress/browsers:node16.16.0-chrome106-ff99-edge
8689
user: node
8790
environment:
8891
PLATFORM: linux
@@ -93,7 +96,7 @@ executors:
9396
mac:
9497
macos:
9598
# Executor should have Node >= required version
96-
xcode: "13.0.0"
99+
xcode: "14.0.0"
97100
resource_class: macos.x86.medium.gen2
98101
environment:
99102
PLATFORM: darwin
@@ -128,7 +131,7 @@ commands:
128131
- run:
129132
name: Check current branch to persist artifacts
130133
command: |
131-
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "webkit-experimental" ]]; then
134+
if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "issue-23843_electron_21_upgrade" ]]; then
132135
echo "Not uploading artifacts or posting install comment for this branch."
133136
circleci-agent step halt
134137
fi

.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.14.2
1+
16.16.0

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"dedent": "^0.7.0",
142142
"del": "3.0.0",
143143
"detect-port": "^1.3.0",
144-
"electron": "19.0.8",
144+
"electron": "21.0.0",
145145
"electron-builder": "^22.13.1",
146146
"electron-notarize": "^1.1.1",
147147
"enzyme-adapter-react-16": "1.12.1",
@@ -217,7 +217,7 @@
217217
"yarn-deduplicate": "3.1.0"
218218
},
219219
"engines": {
220-
"node": ">=16.14.2",
220+
"node": ">=16.16.0",
221221
"yarn": ">=1.17.3"
222222
},
223223
"productName": "Cypress",

packages/server/test/integration/http_requests_spec.js

+5-4
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,7 @@ describe('Routes', () => {
16611661
})
16621662
})
16631663

1664-
it('passes invalid cookies', function () {
1664+
it('passes invalid cookies', function (done) {
16651665
nock(this.server.remoteStates.current().origin)
16661666
.get('/invalid')
16671667
.reply(200, 'OK', {
@@ -1672,15 +1672,16 @@ describe('Routes', () => {
16721672
],
16731673
})
16741674

1675-
return this.rp('http://localhost:8080/invalid')
1676-
.then((res) => {
1675+
http.get('http://localhost:8080/invalid', (res) => {
16771676
expect(res.statusCode).to.eq(200)
16781677

16791678
expect(res.headers['set-cookie']).to.deep.eq([
16801679
'foo=bar; Path=/',
16811680
'___utmvmXluIZsM=fidJKOsDSdm; path=/; Max-Age=900',
1682-
'___utmvbXluIZsM=bZM XtQOGalF: VtR; path=/; Max-Age=900',
1681+
'___utmvbXluIZsM=bZM\n XtQOGalF: VtR; path=/; Max-Age=900',
16831682
])
1683+
1684+
done()
16841685
})
16851686
})
16861687

scripts/run-docker-local.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set e+x
33

44
echo "This script should be run from cypress's root"
55

6-
name=cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
6+
name=cypress/browsers:node16.16.0-chrome106-ff99-edge
77
echo "Pulling CI container $name"
88

99
docker pull $name

system-tests/test-binary/node_versions_spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('binary node versions', () => {
2828
[
2929
'cypress/base:12',
3030
'cypress/base:14',
31-
'cypress/base:16.14.2',
31+
'cypress/base:16.16.0',
3232
'cypress/base:17.3.0',
3333
].forEach(smokeTestDockerImage)
3434
})

yarn.lock

+7-17
Original file line numberDiff line numberDiff line change
@@ -12584,7 +12584,7 @@ concat-map@0.0.1:
1258412584
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
1258512585
integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
1258612586

12587-
concat-stream@1.6.2, concat-stream@^1.4.4, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.2:
12587+
concat-stream@1.6.2, concat-stream@^1.4.4, concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0:
1258812588
version "1.6.2"
1258912589
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
1259012590
integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -14841,14 +14841,14 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.4.84:
1484114841
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz#897613f6504f3f17c9381c7499a635b413e4df4e"
1484214842
integrity sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw==
1484314843

14844-
electron@19.0.8:
14845-
version "19.0.8"
14846-
resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.8.tgz#c4d4ba915de554f2926261eb37d3527d2b092d4c"
14847-
integrity sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw==
14844+
electron@21.0.0:
14845+
version "21.0.0"
14846+
resolved "https://registry.yarnpkg.com/electron/-/electron-21.0.0.tgz#d4f23c9cf457e6b64d4158f2c21f75c98b241c81"
14847+
integrity sha512-7HGxgaH0goYsq5m23rbLuKNwxOP4wS/JTNVTYt4n+a4sPkxI97Fcngh55pHaIvvMO3jKZ9yzll7L/D1dHwMdLA==
1484814848
dependencies:
1484914849
"@electron/get" "^1.14.1"
1485014850
"@types/node" "^16.11.26"
14851-
extract-zip "^1.0.3"
14851+
extract-zip "^2.0.1"
1485214852

1485314853
elegant-spinner@^1.0.1:
1485414854
version "1.0.1"
@@ -16392,16 +16392,6 @@ extract-zip@2.0.1, extract-zip@^2.0.0, extract-zip@^2.0.1:
1639216392
optionalDependencies:
1639316393
"@types/yauzl" "^2.9.1"
1639416394

16395-
extract-zip@^1.0.3:
16396-
version "1.7.0"
16397-
resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927"
16398-
integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==
16399-
dependencies:
16400-
concat-stream "^1.6.2"
16401-
debug "^2.6.9"
16402-
mkdirp "^0.5.4"
16403-
yauzl "^2.10.0"
16404-
1640516395
extsprintf@1.3.0, extsprintf@^1.2.0:
1640616396
version "1.3.0"
1640716397
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
@@ -23804,7 +23794,7 @@ mkdirp@0.5.3:
2380423794
dependencies:
2380523795
minimist "^1.2.5"
2380623796

23807-
mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@^0.5.5, mkdirp@~0.5.1:
23797+
mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
2380823798
version "0.5.5"
2380923799
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
2381023800
integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==

0 commit comments

Comments
 (0)