From 2e6ff217a2ef7149d37089b06f80363d1f4b2867 Mon Sep 17 00:00:00 2001
From: yougotwill <yougotwill94@gmail.com>
Date: Mon, 17 Feb 2025 17:26:29 +1100
Subject: [PATCH] fix: updated semver package to fix prerelease comparison

log version comparison when debugging
---
 package.json                              | 2 +-
 ts/components/dialog/debug/components.tsx | 9 +++++++++
 ts/updater/updater.ts                     | 4 +++-
 yarn.lock                                 | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 333de2038..c833bb0f6 100644
--- a/package.json
+++ b/package.json
@@ -125,7 +125,7 @@
     "redux-promise-middleware": "^6.2.0",
     "rimraf": "2.6.2",
     "sanitize.css": "^12.0.1",
-    "semver": "^7.5.4",
+    "semver": "^7.7.1",
     "styled-components": "^6.1.11",
     "uuid": "8.3.2",
     "webrtc-adapter": "^4.1.1",
diff --git a/ts/components/dialog/debug/components.tsx b/ts/components/dialog/debug/components.tsx
index cccb9f924..4ee204adc 100644
--- a/ts/components/dialog/debug/components.tsx
+++ b/ts/components/dialog/debug/components.tsx
@@ -2,6 +2,7 @@ import useAsync from 'react-use/lib/useAsync';
 import { shell } from 'electron';
 import useBoolean from 'react-use/lib/useBoolean';
 import { useDispatch } from 'react-redux';
+import { gt as isVersionGreaterThan } from 'semver';
 import { Flex } from '../../basic/Flex';
 import { SpacerXS } from '../../basic/Text';
 import { localize } from '../../../localization/localeTools';
@@ -94,6 +95,10 @@ export const DebugActions = () => {
                 `Current: v${window.versionInfo.version}`
               );
               ToastUtils.pushToastInfo('debugLatestRelease', `Available: v${versionNumber}`);
+              window.log.debug(
+                `WIP: [debugMenu] [updater] isVersionGreaterThan(latestVersion, currentVersion)`,
+                isVersionGreaterThan(`v${versionNumber}`, `v${window.versionInfo.version}`)
+              );
             } else {
               ToastUtils.pushToastError('debugLatestRelease', 'Failed to fetch latest release');
             }
@@ -123,6 +128,10 @@ export const DebugActions = () => {
                 `Current: v${window.versionInfo.version}`
               );
               ToastUtils.pushToastInfo('debugAlphaRelease', `Available: v${versionNumber}`);
+              window.log.debug(
+                `WIP: [debugMenu] [updater] isVersionGreaterThan(latestVersion, currentVersion)`,
+                isVersionGreaterThan(`v${versionNumber}`, `v${window.versionInfo.version}`)
+              );
             } else {
               ToastUtils.pushToastError('debugAlphaRelease', 'Failed to fetch latest release');
             }
diff --git a/ts/updater/updater.ts b/ts/updater/updater.ts
index d5d56b2a3..22d2cdb21 100644
--- a/ts/updater/updater.ts
+++ b/ts/updater/updater.ts
@@ -193,7 +193,9 @@ function isUpdateAvailable(updateInfo: UpdateInfo): boolean {
   const currentVersion = autoUpdater.currentVersion.toString();
 
   const latestIsNewer = isVersionGreaterThan(latestVersion, currentVersion);
-  console.log(`[updater] isUpdateAvailable latestIsNewer: ${latestIsNewer}`);
+  console.log(
+    `[updater] isUpdateAvailable latestIsNewer: ${latestIsNewer} currentVersion: ${currentVersion} latestVersion: ${latestVersion}`
+  );
   return latestIsNewer;
 }
 
diff --git a/yarn.lock b/yarn.lock
index 576174a3e..03e534c7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6858,7 +6858,7 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4:
+semver@^7.1.2, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.4, semver@^7.7.1:
   version "7.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
   integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==