refactor(publish): Gather current tags filtered by --list glob

lerna · Nov 27, 2018 · 3b98973 · 3b98973
1 parent 1aa1712
commit 3b98973
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/commands/publish/index.js b/commands/publish/index.js
@@ -198,12 +198,15 @@ class PublishCommand extends Command {
   }
 
   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));
+    chain = chain.then(() => getCurrentTags(this.execOpts, matchingPattern));
     chain = chain.then(taggedPackageNames => {
       if (!taggedPackageNames.length) {
         this.logger.notice("from-git", "No tagged release found");
@@ -212,7 +215,7 @@ class PublishCommand extends Command {
       }
 
       if (this.project.isIndependent()) {
-        return taggedPackageNames.map(name => this.packageGraph.get(name)).filter(name => name !== undefined);
+        return taggedPackageNames.map(name => this.packageGraph.get(name));
       }
 
       return getTaggedPackages(this.packageGraph, this.project.rootPath, this.execOpts);

diff --git a/commands/publish/lib/get-current-tags.js b/commands/publish/lib/get-current-tags.js
@@ -6,7 +6,7 @@ const childProcess = require("@lerna/child-process");
 
 module.exports = getCurrentTags;
 
-function getCurrentTags(execOpts) {
+function getCurrentTags(execOpts, matchingPattern) {
   log.silly("getCurrentTags");
 
   const opts = Object.assign({}, execOpts, {
@@ -15,7 +15,7 @@ function getCurrentTags(execOpts) {
   });
 
   return childProcess
-    .exec("git", ["tag", "--sort", "version:refname", "--points-at", "HEAD"], opts)
+    .exec("git", ["tag", "--sort", "version:refname", "--points-at", "HEAD", "--list", matchingPattern], opts)
     .then(listPackageNames);
 }
 

diff --git a/integration/lerna-publish-custom-tag.test.js b/integration/lerna-publish-custom-tag.test.js
@@ -25,6 +25,6 @@ test("lerna publish from-git handles custom tags", async () => {
 
   const args = ["publish", "--yes", "from-git"];
 
-  const { stdout } = await cliRunner(cwd, env)(...args);
-  expect(stdout).toMatchInlineSnapshot("", ``);
+  const { stderr } = await cliRunner(cwd, env)(...args);
+  expect(stderr).toMatch("lerna notice from-git No tagged release found");
 });