Merge pull request #127 from oat-sa/fix/TR-5972/monorepo-release-comm…

…ent-root-change Fix/tr 5972/npm release monorepo: comment if changes only in root
oat-sa · Mar 5, 2024 · 2254aed · 2254aed
2 parents d16b6bb + 0af0100
commit 2254aed
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 7 deletions.
diff --git a/src/release.js b/src/release.js
@@ -767,11 +767,13 @@ export default function taoExtensionReleaseFactory(params = {}) {
                 } else {
                     //from conventional commits which change files in this package
                     const { version, recommendation } = await conventionalCommits.getNextVersion(packageInfo.lastVersion, packageInfo.packagePath);
+                    packageInfo.recommendation = recommendation;
                     if (recommendation.stats && recommendation.stats.commits === 0) {
                         packageInfo.noChanges = true;
+                        packageInfo.version = packageInfo.lastVersion;
+                    } else {
+                        packageInfo.version = version;
                     }
-                    packageInfo.recommendation = recommendation;
-                    packageInfo.version = version;
                 }
             }
 

diff --git a/src/release/packageApi.js b/src/release/packageApi.js
@@ -89,11 +89,11 @@ export default function packageApiFactory(params = {}, data) {
         },
 
         /**
-         * Checkout master, show a prompt and then run `npm publish`
-         * TODO: checkout latest tag?
-         * @returns {Promise}
+         * Checkout master,
+         * Prompt user whether he wants to publish packages
+         * @returns {Promise<Boolean>}
          */
-        async publish() {
+        async beforePublish() {
             if (this.gitClient) {
                 await this.gitClient.checkout(params.releaseBranch);
             }
@@ -113,6 +113,16 @@ export default function packageApiFactory(params = {}, data) {
                 });
                 publishPackage = confirmPublish;
             }
+            return publishPackage;
+        },
+
+        /**
+         * Checkout master, show a prompt and then run `npm publish`
+         * TODO: checkout latest tag?
+         * @returns {Promise}
+         */
+        async publish() {
+            const publishPackage = await this.beforePublish();
             if (publishPackage)     {
                 log.doing(`Publishing package ${this.npmPackage.name} @ ${this.npmPackage.version}`);
                 return this.npmPackage.publish();
@@ -153,7 +163,11 @@ export default function packageApiFactory(params = {}, data) {
          * @returns {Promise<void>}
          */
         async monorepoPublish() {
-            await this.npmPackage.lernaPublish();
+            const publishPackage = await this.beforePublish();
+            if (publishPackage) {
+                log.doing('Publishing monorepo packages');
+                return this.npmPackage.lernaPublish();
+            }
         }
     };
 }