Skip to content

Commit b85dd75

Browse files
AtofStrykerryanthemanuelchrisbreidingmschile
authored
dependency: update to electron 25 and node 18 (#27715)
* feat: update to electron 25 and bump node dependencies. need to remove custom docker image * chore: update node versions to 18+ [run ci] * chore: bump @types/node from v16 to v18 and bump the typescript supported CLI version from 3.9 to 4.4 * update mock-fs to 5.2.0 to fix BigInt issue (see https://github.com/tschaub/mock-fs/releases/tag/v5.1.4) [run ci] * chore: update electron integrity check to pass create binary job * chore: fix issues with achrinza/node-ipc not yet having node 18 engine support (only up to 17 by patching from 9.2.2 to 9.2.5 as seen in achrinza/node-ipc#38. vue/cli-service is not maintained and we should migrate these over to vue create at some point in the near future to get rid of these resolutions * allow for TLSv1 tests to work with node 18 as the express server running node 18 with tlsv1 needs to allow legacy ciphers * chore: update snyk workflows to use node 18 * chore: add changelog * update timeout * more cleanup during binary build * bump cache and run ci. include ignore engines for rwa and get rid of 16.16 image references * chore: update FF tests to 115 as serialization now works with errors and click events do not get fired on buttons being typed into * chore: don't error when symlink already exists * chore: fix serialization test for newer versions of firefox * chore: fix CI config * chore: fix chrome system tests to work with chrome 114. updates mostly caused by bugs in screen height in chrome. see https://bugs.chromium.org/p/chromium/issues/detail?id=1416398 * chore: test binary against vite update in RWA * remove wait for RWA as it shouldnt be needed for vite. link example recipes update to node 18 chore: remove commented out code * chore: print message when DISABLE_SNAPSHOT_REQUIRE is set * chore: clean out unneeded dependencies always * chore: remove trailing space * fix: propagate click events for enter and typing on firefox 106 or later * chore: fix changelog failures * fix: correctly simulate click events for buttons on keyup and space type in Firefox versions greater than 91 and simulate click for buttons on enter in Firefox versions greater than or equal to 106 * chore: add documentation to type to clarify firefox synthetic events * chore: update protocol snapshot as order or log messages seems to have changed * update comments * sort commandLogChanged events for protocol * chore: remove PR ids from CRA and CER as the PRs are merged into develop --------- Co-authored-by: Ryan Manuel <[email protected]> Co-authored-by: Chris Breiding <[email protected]> Co-authored-by: Matt Schile <[email protected]>
1 parent 617d7af commit b85dd75

File tree

71 files changed

+838
-779
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+838
-779
lines changed

.circleci/cache-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Bump this version to force CI to re-create the cache from scratch.
22

3-
08-31-23
3+
09-3-23

.circleci/workflows.yml

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mainBuildFilters: &mainBuildFilters
3030
- /^release\/\d+\.\d+\.\d+$/
3131
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
3232
- 'publish-binary'
33-
- 'jordanpowell88/update-angular-tsconfig-path'
33+
- 'chore/update_electron25_and_node18'
3434

3535
# usually we don't build Mac app - it takes a long time
3636
# but sometimes we want to really confirm we are doing the right thing
@@ -40,7 +40,8 @@ macWorkflowFilters: &darwin-workflow-filters
4040
or:
4141
- equal: [ develop, << pipeline.git.branch >> ]
4242
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
43-
- equal: [ 'jordanpowell88/update-angular-tsconfig-path', << pipeline.git.branch >> ]
43+
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
44+
- equal: [ 'chore/update_electron25_and_node18', << pipeline.git.branch >> ]
4445
- matches:
4546
pattern: /^release\/\d+\.\d+\.\d+$/
4647
value: << pipeline.git.branch >>
@@ -52,6 +53,7 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
5253
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
5354
- equal: [ 'jordanpowell88/update-angular-tsconfig-path', << pipeline.git.branch >> ]
5455
- equal: [ 'publish-binary', << pipeline.git.branch >> ]
56+
- equal: [ 'chore/update_electron25_and_node18', << pipeline.git.branch >> ]
5557
- matches:
5658
pattern: /^release\/\d+\.\d+\.\d+$/
5759
value: << pipeline.git.branch >>
@@ -70,7 +72,8 @@ windowsWorkflowFilters: &windows-workflow-filters
7072
or:
7173
- equal: [ develop, << pipeline.git.branch >> ]
7274
# use the following branch as well to ensure that v8 snapshot cache updates are fully tested
73-
- equal: [ 'jordanpowell88/update-angular-tsconfig-path', << pipeline.git.branch >> ]
75+
- equal: [ 'update-v8-snapshot-cache-on-develop', << pipeline.git.branch >> ]
76+
- equal: [ 'chore/update_electron25_and_node18', << pipeline.git.branch >> ]
7477
- matches:
7578
pattern: /^release\/\d+\.\d+\.\d+$/
7679
value: << pipeline.git.branch >>
@@ -79,7 +82,7 @@ executors:
7982
# the Docker image with Cypress dependencies and Chrome browser
8083
cy-doc:
8184
docker:
82-
- image: cypress/browsers:node16.16.0-chrome106-ff99-edge
85+
- image: cypress/browsers-internal:node18.15.0-chrome114-ff115
8386
# by default, we use "medium" to balance performance + CI costs. bump or reduce on a per-job basis if needed.
8487
resource_class: medium
8588
environment:
@@ -89,7 +92,7 @@ executors:
8992
# Docker image with non-root "node" user
9093
non-root-docker-user:
9194
docker:
92-
- image: cypress/browsers:node16.16.0-chrome106-ff99-edge
95+
- image: cypress/browsers-internal:node18.15.0-chrome114-ff115
9396
user: node
9497
environment:
9598
PLATFORM: linux
@@ -140,7 +143,7 @@ commands:
140143
name: Set environment variable to determine whether or not to persist artifacts
141144
command: |
142145
echo "Setting SHOULD_PERSIST_ARTIFACTS variable"
143-
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "jordanpowell88/update-angular-tsconfig-path" && "$CIRCLE_BRANCH" != "ryanm/feat/handle-304s" ]]; then
146+
echo 'if ! [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "release/"* && "$CIRCLE_BRANCH" != "publish-binary" && "$CIRCLE_BRANCH" != "update-v8-snapshot-cache-on-develop" && "$CIRCLE_BRANCH" != "chore/update_electron25_and_node18" ]]; then
144147
export SHOULD_PERSIST_ARTIFACTS=true
145148
fi' >> "$BASH_ENV"
146149
# You must run `setup_should_persist_artifacts` command and be using bash before running this command
@@ -821,13 +824,10 @@ commands:
821824
working_directory: /tmp/<<parameters.repo>>
822825
command: yarn types
823826
- run:
827+
# NOTE: we do not need to wait for the vite dev server to start
824828
working_directory: /tmp/<<parameters.repo>>
825829
command: <<parameters.server-start-command>>
826830
background: true
827-
- run:
828-
condition: <<parameters.wait-on>>
829-
name: "Waiting on server to boot: <<parameters.wait-on>>"
830-
command: "npx wait-on <<parameters.wait-on>>"
831831
- when:
832832
condition: <<parameters.folder>>
833833
steps:
@@ -2242,7 +2242,7 @@ jobs:
22422242
<<: *defaults
22432243
resource_class: small
22442244
docker:
2245-
- image: cypress/base:16.16.0
2245+
- image: cypress/base-internal:18.15.0
22462246
steps:
22472247
- restore_workspace_binaries
22482248
- run: mkdir test-binary
@@ -2257,15 +2257,15 @@ jobs:
22572257
- run:
22582258
name: Verify Cypress binary
22592259
working_directory: test-binary
2260-
command: $(npm bin)/cypress verify
2260+
command: npx cypress verify
22612261
- run:
22622262
name: Print Cypress version
22632263
working_directory: test-binary
2264-
command: $(npm bin)/cypress version
2264+
command: npx cypress version
22652265
- run:
22662266
name: Cypress info
22672267
working_directory: test-binary
2268-
command: $(npm bin)/cypress info
2268+
command: npx cypress info
22692269

