Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade electron to 32.2.0 #30394

Merged
merged 98 commits into from
Oct 29, 2024
Merged
Show file tree
Hide file tree
Changes from 96 commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
1159566
chore: upgrade electron to 32.2.0 -- run ci
ryanthemanuel Oct 10, 2024
5b587a2
fix node versions
ryanthemanuel Oct 10, 2024
ab7504d
fix build
ryanthemanuel Oct 10, 2024
7ac1953
fix evil-dns
ryanthemanuel Oct 10, 2024
1c206eb
various fixes
ryanthemanuel Oct 10, 2024
df17f1e
fix srcdoc
ryanthemanuel Oct 11, 2024
e98805a
various fixes
ryanthemanuel Oct 11, 2024
851f1f2
update package.json
ryanthemanuel Oct 11, 2024
affdd63
update yarn.lock
ryanthemanuel Oct 11, 2024
8bebe5d
various fixes
ryanthemanuel Oct 11, 2024
4b8b0a2
fix integrity check
ryanthemanuel Oct 11, 2024
37f68c2
fix binary verification
ryanthemanuel Oct 11, 2024
9a921d9
various fixes
ryanthemanuel Oct 11, 2024
88f091b
update yarn.lock
ryanthemanuel Oct 11, 2024
35934de
fix typo
ryanthemanuel Oct 11, 2024
ecb0423
fix lock file
ryanthemanuel Oct 11, 2024
7ccd723
fix tests
ryanthemanuel Oct 12, 2024
b4ed44f
fix tests
ryanthemanuel Oct 12, 2024
8a7dd47
various fixes
ryanthemanuel Oct 12, 2024
0a49434
various fixes
ryanthemanuel Oct 12, 2024
2854b2a
various fixes
ryanthemanuel Oct 12, 2024
ff5034c
fix stuff
ryanthemanuel Oct 13, 2024
686b56c
fix things
ryanthemanuel Oct 13, 2024
2efafbd
try to fix errors
ryanthemanuel Oct 15, 2024
168cb30
fix
ryanthemanuel Oct 15, 2024
7f3a243
updates
ryanthemanuel Oct 15, 2024
f459453
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 16, 2024
979715e
add yarn berry
ryanthemanuel Oct 16, 2024
6c954c2
upgrade electron
ryanthemanuel Oct 16, 2024
1bca323
attempt with gcc
ryanthemanuel Oct 18, 2024
86b440c
blank
ryanthemanuel Oct 18, 2024
9199ec6
update arm64 executor
ryanthemanuel Oct 18, 2024
7bc49ed
try to fix the arm64 issue
ryanthemanuel Oct 18, 2024
5f9e470
fix arm64
ryanthemanuel Oct 18, 2024
bc0f4f1
bump cache
ryanthemanuel Oct 18, 2024
32773d7
attempt to fix arm64 again
ryanthemanuel Oct 18, 2024
3da8d17
attempt to fix arm64 again
ryanthemanuel Oct 18, 2024
66f3bfb
fix darwin problems
ryanthemanuel Oct 18, 2024
f8edcca
merge release/14.0.0
ryanthemanuel Oct 18, 2024
650cd44
merge release/14.0.0
ryanthemanuel Oct 18, 2024
851ff69
update yarn.lock
ryanthemanuel Oct 18, 2024
dcaf19f
blank -- run ci
ryanthemanuel Oct 18, 2024
26359cf
blank
ryanthemanuel Oct 19, 2024
da3504c
blank
ryanthemanuel Oct 19, 2024
1255cc4
blank
ryanthemanuel Oct 19, 2024
6cc8587
try something
ryanthemanuel Oct 19, 2024
c179094
try something
ryanthemanuel Oct 19, 2024
7d509d1
clean up
ryanthemanuel Oct 20, 2024
5b1ad94
blank
ryanthemanuel Oct 20, 2024
12301d8
try to fix sessions issue
ryanthemanuel Oct 20, 2024
8e810e9
fixes
ryanthemanuel Oct 20, 2024
d915c1d
get more info
ryanthemanuel Oct 20, 2024
d696673
get more info
ryanthemanuel Oct 21, 2024
a271c03
try something
ryanthemanuel Oct 21, 2024
4b48b6e
fix
ryanthemanuel Oct 21, 2024
67f1e78
try something
ryanthemanuel Oct 21, 2024
1baf28a
try something
ryanthemanuel Oct 21, 2024
78e0bcd
try something
ryanthemanuel Oct 21, 2024
4262738
tweak
ryanthemanuel Oct 21, 2024
00c52d3
one more thing
ryanthemanuel Oct 21, 2024
c8a9791
let us see if this works
ryanthemanuel Oct 21, 2024
cfd5405
blank
ryanthemanuel Oct 21, 2024
9093d5d
chore: updating v8 snapshot cache
Oct 22, 2024
69af3f9
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 22, 2024
07b2b1f
chore: updating v8 snapshot cache
Oct 22, 2024
2b338c7
chore: updating v8 snapshot cache
Oct 22, 2024
d3e076b
Apply suggestions from code review
ryanthemanuel Oct 22, 2024
a235e02
Apply suggestions from code review
ryanthemanuel Oct 22, 2024
f45e3ed
Update cli/CHANGELOG.md
ryanthemanuel Oct 22, 2024
6364f8a
Update cli/CHANGELOG.md
ryanthemanuel Oct 22, 2024
5a8de1e
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 22, 2024
74bb4de
Update CHANGELOG.md
ryanthemanuel Oct 22, 2024
f8e5f5e
Update cache-version.txt
ryanthemanuel Oct 22, 2024
ed5f6fd
fix nx (maybe)
ryanthemanuel Oct 22, 2024
991c0c8
Update package.json
ryanthemanuel Oct 23, 2024
6a61b7d
try something
ryanthemanuel Oct 23, 2024
90056b2
Update packages/app/src/runner/aut-iframe.ts
ryanthemanuel Oct 23, 2024
2ff998a
bump version
ryanthemanuel Oct 23, 2024
31e39f7
try to bust cache
ryanthemanuel Oct 23, 2024
5e1f363
try to invalidate cache
ryanthemanuel Oct 23, 2024
5e2c623
Update cli/CHANGELOG.md
ryanthemanuel Oct 23, 2024
378c964
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 23, 2024
f5de4ac
suppress benign warnings
ryanthemanuel Oct 23, 2024
2a943f4
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 23, 2024
ce6cbad
Apply suggestions from code review
ryanthemanuel Oct 23, 2024
82f6c39
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 28, 2024
56524b7
PR comments
ryanthemanuel Oct 28, 2024
609dee4
PR comment
ryanthemanuel Oct 28, 2024
9f3f7dd
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 28, 2024
5a83687
Apply suggestions from code review
ryanthemanuel Oct 28, 2024
02e27e0
chore: updating v8 snapshot cache
Oct 28, 2024
308e5fd
chore: updating v8 snapshot cache
Oct 28, 2024
b6983b3
chore: updating v8 snapshot cache
Oct 28, 2024
fe4cd75
Update cli/CHANGELOG.md
ryanthemanuel Oct 28, 2024
b4a3f38
update debug scenario 4 regex
ryanthemanuel Oct 28, 2024
814e010
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 28, 2024
cb217de
Update scripts/binary/trigger-publish-binary-pipeline.js
ryanthemanuel Oct 29, 2024
32ea251
Merge branch 'release/14.0.0' into ryanm/chore/electron-upgrade
ryanthemanuel Oct 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/cache-version.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Bump this version to force CI to re-create the cache from scratch.

