fix(publish): Allow composed version command to decide when to verify…

… working tree
lerna · Aug 20, 2018 · e61aa67 · e61aa67
1 parent 9f26d08
commit e61aa67
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/commands/publish/index.js b/commands/publish/index.js
@@ -146,8 +146,6 @@ class PublishCommand extends Command {
   findVersionedUpdates() {
     let chain = Promise.resolve();
 
-    chain = chain.then(() => this.verifyWorkingTreeClean());
-
     if (this.options.bump === "from-git") {
       chain = chain.then(() => this.detectFromGit());
     } else if (this.options.canary) {
@@ -166,6 +164,9 @@ class PublishCommand extends Command {
   detectFromGit() {
     let chain = Promise.resolve();
 
+    // attempting to publish a tagged release with local changes is not allowed
+    chain = chain.then(() => this.verifyWorkingTreeClean());
+
     chain = chain.then(() => getCurrentTags(this.execOpts));
     chain = chain.then(taggedPackageNames => {
       if (!taggedPackageNames.length) {
@@ -199,6 +200,9 @@ class PublishCommand extends Command {
 
     let chain = Promise.resolve();
 
+    // attempting to publish a canary release with local changes is not allowed
+    chain = chain.then(() => this.verifyWorkingTreeClean());
+
     // find changed packages since last release, if any
     chain = chain.then(() =>
       collectUpdates(this.filteredPackages, this.packageGraph, this.execOpts, {