release-please 13.15.1 → 13.16.0

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [13.16.0](https://github.com/googleapis/release-please/compare/v13.15.1...v13.16.0) (2022-05-06)
+
+
+### Features
+
+* allow configuring separate-pull-requests per component ([#1412](https://github.com/googleapis/release-please/issues/1412)) ([d274421](https://github.com/googleapis/release-please/commit/d2744219fbbd6c58a10b177a824fb3715039162a))
+
 ### [13.15.1](https://github.com/googleapis/release-please/compare/v13.15.0...v13.15.1) (2022-05-05)
 
 

package/build/src/manifest.d.ts

@@ -39,6 +39,7 @@ export interface ReleaserConfig {
     includeVInTag?: boolean;
     pullRequestTitlePattern?: string;
     tagSeparator?: string;
+    separatePullRequests?: boolean;
     changelogSections?: ChangelogSection[];
     changelogPath?: string;
     changelogType?: ChangelogNotesType;
@@ -75,6 +76,7 @@ interface ReleaserConfigJson {
     'changelog-type'?: ChangelogNotesType;
     'changelog-host'?: string;
     'pull-request-title-pattern'?: string;
+    'separate-pull-requests'?: boolean;
     'tag-separator'?: string;
     'extra-files'?: string[];
     'version-file'?: string;
@@ -125,7 +127,6 @@ export interface ManifestConfig extends ReleaserConfigJson {
     'last-release-sha'?: string;
     'always-link-local'?: boolean;
     plugins?: PluginType[];
-    'separate-pull-requests'?: boolean;
     'group-pull-request-title-pattern'?: string;
     'release-search-depth'?: number;
     'commit-search-depth'?: number;

package/build/src/manifest.js

@@ -715,6 +715,7 @@ function extractReleaserConfig(config) {
         changelogType: config['changelog-type'],
         pullRequestTitlePattern: config['pull-request-title-pattern'],
         tagSeparator: config['tag-separator'],
+        separatePullRequests: config['separate-pull-requests'],
     };
 }
 /**
@@ -873,7 +874,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, prefix,
     return candidateTagVersion.sort((a, b) => b.compare(a))[0];
 }
 function mergeReleaserConfig(defaultConfig, pathConfig) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
     return {
         releaseType: (_b = (_a = pathConfig.releaseType) !== null && _a !== void 0 ? _a : defaultConfig.releaseType) !== null && _b !== void 0 ? _b : 'node',
         bumpMinorPreMajor: (_c = pathConfig.bumpMinorPreMajor) !== null && _c !== void 0 ? _c : defaultConfig.bumpMinorPreMajor,
@@ -893,6 +894,7 @@ function mergeReleaserConfig(defaultConfig, pathConfig) {
         includeVInTag: (_s = pathConfig.includeVInTag) !== null && _s !== void 0 ? _s : defaultConfig.includeVInTag,
         tagSeparator: (_t = pathConfig.tagSeparator) !== null && _t !== void 0 ? _t : defaultConfig.tagSeparator,
         pullRequestTitlePattern: (_u = pathConfig.pullRequestTitlePattern) !== null && _u !== void 0 ? _u : defaultConfig.pullRequestTitlePattern,
+        separatePullRequests: (_v = pathConfig.separatePullRequests) !== null && _v !== void 0 ? _v : defaultConfig.separatePullRequests,
     };
 }
 /**

package/build/src/plugins/merge.js

@@ -38,11 +38,20 @@ class Merge extends plugin_1.ManifestPlugin {
             return candidates;
         }
         logger_1.logger.info(`Merging ${candidates.length} pull requests`);
+        const [inScopeCandidates, outOfScopeCandidates] = candidates.reduce((collection, candidate) => {
+            if (candidate.config.separatePullRequests) {
+                collection[1].push(candidate);
+            }
+            else {
+                collection[0].push(candidate);
+            }
+            return collection;
+        }, [[], []]);
         const releaseData = [];
         const labels = new Set();
         let rawUpdates = [];
         let rootRelease = null;
-        for (const candidate of candidates) {
+        for (const candidate of inScopeCandidates) {
             const pullRequest = candidate.pullRequest;
             rawUpdates = rawUpdates.concat(...pullRequest.updates);
             for (const label of pullRequest.labels) {
@@ -72,6 +81,7 @@ class Merge extends plugin_1.ManifestPlugin {
                     releaseType,
                 },
             },
+            ...outOfScopeCandidates,
         ];
     }
 }

package/build/src/strategies/base.d.ts

@@ -79,6 +79,7 @@ export declare abstract class BaseStrategy implements Strategy {
      */
     getComponent(): Promise<string | undefined>;
     getDefaultComponent(): Promise<string | undefined>;
+    protected getBranchComponent(): Promise<string | undefined>;
     getPackageName(): Promise<string | undefined>;
     getDefaultPackageName(): Promise<string | undefined>;
     protected normalizeComponent(component: string | undefined): string;

package/build/src/strategies/base.js

@@ -73,6 +73,9 @@ class BaseStrategy {
         var _a;
         return this.normalizeComponent((_a = this.packageName) !== null && _a !== void 0 ? _a : (await this.getDefaultPackageName()));
     }
+    async getBranchComponent() {
+        return this.component || (await this.getDefaultComponent());
+    }
     async getPackageName() {
         var _a;
         return (_a = this.packageName) !== null && _a !== void 0 ? _a : (await this.getDefaultPackageName());
@@ -143,8 +146,9 @@ class BaseStrategy {
         const newVersionTag = new tag_name_1.TagName(newVersion, this.includeComponentInTag ? component : undefined, this.tagSeparator, this.includeVInTag);
         logger_1.logger.debug('pull request title pattern:', this.pullRequestTitlePattern);
         const pullRequestTitle = pull_request_title_1.PullRequestTitle.ofComponentTargetBranchVersion(component || '', this.targetBranch, newVersion, this.pullRequestTitlePattern);
-        const branchName = component
-            ? branch_name_1.BranchName.ofComponentTargetBranch(component, this.targetBranch)
+        const branchComponent = await this.getBranchComponent();
+        const branchName = branchComponent
+            ? branch_name_1.BranchName.ofComponentTargetBranch(branchComponent, this.targetBranch)
             : branch_name_1.BranchName.ofTargetBranch(this.targetBranch);
         const releaseNotesBody = await this.buildReleaseNotes(conventionalCommits, newVersion, newVersionTag, latestRelease, commits);
         if (this.changelogEmpty(releaseNotesBody)) {

package/package.json

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