Skip to content

Commit 8fff210

Browse files
committed
feat(version): filter latest RC's from 'from'
Also, removed commented code
1 parent 34716d2 commit 8fff210

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

src/components/common/VersionSelector.js

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ const getReleasedVersionsWithCandidates = ({
9191
)
9292

9393
let validRC = false
94-
9594
return releasedVersions.filter(releasedVersion => {
9695
if (releasedVersion && showReleaseCandidates) {
9796
validRC = isFromAValidReleaseCandidate({
@@ -117,27 +116,25 @@ const getReleasedVersionsWithCandidates = ({
117116
})
118117
}
119118

120-
// semver.compare(
121-
// semver.valid(semver.coerce(releasedVersion)),
122-
// semver.valid(semver.coerce(maxVersion || '16.2.9'))
123-
// ) === -1)
124119
const getReleasedVersions = ({ releasedVersions, minVersion, maxVersion }) => {
125120
const latestMajorReleaseVersion = getLatestMajorReleaseVersion(
126121
releasedVersions
127122
)
128123

129-
return releasedVersions.filter(
124+
const isVersionAReleaseAndOfLatest = version =>
125+
version.includes('rc') &&
126+
semver.valid(semver.coerce(version)) === latestMajorReleaseVersion
127+
128+
let result = releasedVersions.filter(
130129
releasedVersion =>
131-
(releasedVersion.length > 0 &&
132-
((maxVersion && semver.lt(releasedVersion, maxVersion)) ||
133-
(minVersion && semver.gt(releasedVersion, minVersion)))) ||
134-
(!releasedVersion.includes('rc') &&
135-
releasedVersion === latestMajorReleaseVersion) ||
136-
semver.gt(
137-
semver.valid(semver.coerce(releasedVersion || '12.6.3')),
138-
semver.valid(semver.coerce(latestMajorReleaseVersion))
139-
)
130+
releasedVersion.length > 0 &&
131+
((maxVersion && semver.lt(releasedVersion, maxVersion)) ||
132+
(minVersion &&
133+
semver.gt(releasedVersion, minVersion) &&
134+
!isVersionAReleaseAndOfLatest(releasedVersion)))
140135
)
136+
137+
return result
141138
}
142139

143140
// Finds the first minor release (which in react-native is the major) when compared to another version

0 commit comments

Comments
 (0)