fix bundled env update availability check

Author: mbektas

src/main/registry.ts

@@ -19,7 +19,8 @@ import {
   getBundledPythonPath,
   getEnvironmentPath,
   getUserHomeDir,
-  isPortInUse
+  isPortInUse,
+  versionWithoutSuffix
 } from './utils';
 import { SettingType, userSettings } from './config/settings';
 import { appData } from './config/appdata';
@@ -779,13 +780,10 @@ export class Registry implements IRegistry, IDisposable {
     return requirements.every((req, index, reqSelf) => {
       try {
         const version = environment.versions[req.name];
-        // remove alpha / beta suffixes
-        const versionWithoutSuffix = `${semver.major(version, {
-          loose: true
-        })}.${semver.minor(version, {
-          loose: true
-        })}.${semver.patch(version, { loose: true })}`;
-        return semver.satisfies(versionWithoutSuffix, req.versionRange);
+        return semver.satisfies(
+          versionWithoutSuffix(version),
+          req.versionRange
+        );
       } catch (e) {
         return false;
       }

src/main/settingsdialog/settingsdialog.ts

@@ -5,7 +5,6 @@ import * as ejs from 'ejs';
 import { app, BrowserWindow } from 'electron';
 import * as path from 'path';
 import * as fs from 'fs';
-const semver = require('semver');
 import { ThemedWindow } from '../dialog/themedwindow';
 import {
   CtrlWBehavior,
@@ -16,7 +15,7 @@ import {
   StartupMode,
   ThemeType
 } from '../config/settings';
-import { getBundledPythonPath } from '../utils';
+import { getBundledPythonPath, versionWithoutSuffix } from '../utils';
 import { IRegistry } from '../registry';
 
 export class SettingsDialog {
@@ -69,8 +68,10 @@ export class SettingsDialog {
         const bundledEnv = registry.getEnvironmentByPath(bundledPythonPath);
         const jlabVersion = bundledEnv.versions['jupyterlab'];
         const appVersion = app.getVersion();
-        const diff = semver.diff(appVersion, jlabVersion);
-        if (diff !== 'prerelease') {
+
+        if (
+          versionWithoutSuffix(jlabVersion) !== versionWithoutSuffix(appVersion)
+        ) {
           bundledEnvInstallationLatest = false;
         }
       } catch (error) {

src/main/utils.ts

@@ -3,6 +3,7 @@
 
 import * as path from 'path';
 import * as fs from 'fs';
+import * as semver from 'semver';
 import log from 'electron-log';
 import { AddressInfo, createServer, Socket } from 'net';
 import { app, nativeTheme } from 'electron';
@@ -230,3 +231,10 @@ export async function waitForFunction(
     }
   });
 }
+
+// remove alpha / beta suffixes
+export function versionWithoutSuffix(version: string) {
+  return `${semver.major(version, { loose: true })}.${semver.minor(version, {
+    loose: true
+  })}.${semver.patch(version, { loose: true })}`;
+}