10-23-24
10-28-24
42 changes: 30 additions & 12 deletions .circleci/workflows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters
- /^release\/\d+\.\d+\.\d+$/
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- 'update-v8-snapshot-cache-on-develop'
- 'ryanm/chore/fix-windows-tests'
- 'ryanm/chore/electron-upgrade'
- 'publish-binary'

# usually we don't build Mac app - it takes a long time
Expand All @@ -42,7 +42,7 @@ macWorkflowFilters: &darwin-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/fix-windows-tests', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/electron-upgrade', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -53,7 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/fix-windows-tests', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/electron-upgrade', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -76,7 +76,7 @@ windowsWorkflowFilters: &windows-workflow-filters
- equal: [ develop, << pipeline.git.branch >> ]
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/fix-windows-tests', << pipeline.git.branch >> ]
- equal: [ 'ryanm/chore/electron-upgrade', << pipeline.git.branch >> ]
- matches:
pattern: /^release\/\d+\.\d+\.\d+$/
value: << pipeline.git.branch >>
Expand All @@ -85,7 +85,7 @@ executors:
# the Docker image with Cypress dependencies and Chrome browser
cy-doc:
docker:
- image: cypress/browsers-internal:node18.17.1-chrome128-ff131
- image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131
# by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
resource_class: medium
environment:
Expand All @@ -94,7 +94,7 @@ executors:

