fix: increase next version on prerelease branch based on highest commit type

lib/get-next-version.js

@@ -1,18 +1,28 @@
 const semver = require('semver');
 const {FIRST_RELEASE, FIRSTPRERELEASE} = require('./definitions/constants');
-const {isSameChannel} = require('./utils');
+const {isSameChannel, getLatestVersion, tagsToVersions, highest} = require('./utils');
 
 module.exports = ({branch, nextRelease: {type, channel}, lastRelease, logger}) => {
   let version;
   if (lastRelease.version) {
     const {major, minor, patch} = semver.parse(lastRelease.version);
-    version =
-      branch.type === 'prerelease'
-        ? semver.prerelease(lastRelease.version) &&
-          lastRelease.channels.some(lastReleaseChannel => isSameChannel(lastReleaseChannel, channel))
-          ? semver.inc(lastRelease.version, 'prerelease')
-          : `${semver.inc(`${major}.${minor}.${patch}`, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`
-        : semver.inc(lastRelease.version, type);
+
+    if (branch.type === 'prerelease') {
+      if (
+        semver.prerelease(lastRelease.version) &&
+        lastRelease.channels.some(lastReleaseChannel => isSameChannel(lastReleaseChannel, channel))
+      ) {
+        version = highest(
+          semver.inc(lastRelease.version, 'prerelease'),
+          `${semver.inc(getLatestVersion(tagsToVersions(branch.tags)), type)}-${branch.prerelease}.${FIRSTPRERELEASE}`
+        );
+      } else {
+        version = `${semver.inc(`${major}.${minor}.${patch}`, type)}-${branch.prerelease}.${FIRSTPRERELEASE}`;
+      }
+    } else {
+      version = semver.inc(lastRelease.version, type);
+    }
+
     logger.log('The next release version is %s', version);
   } else {
     version = branch.type === 'prerelease' ? `${FIRST_RELEASE}-${branch.prerelease}.${FIRSTPRERELEASE}` : FIRST_RELEASE;