diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f76667e57..7e4f7cca19 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,7 @@ mainBuildFilters: &mainBuildFilters only: - develop - fix-ci-deps + - issue-23843_electron_21_upgrade # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -37,6 +38,7 @@ macWorkflowFilters: &darwin-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] - equal: [ 'correct-dashboard-results', << pipeline.git.branch >> ] + - equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -45,6 +47,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] + - equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -63,7 +66,7 @@ windowsWorkflowFilters: &windows-workflow-filters or: - equal: [ develop, << pipeline.git.branch >> ] - equal: [ linux-arm64, << pipeline.git.branch >> ] - - equal: [ 'mikep/21720-ct-stack-traces', << pipeline.git.branch >> ] + - equal: [ 'issue-23843_electron_21_upgrade', << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -72,7 +75,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge + - image: cypress/browsers:node16.16.0-chrome106-ff99-edge # by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed. resource_class: medium environment: @@ -82,7 +85,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge + - image: cypress/browsers:node16.16.0-chrome106-ff99-edge user: node environment: PLATFORM: linux @@ -93,7 +96,7 @@ executors: mac: macos: # Executor should have Node >= required version - xcode: "13.0.0" + xcode: "14.0.0" resource_class: macos.x86.medium.gen2 environment: PLATFORM: darwin @@ -128,7 +131,7 @@ commands: - run: name: Check current branch to persist artifacts command: | - if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "webkit-experimental" ]]; then + if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "issue-23843_electron_21_upgrade" ]]; then echo "Not uploading artifacts or posting install comment for this branch." circleci-agent step halt fi diff --git a/.node-version b/.node-version index a1fe187884..431076a948 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -16.14.2 \ No newline at end of file +16.16.0 diff --git a/package.json b/package.json index e8eea38475..f9fb651749 100644 --- a/package.json +++ b/package.json @@ -141,7 +141,7 @@ "dedent": "^0.7.0", "del": "3.0.0", "detect-port": "^1.3.0", - "electron": "19.0.8", + "electron": "21.0.0", "electron-builder": "^22.13.1", "electron-notarize": "^1.1.1", "enzyme-adapter-react-16": "1.12.1", @@ -217,7 +217,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=16.14.2", + "node": ">=16.16.0", "yarn": ">=1.17.3" }, "productName": "Cypress", diff --git a/packages/server/test/integration/http_requests_spec.js b/packages/server/test/integration/http_requests_spec.js index dfcb18b9bb..bfb0c0baaf 100644 --- a/packages/server/test/integration/http_requests_spec.js +++ b/packages/server/test/integration/http_requests_spec.js @@ -1661,7 +1661,7 @@ describe('Routes', () => { }) }) - it('passes invalid cookies', function () { + it('passes invalid cookies', function (done) { nock(this.server.remoteStates.current().origin) .get('/invalid') .reply(200, 'OK', { @@ -1672,15 +1672,16 @@ describe('Routes', () => { ], }) - return this.rp('http://localhost:8080/invalid') - .then((res) => { + http.get('http://localhost:8080/invalid', (res) => { expect(res.statusCode).to.eq(200) expect(res.headers['set-cookie']).to.deep.eq([ 'foo=bar; Path=/', '___utmvmXluIZsM=fidJKOsDSdm; path=/; Max-Age=900', - '___utmvbXluIZsM=bZM XtQOGalF: VtR; path=/; Max-Age=900', + '___utmvbXluIZsM=bZM\n XtQOGalF: VtR; path=/; Max-Age=900', ]) + + done() }) }) diff --git a/scripts/run-docker-local.sh b/scripts/run-docker-local.sh index 89f54c62ef..f5a068f679 100755 --- a/scripts/run-docker-local.sh +++ b/scripts/run-docker-local.sh @@ -3,7 +3,7 @@ set e+x echo "This script should be run from cypress's root" -name=cypress/browsers:node16.14.2-slim-chrome100-ff99-edge +name=cypress/browsers:node16.16.0-chrome106-ff99-edge echo "Pulling CI container $name" docker pull $name diff --git a/system-tests/test-binary/node_versions_spec.ts b/system-tests/test-binary/node_versions_spec.ts index d62dd43db6..f2d6294ea6 100644 --- a/system-tests/test-binary/node_versions_spec.ts +++ b/system-tests/test-binary/node_versions_spec.ts @@ -28,7 +28,7 @@ describe('binary node versions', () => { [ 'cypress/base:12', 'cypress/base:14', - 'cypress/base:16.14.2', + 'cypress/base:16.16.0', 'cypress/base:17.3.0', ].forEach(smokeTestDockerImage) }) diff --git a/yarn.lock b/yarn.lock index 19a32ab1dc..045bcefe1b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12584,7 +12584,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -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: +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: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -14841,14 +14841,14 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.4.84: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz#897613f6504f3f17c9381c7499a635b413e4df4e" integrity sha512-/s3+fwhKf1YK4k7btOImOzCQLpUjS6MaPf0ODTNuT4eTM1Bg4itBpLkydhOzJmpmH6Z9eXFyuuK5czsmzRzwtw== -electron@19.0.8: - version "19.0.8" - resolved "https://registry.yarnpkg.com/electron/-/electron-19.0.8.tgz#c4d4ba915de554f2926261eb37d3527d2b092d4c" - integrity sha512-OWK3P/NbDFfBUv+wbYv1/OV4jehY5DQPT7n1maQJfN9hsnrWTMktXS/bmS05eSUAjNAzHmKPKfiKH2c1Yr7nGw== +electron@21.0.0: + version "21.0.0" + resolved "https://registry.yarnpkg.com/electron/-/electron-21.0.0.tgz#d4f23c9cf457e6b64d4158f2c21f75c98b241c81" + integrity sha512-7HGxgaH0goYsq5m23rbLuKNwxOP4wS/JTNVTYt4n+a4sPkxI97Fcngh55pHaIvvMO3jKZ9yzll7L/D1dHwMdLA== dependencies: "@electron/get" "^1.14.1" "@types/node" "^16.11.26" - extract-zip "^1.0.3" + extract-zip "^2.0.1" elegant-spinner@^1.0.1: version "1.0.1" @@ -16392,16 +16392,6 @@ extract-zip@2.0.1, extract-zip@^2.0.0, extract-zip@^2.0.1: optionalDependencies: "@types/yauzl" "^2.9.1" -extract-zip@^1.0.3: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== - dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" - yauzl "^2.10.0" - extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" @@ -23804,7 +23794,7 @@ mkdirp@0.5.3: dependencies: minimist "^1.2.5" -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: +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: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==