kitchensink-executor:
docker:
- image: cypress/browsers-internal:node20.15.0-chrome126-ff131
- image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131
# by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
resource_class: medium
environment:
Expand All @@ -104,7 +104,7 @@ executors:
# Docker image with non-root "node" user
non-root-docker-user:
docker:
- image: cypress/browsers-internal:node18.17.1-chrome128-ff131
- image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131
user: node
environment:
PLATFORM: linux
Expand Down Expand Up @@ -136,7 +136,7 @@ executors:

linux-arm64: &linux-arm64-executor
machine:
image: ubuntu-2004:2023.07.1
image: ubuntu-2004:2024.05.1
resource_class: arm.medium
environment:
PLATFORM: linux
Expand All @@ -152,7 +152,7 @@ commands:
name: Set environment variable to determine whether or not to persist artifacts
command: |
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/chore/fix-windows-tests" ]]; then
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "ryanm/chore/electron-upgrade" ]]; then
export SHOULD_PERSIST_ARTIFACTS=true
fi' >> "$BASH_ENV"
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
Expand Down Expand Up @@ -383,6 +383,24 @@ commands:
- run:
name: Install Node Modules
command: |
if [[ `node ./scripts/get-platform-key.js` == 'linux-arm64' ]]; then
# Building better-sqlite3 on arm64 requires gcc-10
# on Arm, CI runs as non-root so we need to use sudo
sudo apt install gcc-10 g++-10
ryanthemanuel marked this conversation as resolved.
Show resolved Hide resolved

# Update default to gcc-10 and g++-10
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 30
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 30
sudo update-alternatives --install /usr/bin/cc cc /usr/bin/gcc 30
sudo update-alternatives --set cc /usr/bin/gcc
sudo update-alternatives --install /usr/bin/c++ c++ /usr/bin/g++ 30
sudo update-alternatives --set c++ /usr/bin/g++
sudo update-alternatives --config gcc
sudo update-alternatives --config g++

