githublogen 0.1.4 → 0.1.5

package/dist/cli.cjs

@@ -20,7 +20,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 const cac__default = /*#__PURE__*/_interopDefaultCompat(cac);
 
-const version = "0.1.4";
+const version = "0.1.5";
 
 const cli = cac__default("githublogen");
 cli.version(version).option("-t, --token <path>", "GitHub Token").option("--from <ref>", "From tag").option("--to <ref>", "To tag").option("--github <path>", "GitHub Repository, e.g. soybeanjs/githublogen").option("--name <name>", "Name of the release").option("--contributors", "Show contributors section").option("--prerelease", "Mark release as prerelease").option("-d, --draft", "Mark release as draft").option("--output <path>", "Output to file instead of sending to GitHub").option("--capitalize", "Should capitalize for each comment message").option("--emoji", "Use emojis in section titles", { default: true }).option("--group", "Nest commit messages under their scopes").option("--dry", "Dry run").help();
@@ -75,11 +75,12 @@ ${changelog}
       }
       await fs.promises.writeFile(config.output, changelogMD);
       const { email = "unknow@unknow.com", name = "unknow" } = commits[0]?.author || {};
+      const branchMain = await index.getGitMainBranchName();
       await execa.execa("git", ["config", "--global", "user.email", `"${email}"`]);
       await execa.execa("git", ["config", "--global", "user.name", `"${name}"`]);
       await execa.execa("git", ["add", "."]);
       await execa.execa("git", ["commit", "-m", '"docs(projects): CHANGELOG.md"'], { cwd });
-      await execa.execa("git", ["push", pushUrl], { cwd });
+      await execa.execa("git", ["push", pushUrl, `HEAD:${branchMain}`], { cwd });
     }
     if (!await index.hasTagOnGitHub(config.to, config)) {
       console.error(kolorist.yellow(`Current ref "${kolorist.bold(config.to)}" is not available as tags on GitHub. Release skipped.`));

package/dist/cli.mjs

@@ -3,7 +3,7 @@ import { existsSync, promises } from 'node:fs';
 import { dim, bold, cyan, blue, yellow, red } from 'kolorist';
 import { execa } from 'execa';
 import cac from 'cac';
-import { generate, getGitPushUrl, hasTagOnGitHub, isRepoShallow, sendRelease } from './index.mjs';
+import { generate, getGitPushUrl, getGitMainBranchName, hasTagOnGitHub, isRepoShallow, sendRelease } from './index.mjs';
 import 'ohmyfetch';
 import 'convert-gitmoji';
 import 'node:module';
@@ -14,7 +14,7 @@ import 'node:path';
 import 'node:v8';
 import 'node:util';
 
-const version = "0.1.4";
+const version = "0.1.5";
 
 const cli = cac("githublogen");
 cli.version(version).option("-t, --token <path>", "GitHub Token").option("--from <ref>", "From tag").option("--to <ref>", "To tag").option("--github <path>", "GitHub Repository, e.g. soybeanjs/githublogen").option("--name <name>", "Name of the release").option("--contributors", "Show contributors section").option("--prerelease", "Mark release as prerelease").option("-d, --draft", "Mark release as draft").option("--output <path>", "Output to file instead of sending to GitHub").option("--capitalize", "Should capitalize for each comment message").option("--emoji", "Use emojis in section titles", { default: true }).option("--group", "Nest commit messages under their scopes").option("--dry", "Dry run").help();
@@ -69,11 +69,12 @@ ${changelog}
       }
       await promises.writeFile(config.output, changelogMD);
       const { email = "unknow@unknow.com", name = "unknow" } = commits[0]?.author || {};
+      const branchMain = await getGitMainBranchName();
       await execa("git", ["config", "--global", "user.email", `"${email}"`]);
       await execa("git", ["config", "--global", "user.name", `"${name}"`]);
       await execa("git", ["add", "."]);
       await execa("git", ["commit", "-m", '"docs(projects): CHANGELOG.md"'], { cwd });
-      await execa("git", ["push", pushUrl], { cwd });
+      await execa("git", ["push", pushUrl, `HEAD:${branchMain}`], { cwd });
     }
     if (!await hasTagOnGitHub(config.to, config)) {
       console.error(yellow(`Current ref "${bold(config.to)}" is not available as tags on GitHub. Release skipped.`));

package/dist/index.cjs

@@ -193,10 +193,14 @@ async function getGitHubRepo() {
   }
   return `${match[1]}/${match[2]}`;
 }
