diff --git a/electron/commands/auto-update.ts b/electron/commands/auto-update.ts index 320b9b7..1a34de9 100644 --- a/electron/commands/auto-update.ts +++ b/electron/commands/auto-update.ts @@ -1,12 +1,12 @@ -import { MessageBoxOptions, dialog } from "electron"; -import { autoUpdater } from "electron-updater"; +import { MessageBoxOptions, dialog, shell } from "electron"; +import { UpdateDownloadedEvent, autoUpdater } from "electron-updater"; import logit from "../utils/logit"; -const autoUpdate = (event) => { +const autoUpdate = (event: UpdateDownloadedEvent) => { autoUpdater.autoInstallOnAppQuit = false; const dialogOpts: MessageBoxOptions = { type: "info", - buttons: ["Install update", "No Thanks"], + buttons: ["Install update", "No Thanks", "Check Release Notes"], title: "New Upscayl Update", message: event.releaseName as string, detail: @@ -16,6 +16,10 @@ const autoUpdate = (event) => { dialog.showMessageBox(dialogOpts).then((returnValue) => { if (returnValue.response === 0) { autoUpdater.quitAndInstall(); + } else if (returnValue.response === 2) { + shell.openExternal( + "https://github.com/upscayl/upscayl/releases/tag/v" + event.version + ); } else { logit("🚫 Update Installation Cancelled"); } diff --git a/package-lock.json b/package-lock.json index 1f559aa..73cfc56 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "electron-is-dev": "^2.0.0", "electron-log": "^5.0.0-beta.16", "electron-next": "^3.1.5", - "electron-updater": "^6.1.1", + "electron-updater": "^6.1.4", "firebase": "^10.3.0", "jotai": "^2.2.2", "react-compare-slider": "^2.2.0", @@ -3415,9 +3415,9 @@ "integrity": "sha512-8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w==" }, "node_modules/electron-updater": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.1.tgz", - "integrity": "sha512-IBT3zJ4yO5UZMF2gOTC9HrlmG4OYSRtOiHKzNAShJvfuicdx6UaXoa6AvhcTxdx6zf/rJyFMRBISS9jhVwTfow==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz", + "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==", "dependencies": { "builder-util-runtime": "9.2.1", "fs-extra": "^10.1.0", @@ -3426,7 +3426,7 @@ "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", "semver": "^7.3.8", - "typed-emitter": "^2.1.0" + "tiny-typed-emitter": "^2.1.0" } }, "node_modules/electron-updater/node_modules/fs-extra": { @@ -5655,24 +5655,6 @@ "queue-microtask": "^1.2.2" } }, - "node_modules/rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "optional": true, - "dependencies": { - "tslib": "^1.9.0" - }, - "engines": { - "npm": ">=2.0.0" - } - }, - "node_modules/rxjs/node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "optional": true - }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -6308,6 +6290,11 @@ "node": ">=0.8" } }, + "node_modules/tiny-typed-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", + "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" + }, "node_modules/tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -6396,14 +6383,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz", - "integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==", - "optionalDependencies": { - "rxjs": "*" - } - }, "node_modules/typescript": { "version": "4.8.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", @@ -9206,9 +9185,9 @@ "integrity": "sha512-8KR114CAYQ4/r5EIEsOmOMqQ9j0MRbJZR3aXD/KFA8RuKzyoUB4XrUCg+l8RUGqTVQgKNIgTpjaG8YHRPAbX2w==" }, "electron-updater": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.1.tgz", - "integrity": "sha512-IBT3zJ4yO5UZMF2gOTC9HrlmG4OYSRtOiHKzNAShJvfuicdx6UaXoa6AvhcTxdx6zf/rJyFMRBISS9jhVwTfow==", + "version": "6.1.4", + "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.4.tgz", + "integrity": "sha512-yYAJc6RQjjV4WtInZVn+ZcLyXRhbVXoomKEfUUwDqIk5s2wxzLhWaor7lrNgxODyODhipjg4SVPMhJHi5EnsCA==", "requires": { "builder-util-runtime": "9.2.1", "fs-extra": "^10.1.0", @@ -9217,7 +9196,7 @@ "lodash.escaperegexp": "^4.1.2", "lodash.isequal": "^4.5.0", "semver": "^7.3.8", - "typed-emitter": "^2.1.0" + "tiny-typed-emitter": "^2.1.0" }, "dependencies": { "fs-extra": { @@ -10789,23 +10768,6 @@ "queue-microtask": "^1.2.2" } }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "optional": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "optional": true - } - } - }, "safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -11272,6 +11234,11 @@ "thenify": ">= 3.1.0 < 4" } }, + "tiny-typed-emitter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tiny-typed-emitter/-/tiny-typed-emitter-2.1.0.tgz", + "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==" + }, "tmp": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", @@ -11342,14 +11309,6 @@ "dev": true, "optional": true }, - "typed-emitter": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/typed-emitter/-/typed-emitter-2.1.0.tgz", - "integrity": "sha512-g/KzbYKbH5C2vPkaXGu8DJlHrGKHLsM25Zg9WuC9pMGfuvT+X25tZQWo5fK1BjBm8+UrVE9LDCvaY0CQk+fXDA==", - "requires": { - "rxjs": "*" - } - }, "typescript": { "version": "4.8.4", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz", diff --git a/package.json b/package.json index 5dab06e..abccfc4 100644 --- a/package.json +++ b/package.json @@ -123,7 +123,6 @@ "gatekeeperAssess": false, "entitlements": "resources/entitlements.mac.plist", "entitlementsInherit": "resources/entitlements.mac.plist", - "provisioningProfile": "embedded.provisionprofile", "mergeASARs": false, "target": [ { @@ -216,7 +215,7 @@ "electron-is-dev": "^2.0.0", "electron-log": "^5.0.0-beta.16", "electron-next": "^3.1.5", - "electron-updater": "^6.1.1", + "electron-updater": "^6.1.4", "firebase": "^10.3.0", "jotai": "^2.2.2", "react-compare-slider": "^2.2.0",