Skip to content
This repository was archived by the owner on Jan 8, 2022. It is now read-only.

Commit 23b16b0

Browse files
committed
upgrade to electron 12
1 parent e03e48e commit 23b16b0

File tree

5 files changed

+9805
-286
lines changed

5 files changed

+9805
-286
lines changed

.prettierrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"@egoist/prettier-config"

app/index.js

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const login = require('./login')
1010

1111
require('electron-debug')()
1212
require('electron-context-menu')({
13-
showInspectElement: true
13+
showInspectElement: true,
1414
})
1515

1616
app.setAppUserModelId('sh.egoist.devdocs')
@@ -56,12 +56,14 @@ function createMainWindow() {
5656
titleBarStyle: process.platform === 'darwin' ? 'hidden' : 'default',
5757
trafficLightPosition: {
5858
x: 10,
59-
y: 10
59+
y: 10,
6060
},
6161
webPreferences: {
6262
nodeIntegration: true,
63-
webviewTag: true
64-
}
63+
webviewTag: true,
64+
contextIsolation: false,
65+
enableRemoteModule: true,
66+
},
6567
})
6668

6769
if (process.platform === 'darwin') {
@@ -100,15 +102,15 @@ app.on('ready', () => {
100102
name,
101103
accelerator,
102104
registered: false,
103-
action: toggleWindow
105+
action: toggleWindow,
104106
})
105107
}
106108
}
107109

108110
Menu.setApplicationMenu(
109111
createMenu({
110-
toggleWindow
111-
})
112+
toggleWindow,
113+
}),
112114
)
113115
mainWindow = createMainWindow()
114116
tray.create(mainWindow)

app/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
},
2929
"homepage": "https://github.com/egoist/devdocs-desktop#readme",
3030
"dependencies": {
31-
"axios": "^0.16.2",
32-
"debug": "^3.1.0",
33-
"electron-context-menu": "^0.16.0",
31+
"axios": "^0.21.1",
32+
"debug": "^4.3.1",
33+
"electron-context-menu": "^2.5.1",
3434
"electron-debug": "^3.0.1",
35-
"electron-is-dev": "^1.1.0",
36-
"electron-log": "^4.0.7",
37-
"electron-store": "^5.1.1",
38-
"electron-updater": "^4.2.4",
39-
"mkdirp": "^1.0.3",
35+
"electron-is-dev": "^2.0.0",
36+
"electron-log": "^4.3.4",
37+
"electron-store": "^7.0.3",
38+
"electron-updater": "^4.3.8",
39+
"mkdirp": "^1.0.4",
4040
"semver-compare": "^1.0.0"
4141
}
4242
}

0 commit comments

Comments
 (0)