List all authors in release notes

rollup · Feb 16, 2024 · c9b3655 · c9b3655
1 parent 0146b84
commit c9b3655
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/scripts/declarations.d.ts b/scripts/declarations.d.ts
@@ -4,6 +4,8 @@ declare module 'github-api' {
 			data: { number: number; title: string; head: { sha: string } }[];
 		}>;
 
+		listCommitsOnPR(pr: number): Promise<{ data: { author: { login: string } }[] }>;
+
 		getPullRequest(pr: number): Promise<{ data: { body: string; user: { login: string } } }>;
 
 		createRelease(release: { body: string; name: string; tag_name: string }): Promise<void>;

diff --git a/scripts/prepare-release.js b/scripts/prepare-release.js
@@ -174,8 +174,8 @@ ${sections}### Pull Requests
 
 ${prs
 	.map(
-		({ text, pr, author }) =>
-			`- [#${pr}](https://github.com/rollup/rollup/pull/${pr}): ${text} (@${author})`
+		({ text, pr, authors }) =>
+			`- [#${pr}](https://github.com/rollup/rollup/pull/${pr}): ${text} (${authors.map(author => `@${author}`).join(', ')})`
 	)
 	.join('\n')}`;
 }

diff --git a/scripts/release-helpers.js b/scripts/release-helpers.js
@@ -23,7 +23,7 @@ export function getFirstChangelogEntry(changelog) {
 
 /**
  * @typedef {object} IncludedPR
- * @property {string} author
+ * @property {string[]} authors
  * @property {number[]} closed - which PRs are closed by this
  * @property {number} pr
  * @property {string} text
@@ -72,15 +72,21 @@ export async function getIncludedPRs(fromVersion, toVersion, repo, currentBranch
 	prs.sort((a, b) => (a.pr > b.pr ? 1 : -1));
 	return Promise.all(
 		prs.map(async ({ pr, text }) => {
-			const { data } = await repo.getPullRequest(pr);
-			const bodyWithoutComments = data.body.replace(/<!--[\S\s]*?-->/g, '');
+			const [{ data: pullRequest }, { data: commits }] = await Promise.all([
+				repo.getPullRequest(pr),
+				repo.listCommitsOnPR(pr)
+			]);
+			const mainAuthor = pullRequest.user.login;
+			const otherAuthors = new Set(commits.map(({ author: { login } }) => login));
+			otherAuthors.delete(mainAuthor);
+			const bodyWithoutComments = pullRequest.body.replace(/<!--[\S\s]*?-->/g, '');
 			const closedIssuesRegexp = /([Ff]ix(es|ed)?|([Cc]lose|[Rr]esolve)[ds]?) #(\d+)/g;
 			const closed = [];
 			while ((match = closedIssuesRegexp.exec(bodyWithoutComments))) {
 				closed.push(Number(match[4]));
 			}
 			return {
-				author: data.user.login,
+				authors: [mainAuthor, ...otherAuthors],
 				closed,
 				pr,
 				text