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

Updates electron and associated dependencies to the latest #2102

Merged
merged 18 commits into from
Jun 18, 2020
Merged

Updates electron and associated dependencies to the latest #2102

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
1ad109a
Update electron
belcherj May 18, 2020
85126d8
Complete updating electron
belcherj Jun 3, 2020
f455999
Delete unused code
belcherj Jun 3, 2020
fc7804c
Remove icon in BrowserWidow as it is uneeded
belcherj Jun 4, 2020
e00df89
Update dependencies
belcherj Jun 12, 2020
87e0c75
Add --no-sandbox arg to linux
belcherj Jun 12, 2020
c8e0694
Use an array
belcherj Jun 12, 2020
5f08687
Remove icons folder
belcherj Jun 12, 2020
8e053e7
Turn off node integration
belcherj Jun 12, 2020
0e8f972
Add unhandled to determine why Electron is failing on Linux
belcherj Jun 15, 2020
8732b0f
Try asar false
belcherj Jun 15, 2020
fb6a985
Fix up config to get app running without no sandbox flag
belcherj Jun 15, 2020
e9ffd52
Make menus work
belcherj Jun 15, 2020
0abb00e
Fix isMac detection
belcherj Jun 15, 2020
2ef2f90
Cleanup
belcherj Jun 15, 2020
22f0aae
Get insert checklist working
belcherj Jun 15, 2020
e12a573
Add types and remove ipc require
belcherj Jun 18, 2020
0141274
Make electron reload on log out
belcherj Jun 18, 2020
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ PUBLISH ?= onTag
# Main targets
.PHONY: start
start:
@NODE_ENV=$(NODE_ENV) DEV_SERVER=$(DEV_SERVER) npx electron .
@NODE_ENV=$(NODE_ENV) DEV_SERVER=$(DEV_SERVER) npx electron . --inspect
Copy link
Member

Choose a reason for hiding this comment

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

Did you intend to leave this debugging in for start and not just dev? Not sure if I am reading it right.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I left it there on purpose.

Copy link
Member

Choose a reason for hiding this comment

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

why?

also why did we remove rebuild-deps?


.PHONY: dev
dev:
Expand Down
1 change: 1 addition & 0 deletions desktop/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ module.exports = function main() {
);
});
});
mainWindow.reload();
});

ipcMain.on('setAutoHideMenuBar', function (event, autoHideMenuBar) {
Expand Down
7 changes: 6 additions & 1 deletion desktop/preload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@ const { contextBridge, ipcRenderer } = require('electron');
contextBridge.exposeInMainWorld('electron', {
send: (channel, data) => {
// whitelist channels
let validChannels = ['appCommand', 'setAutoHideMenuBar', 'settingsUpdate'];
let validChannels = [
'appCommand',
'clearCookies',
'setAutoHideMenuBar',
'settingsUpdate',
];
if (validChannels.includes(channel)) {
ipcRenderer.send(channel, data);
}
Expand Down