okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of https://github.com/ciderapp/Cider into develop

Browse source
This commit is contained in:
Maikiwi 2022-03-08 14:14:53 -08:00
commit a492209256
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package.json
View file

@ -77,7 +77,7 @@
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"@types/qrcode-terminal": "^0.12.0", "@types/qrcode-terminal": "^0.12.0",
"@types/ws": "^8.5.1", "@types/ws": "^8.5.1",
"electron": "git+https://github.com/castlabs/electron-releases.git#16-x-y", "electron": "git+https://github.com/castlabs/electron-releases.git",
"electron-builder": "^22.14.13", "electron-builder": "^22.14.13",
"electron-builder-notarize-pkg": "^1.2.0", "electron-builder-notarize-pkg": "^1.2.0",
"electron-webpack": "^2.8.2", "electron-webpack": "^2.8.2",
@ -109,9 +109,9 @@
} }
], ],
"build": { "build": {
"electronVersion": "16.0.7", "electronVersion": "17.1.0",
"electronDownload": { "electronDownload": {
"version": "16.0.7+wvcus", "version": "18.0.0-alpha.5+wvcus",
"mirror": "https://github.com/castlabs/electron-releases/releases/download/v" "mirror": "https://github.com/castlabs/electron-releases/releases/download/v"
}, },
"appId": "cider", "appId": "cider",

5
src/main/index.ts
View file

@ -1,6 +1,6 @@
require('v8-compile-cache'); require('v8-compile-cache');
import {app, components, ipcMain} from 'electron'; const {app, components, ipcMain} = require('electron');
import {join} from 'path'; import {join} from 'path';
if (!app.isPackaged) { if (!app.isPackaged) {
@ -41,8 +41,7 @@ app.on('ready', () => {
require('vue-devtools').install() require('vue-devtools').install()
} }
app.whenReady().then(async () => { components.whenReady().then(async () => {
await components.whenReady();
const bw = new BrowserWindow() const bw = new BrowserWindow()
const win = await bw.createWindow() const win = await bw.createWindow()