release-it 18.0.0 → 18.1.1

package/lib/plugin/GitRelease.js

@@ -18,7 +18,8 @@ class GitRelease extends GitBase {
       'tagMatch',
       'getLatestTagFromAllRefs',
       'pushRepo',
-      'changelog'
+      'changelog',
+      'commit'
     ]);
     return _.defaults(baseOptions, gitOptions);
   }
@@ -31,7 +32,8 @@ class GitRelease extends GitBase {
   async beforeRelease() {
     const { releaseNotes: script } = this.options;
     const { changelog } = this.config.getContext();
-    const releaseNotes = script ? await this.processReleaseNotes(script) : changelog;
+    const releaseNotes =
+      typeof script === 'function' || typeof script === 'string' ? await this.processReleaseNotes(script) : changelog;
     this.setContext({ releaseNotes });
     if (releaseNotes !== changelog) {
       this.log.preview({ title: 'release notes', text: releaseNotes });
@@ -42,7 +44,9 @@ class GitRelease extends GitBase {
     if (typeof script === 'function') {
       const ctx = Object.assign({}, this.config.getContext(), { [this.namespace]: this.getContext() });
       return script(ctx);
-    } else {
+    }
+
+    if (typeof script === 'string') {
       return this.exec(script);
     }
   }

package/lib/plugin/github/GitHub.js

@@ -211,7 +211,7 @@ class GitHub extends Release {
     }
   }
 
-  getOctokitReleaseOptions(options = {}) {
+  async getOctokitReleaseOptions(options = {}) {
     const { owner, project: repo } = this.getContext('repo');
     const {
       releaseName,
@@ -225,7 +225,12 @@ class GitHub extends Release {
     const { version, releaseNotes, isUpdate } = this.getContext();
     const { isPreRelease } = parseVersion(version);
     const name = format(releaseName, this.config.getContext());
-    const body = autoGenerate ? (isUpdate ? null : '') : truncateBody(releaseNotes);
+    const releaseNotesObject = this.options.releaseNotes;
+    const body = autoGenerate
+      ? isUpdate
+        ? null
+        : ''
+      : truncateBody(releaseNotesObject?.commit ? await this.renderReleaseNotes(releaseNotesObject) : releaseNotes);
 
     /**
      * @type {CreateReleaseOptions}
@@ -254,7 +259,7 @@ class GitHub extends Release {
   }
 
   async createRelease() {
-    const options = this.getOctokitReleaseOptions();
+    const options = await this.getOctokitReleaseOptions();
     const { isDryRun } = this.config;
 
     this.log.exec(`octokit repos.createRelease "${options.name}" (${options.tag_name})`, { isDryRun });
@@ -350,11 +355,11 @@ class GitHub extends Release {
     return `https://${host}/${repository}/releases/tag/${tagName}`;
   }
 
-  generateWebUrl() {
+  async generateWebUrl() {
     const host = this.options.host || this.getContext('repo.host');
     const isGitHub = host === 'github.com';
 
-    const options = this.getOctokitReleaseOptions();
+    const options = await this.getOctokitReleaseOptions();
     const url = newGithubReleaseUrl({
       user: options.owner,
       repo: options.repo,
@@ -369,7 +374,7 @@ class GitHub extends Release {
   async createWebRelease() {
     const { isCI } = this.config;
     const { tagName } = this.config.getContext();
-    const url = this.generateWebUrl();
+    const url = await this.generateWebUrl();
     if (isCI) {
       this.setContext({ isReleased: true, releaseUrl: url });
     } else {
@@ -380,10 +385,10 @@ class GitHub extends Release {
     }
   }
 
-  updateRelease() {
+  async updateRelease() {
     const { isDryRun } = this.config;
     const release_id = this.getContext('releaseId');
-    const options = this.getOctokitReleaseOptions({ release_id });
+    const options = await this.getOctokitReleaseOptions({ release_id });
 
     this.log.exec(`octokit repos.updateRelease (${options.tag_name})`, { isDryRun });
 
@@ -438,6 +443,32 @@ class GitHub extends Release {
       }
     }
   }
+
+  async getCommits() {
+    const { owner, project: repo } = this.getContext('repo');
+    const { latestTag } = this.config.getContext();
+    this.debug({ owner, repo, base: latestTag, head: 'HEAD' });
+    const { data } = await this.client.repos.compareCommits({ owner, repo, base: latestTag, head: 'HEAD' });
+    return data.commits;
+  }
+
+  async renderReleaseNotes(releaseNotes) {
+    const { commit: template, excludeMatches = [] } = releaseNotes;
+    const commits = await this.getCommits();
+
+    if (this.options.commit) commits.pop();
+
+    return commits
+      .map(commit => {
+        commit.commit.subject = commit.commit.message.split('\n')[0];
+        const partial = template.replace(/(?<!\$)\{((?:[^{}]|\${[^}]+})+)\}/g, (_, block) => {
+          const rendered = format(block, commit);
+          return excludeMatches.some(match => rendered.includes(match)) ? '' : rendered;
+        });
+        return format(partial, commit);
+      })
+      .join('\n');
+  }
 }
 
 export default GitHub;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-it",
-  "version": "18.0.0",
+  "version": "18.1.1",
   "description": "Generic CLI tool to automate versioning and package publishing-related tasks.",
   "keywords": [
     "build",

package/schema/github.json

@@ -14,6 +14,24 @@
       "default": "Release ${version}"
     },
     "releaseNotes": {
+      "anyOf": [
+        { "type": ["string", "null"] },
+        {
+          "type": "object",
+          "properties": {
+            "commit": {
+              "type": "string"
+            },
+            "excludeMatches": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "default": []
+            }
+          }
+        }
+      ],
       "default": null
     },
     "autoGenerate": {

package/types/config.d.ts

@@ -106,7 +106,7 @@ export interface Config {
     releaseName?: string;
 
     /** @default null */
-    releaseNotes?: any;
+    releaseNotes?: string | null | (() => string | Promise<string>) | { commit?: string; excludeMatches?: string[] };
 
     /** @default false */
     autoGenerate?: boolean;