@clickview/ship-it 0.0.38 → 0.0.39

package/lib/src/constants/ProjectNames.js

@@ -23,6 +23,7 @@ exports.PROJECT_NAMES = {
      * it will still be detected by `ProjectIds.ts`
      */
     backend: {
+        account: '1175',
         integrations: '850',
         auth: '54',
         online: '41',

package/lib/src/constants/TeamCityBuildIDs.js

@@ -42,4 +42,5 @@ exports.TeamCityBuildIds = (_a = {},
     _a[constants_1.PROJECT_NAMES.backend.clients] = 'Tooling_Clients_PublishToNuget',
     _a[constants_1.PROJECT_NAMES.backend.goodstuff] = 'Tooling_GoodStuffInternal_PublishToNuget',
     _a[constants_1.PROJECT_NAMES.backend.share] = 'Api_ShareApi_BuildAndPackageDocker',
+    _a[constants_1.PROJECT_NAMES.backend.account] = 'Api_AccountApi_BuildAndPackageDocker',
     _a);

package/lib/src/tasks/BumpPackagesTask.js

@@ -64,27 +64,20 @@ var BumpPackagesTask = /** @class */ (function () {
     function BumpPackagesTask(service) {
         this.isReleaseBranch = false;
         this.isHotfixBranch = false;
-        this.isInPreRelease = false;
         this.service = service;
     }
     BumpPackagesTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, branch, isValid, commitFiles, _i, commitFiles_1, file, newJsonFile;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var branch, isValid, commitFiles, _i, commitFiles_1, file, newJsonFile;
+            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);
-                        _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();
+                    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];
@@ -103,8 +96,8 @@ var BumpPackagesTask = /** @class */ (function () {
                         }
                         utils_1.Logger.logInfo('Committing new versions...');
                         return [4 /*yield*/, this.service.commit(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName, 'Bump package versions', commitFiles)];
-                    case 3:
-                        _b.sent();
+                    case 2:
+                        _a.sent();
                         utils_1.Logger.logSuccess('Successfully committed updated version numbers.');
                         return [2 /*return*/, true];
                 }
@@ -174,98 +167,58 @@ var BumpPackagesTask = /** @class */ (function () {
         }
         return commitFiles;
     };
-    BumpPackagesTask.prototype.getNextVersion = function (version, options) {
+    BumpPackagesTask.prototype.getNextVersion = function (currentVersion, options) {
         if (options.preId)
-            return this.getNextPrereleaseVersion(version, options);
-        return this.getNextReleaseVersion(version);
+            return this.getNextPrereleaseVersion(currentVersion, options);
+        return this.getNextReleaseVersion(currentVersion);
     };
-    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 _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 _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");
+    BumpPackagesTask.prototype.getNextPrereleaseVersion = function (currentVersion, options) {
+        if (options.preId === 'dev') {
+            // If version is already a dev version, increment the preId
+            // Example: 1.0.0-dev.5 -> 1.0.0-dev.6
+            if (DEV_VERSION_REGEX.test(currentVersion)) {
+                var _a = currentVersion.split('-dev.'), mainVersion = _a[0], currentPreId = _a[1];
+                return "".concat(mainVersion, "-dev.").concat(Number(currentPreId) + 1);
             }
-            // Should never run
-            return version;
+            // Bump the patch version and add the dev preId
+            // Example: 1.0.0 -> 1.0.1-dev.0
+            return "".concat(utils_1.Versions.getNextVersion(currentVersion, 'patch'), "-dev.0");
         }
-        /**
-         * 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') {
+            // If version is already an rc version, increment the preId
+            // Example: 1.0.0-rc.5 -> 1.0.0-rc.6
+            if (RC_VERSION_REGEX.test(currentVersion)) {
+                var _b = currentVersion.split('-rc.'), mainVersion = _b[0], currentPreId = _b[1];
+                return "".concat(mainVersion, "-rc.").concat(Number(currentPreId) + 1);
+            }
+            // For release branches, bump the minor version and add the rc preId
+            // Example: 1.0.0 -> 1.1.0-rc.0
             if (this.isReleaseBranch)
-                return "".concat(utils_1.Versions.getNextVersion(version, 'minor'), "-rc.0");
+                return "".concat(utils_1.Versions.getNextVersion(currentVersion, 'minor'), "-rc.0");
+            // For hotfix branches, bump the patch version and add the rc preId
+            // Example: 1.0.0 -> 1.0.1-rc.0
             if (this.isHotfixBranch)
-                return "".concat(utils_1.Versions.getNextVersion(version, 'patch'), "-rc.0");
+                return "".concat(utils_1.Versions.getNextVersion(currentVersion, 'patch'), "-rc.0");
         }
         // Should never run
-        return version;
+        return currentVersion;
     };
-    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];
+    BumpPackagesTask.prototype.getNextReleaseVersion = function (currentVersion) {
+        // Example: 1.0.1-dev.0 -> 1.0.1
+        if (DEV_VERSION_REGEX.test(currentVersion)) {
+            return currentVersion.split('-')[0];
+        }
+        // Example: 1.0.1-rc.5 -> 1.0.1
+        if (RC_VERSION_REGEX.test(currentVersion)) {
+            return currentVersion.split('-')[0];
         }
         // Example: 1.0.0 -> 1.1.0
         if (this.isReleaseBranch)
-            return utils_1.Versions.getNextVersion(version, 'minor');
+            return utils_1.Versions.getNextVersion(currentVersion, 'minor');
         // Example: 1.0.0 -> 1.0.1
         if (this.isHotfixBranch)
-            return utils_1.Versions.getNextVersion(version, 'patch');
-        return version;
-    };
-    BumpPackagesTask.prototype.getIsInPrerelease = 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 = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES;
-                        _a.label = 1;
-                    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();
-                        json = JSON.parse(text);
-                        if (RC_VERSION_REGEX.test(json.version))
-                            return [2 /*return*/, true];
-                        if (DEV_VERSION_REGEX.test(json.version))
-                            return [2 /*return*/, true];
-                        _a.label = 3;
-                    case 3:
-                        _i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, false];
-                }
-            });
-        });
+            return utils_1.Versions.getNextVersion(currentVersion, 'patch');
+        return currentVersion;
     };
     BumpPackagesTask = __decorate([
         (0, inversify_1.injectable)(),

package/lib/src/tasks/InstallPackagesTask.js

@@ -96,6 +96,14 @@ var InstallPackagesTask = /** @class */ (function () {
                         }
                         if (!(_options.targetBranchName && _options.monorepoBranchName && _options.projectIds)) return [3 /*break*/, 8];
                         targetBranch = _options.targetBranchName;
+                        if (targetBranch.startsWith('release') && !_options.monorepoBranchName.startsWith('release')) {
+                            utils_1.Logger.logError('Attempting to target release with non release branch.');
+                            return [2 /*return*/, false];
+                        }
+                        if (targetBranch.startsWith('hotfix') && !_options.monorepoBranchName.startsWith('hotfix')) {
+                            utils_1.Logger.logError('Attempting to target hotfix with non hotfix branch.');
+                            return [2 /*return*/, false];
+                        }
                         if (_options.projectIds.length > 1) {
                             utils_1.Logger.logError("Too many projects given! Maximum 1 project allowed but got ".concat(_options.projectIds.length));
                             return [2 /*return*/, false];

package/lib/src/tasks/TagMasterTask.js

@@ -62,7 +62,7 @@ var TagMasterTask = /** @class */ (function () {
     }
     TagMasterTask.prototype.run = function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var projects, cont, logMessageSlack, _i, projects_1, project, _a, branchName, nextVersion, mergeRequest, existingTag, _b, threadLabel, statusCleanMessage;
+            var projects, cont, logMessageSlack, _i, projects_1, project, _a, branchName, nextVersion, existingTag, mergeRequest, _b, threadLabel, statusCleanMessage;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -80,19 +80,19 @@ var TagMasterTask = /** @class */ (function () {
                         return [4 /*yield*/, this.service.getNextBranchInfo(project.id, options.version)];
                     case 3:
                         _a = _c.sent(), branchName = _a.branchName, nextVersion = _a.nextVersion;
-                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
+                        return [4 /*yield*/, this.service.getTag(project.id, nextVersion)];
                     case 4:
-                        mergeRequest = _c.sent();
-                        if (!(mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.mergeCommit)) {
-                            Logger_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] has not been merged"));
+                        existingTag = _c.sent();
+                        if (existingTag) {
+                            Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(existingTag.name, "] tag already exists"));
                             cont = false;
                             return [3 /*break*/, 8];
                         }
-                        return [4 /*yield*/, this.service.getTag(project.id, nextVersion)];
+                        return [4 /*yield*/, this.service.getMergeRequest(project.id, branchName)];
                     case 5:
-                        existingTag = _c.sent();
-                        if (existingTag) {
-                            Logger_1.Logger.logWarning("[".concat(project.title, "]: [").concat(existingTag.name, "] tag already exists"));
+                        mergeRequest = _c.sent();
+                        if (!(mergeRequest === null || mergeRequest === void 0 ? void 0 : mergeRequest.mergeCommit)) {
+                            Logger_1.Logger.logError("[".concat(project.title, "]: [").concat(branchName, "] has not been merged"));
                             cont = false;
                             return [3 /*break*/, 8];
                         }
@@ -115,7 +115,7 @@ var TagMasterTask = /** @class */ (function () {
                         return [3 /*break*/, 2];
                     case 9:
                         if (!(options.slackNotifier && logMessageSlack !== '')) return [3 /*break*/, 11];
-                        threadLabel = "".concat(options.milestone, " merge conflicts found when merging master into dev.");
+                        threadLabel = "".concat(options.milestone, " merge issues found when merging master into dev.");
                         statusCleanMessage = 'No projects require manual merging.';
                         return [4 /*yield*/, this.slackService.sendSlackStatusMessage({
                                 emailList: [],
@@ -143,7 +143,7 @@ var TagMasterTask = /** @class */ (function () {
                     case 1:
                         mergeRequest = _a.sent();
                         // Add delay to give time before we merge created MR
-                        return [4 /*yield*/, delay(5000)];
+                        return [4 /*yield*/, delay(10000)];
                     case 2:
                         // Add delay to give time before we merge created MR
                         _a.sent();
@@ -168,6 +168,9 @@ var TagMasterTask = /** @class */ (function () {
                         }
                         else {
                             Logger_1.Logger.logError("Could not merge master into dev.");
+                            logMessageSlack += "[".concat(project.title, "]: Requires manual merging. An issue was found when trying to merge master into dev.\n");
+                            logMessageSlack += "  - ".concat(updatedMergeRequest.url, "\n");
+                            return [2 /*return*/, logMessageSlack];
                         }
                         return [2 /*return*/, logMessageSlack];
                 }

package/package.json

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