From c078dbbf7887bfb4c8e0d49b70b58d4c94468a92 Mon Sep 17 00:00:00 2001 From: Harsh Rathi Date: Sun, 16 Mar 2025 16:51:18 +0530 Subject: [PATCH 1/2] Exclude older Electron versions in setVersions() --- src/versions.ts | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/versions.ts b/src/versions.ts index 7f437aa..e2d2992 100644 --- a/src/versions.ts +++ b/src/versions.ts @@ -157,11 +157,18 @@ export class BaseVersions implements Versions { // build the array let parsed: Array = []; if (isArrayOfVersionObjects(val)) { - parsed = val.map(({ version }) => semverParse(version)); + parsed = val + .map(({ version }) => semverParse(version)) + .filter((sem) => sem && SemVer.gte(sem.version, '0.30.0')) // Keep >=0.30.0 + .filter((sem) => !sem.version.startsWith('0.2')); // Exclude atom-shell // build release info for (const entry of val) { - if (isReleaseInfo(entry)) { + if ( + isReleaseInfo(entry) && + SemVer.gte(entry.version, '0.30.0') && // Correct comparison + !entry.version.startsWith('0.2') // Exclude atom-shell + ){ this.releaseInfo.set(entry.version, { version: entry.version, date: entry.date, @@ -177,7 +184,10 @@ export class BaseVersions implements Versions { } } } else if (isArrayOfStrings(val)) { - parsed = val.map((version) => semverParse(version)); + parsed = val + .map((version) => semverParse(version)) + .filter((sem) => sem && SemVer.gte(sem.version, '0.30.0')) + .filter((sem) => !sem.version.startsWith('0.2')); } else { console.warn('Unrecognized versions:', val); } From 2ceccb0e82ff528adcc9971206fb82a2ec32e909 Mon Sep 17 00:00:00 2001 From: Harsh Rathi Date: Sun, 16 Mar 2025 17:21:51 +0530 Subject: [PATCH 2/2] Exclude older Electron versions in setVersions() --- src/versions.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/versions.ts b/src/versions.ts index e2d2992..db7551b 100644 --- a/src/versions.ts +++ b/src/versions.ts @@ -1,5 +1,5 @@ import * as fs from 'fs-extra'; -import { parse as semverParse, SemVer } from 'semver'; +import { parse as semverParse, SemVer, gte } from 'semver'; import debug from 'debug'; import fetch from 'node-fetch'; @@ -159,15 +159,17 @@ export class BaseVersions implements Versions { if (isArrayOfVersionObjects(val)) { parsed = val .map(({ version }) => semverParse(version)) - .filter((sem) => sem && SemVer.gte(sem.version, '0.30.0')) // Keep >=0.30.0 + .filter((sem) => sem && gte(sem, '0.30.0')) // Standalone gte .filter((sem) => !sem.version.startsWith('0.2')); // Exclude atom-shell // build release info for (const entry of val) { + const parsedVersion = semverParse(entry.version); if ( isReleaseInfo(entry) && - SemVer.gte(entry.version, '0.30.0') && // Correct comparison - !entry.version.startsWith('0.2') // Exclude atom-shell + parsedVersion && + gte(parsedVersion, '0.30.0') && + !entry.version.startsWith('0.2') ){ this.releaseInfo.set(entry.version, { version: entry.version, @@ -186,7 +188,7 @@ export class BaseVersions implements Versions { } else if (isArrayOfStrings(val)) { parsed = val .map((version) => semverParse(version)) - .filter((sem) => sem && SemVer.gte(sem.version, '0.30.0')) + .filter((sem) => sem && gte(sem, '0.30.0')) .filter((sem) => !sem.version.startsWith('0.2')); } else { console.warn('Unrecognized versions:', val);