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

Upgrade electron to v20 #223

Merged
merged 14 commits into from Aug 30, 2022
Merged

Upgrade electron to v20 #223

merged 14 commits into from Aug 30, 2022

Conversation

bstein
Copy link
Collaborator

@bstein bstein commented Aug 18, 2022

This pull request bumps the version of electron from v1.7.11 to v20.0.3 and includes fixes for breaking changes that were introduced in various major versions of electron. A detailed account of changes by version is available in #219.

Additionally, because electron v11 and later support running natively on Apple Silicon, I updated the build command for MacOS to target MacOS 11 Big Sur as well as both x86 and ARM. The updated command builds a Universal App which can be installed on both Intel and Apple Silicon Macs without requiring emulation.

@bstein bstein requested a review from tijcolem August 18, 2022 19:05
@bstein bstein linked an issue Aug 18, 2022 that may be closed by this pull request
36 tasks
@tijcolem
Copy link
Collaborator

@bstein This looks great. I tested the installers out and ran a simple analysis and all looked good on my end.

@tijcolem tijcolem requested review from kflemin and removed request for tijcolem August 23, 2022 17:47
@tijcolem
Copy link
Collaborator

@bstein I am tagging @kflemin to do a code review on the proposed changes. From my end the PAT app itself seems to be working great.

Copy link
Contributor

@kflemin kflemin left a comment

Choose a reason for hiding this comment

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

^1.7.11 → ~20.0.1🤯
Wow @bstein, thank you for making this upgrade!

Everything looks good to me except the server tab is not loading the server view (it says cannot GET url...)
Screen Shot 2022-08-25 at 10 28 22 AM

I haven't used PAT in a while so i'm not sure when this page stopped working, but perhaps during this update? @tijcolem, have you noticed this before?

@tijcolem
Copy link
Collaborator

@kflemin Those are NREL internal URLs http://bball-13055.nrel.gov:8080. Maybe this was something saved in one of your PAT build projects? If this is something in PAT itself we'd want to get this removed

@kflemin
Copy link
Contributor

kflemin commented Aug 25, 2022

@tijcolem, this page should show whatever server PAT connected to (remote , local, whatever). I just happened to connect to that one. I haven't tested with other ones or local or anything. Can you get that page to show any server?

@tijcolem
Copy link
Collaborator

@kflemin Okay, I see what you are saying. I tested out the 3.4.0 release and it shows the page with server dashboard as it appears on http://localhost:8080. But when I test with the updated electron app v20I get the blank screen.

3.4.0 server screen (electron v1)
Screen Shot 2022-08-25 at 2 45 24 PM

3.4.0 server screen (electron v20)
Screen Shot 2022-08-25 at 2 51 27 PM

@bstein Could you investigate?

@bstein
Copy link
Collaborator Author

bstein commented Aug 29, 2022

@tijcolem @kflemin

It appears there were some changes in Electron v16 related to the <webview> tag, which holds the server page. This surfaced some buggy behavior when using the src attribute in the server.html file. By using the ng-src directive, we avoid these issues (see explanation).

This PR should now be ready for re-review 👍

@kflemin kflemin self-requested a review August 29, 2022 19:41
Copy link
Contributor

@kflemin kflemin left a comment

Choose a reason for hiding this comment

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

Looks great now! thanks for the fix!

@tijcolem
Copy link
Collaborator

Fantastic! Going to merge.

@tijcolem tijcolem merged commit 5e96bc3 into develop Aug 30, 2022
@tijcolem tijcolem deleted the upgrade-electron-latest branch August 30, 2022 18:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade electron to latest version (v20)
3 participants