feat: use pkg folder name as tag name

Author: tomgao365

src/changelog.ts

@@ -80,7 +80,7 @@ export async function runGenerateChangelog(opts: ReleaseOptions) {
         tags: tagNames.map((name) => {
           const item = tags.find(s => s.name === name)!;
           if (item && item.name === 'HEAD') {
-            item.name = getGitTagVersion(pkg.name, item.version, opts);
+            item.name = getGitTagVersion(pkg.tagName, item.version, opts);
           }
 
           return item;
@@ -205,7 +205,7 @@ async function bumpVersionAndTag(pkg: PackageInfo, opts: ReleaseOptions) {
   !dryRun && updatePackageVersion(pkg);
 
   await run('git add .', { cwd: pkg.dir, dryRun });
-  const tag = getGitTagVersionRelease(pkg.name, pkg.newVersion, isMonorepo);
+  const tag = getGitTagVersionRelease(pkg.tagName, pkg.newVersion, isMonorepo);
   await run(`git commit -m "chore: release ${tag}"`, {
     cwd: pkg.dir,
     dryRun,

src/git.ts

@@ -174,11 +174,17 @@ export async function getGitTags(opts: ReleaseOptions) {
   // compatible with old version
   const prefixMap: Record<string, string> = {};
   if (isMonorepo) {
-    pkgNames.forEach((name) => {
+    pkgs.forEach((pkg) => {
+      const { name, tagName } = pkg;
       prefixMap[getGitTagPrefix(name, { isMonorepo, scopedTag: true, lineTag: false })] = name;
       prefixMap[getGitTagPrefix(name, { isMonorepo, scopedTag: false, lineTag: false })] = name;
       prefixMap[getGitTagPrefix(name, { isMonorepo, scopedTag: true, lineTag: true })] = name;
       prefixMap[getGitTagPrefix(name, { isMonorepo, scopedTag: false, lineTag: true })] = name;
+
+      prefixMap[getGitTagPrefix(tagName, { isMonorepo, scopedTag: true, lineTag: false })] = name;
+      prefixMap[getGitTagPrefix(tagName, { isMonorepo, scopedTag: false, lineTag: false })] = name;
+      prefixMap[getGitTagPrefix(tagName, { isMonorepo, scopedTag: true, lineTag: true })] = name;
+      prefixMap[getGitTagPrefix(tagName, { isMonorepo, scopedTag: false, lineTag: true })] = name;
     });
   }
 
@@ -306,7 +312,7 @@ export async function resetGitSubmit(opts: ReleaseOptions) {
 
   // remote git tag
   for (const pkg of pkgs) {
-    const tag = getGitTagVersion(pkg.name, pkg.version, opts);
+    const tag = getGitTagVersion(pkg.tagName, pkg.version, opts);
     const res = await run(`git tag -l ${tag}`);
     if (res) {
       await run(`git tag -d ${tag}`);

src/options.ts

@@ -1,7 +1,6 @@
 import type { ReleaseType } from 'semver';
 import type { PackageInfo, ReleaseCLIOptions, ReleaseOptions } from './types';
 import fs from 'node:fs';
-import path from 'node:path';
 import { getPackages } from '@manypkg/get-packages';
 import chalk from 'chalk';
 import GitHost from 'hosted-git-info';
@@ -106,15 +105,9 @@ async function findPackages(opts: ReleaseOptions) {
   if (!rootPackage || !_packages || _packages.length === 0) {
     throw new Error('No root package found.');
   }
-  // ignore private
 
-  const packages = _packages.filter((s) => {
-    if (s.packageJson.private) {
-      return false;
-    }
-    const dirname = path.dirname(s.relativeDir);
-    return !['example', 'examples'].includes(dirname);
-  });
+  // ignore private
+  const packages = _packages.filter(s => !s.packageJson.private);
 
   let isMonorepo = false;
   if (packages.length === 0) {
@@ -139,13 +132,28 @@ async function findPackages(opts: ReleaseOptions) {
   const pkgs = packages
     .filter(s => !s.packageJson.private)
     .map((s) => {
+      const scoped = isScopedPackage(s.packageJson.name);
+      const name = s.packageJson.name;
+      let tagName = name;
+      if (isMonorepo) {
+        if (s.relativeDir.startsWith('packages/')) {
+          tagName = s.relativeDir.split('/')[1];
+        }
+        else if (scoped) {
+          const names = name.split('/');
+          tagName = names.pop() || name;
+        }
+      }
+
       return {
         ...s,
-        name: s.packageJson.name,
+        name,
+        // use package folder name as tag name
+        tagName,
         version: s.packageJson.version,
         newVersion: '',
         tag: '',
-        scoped: isScopedPackage(s.packageJson.name),
+        scoped,
       } as PackageInfo;
     });
   opts.pkgs = pkgs;

src/publish.ts

@@ -38,12 +38,12 @@ async function bumpVersionAndTag(opts: ReleaseOptions) {
   await run('git add -A', { dryRun });
 
   // git commit message
-  const msgTags = pkgs.map(s => getGitTagVersionRelease(s.name, s.newVersion, opts.isMonorepo));
+  const msgTags = pkgs.map(s => getGitTagVersionRelease(s.tagName, s.newVersion, opts.isMonorepo));
   await run(`git commit -m "chore: release ${msgTags.join(', ')}"`, {
     dryRun,
   });
 
-  const tags = pkgs.map(s => getGitTagVersion(s.name, s.newVersion, opts));
+  const tags = pkgs.map(s => getGitTagVersion(s.tagName, s.newVersion, opts));
   for (const tag of tags) {
     await run(`git tag ${tag}`, { dryRun });
   }
@@ -174,7 +174,7 @@ async function runGithubRelease(opts: ReleaseOptions) {
     repoUrl.pathname += '/releases/new';
 
     const { newVersion: version, changelogs } = pkg;
-    const tag = getGitTagVersion(pkg.name, version, opts);
+    const tag = getGitTagVersion(pkg.tagName, version, opts);
     repoUrl.searchParams.set('tag', tag);
     repoUrl.searchParams.set('title', tag);
     const pre = semver.parse(version)?.prerelease;

src/types.ts

@@ -26,8 +26,13 @@ export interface NpmInfo {
 }
 
 export interface PackageInfo {
+  /** npm package name */
   name: string;
+  /** git tag name */
+  tagName: string;
+  /** npm package version */
   version: string;
+  /** npm package new version */
   newVersion: string;
   /** npm publish tag */
   tag: string;