+async function getGitMainBranchName() {
+  const main = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+  return main;
+}
 async function getCurrentGitBranch() {
   const result1 = await execCommand("git", ["tag", "--points-at", "HEAD"]);
-  const result2 = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-  return result1 || result2;
+  const main = getGitMainBranchName();
+  return result1 || main;
 }
 async function isRepoShallow() {
   return (await execCommand("git", ["rev-parse", "--is-shallow-repository"])).trim() === "true";
@@ -8433,6 +8437,7 @@ exports.getCurrentGitBranch = getCurrentGitBranch;
 exports.getFirstGitCommit = getFirstGitCommit;
 exports.getGitDiff = getGitDiff;
 exports.getGitHubRepo = getGitHubRepo;
+exports.getGitMainBranchName = getGitMainBranchName;
 exports.getGitPushUrl = getGitPushUrl;
 exports.getGitRemoteURL = getGitRemoteURL;
 exports.getLastGitTag = getLastGitTag;

package/dist/index.d.ts

@@ -116,6 +116,7 @@ declare function resolveAuthors(commits: Commit[], options: ChangelogOptions): P
 declare function hasTagOnGitHub(tag: string, options: ChangelogOptions): Promise<boolean>;
 
 declare function getGitHubRepo(): Promise<string>;
+declare function getGitMainBranchName(): Promise<string>;
 declare function getCurrentGitBranch(): Promise<string>;
 declare function isRepoShallow(): Promise<boolean>;
 declare function getLastGitTag(delta?: number): Promise<string>;
@@ -141,4 +142,4 @@ declare function resolveConfig(cwd: string, options: ChangelogOptions): Promise<
 declare function parseGitCommit(commit: RawGitCommit, config: ChangelogConfig): GitCommit | null;
 declare function parseCommits(commits: RawGitCommit[], config: ChangelogConfig): GitCommit[];
 
-export { AuthorInfo, ChangelogConfig, ChangelogOptions, Commit, GitCommit, GitCommitAuthor, GithubOptions, GithubRelease, RawGitCommit, Reference, RepoConfig, RepoProvider, ResolvedChangelogOptions, SemverBumpType, generate, generateChangelog, generateMarkdown, getCurrentGitBranch, getFirstGitCommit, getGitDiff, getGitHubRepo, getGitPushUrl, getGitRemoteURL, getLastGitTag, hasTagOnGitHub, isPrerelease, isRefGitTag, isRepoShallow, parseCommits, parseGitCommit, resolveAuthorInfo, resolveAuthors, resolveConfig, sendRelease };
+export { AuthorInfo, ChangelogConfig, ChangelogOptions, Commit, GitCommit, GitCommitAuthor, GithubOptions, GithubRelease, RawGitCommit, Reference, RepoConfig, RepoProvider, ResolvedChangelogOptions, SemverBumpType, generate, generateChangelog, generateMarkdown, getCurrentGitBranch, getFirstGitCommit, getGitDiff, getGitHubRepo, getGitMainBranchName, getGitPushUrl, getGitRemoteURL, getLastGitTag, hasTagOnGitHub, isPrerelease, isRefGitTag, isRepoShallow, parseCommits, parseGitCommit, resolveAuthorInfo, resolveAuthors, resolveConfig, sendRelease };

package/dist/index.mjs

@@ -183,10 +183,14 @@ async function getGitHubRepo() {
   }
   return `${match[1]}/${match[2]}`;
 }
+async function getGitMainBranchName() {
+  const main = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
+  return main;
+}
 async function getCurrentGitBranch() {
   const result1 = await execCommand("git", ["tag", "--points-at", "HEAD"]);
-  const result2 = await execCommand("git", ["rev-parse", "--abbrev-ref", "HEAD"]);
-  return result1 || result2;
+  const main = getGitMainBranchName();
+  return result1 || main;
 }
 async function isRepoShallow() {
   return (await execCommand("git", ["rev-parse", "--is-shallow-repository"])).trim() === "true";
@@ -8416,4 +8420,4 @@ async function generate(cwd, options) {
   return { config: resolved, md, commits, changelog };
 }
 
-export { generate, generateChangelog, generateMarkdown, getCurrentGitBranch, getFirstGitCommit, getGitDiff, getGitHubRepo, getGitPushUrl, getGitRemoteURL, getLastGitTag, hasTagOnGitHub, isPrerelease, isRefGitTag, isRepoShallow, parseCommits, parseGitCommit, resolveAuthorInfo, resolveAuthors, resolveConfig, sendRelease };
+export { generate, generateChangelog, generateMarkdown, getCurrentGitBranch, getFirstGitCommit, getGitDiff, getGitHubRepo, getGitMainBranchName, getGitPushUrl, getGitRemoteURL, getLastGitTag, hasTagOnGitHub, isPrerelease, isRefGitTag, isRepoShallow, parseCommits, parseGitCommit, resolveAuthorInfo, resolveAuthors, resolveConfig, sendRelease };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "githublogen",
   "type": "module",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "sideEffects": false,
   "author": {
     "name": "SoybeanJS",