@clickview/ship-it 0.0.35-dev.15 → 0.0.35-dev.17

package/lib/src/api-clients/git-lab/GitLabApiClient.js

@@ -359,22 +359,6 @@ var GitLabApiClient = /** @class */ (function () {
             });
         });
     };
-    GitLabApiClient.prototype.updateFiles = 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.client.Commits.create(projectId, branchName, commitMessage, files.map(function (f) { return ({
-                            action: 'update',
-                            filePath: f.filePath,
-                            content: f.content
-                        }); }))];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
     GitLabApiClient.prototype.commit = function (projectId, branchName, files, commitMessage) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/lib/src/constants/MonorepoPackageJsonFiles.js

@@ -1,6 +1,8 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MONOREPO_PACKAGE_JSON_FILES = void 0;
+exports.MONOREPO_PACKAGE_JSON_FILES_MAP = exports.MONOREPO_PACKAGE_JSON_FILES = void 0;
+var ProjectNames_1 = require("./ProjectNames");
 exports.MONOREPO_PACKAGE_JSON_FILES = [
     'packages/libs/analytics/package.json',
     'packages/libs/styles/package.json',
@@ -15,3 +17,14 @@ exports.MONOREPO_PACKAGE_JSON_FILES = [
     'packages/projects/player/package.json',
     'packages/projects/streamable-learning/package.json'
 ];
+exports.MONOREPO_PACKAGE_JSON_FILES_MAP = (_a = {},
+    _a[ProjectNames_1.PROJECT_NAMES.backend.auth] = 'packages/projects/auth/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.curator] = 'packages/projects/curator/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.cloud] = 'packages/projects/library-editor/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.lite] = 'packages/projects/lite/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.online] = 'packages/projects/online/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.reports] = 'packages/projects/reports/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.exchange] = 'packages/projects/exchange/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.player] = 'packages/projects/player/package.json',
+    _a[ProjectNames_1.PROJECT_NAMES.frontend.streamable] = 'packages/projects/streamable-learning/package.json',
+    _a);

package/lib/src/services/GitLabService.js

