release-please 15.5.0 → 15.6.0

package/CHANGELOG.md

@@ -4,6 +4,20 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [15.6.0](https://github.com/googleapis/release-please/compare/v15.5.1...v15.6.0) (2023-02-01)
+
+
+### Features
+
+* **changelog.json:** Add pr suffix to issues array ([#1839](https://github.com/googleapis/release-please/issues/1839)) ([fdd75ef](https://github.com/googleapis/release-please/commit/fdd75efbc276d432f1d9d54f1790f4852a4aa3f7))
+
+## [15.5.1](https://github.com/googleapis/release-please/compare/v15.5.0...v15.5.1) (2023-01-30)
+
+
+### Bug Fixes
+
+* Support TOML up to v1.0.0-rc.1 spec. ([#1837](https://github.com/googleapis/release-please/issues/1837)) ([a3d94ee](https://github.com/googleapis/release-please/commit/a3d94eec209e00b6f513caa379096d082af7a72b))
+
 ## [15.5.0](https://github.com/googleapis/release-please/compare/v15.4.0...v15.5.0) (2023-01-27)
 
 

package/build/src/updaters/changelog-json.js

@@ -19,6 +19,7 @@ const default_1 = require("./default");
 const crypto_1 = require("crypto");
 const BREAKING_CHANGE_TITLE = 'BREAKING CHANGE';
 const COMMIT_PREFIX = /^[^:]+: ?/;
+const PR_SUFFIX_REGEX = / ?\(#(?<pr>[0-9]+)\)$/;
 /**
  * Maintians a machine readable CHANGELOG in chnagelog.json.
  * See: https://gist.github.com/bcoe/50ef0a0024bbf107cd5bc0adbdc04758
@@ -40,17 +41,33 @@ class ChangelogJson extends default_1.DefaultUpdater {
      * @returns {string} The updated content
      */
     updateContent(content, logger = logger_1.logger) {
+        var _a;
         const parsed = JSON.parse(content);
         logger.info(`adding release ${this.version} for ${this.artifactName}`);
         const changes = [];
         for (const commit of this.commits) {
+            const issues = new Set();
             // The commit.message field contains the type/scope prefix.
-            const message = commit.message.replace(COMMIT_PREFIX, '');
+            let message = commit.message.replace(COMMIT_PREFIX, '');
+            // When squashing commits, GitHub adds a suffix refrencing
+            // the # of the PR, e.g., chore(main): release 15.5.1 (#1838)
+            // this logic removes this suffix and prepends it to the
+            // issues array.
+            const match = message.match(PR_SUFFIX_REGEX);
+            if (match && ((_a = match.groups) === null || _a === void 0 ? void 0 : _a.pr)) {
+                message = message.replace(match[0], '');
+                issues.add(match.groups.pr);
+            }
+            // Array.from(someSet) will maintain elements in insertion
+            // order, given this we add references after the pr suffix.
+            for (const ref of commit.references) {
+                issues.add(ref.issue);
+            }
             const change = {
                 type: commit.type,
                 sha: commit.sha,
                 message: message,
-                issues: commit.references.map(ref => ref.issue),
+                issues: Array.from(issues),
             };
             if (commit.scope)
                 change.scope = commit.scope;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "15.5.0",
+  "version": "15.6.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -69,7 +69,7 @@
   "dependencies": {
     "@conventional-commits/parser": "^0.4.1",
     "@google-automations/git-file-utils": "^1.2.5",
-    "@iarna/toml": "^2.2.5",
+    "@iarna/toml": "^3.0.0",
     "@lerna/collect-updates": "^6.4.1",
     "@lerna/package": "^6.4.1",
     "@lerna/package-graph": "^6.4.1",