Skip to content
This repository has been archived by the owner on Mar 3, 2023. It is now read-only.

Upgrade to Electron 4 #19373

Merged
merged 29 commits into from
Jul 19, 2019
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
5571a7c
⬆️ electron@4.2.0
rafeca May 9, 2019
eb2f091
⬆️ electron-chromedriver@4.0.0-beta.1
rafeca May 9, 2019
abaaf75
⬆️ electron-mksnapshot@4.2.0
rafeca May 9, 2019
a4c6f31
Merge branch 'master' into electron-4
50Wliu May 20, 2019
218657f
Use new attributeStyleMap for elements
daviwil Dec 13, 2018
4c47249
Use correct fontWeight value in ThemeManager spec
daviwil Jan 3, 2019
d988983
Forward-port chromedriver changes
50Wliu May 21, 2019
a1aa1bb
:arrow_up: apm prerelease for updated Node
50Wliu May 21, 2019
1483f4b
:arrow_up: @atom/nsfw, git-utils to allow loading on Windows
50Wliu May 21, 2019
906a106
:arrow_up: scandal to update nested git-utils dependency
50Wliu May 22, 2019
cfaca0a
Temporarily disable snapshotting
50Wliu May 22, 2019
7f5e639
Try updating @atom/nsfw to 1.0.23-1
50Wliu May 22, 2019
c2f1d65
Oops, package lock it
50Wliu May 22, 2019
a186961
Don't add menu items without labels
50Wliu May 22, 2019
10c1c97
Update Electron builtins
50Wliu May 22, 2019
00362cc
Investigate chromedriver failures
50Wliu May 22, 2019
1ebfcba
Merge branch 'master' into electron-4
50Wliu May 30, 2019
3e6d7cc
Re-enable snapshotting
50Wliu May 30, 2019
5f0aad2
Merge branch 'master' into electron-4
50Wliu May 31, 2019
6e90fbe
Back to manual debugging it is
50Wliu Jun 3, 2019
5ddb665
Merge branch 'master' into electron-4
rafeca Jun 15, 2019
8ad7aa0
⬆️ electron-chromedriver@4.2.0
rafeca Jun 17, 2019
60093e4
Revert "Back to manual debugging it is"
rafeca Jun 17, 2019
91b53d4
Use random port to initialize ChromeDriver
rafeca Jun 17, 2019
5b61fba
Merge branch 'master' into electron-4
rafeca Jun 24, 2019
9663c79
⬆️ electron@4.2.5
rafeca Jun 24, 2019
79a952b
⬆️ electron@4.2.6
rafeca Jul 16, 2019
f7f002f
Merge branch 'master' into electron-4
rafeca Jul 19, 2019
a8e2c83
⬆️ electron@4.2.7
rafeca Jul 19, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
"electronVersion": "3.1.9",
"electronVersion": "4.2.0",
Copy link
Contributor

Choose a reason for hiding this comment

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

Isn't it more practical to use 4.2.2 to also have the latest bugfixes?

Copy link
Contributor

Choose a reason for hiding this comment

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

Why not go straight to v5.0.1?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It's just about being incremental. We tried to go to 3 first, but we're hitting #19372, so we wanted to see how we'd do in 4. Unfortunately we still don't really know if the crash is fixed on Electron 4 because we can't get it started yet.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But yeah, we should be on the latest patch release.

Copy link
Contributor

Choose a reason for hiding this comment

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

4.2.3 has been released yesterday

Copy link
Contributor

Choose a reason for hiding this comment

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

And 4.2.4 has been tagged

Copy link
Contributor

Choose a reason for hiding this comment

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

And 4.2.5 has been tagged now too

"dependencies": {
"@atom/nsfw": "1.0.22",
"@atom/source-map-support": "^0.3.4",
Expand Down
33 changes: 27 additions & 6 deletions script/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions script/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"coffeelint": "1.15.7",
"colors": "1.1.2",
"donna": "1.0.16",
"electron-chromedriver": "^3.0.0",
"electron-chromedriver": "^4.0.0-beta.1",
"electron-link": "0.4.0",
"electron-mksnapshot": "^3.0.10",
"electron-mksnapshot": "^4.2.0",
"electron-packager": "12.2.0",
"electron-winstaller": "2.6.4",
"eslint": "^5.16.0",
Expand Down