@clickview/ship-it 0.0.37-dev.0 → 0.0.37-dev.2

package/lib/src/tasks/BumpPackagesTask.js

@@ -76,11 +76,12 @@ var BumpPackagesTask = /** @class */ (function () {
                         utils_1.Logger.logTask('Bumping clickview npm package versions');
                         this.isReleaseBranch = RELEASE_BRANCH_REGEX.test(options.branchName);
                         this.isHotfixBranch = HOTFIX_BRANCH_REGEX.test(options.branchName);
-                        utils_1.Logger.logTask('Detected that monorepo is currently in a pre-release state');
                         _a = this;
                         return [4 /*yield*/, this.getIsInPrerelease(options.branchName)];
                     case 1:
                         _a.isInPreRelease = _b.sent();
+                        if (this.isInPreRelease)
+                            utils_1.Logger.logTask('Detected that monorepo is currently in a pre-release state');
                         return [4 /*yield*/, this.service.getBranch(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
                     case 2:
                         branch = _b.sent();
@@ -176,8 +177,24 @@ var BumpPackagesTask = /** @class */ (function () {
     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) {
-            var currentPreId = Number(version[version.length - 1]);
-            return "".concat(version.substring(0, version.length - 1)).concat(currentPreId + 1);
+            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);
+                }
+                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);
+                }
+                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");
+            }
+            return version;
         }
         if (options.preId === 'dev')
             return "".concat(utils_1.Versions.getNextVersion(version, 'patch'), "-dev.0");
@@ -204,6 +221,8 @@ var BumpPackagesTask = /** @class */ (function () {
                     case 1:
                         if (!(_i < MONOREPO_PACKAGE_JSON_FILES_1.length)) return [3 /*break*/, 4];
                         file = MONOREPO_PACKAGE_JSON_FILES_1[_i];
+                        if (!file.includes('projects'))
+                            return [3 /*break*/, 3];
                         return [4 /*yield*/, this.getFileText(utils_1.ProjectIds.MONOREPO_PROJECT_ID, branchName, file)];
                     case 2:
                         text = _a.sent();

package/package.json

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