[MM-61271] Upgrade to Electron v33.0.2#3181
Merged
devinbinnie merged 3 commits intomasterfrom Oct 25, 2024
Merged
Conversation
devinbinnie
added
2: Dev Review
devinbinnie
requested review from
a team,
pvev and
wiggin77
and removed request for
a team
devinbinnie
commented
Oct 24, 2024
| @@ -0,0 +1,33 @@ | |||
| diff --git a/node_modules/electron/electron.d.ts b/node_modules/electron/electron.d.ts | |||
Member
Author
There was a problem hiding this comment.
This patch is needed due to an issue in Electron's typing for this module that caused a bug. A fix is waiting to be merged, but for now we'll use this patch.
electron/electron#44391
devinbinnie
commented
Oct 24, 2024
| } else { | ||
| focusedWindow.webContents.openDevTools({mode: 'detach'}); | ||
| } | ||
| click() { |
Member
Author
There was a problem hiding this comment.
This used to matter when we had the Settings and Main windows, but now we just have the main one so we can assume we're using that one.
hmhealey
approved these changes
Oct 24, 2024
|
Here are the test results below: |
|
Here are the test results below: |
cpoile
approved these changes
Oct 24, 2024
devinbinnie
added
4: Reviews Complete
devinbinnie
commented
Oct 24, 2024
|
|
||
| #if defined(V8_MAJOR_VERSION) && (V8_MAJOR_VERSION > 11 \ | ||
| - && defined(V8_MINOR_VERSION) && V8_MINOR_VERSION > 7) | ||
| + && defined(V8_MINOR_VERSION) && (V8_MAJOR_VERSION > 12 || (V8_MAJOR_VERSION == 11 && V8_MINOR_VERSION > 7))) |
Member
Author
There was a problem hiding this comment.
The most recent Electron version bumped V8 to version 13, but that hasn't been updated in nan yet. A PR to do so is already open: nodejs/nan#979
Contributor
|
Cherry pick is scheduled. |
mattermost-build
pushed a commit
that referenced
this pull request
Oct 25, 2024
* [MM-61271] Upgrade to Electron v33.0.2 * Fix node-abi * Fix and patch nan (cherry picked from commit 14bb75e)
mattermost-build
added
CherryPick/Done
devinbinnie
added a commit
that referenced
this pull request
Oct 25, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Upgrade to Electron v33.0.2. Some deprecations were addressed, but otherwise nothing major should be changed.
Ticket Link
https://mattermost.atlassian.net/browse/MM-61271