@clickview/ship-it 0.0.37-rc.0 → 0.0.38

package/lib/src/tasks/BumpPackagesTask.js

@@ -175,27 +175,44 @@ var BumpPackagesTask = /** @class */ (function () {
         return commitFiles;
     };
     BumpPackagesTask.prototype.getNextVersion = function (version, options) {
-        // If we're in a prerelease, we only want to increment the preId part of the version number
-        if (this.isInPreRelease && options.preId) {
+        if (options.preId)
+            return this.getNextPrereleaseVersion(version, options);
+        return this.getNextReleaseVersion(version);
+    };
+    BumpPackagesTask.prototype.getNextPrereleaseVersion = function (version, options) {
+        /**
+         * If we're in a prerelease state already, we only want to increment the
+         * preId part of the version number
+         *
+         * Example: 1.0.0-rc.0 -> 1.0.0-rc.1
+         */
+        if (this.isInPreRelease) {
             if (options.preId === 'dev') {
                 if (DEV_VERSION_REGEX.test(version)) {
-                    var currentPreId = Number(version[version.length - 1]);
-                    return "".concat(version.substring(0, version.length - 1)).concat(currentPreId + 1);
+                    var _a = version.split('-dev.'), mainVersion = _a[0], currentPreId = _a[1];
+                    return "".concat(mainVersion, "-dev.").concat(Number(currentPreId) + 1);
                 }
                 return "".concat(utils_1.Versions.getNextVersion(version, 'patch'), "-dev.0");
             }
             if (options.preId === 'rc') {
                 if (RC_VERSION_REGEX.test(version)) {
-                    var currentPreId = Number(version[version.length - 1]);
-                    return "".concat(version.substring(0, version.length - 1)).concat(currentPreId + 1);
+                    var _b = version.split('-rc.'), mainVersion = _b[0], currentPreId = _b[1];
+                    return "".concat(mainVersion, "-rc.").concat(Number(currentPreId) + 1);
                 }
                 if (this.isReleaseBranch)
                     return "".concat(utils_1.Versions.getNextVersion(version, 'minor'), "-rc.0");
                 if (this.isHotfixBranch)
                     return "".concat(utils_1.Versions.getNextVersion(version, 'patch'), "-rc.0");
             }
+            // Should never run
             return version;
         }
+        /**
+         * The code below runs if we are not currently in a prerelease state,
+         * and we want to bump to a prerelease version.
+         *
+         * Example: 1.0.0 -> 1.0.1-dev.0 / 1.0.0 -> 1.1.0-rc.0
+         */
         if (options.preId === 'dev')
             return "".concat(utils_1.Versions.getNextVersion(version, 'patch'), "-dev.0");
         if (options.preId === 'rc') {
@@ -204,8 +221,18 @@ var BumpPackagesTask = /** @class */ (function () {
             if (this.isHotfixBranch)
                 return "".concat(utils_1.Versions.getNextVersion(version, 'patch'), "-rc.0");
         }
+        // Should never run
+        return version;
+    };
+    BumpPackagesTask.prototype.getNextReleaseVersion = function (version) {
+        if (this.isInPreRelease) {
+            // Examples: 1.0.1-rc.5 -> 1.0.1 / 1.0.0-dev.0 -> 1.0.0
+            return version.split('-')[0];
+        }
+        // Example: 1.0.0 -> 1.1.0
         if (this.isReleaseBranch)
             return utils_1.Versions.getNextVersion(version, 'minor');
+        // Example: 1.0.0 -> 1.0.1
         if (this.isHotfixBranch)
             return utils_1.Versions.getNextVersion(version, 'patch');
         return version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clickview/ship-it",
-  "version": "0.0.37-rc.0",
+  "version": "0.0.38",
   "description": "Release Manager",
   "main": "./lib/index.js",
   "bin": {