From 0de6e62f58ea124c48421a843bece01a2319dbb1 Mon Sep 17 00:00:00 2001 From: Colin Diesh Date: Wed, 11 Jan 2023 07:44:01 -0700 Subject: [PATCH] Fix auto-updates on desktop not working since v2.2.2 (#3451) --- products/jbrowse-desktop/package.json | 2 +- products/jbrowse-desktop/public/electron.ts | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/products/jbrowse-desktop/package.json b/products/jbrowse-desktop/package.json index 9678a12ed6..c9a6ff84b2 100644 --- a/products/jbrowse-desktop/package.json +++ b/products/jbrowse-desktop/package.json @@ -13,8 +13,8 @@ "electron": "electron .", "test": "craco test", "electron-ts": "yarn tsc --strict --esModuleInterop --skipLibCheck public/electron.ts", + "preelectron": "npm run electron-ts", "prebuild": "npm run electron-ts", - "predevelop": "npm run electron-ts", "prepack": "yarn build", "build": "craco build", "build-electron": "yarn build && electron-builder build --windows --mac --linux", diff --git a/products/jbrowse-desktop/public/electron.ts b/products/jbrowse-desktop/public/electron.ts index 5f7ac3a26d..f9749d9df4 100644 --- a/products/jbrowse-desktop/public/electron.ts +++ b/products/jbrowse-desktop/public/electron.ts @@ -208,6 +208,14 @@ async function createWindow() { }, }) mainWindowState.manage(mainWindow) + + // this ready-to-show handler must be attached before the loadURL + mainWindow.once('ready-to-show', () => { + // unsure how to error handle + // eslint-disable-next-line @typescript-eslint/no-floating-promises + autoUpdater.checkForUpdatesAndNotify() + }) + await mainWindow.loadURL( isDev ? url.format(devServerUrl) @@ -331,12 +339,6 @@ async function createWindow() { mainWindow.on('closed', () => { mainWindow = null }) - - mainWindow.once('ready-to-show', () => { - // unsure how to error handle - // eslint-disable-next-line @typescript-eslint/no-floating-promises - autoUpdater.checkForUpdatesAndNotify() - }) } function sendStatusToWindow(text: string) {