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

Upgrade to Electron 13 #1230

Merged
merged 33 commits into from Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
15d7128
Catch promise errors better
TheCleric May 21, 2021
46ca0b9
Move subFunctions to bottom of createNewWindow
TheCleric May 21, 2021
01acce9
Use parents when creating child BrowserWindow instances
TheCleric May 21, 2021
9c9be2a
Some about:blank pages have an anchor (for some reason)
TheCleric May 21, 2021
1064c80
Inject browserWindowOptions better
TheCleric May 21, 2021
b88786a
Interim refactor to MainWindow object
TheCleric May 24, 2021
2dbe0e1
Split up the window functions/helpers/events some
TheCleric May 24, 2021
3d84170
Further separate out window functions + tests
TheCleric May 25, 2021
52b5cd8
Add a mock for unit testing functions that access electron
TheCleric May 25, 2021
6506b27
Add unit tests for onWillPreventUnload
TheCleric May 25, 2021
1bd77d2
Improve windowEvents tests
TheCleric May 25, 2021
e8d18b0
Add the first test for windowHelpers
TheCleric May 25, 2021
f722144
Move WebRequest event handling to node
TheCleric May 25, 2021
c909314
insertCSS completely under test
TheCleric May 25, 2021
ddd364f
clearAppData completely under test
TheCleric May 25, 2021
de45694
Merge branch 'master' into feature/refactor_app_window
TheCleric May 25, 2021
461cbb4
Fix contextMenu require bug
TheCleric May 25, 2021
2d45121
More tests + fixes
TheCleric May 25, 2021
80f2483
Fix + add to createNewTab tests
TheCleric May 26, 2021
c3f66ab
Convert createMainWindow back to func + work out gremlins
TheCleric May 26, 2021
facae3c
Move setupWindow away from main since its shared
TheCleric May 26, 2021
a2dad73
Make sure contextMenu is handling promises
TheCleric May 26, 2021
f7f3e3d
Merge branch 'master' into feature/electron_13
TheCleric Jun 16, 2021
0ff369d
v13.1.2
TheCleric Jun 16, 2021
6f2a750
v13.1.4
TheCleric Jun 26, 2021
a2446b5
Merge branch 'master' into feature/electron_13
TheCleric Jun 26, 2021
ba2ea4d
Update Webkit version for Safari
TheCleric Jun 27, 2021
b9ab798
Merge branch 'master' into feature/electron_13
TheCleric Jul 15, 2021
eec69bf
13.1.6 -> NO CRASH!
TheCleric Jul 15, 2021
64ae857
Fix types/debug build error on Ubuntu
TheCleric Jul 15, 2021
d0383bf
13 -> 13.1.7
TheCleric Jul 15, 2021
66cdb7f
Merge branch 'master' into feature/electron_13
ronjouch Jul 16, 2021
6fb98ba
Bump default Firefox version
ronjouch Jul 16, 2021
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 app/package.json
Expand Up @@ -20,6 +20,6 @@
"source-map-support": "^0.5.19"
},
"devDependencies": {
"electron": "^12.0.15"
"electron": "^13.1.7"
}
}
10 changes: 5 additions & 5 deletions src/constants.ts
Expand Up @@ -4,18 +4,18 @@ export const DEFAULT_APP_NAME = 'APP';

// Update both DEFAULT_ELECTRON_VERSION and DEFAULT_CHROME_VERSION together,
// and update app / package.json / devDeps / electron to value of DEFAULT_ELECTRON_VERSION
export const DEFAULT_ELECTRON_VERSION = '12.0.14';
export const DEFAULT_CHROME_VERSION = '89.0.4389.128';
export const DEFAULT_ELECTRON_VERSION = '13.1.7';
export const DEFAULT_CHROME_VERSION = '91.0.4472.124';

// Update each of these periodically
// https://product-details.mozilla.org/1.0/firefox_versions.json
export const DEFAULT_FIREFOX_VERSION = '89.0';
export const DEFAULT_FIREFOX_VERSION = '90.0';

// https://en.wikipedia.org/wiki/Safari_version_history
export const DEFAULT_SAFARI_VERSION = {
majorVersion: 14,
version: '14.0.3',
webkitVersion: '610.4.3.1.7',
version: '14.1.1',
webkitVersion: '611.2.7.1.4',
};

export const ELECTRON_MAJOR_VERSION = parseInt(
Expand Down