From 0b850be23f5932e57830f29f7b7098175c2af1f7 Mon Sep 17 00:00:00 2001 From: Zach Bloomquist Date: Fri, 16 Jul 2021 13:58:01 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20revert=20"fix(deps):=20update=20depend?= =?UTF-8?q?ency=20electron=20to=20v13=20=F0=9F=8C=9F=20(#17037)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bda59dd7cc407518ae673eeffc49576652dc4972. --- .node-version | 2 +- appveyor.yml | 2 +- circle.yml | 5 ++--- package.json | 2 +- packages/electron/package.json | 2 +- scripts/run-docker-local.sh | 2 +- yarn.lock | 10 +++++----- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.node-version b/.node-version index 62df50f1eefe..2a0dc9a810cf 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -14.17.0 +14.16.0 diff --git a/appveyor.yml b/appveyor.yml index e68db73558be..48189a8e4246 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ branches: # https://www.appveyor.com/docs/lang/nodejs-iojs/ environment: # use matching version of Node.js - nodejs_version: "14.17.0" + nodejs_version: "14.16.0" # encode secure variables which will NOT be used # in pull requests # https://www.appveyor.com/docs/build-configuration/#secure-variables diff --git a/circle.yml b/circle.yml index 19c64156cb5b..ee71591d5d93 100644 --- a/circle.yml +++ b/circle.yml @@ -49,7 +49,7 @@ executors: # the Docker image with Cypress dependencies and Chrome browser cy-doc: docker: - - image: cypress/browsers:node14.17.0-chrome91-ff89 + - image: cypress/browsers:node14.16.0-chrome90-ff88 # by default, we use "small" to save on CI costs. bump on a per-job basis if needed. resource_class: small environment: @@ -58,7 +58,7 @@ executors: # Docker image with non-root "node" user non-root-docker-user: docker: - - image: cypress/browsers:node14.17.0-chrome91-ff89 + - image: cypress/browsers:node14.16.0-chrome90-ff88 user: node environment: PLATFORM: linux @@ -1126,7 +1126,6 @@ jobs: runner-integration-tests-electron: <<: *defaults - resource_class: medium parallelism: 2 steps: - run-runner-integration-tests: diff --git a/package.json b/package.json index ce5dcaa05c48..7d0664ab4906 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "yarn-deduplicate": "3.1.0" }, "engines": { - "node": ">=14.17.0", + "node": ">=14.16.0", "yarn": ">=1.17.3" }, "productName": "Cypress", diff --git a/packages/electron/package.json b/packages/electron/package.json index f04b955d3a92..393751786549 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -24,7 +24,7 @@ "minimist": "1.2.5" }, "devDependencies": { - "electron": "13.1.6", + "electron": "12.0.0-beta.14", "execa": "4.1.0", "mocha": "3.5.3" }, diff --git a/scripts/run-docker-local.sh b/scripts/run-docker-local.sh index 2f359b980fbf..17dd15696c02 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:node14.17.0-chrome91-ff89 +name=cypress/browsers:node14.16.0-chrome90-ff88 echo "Pulling CI container $name" docker pull $name diff --git a/yarn.lock b/yarn.lock index c6984adef55c..eb10f68a916f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16943,10 +16943,10 @@ electron-to-chromium@^1.3.247, electron-to-chromium@^1.3.378, electron-to-chromi resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf" integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg== -electron@13.1.6: - version "13.1.6" - resolved "https://registry.npmjs.org/electron/-/electron-13.1.6.tgz#6ecaf969255d62ce82cc0b5c948bf26e7dfb489b" - integrity sha512-XiB55/JTaQpDFQrD9pulYnOGwaWeMyRIub5ispvoE2bWBvM5zVMLptwMLb0m3KTMrfSkzhedZvOu7fwYvR7L7Q== +electron@12.0.0-beta.14: + version "12.0.0-beta.14" + resolved "https://registry.npmjs.org/electron/-/electron-12.0.0-beta.14.tgz#f8c40c7e479879c305e519380e710c0a357aa734" + integrity sha512-PYM+EepIEj9kLePXEb9gIxzZk5H4zM7LGg5iw60OHt+SYEECPNFJmPj3N6oHKu3W+KrCG7285Vgz2ZCp1u0kKA== dependencies: "@electron/get" "^1.0.1" "@types/node" "^14.6.2" @@ -31047,7 +31047,7 @@ pretty-error@^2.0.2, pretty-error@^2.1.1: pretty-format@26.4.0, pretty-format@^24.9.0, pretty-format@^26.6.2: version "26.4.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.0.tgz#c08073f531429e9e5024049446f42ecc9f933a3b" + resolved "https://registry.npmjs.org/pretty-format/-/pretty-format-26.4.0.tgz#c08073f531429e9e5024049446f42ecc9f933a3b" integrity sha512-mEEwwpCseqrUtuMbrJG4b824877pM5xald3AkilJ47Po2YLr97/siejYQHqj2oDQBeJNbu+Q0qUuekJ8F0NAPg== dependencies: "@jest/types" "^26.3.0"