@@ -353,9 +353,6 @@ var GitLabService = /** @class */ (function () {
     GitLabService.prototype.updateFile = function (projectId, filePath, branchName, content, commit) {
         return this.apiClient.updateFile(projectId, filePath, branchName, content, commit);
     };
-    GitLabService.prototype.updateFiles = function (projectId, branchName, commitMessage, files) {
-        return this.apiClient.updateFiles(projectId, branchName, commitMessage, files);
-    };
     GitLabService.prototype.commit = function (projectId, branchName, commitMessage, files) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/lib/src/tasks/BumpPackagesTask.js

@@ -68,22 +68,23 @@ var BumpPackagesTask = /** @class */ (function () {
         this.service = service;
     }
     BumpPackagesTask.prototype.run = function (options) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _a, branch, isValid, commitFiles;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var _b, branch, isValid, packageJsonFiles, commitFiles, _i, commitFiles_1, file;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         utils_1.Logger.logTask('Bumping clickview npm package versions');
-                        this.isReleaseBranch = RELEASE_BRANCH_REGEX.test(options.branchName) || true;
+                        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;
+                        _b = this;
                         return [4 /*yield*/, this.getIsInPrerelease(options.branchName)];
                     case 1:
-                        _a.isInPreRelease = _b.sent();
+                        _b.isInPreRelease = _c.sent();
                         return [4 /*yield*/, this.service.getBranch(utils_1.ProjectIds.MONOREPO_PROJECT_ID, options.branchName)];
                     case 2:
-                        branch = _b.sent();
+                        branch = _c.sent();
                         if (!branch) {
                             utils_1.Logger.logError("Branch with name ".concat(options.branchName, " was not be found."));
                             return [2 /*return*/, false];
@@ -91,11 +92,22 @@ var BumpPackagesTask = /** @class */ (function () {
                         isValid = this.validateOptions(options);
                         if (!isValid)
                             return [2 /*return*/, false];
-                        utils_1.Logger.logInfo('Options are valid! Proceeding to bump package versions.');
-                        commitFiles = this.getCommitFiles(options);
+                        utils_1.Logger.logInfo('Options are valid!');
+                        packageJsonFiles = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES;
+                        if ((_a = options.projectIds) === null || _a === void 0 ? void 0 : _a.length) {
+                            utils_1.Logger.logInfo('Project IDs list detected. Filtering out unspecified package.json files...');
+                            packageJsonFiles = options.projectIds.map(function (projectId) { return MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES_MAP[projectId]; });
+                        }
+                        commitFiles = this.getCommitFiles(options, packageJsonFiles);
+                        utils_1.Logger.logInfo('Writing new versions to package.json files...');
+                        for (_i = 0, commitFiles_1 = commitFiles; _i < commitFiles_1.length; _i++) {
+                            file = commitFiles_1[_i];
+                            (0, fs_1.writeFileSync)(file.filePath, file.content);
+                        }
+                        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();
+                        _c.sent();
                         utils_1.Logger.logSuccess('Successfully committed updated version numbers.');
                         return [2 /*return*/, true];
                 }
@@ -138,14 +150,13 @@ var BumpPackagesTask = /** @class */ (function () {
             });
         });
     };
-    BumpPackagesTask.prototype.getCommitFiles = function (options) {
+    BumpPackagesTask.prototype.getCommitFiles = function (options, packageJsonFiles) {
         var commitFiles = [];
-        for (var _i = 0, MONOREPO_PACKAGE_JSON_FILES_1 = MonorepoPackageJsonFiles_1.MONOREPO_PACKAGE_JSON_FILES; _i < MONOREPO_PACKAGE_JSON_FILES_1.length; _i++) {
-            var filePath = MONOREPO_PACKAGE_JSON_FILES_1[_i];
+        for (var _i = 0, packageJsonFiles_1 = packageJsonFiles; _i < packageJsonFiles_1.length; _i++) {
+            var filePath = packageJsonFiles_1[_i];
             var content = '';
             try {
                 content = (0, fs_1.readFileSync)(filePath, { encoding: 'utf8' });
-                utils_1.Logger.logInfo('file', filePath, content);
             }
             catch (_a) {
                 /**
@@ -185,15 +196,15 @@ var BumpPackagesTask = /** @class */ (function () {
     };
     BumpPackagesTask.prototype.getIsInPrerelease = function (branchName) {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, MONOREPO_PACKAGE_JSON_FILES_2, file, text, json;
+            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_2 = MonorepoPackageJsonFiles_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_2.length)) return [3 /*break*/, 4];
-                        file = MONOREPO_PACKAGE_JSON_FILES_2[_i];
+                        if (!(_i < MONOREPO_PACKAGE_JSON_FILES_1.length)) return [3 /*break*/, 4];
+                        file = MONOREPO_PACKAGE_JSON_FILES_1[_i];
                         return [4 /*yield*/, this.getFileText(utils_1.ProjectIds.MONOREPO_PROJECT_ID, branchName, file)];
                     case 2:
                         text = _a.sent();

package/lib/src/tasks/InstallPackagesTask.js

@@ -128,7 +128,7 @@ var InstallPackagesTask = /** @class */ (function () {
                         /**
                          * Run npm i to update our package log file
                         */
-                        utils_1.Logger.logInfo("[".concat(project.title, "]: Running npm i --package-lock-only"));
+                        utils_1.Logger.logInfo("[".concat(project.title, "]: Running npm i"));
                         this.npmInstall(project, folderName);
                         utils_1.Logger.logInfo('\n');
                         /**
@@ -221,7 +221,7 @@ var InstallPackagesTask = /** @class */ (function () {
                         /**
                          * Run npm i to update our package log file
                          */
-                        utils_1.Logger.logInfo("[".concat(project.title, "]: Running npm i --package-lock-only"));
+                        utils_1.Logger.logInfo("[".concat(project.title, "]: Running npm i"));
                         this.npmInstall(project, options.milestone);
                         utils_1.Logger.logInfo('\n');
                         /**
@@ -280,7 +280,7 @@ var InstallPackagesTask = /** @class */ (function () {
     };
     InstallPackagesTask.prototype.npmInstall = function (project, folderName) {
         var outputPath = this.getOutputPath(project, folderName);
-        child_process_1.default.execSync('npm i --package-lock-only', {
+        child_process_1.default.execSync('npm i', {
             cwd: outputPath,
             // Uncomment if we want to silence
             // stdio: 'pipe'

package/package.json

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