# If we are on arm64 we need to install setuptools as it no longer comes standard with the latest version of python
pip install setuptools
fi
source ./scripts/ensure-node.sh
# avoid installing Percy's Chromium every time we use @percy/cli
# https://docs.percy.io/docs/caching-asset-discovery-browser-in-ci
Expand Down Expand Up @@ -528,9 +546,9 @@ commands:
if [[ ! -f better_sqlite3.node ]]; then
set -x
apt update && apt install -y docker.io
docker run -d --name better-sqlite3-builder cypress/base-internal:20.15.0-buster /bin/bash -c "sleep 1000000000"
docker run -d --name better-sqlite3-builder cypress/base-internal:20.15.0-buster-python3.8-gcc-10.5 /bin/bash -c "sleep 1000000000"
docker cp ~/cypress/node_modules/better-sqlite3 better-sqlite3-builder:/better-sqlite3
docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 27.1.3 --include-regex 'better_sqlite3.node$'"
docker exec -it better-sqlite3-builder /bin/bash -c "cd /better-sqlite3 && source /root/.bashrc && chown -R root:root . && npm install --ignore-scripts && npx --no-install prebuild -r electron -t 32.2.0 --include-regex 'better_sqlite3.node$'"
docker cp better-sqlite3-builder:/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node
docker rm -f better-sqlite3-builder
cp ~/cypress/node_modules/better-sqlite3/build/Release/better_sqlite3.node ~/cypress/better_sqlite3.node
Expand Down Expand Up @@ -1782,7 +1800,7 @@ jobs:
working_directory: ~/cypress
docker:
# we need an image with yarn 4 berry installed on it to run this test
- image: cypress/base-internal:18.17.1-yarn-berry
- image: cypress/base-internal:20.18.0-yarn-berry
environment:
# needed to inform the bootstrap-docker-container.sh script to link the binary in the system-test project directory
REPO_DIR: /root/cypress
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/1-bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ body:
attributes:
label: Node version
description: What version of node.js are you using to run Cypress?
placeholder: ex. v18.17.0
placeholder: ex. v20.18.0
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/2-memory-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ body:
attributes:
label: Node version
description: What version of node.js are you using to run Cypress?
placeholder: ex. v18.17.0
placeholder: ex. v20.18.0
validations:
required: true
- type: input
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/3-install-issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ body:
attributes:
label: Node version
description: What version of node.js are you using to run Cypress?
placeholder: ex. v18.17.0
placeholder: ex. v20.18.0
validations:
required: true
- type: dropdown
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk_sca_scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [18.x]
node-version: [20.x]
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -28,7 +28,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'yarn'
- name: Run yarn
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/snyk_static_analysis_scan.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'yarn'
- name: Run yarn
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-browser-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
- name: Check for new Chrome versions
id: get-versions
uses: actions/github-script@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_v8_snapshot_cache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'yarn'
- name: Run yarn
run: yarn
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.17.1
20.18.0
11 changes: 11 additions & 0 deletions cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@ _Released 12/3/2024 (PENDING)_
- We removed yielding the second argument of `before:browser:launch` as an array of browser arguments. This behavior has been deprecated since Cypress 4.0.0. Addressed in [#30460](https://github.com/cypress-io/cypress/pull/30460).
- The `cypress open-ct` and `cypress run-ct` CLI commands were removed. Please use `cypress open --component` or `cypress run --component` respectively instead. Addressed in [#30456](https://github.com/cypress-io/cypress/pull/30456)
- The undocumented methods `Cypress.backend('firefox:force:gc')` and `Cypress.backend('log:memory:pressure')` were removed. Addresses [#30222](https://github.com/cypress-io/cypress/issues/30222).
- Upgraded bundled Node.js version from `18.17.0` to `20.18.0`. Addresses [#29547](https://github.com/cypress-io/cypress/issues/29547).
- It is no longer possible to make a `fetch` or `XMLHttpRequest` request from the `about:blank` page in Electron (i.e. `cy.window().then((win) => win.fetch('<some-url>')`). You must use `cy.request` instead or perform some form of initial navigation via `cy.visit()`. Addressed in [#29547](https://github.com/cypress-io/cypress/pull/30394).

**Bugfixes:**

- The CSS pseudo-class `:dir()` is now supported when testing in Electron. Addresses [#29766](https://github.com/cypress-io/cypress/issues/29766).

**Dependency Updates:**

- 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.1

Expand Down
16 changes: 9 additions & 7 deletions cli/lib/exec/spawn.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ const isDbusWarning = /Failed to connect to the bus:/
// ERROR: No matching issuer found
const isCertVerifyProcBuiltin = /(^\[.*ERROR:cert_verify_proc_builtin\.cc|^----- Certificate i=0 \(OU=Cypress Proxy|^ERROR: No matching issuer found$)/

// Electron logs a benign warning about WebSwapCGLLayer on MacOS v12 and Electron v18 due to a naming collision in shared libraries.
// Once this is fixed upstream this regex can be removed: https://github.com/electron/electron/issues/33685
// Sample:
// objc[60540]: Class WebSwapCGLLayer is implemented in both /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/Frameworks/libANGLE-shared.dylib (0x7ffa5a006318) and /{path/to/app}/node_modules/electron/dist/Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib (0x10f8a89c8). One of the two will be used. Which one is undefined.
const isMacOSElectronWebSwapCGLLayerWarning = /^objc\[\d+\]: Class WebSwapCGLLayer is implemented in both.*Which one is undefined\./

/**
* Electron logs benign warnings about Vulkan when run on hosts that do not have a GPU. This is coming from the primary Electron process,
* and not the browser being used for tests.
Expand Down Expand Up @@ -74,7 +68,15 @@ const isContainerVulkanDriverWarning = /^Warning: vkCreateInstance/

const isContainerVulkanStack = /^\s*at (CheckVkSuccessImpl|CreateVkInstance|Initialize|Create|operator).+(VulkanError|BackendVk).cpp/

const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isMacOSElectronWebSwapCGLLayerWarning, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack]
/**
* In Electron 32.0.0 a new debug scenario log message started appearing when iframes navigate to about:blank. This is a benign message.
* https://github.com/electron/electron/issues/44368
* Sample:
* [78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4
*/
const isDebugScenario4 = /^\[[^\]]+debug_utils\.cc[^\]]+\] Hit debug scenario: 4/

const GARBAGE_WARNINGS = [isXlibOrLibudevRe, isHighSierraWarningRe, isRenderWorkerRe, isDbusWarning, isCertVerifyProcBuiltin, isHostVulkanDriverWarning, isContainerVulkanDriverWarning, isContainerVulkanStack, isDebugScenario4]

const isGarbageLineWarning = (str) => {
return _.some(GARBAGE_WARNINGS, (re) => {
Expand Down
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"execa-wrap": "1.4.0",
"hasha": "5.2.2",
"mocha": "6.2.2",
"mock-fs": "5.2.0",
"mock-fs": "5.4.0",
"mocked-env": "1.3.2",
"nock": "13.2.9",
"proxyquire": "2.1.3",
Expand Down
4 changes: 2 additions & 2 deletions cli/test/lib/exec/spawn_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ describe('lib/exec/spawn', function () {
----- Certificate i=0 (OU=Cypress Proxy Server Certificate,O=Cypress Proxy CA,L=Internet,ST=Internet,C=Internet,CN=www.googletagmanager.com) -----
ERROR: No matching issuer found

objc[60540]: Class WebSwapCGLLayer is implemented in both /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/Frameworks/libANGLE-shared.dylib (0x7ffa5a006318) and /{path/to/app}/node_modules/electron/dist/Electron.app/Contents/Frameworks/Electron Framework.framework/Versions/A/Libraries/libGLESv2.dylib (0x10f8a89c8). One of the two will be used. Which one is undefined.

Warning: loader_scanned_icd_add: Driver /usr/lib/x86_64-linux-gnu/libvulkan_intel.so supports Vulkan 1.2, but only supports loader interface version 4. Interface version 5 or newer required to support this version of Vulkan (Policy #LDP_DRIVER_7)
Warning: loader_scanned_icd_add: Driver /usr/lib/x86_64-linux-gnu/libvulkan_lvp.so supports Vulkan 1.1, but only supports loader interface version 4. Interface version 5 or newer required to support this version of Vulkan (Policy #LDP_DRIVER_7)
Warning: loader_scanned_icd_add: Driver /usr/lib/x86_64-linux-gnu/libvulkan_radeon.so supports Vulkan 1.2, but only supports loader interface version 4. Interface version 5 or newer required to support this verison of Vulkan (Policy #LDP_DRIVER_7)
Expand All @@ -97,6 +95,8 @@ describe('lib/exec/spawn', function () {
at Initialize (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:344)
at Create (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:266)
at operator() (../../third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp:521)

[78887:1023/114920.074882:ERROR:debug_utils.cc(14)] Hit debug scenario: 4
`

const lines = _
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- .:/opt/cypress
ci:
# This should mirror the image used in workflows.yml
image: cypress/browsers-internal:node18.17.1-chrome118-ff115
image: cypress/browsers-internal:node20.18.0-bullseye-chrome129-ff131
ports:
- 5566:5566
- 5567:5567
Expand Down
2 changes: 1 addition & 1 deletion npm/cypress-schematic/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@schematics/angular": "^14.2.1",
"@types/chai-enzyme": "0.6.7",
"@types/mocha": "8.0.3",
"@types/node": "^18.17.5",
"@types/node": "^20.16.0",
"chai": "4.2.0",
"mocha": "3.5.3",
"typescript": "~5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion npm/puppeteer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"puppeteer-core": "^21.2.1"
},
"devDependencies": {
"@types/node": "^18.17.5",
"@types/node": "^20.16.0",
"chai-as-promised": "^7.1.1",
"chokidar": "^3.5.3",
"express": "4.19.2",
Expand Down
2 changes: 1 addition & 1 deletion npm/webpack-dev-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"webpack-merge": "^5.4.0"
},
"devDependencies": {
"@types/node": "18.17.5",
"@types/node": "20.16.0",
"@types/proxyquire": "^1.3.28",
"@types/speed-measure-webpack-plugin": "^1.3.4",
"@types/webpack-dev-server-3": "npm:@types/webpack-dev-server@^3",
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"@babel/eslint-parser": "7.25.1",
"@cypress/request": "^3.0.4",
"@cypress/request-promise": "^5.0.0",
"@electron/fuses": "1.6.1",
"@electron/notarize": "^2.1.0",
"@electron/fuses": "1.8.0",
"@electron/notarize": "^2.5.0",
"@fellow/eslint-plugin-coffee": "0.4.13",
"@graphql-codegen/add": "3.1.0",
"@graphql-codegen/cli": "2.2.0",
Expand Down Expand Up @@ -110,7 +110,7 @@
"@types/lodash": "^4.14.168",
"@types/markdown-it": "12.2.3",
"@types/mocha": "8.0.3",
"@types/node": "18.17.5",
"@types/node": "20.16.0",
"@types/prismjs": "1.16.0",
"@types/react": "16.9.50",
"@types/react-dom": "16.9.8",
Expand Down Expand Up @@ -140,7 +140,7 @@
"dedent": "^0.7.0",
"del": "3.0.0",
"detect-port": "^1.6.1",
"electron": "27.3.10",
"electron": "32.2.0",
"electron-builder": "^23.6.0",
"enzyme-adapter-react-16": "1.12.1",
"eslint": "^8.56.0",
Expand Down Expand Up @@ -179,7 +179,7 @@
"mocha-banner": "1.1.2",
"mocha-junit-reporter": "2.2.0",
"mocha-multi-reporters": "1.1.7",
"mock-fs": "5.2.0",
"mock-fs": "5.4.0",
"npm-packlist": "9.0.0",
"p-defer": "^3.0.0",
"patch-package": "6.4.7",
Expand Down Expand Up @@ -207,7 +207,7 @@
"yarn-deduplicate": "3.1.0"
},
"engines": {
"node": ">=18.17.0",
"node": ">=20.18.0",
"yarn": ">=1.22.17"
},
"productName": "Cypress",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module.exports = {

assertLoadingIntoErrorWorks('SyntaxError')
cy.contains('Your configFile is invalid').should('be.visible')
cy.contains('Unexpected token \',\'').should('be.visible')
cy.contains('Unexpected token \',\'').scrollIntoView().should('be.visible')
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is now necessary, because we are (I would argue correctly) showing the stack trace in this view which pushes 'Unexpected token' off screen.

cy.withCtx(async (ctx) => {
await ctx.actions.file.writeFileInProject('cypress.config.js',
`
Expand Down
4 changes: 2 additions & 2 deletions packages/app/src/runner/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ function setSpecForDriver (spec: SpecFile) {
* a Spec IFrame to load the spec's source code, and
* initialize Cypress on the AUT.
*/
function runSpecE2E (config, spec: SpecFile) {
async function runSpecE2E (config, spec: SpecFile) {
Copy link
Collaborator Author

@ryanthemanuel ryanthemanuel Oct 22, 2024

Choose a reason for hiding this comment

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

This was something interesting I noticed. visitBlankPage was a hanging promise. I believe these changes and the changes in eventManager resolves this.

const $runnerRoot = getRunnerElement()

// clear AUT, if there is one.
Expand All @@ -315,7 +315,7 @@ function runSpecE2E (config, spec: SpecFile) {
el.remove()
})

autIframe.visitBlankPage()
await autIframe.visitBlankPage()

// create Spec IFrame
const specSrc = getSpecUrl({
Expand Down
Loading