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.

Sign up for GitHub

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

WIP: Upgrade electron to latest version #3569

Closed
wants to merge 50 commits into from
Closed

WIP: Upgrade electron to latest version #3569

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
18230ef
bump electron version to 4.0.5
chrisbreiding Feb 22, 2019
fab5514
bump node version to 10.11.0
chrisbreiding Feb 22, 2019
620e87a
Merge branch 'v4.0' into issue-3568-upgrade-electron
chrisbreiding Feb 25, 2019
7714119
use chrome69 docker image (has node 10)
chrisbreiding Feb 25, 2019
78c99fa
use node 10 in appveyor
chrisbreiding Feb 25, 2019
9c5ad58
update server unit test snapshots
chrisbreiding Feb 25, 2019
628a653
Merge branch 'v4.0' into issue-3568-upgrade-electron
chrisbreiding Feb 26, 2019
d05f769
fix server unit test
chrisbreiding Feb 26, 2019
b60920f
ignore the right things
chrisbreiding Feb 26, 2019
d217982
try electron 2.0.0 + node 8
chrisbreiding Feb 26, 2019
c0c87df
match the node version for electron 2
chrisbreiding Feb 26, 2019
3fa8193
Merge branch 'v4.0' into issue-3568-upgrade-electron
chrisbreiding Feb 28, 2019
1f320a8
update test and snapshots
chrisbreiding Feb 28, 2019
0ee8c34
try electron 3 and node 10
chrisbreiding Feb 28, 2019
fc4992a
update server unit test and snapshot
chrisbreiding Feb 28, 2019
ea42dbf
Merge branch 'v4.0' into issue-3568-upgrade-electron
chrisbreiding Mar 25, 2019
dece90e
try electron 3 + node 8
chrisbreiding Apr 2, 2019
6e1cc63
try electron 2.0.18
chrisbreiding Apr 2, 2019
944bce5
back to electron 3.0.0, it's the culprit
chrisbreiding Apr 2, 2019
b18437e
Merge branch 'v4.0' into issue-3568-upgrade-electron
chrisbreiding Apr 15, 2019
e12b319
use node 10.2.0 to match electron 3.0.0
chrisbreiding Apr 15, 2019
bf78b90
use chrome69 docker image for node 10
chrisbreiding Apr 15, 2019
9a33931
remove timers fix
chrisbreiding Apr 15, 2019
b0f8e85
upgrade example gulp to 4.0.0
chrisbreiding Apr 15, 2019
b03dfc2
use node 10.2.1 and electron 3.1.8
chrisbreiding Apr 15, 2019
0077db2
improve uncaught error logging
chrisbreiding Apr 15, 2019
cbc1040
fix cli unit tests with mockfs
kuceb Apr 17, 2019
b526dc3
mockfs fix flaky verify_spec
kuceb Apr 17, 2019
451f234
Merge branch 'develop' into issue-3568-upgrade-electron
chrisbreiding May 20, 2019
b503f73
fix merge omission
chrisbreiding May 20, 2019
b141f20
fix reporter tests
chrisbreiding May 20, 2019
25127ed
use Number.MAX_SAFE_INTEGER instead of Infinity for highWatermark
chrisbreiding May 21, 2019
d428692
rename events
chrisbreiding May 21, 2019
e963c63
fixed timeout in https-proxy spec
flotwig May 22, 2019
a03f7eb
update to expect keep-alive, not close
flotwig May 23, 2019
f7b53b9
do not wait for connection to end before going to next test
flotwig May 23, 2019
ccf4b1c
Merge branch 'v5.0' into issue-3568-upgrade-electron
chrisbreiding May 23, 2019
ced9e7d
update proxy_spec to expect 10.2.1 error
flotwig May 24, 2019
22f8914
node 10.2.1, cypress/browsers:node10.2.1-chrome74
flotwig May 24, 2019
b893c69
update server_spec to 10.2.1 error messages
flotwig May 24, 2019
f2d0e8a
update visit snapshot, stack trace is shorter now
flotwig May 24, 2019
84f6796
socket.io@1.7.4 -> 2.2.0
flotwig May 28, 2019
a30e995
close connection on websocket error
flotwig May 28, 2019
4925722
expect socket hang up, use different cyPort
flotwig May 28, 2019
4452109
Revert "socket.io@1.7.4 -> 2.2.0"
flotwig May 28, 2019
732d84a
updated network-related snapshots
flotwig May 28, 2019
66133c8
update snapshots due to stack lines changes
chrisbreiding May 30, 2019
f414e20
more snapshot updates
chrisbreiding May 30, 2019
85b988b
Merge branch 'v5.0' into issue-3568-upgrade-electron
chrisbreiding May 30, 2019
195e93a
use exact node version in appveyor.yml
chrisbreiding May 30, 2019
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 .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
10.11.0
chrisbreiding marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ branches:

# https://www.appveyor.com/docs/lang/nodejs-iojs/
environment:
# use latest version of Node 8 with NPM 6
nodejs_version: "8"
# use latest version of Node 10
nodejs_version: "10"
chrisbreiding marked this conversation as resolved.
Show resolved Hide resolved
# encode secure variables which will NOT be used
# in pull requests
# https://www.appveyor.com/docs/build-configuration/#secure-variables
Expand Down
2 changes: 1 addition & 1 deletion circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ executors:
# the Docker image with Cypress dependencies and Chrome browser
cy-doc:
docker:
- image: cypress/browsers:chrome64
- image: cypress/browsers:chrome69
environment:
PLATFORM: linux

Expand Down
4 changes: 2 additions & 2 deletions packages/electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@packages/electron",
"version": "0.0.0",
"electronVersion": "1.8.2",
"electronVersion": "4.0.5",
"private": true,
"main": "index.js",
"scripts": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"@cypress/icons": "0.7.0",
"bluebird": "3.5.3",
"debug": "3.2.6",
"electron-packager": "9.1.0",
"electron-packager": "13.1.0",
"fs-extra": "0.30.0",
"lodash": "4.17.11",
"minimist": "1.2.0"
Expand Down