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

package/lib/src/commands/StatusCommand.js

@@ -54,13 +54,13 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var StatusCommand = /** @class */ (function () {
     function StatusCommand(validateTask) {
-        this._validateTask = validateTask;
+        this.validateTask = validateTask;
     }
     StatusCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._validateTask.run(options)];
+                    case 0: return [4 /*yield*/, this.validateTask.run(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/commands/VersionCommand.js

@@ -54,13 +54,13 @@ var inversify_1 = require("inversify");
 var types_1 = require("../types");
 var VersionCommand = /** @class */ (function () {
     function VersionCommand(versionTask) {
-        this._versionTask = versionTask;
+        this.versionTask = versionTask;
     }
     VersionCommand.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._versionTask.run(options)];
+                    case 0: return [4 /*yield*/, this.versionTask.run(options)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];

package/lib/src/constants/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CommandTypeMapping"), exports);
-__exportStar(require("./MonorepoPackageJsonFiles"), exports);
+__exportStar(require("./CommandTypeMapping.js"), exports);
+__exportStar(require("./MonorepoPackageJsonFiles.js"), exports);

package/lib/src/errors/ShipItError.js

@@ -0,0 +1,32 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ShipItError = void 0;
+var ShipItError = /** @class */ (function (_super) {
+    __extends(ShipItError, _super);
+    function ShipItError(message) {
+        var _this = _super.call(this, message) || this;
+        /**
+         * Need to do this to extend errors in typescript and still be able to use instanceof in a catch statement
+         * https://stackoverflow.com/questions/31626231/custom-error-class-in-typescript/41429145
+         */
+        Object.setPrototypeOf(_this, ShipItError.prototype);
+        return _this;
+    }
+    return ShipItError;
+}(Error));
+exports.ShipItError = ShipItError;

package/lib/src/errors/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ShipItError"), exports);

package/lib/src/interfaces/VersionType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/interfaces/command-options/CommitPackageVersionsCommandOptions.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/src/interfaces/index.js

@@ -20,3 +20,4 @@ __exportStar(require("./view-models"), exports);
 __exportStar(require("./Config"), exports);
 __exportStar(require("./ShipItCommand"), exports);
 __exportStar(require("./ShipItTask"), exports);
+__exportStar(require("./VersionType"), exports);

package/lib/src/inversify.config.js

@@ -34,6 +34,7 @@ function createContainer(config) {
     container.bind(types_1.TASKS.CreateReleaseNotesTask).to(tasks_1.CreateReleaseNotesTask);
     container.bind(types_1.TASKS.InstallPackagesTask).to(tasks_1.InstallPackagesTask);
     container.bind(types_1.TASKS.BumpPackagesTask).to(tasks_1.BumpPackagesTask);
+    container.bind(types_1.TASKS.CommitPackageVersionsTask).to(tasks_1.CommitPackageVersionsTask);
     /**
      * Commands
      */

package/lib/src/services/GitLabService.js

@@ -69,9 +69,11 @@ var lodash_1 = __importDefault(require("lodash"));
 var semver_1 = __importDefault(require("semver"));
 var types_1 = require("../types");
 var api_clients_1 = require("../api-clients");
+var errors_1 = require("../errors");
+var utils_1 = require("../utils");
 var GitLabService = /** @class */ (function () {
     function GitLabService(apiClient) {
-        this._apiClient = apiClient;
+        this.apiClient = apiClient;
     }
     GitLabService.prototype.getProjects = function (options) {
         return __awaiter(this, void 0, void 0, function () {
@@ -79,20 +81,20 @@ var GitLabService = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (this._projects)
-                            return [2 /*return*/, this._projects];
-                        return [4 /*yield*/, this._apiClient.getMergeRequests(options)];
+                        if (this.projects)
+                            return [2 /*return*/, this.projects];
+                        return [4 /*yield*/, this.apiClient.getMergeRequests(options)];
                     case 1:
                         mergeRequests = _a.sent();
                         if (!(mergeRequests === null || mergeRequests === void 0 ? void 0 : mergeRequests.length))
-                            throw new Error('Could not find any merge requests for the specified options');
+                            throw new errors_1.ShipItError('Could not find any merge requests for the specified options');
                         projectIds = lodash_1.default.uniqBy(mergeRequests, function (m) { return m.projectId; }).map(function (m) { return m.projectId; });
-                        return [4 /*yield*/, this._apiClient.getProjectsByIds(projectIds)];
+                        return [4 /*yield*/, this.apiClient.getProjectsByIds(projectIds)];
                     case 2:
                         projects = _a.sent();
                         if (!(projects === null || projects === void 0 ? void 0 : projects.length) || projects.length !== projectIds.length)
-                            throw new Error('Could not find all projects for the found merge requests');
-                        return [2 /*return*/, (this._projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
+                            throw new errors_1.ShipItError('Could not find all projects for the found merge requests');
+                        return [2 /*return*/, (this.projects = projects.map(function (p) { return (__assign(__assign({}, p), { mergeRequests: mergeRequests.filter(function (mr) { return mr.projectId === p.id; }) })); }))];
                 }
             });
         });
@@ -102,7 +104,7 @@ var GitLabService = /** @class */ (function () {
             var commits, lastDevCommit, title;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
+                    case 0: return [4 /*yield*/, this.apiClient.getCommitsSince(projectId, 'dev', sinceSha)];
                     case 1:
                         commits = _a.sent();
                         lastDevCommit = lodash_1.default.last(commits);
@@ -113,7 +115,7 @@ var GitLabService = /** @class */ (function () {
                             commits.pop();
                         }
                         if (!(commits === null || commits === void 0 ? void 0 : commits.length))
-                            throw new Error("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
+                            throw new errors_1.ShipItError("Could not find any commits in dev for projectId: ".concat(projectId, " since ").concat(sinceSha));
                         return [2 /*return*/, commits];
                 }
             });
@@ -123,7 +125,7 @@ var GitLabService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getBranch(projectId, branchName)];
+                    case 0: return [4 /*yield*/, this.apiClient.getBranch(projectId, branchName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
@@ -131,53 +133,47 @@ var GitLabService = /** @class */ (function () {
     };
     GitLabService.prototype.createBranch = function (project, branchFrom, branchName, cherryPick) {
         return __awaiter(this, void 0, void 0, function () {
-            var newBranch_1, i, mr, newBranch;
+            var newBranch, i, mr;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!cherryPick) return [3 /*break*/, 6];
-                        return [4 /*yield*/, this._apiClient.createBranch(project.id, branchName, 'master')];
+                        return [4 /*yield*/, this.apiClient.createBranch(project.id, branchName, 'master')];
                     case 1:
-                        newBranch_1 = _a.sent();
-                        if (!newBranch_1)
-                            throw new Error("Failed to create branch from master for projectId: ".concat(project.id));
+                        newBranch = _a.sent();
                         i = 0;
                         _a.label = 2;
                     case 2:
                         if (!(i < project.mergeRequests.length)) return [3 /*break*/, 5];
                         mr = project.mergeRequests[i];
                         if (!mr.mergeCommit)
-                            throw new Error("Could not find the merge commit sha for MR: ".concat(mr.title, " in projectId: ").concat(project.id));
-                        return [4 /*yield*/, this._apiClient.cherryPick(project.id, mr.mergeCommit, branchName)];
+                            throw new errors_1.ShipItError("Could not find the merge commit sha for MR: ".concat(mr.title, " in projectId: ").concat(project.id));
+                        return [4 /*yield*/, this.apiClient.cherryPick(project.id, mr.mergeCommit, branchName)];
                     case 3:
                         _a.sent();
                         _a.label = 4;
                     case 4:
                         i++;
                         return [3 /*break*/, 2];
-                    case 5: return [2 /*return*/, newBranch_1];
-                    case 6: return [4 /*yield*/, this._apiClient.createBranch(project.id, branchName, branchFrom)];
-                    case 7:
-                        newBranch = _a.sent();
-                        if (!newBranch)
-                            throw new Error("Failed to create branch from master for projectId: ".concat(project.id));
-                        return [2 /*return*/, newBranch];
+                    case 5: return [2 /*return*/, newBranch];
+                    case 6: return [4 /*yield*/, this.apiClient.createBranch(project.id, branchName, branchFrom)];
+                    case 7: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     GitLabService.prototype.getMergeRequest = function (projectId, branchName) {
-        return this._apiClient.getMergeRequest(projectId, branchName, 'master');
+        return this.apiClient.getMergeRequest(projectId, branchName, 'master');
     };
     GitLabService.prototype.createMergeRequest = function (projectId, branchName, description) {
-        return this._apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description);
+        return this.apiClient.createMergeRequest(projectId, branchName, 'master', branchName, description);
     };
     GitLabService.prototype.bumpVersionTxt = function (projectId, branchName, newVersion) {
         return __awaiter(this, void 0, void 0, function () {
             var versionTxt, buff, text;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getFile(projectId, 'version.txt', branchName)];
+                    case 0: return [4 /*yield*/, this.apiClient.getFile(projectId, 'version.txt', branchName)];
                     case 1:
                         versionTxt = _a.sent();
                         if (!versionTxt)
@@ -186,7 +182,7 @@ var GitLabService = /** @class */ (function () {
                         text = buff.toString('utf-8');
                         if (text === newVersion)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this._apiClient.updateFile(projectId, 'version.txt', branchName, newVersion, 'Bumping version.txt')];
+                        return [4 /*yield*/, this.apiClient.updateFile(projectId, 'version.txt', branchName, newVersion, 'Bumping version.txt')];
                     case 2:
                         _a.sent();
                         return [2 /*return*/, true];
@@ -198,20 +194,20 @@ var GitLabService = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getFile(projectId, file, branchName)];
+                    case 0: return [4 /*yield*/, this.apiClient.getFile(projectId, file, branchName)];
                     case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     GitLabService.prototype.updateFile = function (projectId, filePath, branchName, content, commit) {
-        return this._apiClient.updateFile(projectId, filePath, branchName, content, commit);
+        return this.apiClient.updateFile(projectId, filePath, branchName, content, commit);
     };
     GitLabService.prototype.commit = function (projectId, branchName, commitMessage, files) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.commit(projectId, branchName, files, commitMessage)];
+                    case 0: return [4 /*yield*/, this.apiClient.commit(projectId, branchName, files, commitMessage)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -219,12 +215,16 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    /**
+     * We use the latest valid semver tag in master to determine what the current version
+     * of a project is
+     */
     GitLabService.prototype.getCurrentVersionTag = function (projectId) {
         return __awaiter(this, void 0, void 0, function () {
             var tags, tagNames, sortedTagNames, currentVersion, currentTag;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._apiClient.getLatestTags(projectId)];
+                    case 0: return [4 /*yield*/, this.apiClient.getLatestTags(projectId)];
                     case 1:
                         tags = _a.sent();
                         if (!(tags === null || tags === void 0 ? void 0 : tags.length))
@@ -242,6 +242,33 @@ var GitLabService = /** @class */ (function () {
             });
         });
     };
+    GitLabService.prototype.getNextBranchInfo = function (projectId, version) {
+        return __awaiter(this, void 0, void 0, function () {
+            var tag, nextVersion, branchName, branch;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.getCurrentVersionTag(projectId)];
+                    case 1:
+                        tag = _a.sent();
+                        if (!tag)
+                            throw new errors_1.ShipItError("Could not find the latest semver tag for projectId: ".concat(projectId));
+                        nextVersion = utils_1.Versions.getNextVersion(tag.name, version);
+                        branchName = version === 'patch' ?
+                            utils_1.BranchNames.getHotfix(nextVersion) :
+                            utils_1.BranchNames.getRelease(nextVersion);
+                        return [4 /*yield*/, this.getBranch(projectId, branchName)];
+                    case 2:
+                        branch = _a.sent();
+                        return [2 /*return*/, {
+                                nextVersion: nextVersion,
+                                branchName: branchName,
+                                branch: branch,
+                                tag: tag
+                            }];
+                }
+            });
+        });
+    };
     GitLabService = __decorate([
         (0, inversify_1.injectable)(),
         __param(0, (0, inversify_1.inject)(types_1.API_CLIENTS.GitLabApiClient)),

package/lib/src/startup/AddMilestoneCommand.js

@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAddMilestoneCommand = void 0;
-var constants_1 = require("../constants");
+var CommandTypeMapping_1 = require("../constants/CommandTypeMapping");
 var utils_1 = require("../utils");
 function processOptions(options) {
     var opts = {
@@ -65,7 +65,7 @@ var getAddMilestoneCommand = function (program, container) {
             .option('--major')
             .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                container.get(constants_1.CommandTypeMapping[name])
+                container.get(CommandTypeMapping_1.CommandTypeMapping[name])
                     .run(processOptions(options));
                 return [2 /*return*/];
             });

package/lib/src/startup/SetupCommands.js

@@ -37,8 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setupCommands = void 0;
-var commander_1 = require("commander");
-var constants_1 = require("../constants");
+var CommandTypeMapping_1 = require("../constants/CommandTypeMapping");
 var AddMilestoneCommand_1 = require("./AddMilestoneCommand");
 function setupCommands(program, container) {
     var _this = this;
@@ -54,11 +53,11 @@ function setupCommands(program, container) {
     program.command('bump-packages')
         .description('Bump clickview npm package versions in monorepo to their next version')
         .requiredOption('-b, --branchName <branchName>')
-        .addOption(new commander_1.Option('-p, --preid <preId>').choices(['dev', 'rc']))
+        .option('-p, --preId <preId>')
         .action(function (options) { return __awaiter(_this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             container
-                .get(constants_1.CommandTypeMapping['bump-packages'])
+                .get(CommandTypeMapping_1.CommandTypeMapping['bump-packages'])
                 .run(options);
             return [2 /*return*/];
         });

package/lib/src/tasks/BumpPackagesTask.js

@@ -54,12 +54,13 @@ var inversify_1 = require("inversify");
 var child_process_1 = require("child_process");
 var types_1 = require("../types");
 var services_1 = require("../services");
+var MonorepoPackageJsonFiles_1 = require("../constants/MonorepoPackageJsonFiles");
 var utils_1 = require("../utils");
-var constants_1 = require("../constants");
 var RELEASE_BRANCH_REGEX = /^release\/(\d|\.)+$/;
 var HOTFIX_BRANCH_REGEX = /^hotfix\/(\d|\.)+$/;
 var DEV_VERSION_REGEX = /-dev\.\d+$/;
 var RC_VERSION_REGEX = /-rc\.\d+$/;
+var SHARED_LERNA_OPTIONS = '--exact --no-git-tag-version --no-push --yes';
 var BumpPackagesTask = /** @class */ (function () {
     function BumpPackagesTask(service) {
         this.isReleaseBranch = false;
@@ -68,26 +69,31 @@ var BumpPackagesTask = /** @class */ (function () {
     }
     BumpPackagesTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var mergeRequest, isValid, bumpCommand;
+            var branch, isValid, lernaVersionCmd;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         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);
-                        mergeRequest = this.service.getMergeRequest(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName);
-                        if (!mergeRequest) {
-                            utils_1.Logger.logError("Merge request for branch ".concat(options.branchName, " could not be found."));
+                        return [4 /*yield*/, this.service.getBranch(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
+                    case 1:
+                        branch = _a.sent();
+                        if (!branch) {
+                            utils_1.Logger.logError("Branch with name ".concat(options.branchName, " was not be found."));
                             return [2 /*return*/, false];
                         }
                         isValid = this.validateOptions(options);
                         if (!isValid)
                             return [2 /*return*/, false];
-                        return [4 /*yield*/, this.getBumpCommand(options)];
-                    case 1:
-                        bumpCommand = _a.sent();
-                        // console.log('bump command is:', bumpCommand);
-                        (0, child_process_1.execSync)("npm run ".concat(bumpCommand));
+                        return [4 /*yield*/, this.getLernaCommand(options)];
+                    case 2:
+                        lernaVersionCmd = _a.sent();
+                        if (!lernaVersionCmd) {
+                            utils_1.Logger.logError('Something went wrong while trying to detect which versioning script to run with Lerna.');
+                            return [2 /*return*/, false];
+                        }
+                        (0, child_process_1.execSync)(lernaVersionCmd);
                         return [2 /*return*/, true];
                 }
             });
@@ -95,6 +101,10 @@ var BumpPackagesTask = /** @class */ (function () {
     };
     BumpPackagesTask.prototype.validateOptions = function (options) {
         var isValidReleaseBranch = this.isReleaseBranch || this.isHotfixBranch;
+        if (options.preId && options.preId !== 'rc' && options.preId !== 'dev') {
+            utils_1.Logger.logError("Argument for \"preId\" can only be \"rc\" or \"dev\". You entered: ".concat(options.preId));
+            return false;
+        }
         if (options.preId === 'dev' && isValidReleaseBranch) {
             utils_1.Logger.logError('Dev versions cannot be generated on release or hotfix branches.');
             return false;
@@ -125,47 +135,56 @@ var BumpPackagesTask = /** @class */ (function () {
             });
         });
     };
-    BumpPackagesTask.prototype.getBumpCommand = function (options) {
+    BumpPackagesTask.prototype.getLernaCommand = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var hasBumpedOnce;
+            var isInPrerelease;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.hasBumpedOnce(options.branchName)];
+                    case 0: return [4 /*yield*/, this.isInPrerelease(options.branchName)];
                     case 1:
-                        hasBumpedOnce = _a.sent();
+                        isInPrerelease = _a.sent();
+                        /**
+                         * The `lerna version prerelease` script only cares about incrementing the preId part
+                         * of the version number. That's why we run this if `isInPrerelease` is true.
+                         *
+                         * E.g. this would change 0.0.1-dev.0 to 0.0.0-dev.1
+                         */
+                        if (isInPrerelease && options.preId)
+                            return [2 /*return*/, "lerna version prerelease --preid ".concat(options.preId, " ").concat(SHARED_LERNA_OPTIONS)];
+                        // Bump the patch with the preId "dev". We currently only support dev prereleases on patch versions
+                        if (options.preId === 'dev')
+                            return [2 /*return*/, "lerna version prepatch --preid dev ".concat(SHARED_LERNA_OPTIONS)];
                         if (options.preId === 'rc') {
-                            if (hasBumpedOnce)
-                                return [2 /*return*/, 'lerna-prerelease-rc'];
+                            // Bump the minor number with the preId "rc". Release branches always bump the minor number.
                             if (this.isReleaseBranch)
-                                return [2 /*return*/, 'lerna-preminor-rc'];
+                                return [2 /*return*/, "lerna version preminor --preid rc ".concat(SHARED_LERNA_OPTIONS)];
+                            // Bump the patch with the preId "rc". Hotfix branches always bump the patch number.
                             if (this.isHotfixBranch)
-                                return [2 /*return*/, 'lerna-prepatch-rc'];
-                        }
-                        if (options.preId === 'dev') {
-                            if (hasBumpedOnce)
-                                return [2 /*return*/, 'lerna-prerelease-dev'];
-                            return [2 /*return*/, 'lerna-prepatch-dev'];
+                                return [2 /*return*/, "lerna version prepatch --preid rc ".concat(SHARED_LERNA_OPTIONS)];
                         }
+                        /**
+                         * If no preId is provided, we bump the version number to a production version.
+                         *
+                         * Release branch = minor bump
+                         * Hotfix branch = patch bump
+                         */
                         if (this.isReleaseBranch)
-                            return [2 /*return*/, 'lerna-minor'];
+                            return [2 /*return*/, "lerna version minor ".concat(SHARED_LERNA_OPTIONS)];
                         if (this.isHotfixBranch)
-                            return [2 /*return*/, 'lerna-patch'];
+                            return [2 /*return*/, "lerna version patch ".concat(SHARED_LERNA_OPTIONS)];
                         // Should never be reached
                         return [2 /*return*/, ''];
                 }
             });
         });
     };
-    /**
-     * If a package in the release already has a version
-     */
-    BumpPackagesTask.prototype.hasBumpedOnce = function (branchName) {
+    BumpPackagesTask.prototype.isInPrerelease = function (branchName) {
         return __awaiter(this, void 0, void 0, function () {
             var _i, MONOREPO_PACKAGE_JSON_FILES_1, file, text, json;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _i = 0, MONOREPO_PACKAGE_JSON_FILES_1 = constants_1.MONOREPO_PACKAGE_JSON_FILES;
+                        _i = 0, MONOREPO_PACKAGE_JSON_FILES_1 = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES;
                         _a.label = 1;
                     case 1:
                         if (!(_i < MONOREPO_PACKAGE_JSON_FILES_1.length)) return [3 /*break*/, 4];

package/lib/src/tasks/BumpVersionTxtTask.js

@@ -54,53 +54,40 @@ var inversify_1 = require("inversify");
 var Logger_1 = require("../utils/Logger");
 var types_1 = require("../types");
 var services_1 = require("../services");
-var utils_1 = require("../utils");
 var BumpVersionTxtTask = /** @class */ (function () {
     function BumpVersionTxtTask(service) {
-        this._service = service;
+        this.service = service;
     }
     BumpVersionTxtTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, cont, _i, projects_1, project, currentVersionTag, nextVersion, branchName, versionBumped;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var projects, _i, projects_1, project, _a, nextVersion, branchName, versionBumped;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         Logger_1.Logger.logTask('Bumping version.txt');
-                        return [4 /*yield*/, this._service.getProjects(options)];
+                        return [4 /*yield*/, this.service.getProjects(options)];
                     case 1:
-                        projects = _a.sent();
-                        if (!projects.length) {
-                            Logger_1.Logger.logError("No projects could be found with the specified options");
-                            return [2 /*return*/, false];
-                        }
-                        cont = true;
+                        projects = _b.sent();
                         _i = 0, projects_1 = projects;
-                        _a.label = 2;
+                        _b.label = 2;
                     case 2:
                         if (!(_i < projects_1.length)) return [3 /*break*/, 6];
                         project = projects_1[_i];
-                        return [4 /*yield*/, this._service.getCurrentVersionTag(project.id)];
+                        return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
-                        currentVersionTag = _a.sent();
-                        if (currentVersionTag === null) {
-                            Logger_1.Logger.logError("[".concat(project.title, "]: Could not find current version tag"));
-                            cont = false;
-                            return [3 /*break*/, 5];
-                        }
-                        nextVersion = utils_1.Versions.getNextVersion(currentVersionTag.name, options.version);
-                        branchName = utils_1.BranchNames.getRelease(nextVersion);
-                        return [4 /*yield*/, this._service.bumpVersionTxt(project.id, branchName, nextVersion)];
+                        _a = _b.sent(), nextVersion = _a.nextVersion, branchName = _a.branchName;
+                        return [4 /*yield*/, this.service.bumpVersionTxt(project.id, branchName, nextVersion)];
                     case 4:
-                        versionBumped = _a.sent();
+                        versionBumped = _b.sent();
                         if (versionBumped)
                             Logger_1.Logger.logMessage("[".concat(project.title, "]: Bumped to ").concat(nextVersion));
                         else
                             Logger_1.Logger.logWarning("[".concat(project.title, "]: Has already been bumped, or does not have a version.txt"));
-                        _a.label = 5;
+                        _b.label = 5;
                     case 5:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 6: return [2 /*return*/, cont];
+                    case 6: return [2 /*return*/, true];
                 }
             });
         });