style: merge both filter functions in get-last-release

semantic-release · Nov 27, 2019 · e722354 · e722354
1 parent 97748c5
commit e722354
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/lib/get-last-release.js b/lib/get-last-release.js
@@ -30,10 +30,10 @@ module.exports = ({branch, options: {tagFormat}}, {before} = {}) => {
   const [{version, gitTag, channels} = {}] = branch.tags
     .filter(
       tag =>
-        (branch.type === 'prerelease' && tag.channels.some(channel => isSameChannel(branch.channel, channel))) ||
-        !semver.prerelease(tag.version)
+        ((branch.type === 'prerelease' && tag.channels.some(channel => isSameChannel(branch.channel, channel))) ||
+          !semver.prerelease(tag.version)) &&
+        (isUndefined(before) || semver.lt(tag.version, before))
     )
-    .filter(tag => isUndefined(before) || semver.lt(tag.version, before))
     .sort((a, b) => semver.rcompare(a.version, b.version));
 
   if (gitTag) {