Mastodon
/
Whalebird-desktop-client-mac-linux-windows
mirror of https://github.com/h3poteto/whalebird-desktop
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #900 from h3poteto/electron/5.0.1 

Update electron version to 5.0.1
This commit is contained in:
AkiraFukushima 2019-05-06 23:10:55 +09:00 committed by GitHub
parent ae92522412 dcd8406e19
commit 0eb97c9395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -6503,20 +6503,20 @@
"dev": true "dev": true
}, },
"electron": { "electron": {
"version": "4.0.8", "version": "5.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-4.0.8.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-5.0.1.tgz",
"integrity": "sha512-FOBJIHkuv8wc15N+ZyqwDzPavYVu5CHMBEf14jHDWv7QW2vkEIpJjVK+PIT31kfZfvjsIP0j2wvA/FBsiqB7pw==", "integrity": "sha512-8KksyhAPcpXVeO8ViVGxfZAuf8yEVBCtV0h/lMBD8VFbCQ9icej1K5csCFAGirbZbqOz5IdsBZX9Gpb9n4RCag==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/node": "10.12.30", "@types/node": "10.14.6",
"electron-download": "4.1.1", "electron-download": "4.1.1",
"extract-zip": "1.6.7" "extract-zip": "1.6.7"
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "10.12.30", "version": "10.14.6",
"resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.30.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.6.tgz",
"integrity": "sha512-nsqTN6zUcm9xtdJiM9OvOJ5EF0kOI8f1Zuug27O/rgtxCRJHGqncSWfCMZUP852dCKPsDsYXGvBhxfRjDBkF5Q==", "integrity": "sha512-Fvm24+u85lGmV4hT5G++aht2C5I4Z4dYlWZIh62FAfFO/TfzXtPpoLI6I7AuBWkIFqZCnhFOoTT7RjjaIL5Fjg==",
"dev": true "dev": true
} }
} }

2
package.json
View File

@ -228,7 +228,7 @@
"css-loader": "^0.28.11", "css-loader": "^0.28.11",
"del": "^3.0.0", "del": "^3.0.0",
"devtron": "^1.4.0", "devtron": "^1.4.0",
"electron": "4.0.8", "electron": "5.0.1",
"electron-builder": "^20.39.0", "electron-builder": "^20.39.0",
"electron-debug": "^2.2.0", "electron-debug": "^2.2.0",
"electron-devtools-installer": "^2.2.4", "electron-devtools-installer": "^2.2.4",

8
src/main/index.ts
View File

@ -203,7 +203,6 @@ async function createWindow() {
defaultWidth: 1000, defaultWidth: 1000,
defaultHeight: 563 defaultHeight: 563
}) })
// mainWindow = new BrowserWindow({
const mainOpts: BrowserWindowConstructorOptions = { const mainOpts: BrowserWindowConstructorOptions = {
titleBarStyle: 'hidden', titleBarStyle: 'hidden',
x: mainWindowState.x, x: mainWindowState.x,
@ -211,7 +210,12 @@ async function createWindow() {
width: mainWindowState.width, width: mainWindowState.width,
height: mainWindowState.height, height: mainWindowState.height,
useContentSize: true, useContentSize: true,
icon: path.resolve(__dirname, '../../build/icons/256x256.png') icon: path.resolve(__dirname, '../../build/icons/256x256.png'),
webPreferences: {
// It is required to use ipcRenderer in renderer process.
// But it is not secure, so if you want to disable this option, please use preload script.
nodeIntegration: true
}
} }
const config: Config = { const config: Config = {
windowOpts: mainOpts, windowOpts: mainOpts,