fix(version): create release when using custom tag-version-separator (#…

…837)
lerna-lite · Apr 2, 2024 · 5fa6184 · 5fa6184
1 parent c247658
commit 5fa6184
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/packages/version/src/lib/create-release.ts b/packages/version/src/lib/create-release.ts
@@ -32,7 +32,7 @@ export function createRelease(
     generateReleaseNotes?: boolean;
     releaseDiscussion?: string;
   },
-  { tags, releaseNotes }: ReleaseCommandProps,
+  { tags, releaseNotes, tagVersionSeparator }: ReleaseCommandProps,
   { gitRemote, execOpts, skipBumpOnlyReleases }: ReleaseOptions,
   dryRun = false
 ) {
@@ -41,15 +41,15 @@ export function createRelease(
 
   return Promise.all(
     releaseNotes.map(({ notes, name, pkg }) => {
-      const tag = name === 'fixed' ? tags[0] : tags.find((t) => t.startsWith(`${name}@`));
+      const tag = name === 'fixed' ? tags[0] : tags.find((t) => t.startsWith(`${name}${tagVersionSeparator}`));
 
       // when using independent mode, it could happen that a few version bump only releases are created
       // and since these aren't very useful for most users, user could choose to skip creating these releases when detecting a version bump only
       if (!tag || (skipBumpOnlyReleases && pkg?.isBumpOnlyVersion)) {
         return Promise.resolve();
       }
 
-      const prereleaseParts = semver.prerelease(tag.replace(`${name}@`, '')) || [];
+      const prereleaseParts = semver.prerelease(tag.replace(`${name}${tagVersionSeparator}`, '')) || [];
 
       // when the `GH_TOKEN` (or `GITHUB_TOKEN`) environment variable is not set,
       // we'll create a link to GitHub web interface form with the fields pre-populated

diff --git a/packages/version/src/models/index.ts b/packages/version/src/models/index.ts
@@ -105,6 +105,7 @@ export interface ReleaseClient {
 
 export interface ReleaseCommandProps {
   tags: string[];
+  tagVersionSeparator: string;
   releaseNotes: ReleaseNote[];
 }
 

diff --git a/packages/version/src/version-command.ts b/packages/version/src/version-command.ts
@@ -386,7 +386,11 @@ export class VersionCommand extends Command<VersionCommandOption> {
             generateReleaseNotes: this.options.generateReleaseNotes,
             releaseDiscussion: this.options.createReleaseDiscussion,
           },
-          { tags: this.tags, releaseNotes: this.releaseNotes },
+          {
+            tags: this.tags,
+            tagVersionSeparator: this.options.tagVersionSeparator || '@',
+            releaseNotes: this.releaseNotes,
+          },
           {
             gitRemote: this.options.gitRemote,
             execOpts: this.execOpts,