release-please 13.4.2 → 13.4.3

package/CHANGELOG.md

@@ -4,6 +4,14 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.4.3](https://github.com/googleapis/release-please/compare/v13.4.2...v13.4.3) (2022-01-24)
+
+
+### Bug Fixes
+
+* multi-component manifest release notes for single component release ([#1247](https://github.com/googleapis/release-please/issues/1247)) ([16aee09](https://github.com/googleapis/release-please/commit/16aee099c79d75853e565f83017745eef13b57fa))
+* release notes should parse initial version heading ([#1248](https://github.com/googleapis/release-please/issues/1248)) ([71dc495](https://github.com/googleapis/release-please/commit/71dc4954e2393f74c4442c021fcf6c8ee530b4ae))
+
 ### [13.4.2](https://github.com/googleapis/release-please/compare/v13.4.1...v13.4.2) (2022-01-21)
 
 

package/build/src/manifest.js

@@ -316,6 +316,7 @@ class Manifest {
             targetBranch: this.targetBranch,
             repositoryConfig: this.repositoryConfig,
         }));
+        logger_1.logger.info(`separate pull requests: ${this.separatePullRequests}`);
         // Combine pull requests into 1 unless configured for separate
         // pull requests
         if (!this.separatePullRequests) {

package/build/src/plugins/merge.js

@@ -20,6 +20,7 @@ const pull_request_title_1 = require("../util/pull-request-title");
 const pull_request_body_1 = require("../util/pull-request-body");
 const branch_name_1 = require("../util/branch-name");
 const composite_1 = require("../updaters/composite");
+const logger_1 = require("../util/logger");
 /**
  * This plugin merges multiple pull requests into a single
  * release pull request.
@@ -36,6 +37,7 @@ class Merge extends plugin_1.ManifestPlugin {
         if (candidates.length < 1) {
             return candidates;
         }
+        logger_1.logger.info(`Merging ${candidates.length} pull requests`);
         const releaseData = [];
         const labels = new Set();
         let rawUpdates = [];
@@ -54,7 +56,7 @@ class Merge extends plugin_1.ManifestPlugin {
         const updates = composite_1.mergeUpdates(rawUpdates);
         const pullRequest = {
             title: pull_request_title_1.PullRequestTitle.ofComponentTargetBranchVersion(rootRelease === null || rootRelease === void 0 ? void 0 : rootRelease.pullRequest.title.component, this.targetBranch, rootRelease === null || rootRelease === void 0 ? void 0 : rootRelease.pullRequest.title.version, this.pullRequestTitlePattern),
-            body: new pull_request_body_1.PullRequestBody(releaseData),
+            body: new pull_request_body_1.PullRequestBody(releaseData, { useComponents: true }),
             updates,
             labels: Array.from(labels),
             headRefName: branch_name_1.BranchName.ofTargetBranch(this.targetBranch).toString(),

package/build/src/util/pull-request-body.d.ts

@@ -3,12 +3,14 @@ interface PullRequestBodyOptions {
     header?: string;
     footer?: string;
     extra?: string;
+    useComponents?: boolean;
 }
 export declare class PullRequestBody {
     header: string;
     footer: string;
     extra?: string;
     releaseData: ReleaseData[];
+    useComponents: boolean;
     constructor(releaseData: ReleaseData[], options?: PullRequestBodyOptions);
     static parse(body: string): PullRequestBody | undefined;
     notes(): string;

package/build/src/util/pull-request-body.js

@@ -22,10 +22,12 @@ const DEFAULT_FOOTER = 'This PR was generated with [Release Please](https://gith
 const NOTES_DELIMITER = '---';
 class PullRequestBody {
     constructor(releaseData, options) {
+        var _a;
         this.header = (options === null || options === void 0 ? void 0 : options.header) || DEFAULT_HEADER;
         this.footer = (options === null || options === void 0 ? void 0 : options.footer) || DEFAULT_FOOTER;
         this.extra = options === null || options === void 0 ? void 0 : options.extra;
         this.releaseData = releaseData;
+        this.useComponents = (_a = options === null || options === void 0 ? void 0 : options.useComponents) !== null && _a !== void 0 ? _a : this.releaseData.length > 1;
     }
     static parse(body) {
         const parts = splitBody(body);
@@ -46,7 +48,7 @@ class PullRequestBody {
         });
     }
     notes() {
-        if (this.releaseData.length > 1) {
+        if (this.useComponents) {
             return this.releaseData
                 .map(release => {
                 var _a;
@@ -110,7 +112,7 @@ function extractMultipleReleases(notes) {
     }
     return data;
 }
-const COMPARE_REGEX = /^#{2,} \[(?<version>\d+\.\d+\.\d+.*)\]/;
+const COMPARE_REGEX = /^#{2,} \[?(?<version>\d+\.\d+\.\d+.*)\]?/;
 function extractSingleRelease(body) {
     var _a;
     body = body.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "13.4.2",
+  "version": "13.4.3",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",