22702270
test-types-cypress-and-jest:
22712271
parameters:
@@ -2369,20 +2369,23 @@ jobs:
23692369
- test-binary-against-repo:
23702370
repo: cypress-example-recipes
23712371
command: npm run test:ci:firefox
2372+
browser: firefox
23722373

23732374
test-binary-against-recipes-chrome:
23742375
<<: *defaults
23752376
steps:
23762377
- test-binary-against-repo:
23772378
repo: cypress-example-recipes
23782379
command: npm run test:ci:chrome
2380+
browser: chrome
23792381

23802382
test-binary-against-recipes:
23812383
<<: *defaults
23822384
steps:
23832385
- test-binary-against-repo:
23842386
repo: cypress-example-recipes
23852387
command: npm run test:ci
2388+
browser: electron
23862389

23872390
# This is a special job. It allows you to test the current
23882391
# built test runner against a pull request in the repo
@@ -2410,7 +2413,7 @@ jobs:
24102413
steps:
24112414
- test-binary-against-repo:
24122415
repo: cypress-example-kitchensink
2413-
browser: "electron"
2416+
browser: electron
24142417

24152418
test-binary-against-kitchensink-firefox:
24162419
<<: *defaults

.github/ISSUE_TEMPLATE/1-bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ body:
4343
attributes:
4444
label: Node version
4545
description: What version of node.js are you using to run Cypress?
46-
placeholder: ex. v16.16.0
46+
placeholder: ex. v18.15.0
4747
validations:
4848
required: true
4949
- type: input

