fix(publish): Revert foolhardy refactoring (5e975e0)

lerna · Feb 13, 2019 · a6733a2 · a6733a2
1 parent 8cf5866
commit a6733a2
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/commands/publish/index.js b/commands/publish/index.js
@@ -115,8 +115,6 @@ class PublishCommand extends Command {
 
     let chain = Promise.resolve();
 
-    // attempting to publish a release with local changes is not allowed
-    chain = chain.then(() => this.verifyWorkingTreeClean());
     chain = chain.then(() => this.findVersionedUpdates());
 
     return chain.then(result => {
@@ -196,10 +194,6 @@ class PublishCommand extends Command {
     });
   }
 
-  verifyWorkingTreeClean() {
-    return describeRef(this.execOpts).then(checkWorkingTree.throwIfUncommitted);
-  }
-
   findVersionedUpdates() {
     let chain = Promise.resolve();
 
@@ -216,12 +210,19 @@ class PublishCommand extends Command {
     return chain;
   }
 
+  verifyWorkingTreeClean() {
+    return describeRef(this.execOpts).then(checkWorkingTree.throwIfUncommitted);
+  }
+
   detectFromGit() {
     const { tagVersionPrefix = "v" } = this.options;
     const matchingPattern = this.project.isIndependent() ? "*@*" : `${tagVersionPrefix}*.*.*`;
 
     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, matchingPattern));
     chain = chain.then(taggedPackageNames => {
       if (!taggedPackageNames.length) {
@@ -251,6 +252,9 @@ class PublishCommand extends Command {
   detectFromPackage() {
     let chain = Promise.resolve();
 
+    // attempting to publish a release with local changes is not allowed
+    chain = chain.then(() => this.verifyWorkingTreeClean());
+
     chain = chain.then(() => getUnpublishedPackages(this.packageGraph, this.conf.snapshot));
     chain = chain.then(unpublished => {
       if (!unpublished.length) {
@@ -286,6 +290,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.packageGraph.rawPackageList, this.packageGraph, this.execOpts, {