.github/ISSUE_TEMPLATE/2-memory-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ body:
5151
attributes:
5252
label: Node version
5353
description: What version of node.js are you using to run Cypress?
54-
placeholder: ex. v16.16.0
54+
placeholder: ex. v18.15.0
5555
validations:
5656
required: true
5757
- type: input

.github/ISSUE_TEMPLATE/3-install-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ body:
3838
attributes:
3939
label: Node version
4040
description: What version of node.js are you using to run Cypress?
41-
placeholder: ex. v16.16.0
41+
placeholder: ex. v18.15.0
4242
validations:
4343
required: true
4444
- type: dropdown

.github/workflows/snyk_sca_scan.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
node-version: [16.x]
19+
node-version: [18.x]
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v3
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Node.js
2727
uses: actions/setup-node@v3
2828
with:
29-
node-version: 16
29+
node-version: 18
3030
cache: 'yarn'
3131
- name: Run yarn
3232
run: yarn

.github/workflows/snyk_static_analysis_scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Set up Node.js
2020
uses: actions/setup-node@v3
2121
with:
22-
node-version: 16
22+
node-version: 18
2323
cache: 'yarn'
2424
- name: Run yarn
2525
run: yarn

.github/workflows/update-browser-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- name: Set up Node.js
2727
uses: actions/setup-node@v3
2828
with:
29-
node-version: 14
29+
node-version: 18
3030
- name: Check for new Chrome versions
3131
id: get-versions
3232
uses: actions/github-script@v6

.github/workflows/update_v8_snapshot_cache.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Set up Node.js
6363
uses: actions/setup-node@v3
6464
with:
65-
node-version: 16
65+
node-version: 18
6666
cache: 'yarn'
6767
- name: Run yarn
6868
run: yarn

.node-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16.16.0
1+
18.15.0

0 commit comments

Comments
 (0)