release-please 13.16.3 → 13.16.4

package/CHANGELOG.md

@@ -4,6 +4,31 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.16.4](https://github.com/googleapis/release-please/compare/v13.16.3...v13.16.4) (2022-05-17)
+
+
+### Bug Fixes
+
+* add release labels if release PR was completed ([#1433](https://github.com/googleapis/release-please/issues/1433)) ([072498c](https://github.com/googleapis/release-please/commit/072498c8ce2f89bc86eb33445d87491e3ab31fbd))
+* CommitSplit with includeEmpty should add commit to all packages ([#1432](https://github.com/googleapis/release-please/issues/1432)) ([19629cb](https://github.com/googleapis/release-please/commit/19629cb42da625d6c62e67f1e9edf7f3cf14d6ee)), closes [#1360](https://github.com/googleapis/release-please/issues/1360)
+* Manifest.fromConfig should find branch component ([#1436](https://github.com/googleapis/release-please/issues/1436)) ([628a562](https://github.com/googleapis/release-please/commit/628a562a21245ed02546aa0c40c97a0e3d50a0c7))
+
+### [13.16.3](https://github.com/googleapis/release-please/compare/v13.16.2...v13.16.3) (2022-05-17)
+
+
+### Bug Fixes
+
+* add release labels if release PR was completed ([#1433](https://github.com/googleapis/release-please/issues/1433)) ([072498c](https://github.com/googleapis/release-please/commit/072498c8ce2f89bc86eb33445d87491e3ab31fbd))
+* CommitSplit with includeEmpty should add commit to all packages ([#1432](https://github.com/googleapis/release-please/issues/1432)) ([19629cb](https://github.com/googleapis/release-please/commit/19629cb42da625d6c62e67f1e9edf7f3cf14d6ee)), closes [#1360](https://github.com/googleapis/release-please/issues/1360)
+* workspace plugins should update manifest versions ([#1429](https://github.com/googleapis/release-please/issues/1429)) ([ab802a9](https://github.com/googleapis/release-please/commit/ab802a924704044b26017b40a2da48657022faad))
+
+### [13.16.3](https://github.com/googleapis/release-please/compare/v13.16.2...v13.16.3) (2022-05-13)
+
+
+### Bug Fixes
+
+* workspace plugins should update manifest versions ([#1429](https://github.com/googleapis/release-please/issues/1429)) ([ab802a9](https://github.com/googleapis/release-please/commit/ab802a924704044b26017b40a2da48657022faad))
+
 ### [13.16.3](https://github.com/googleapis/release-please/compare/v13.16.2...v13.16.3) (2022-05-13)
 
 

package/build/src/manifest.js

@@ -145,9 +145,9 @@ class Manifest {
             github,
             ...config,
         });
-        const component = await strategy.getComponent();
+        const component = await strategy.getBranchComponent();
         const releasedVersions = {};
-        const latestVersion = await latestReleaseVersion(github, targetBranch, version => isPublishedVersion(strategy, version), config.includeComponentInTag ? component : '', config.pullRequestTitlePattern);
+        const latestVersion = await latestReleaseVersion(github, targetBranch, version => isPublishedVersion(strategy, version), component, config.pullRequestTitlePattern);
         if (latestVersion) {
             releasedVersions[path] = latestVersion;
         }
@@ -604,20 +604,16 @@ class Manifest {
         }
     }
     async createReleasesForPullRequest(releases, pullRequest) {
-        // create the release
-        const promises = [];
-        for (const release of releases) {
-            promises.push(this.createRelease(release));
-        }
+        logger_1.logger.info(`Creating ${releases.length} releases for pull #${pullRequest.number}`);
         const duplicateReleases = [];
         const githubReleases = [];
-        for (const promise of promises) {
+        for (const release of releases) {
             try {
-                githubReleases.push(await promise);
+                githubReleases.push(await this.createRelease(release));
             }
             catch (err) {
                 if (err instanceof errors_1.DuplicateReleaseError) {
-                    logger_1.logger.warn(`Duplicate release tag: ${err.tag}`);
+                    logger_1.logger.warn(`Duplicate release tag: ${release.tag.toString()}`);
                     duplicateReleases.push(err);
                 }
                 else {
@@ -625,14 +621,28 @@ class Manifest {
                 }
             }
         }
-        if (duplicateReleases.length > 0 && githubReleases.length === 0) {
-            throw duplicateReleases[0];
+        if (duplicateReleases.length > 0) {
+            if (duplicateReleases.length + githubReleases.length ===
+                releases.length) {
+                // we've either tagged all releases or they were duplicates:
+                // adjust tags on pullRequest
+                await Promise.all([
+                    this.github.removeIssueLabels(this.labels, pullRequest.number),
+                    this.github.addIssueLabels(this.releaseLabels, pullRequest.number),
+                ]);
+            }
+            if (githubReleases.length === 0) {
+                // If all releases were duplicate, throw a duplicate error
+                throw duplicateReleases[0];
+            }
+        }
+        else {
+            // adjust tags on pullRequest
+            await Promise.all([
+                this.github.removeIssueLabels(this.labels, pullRequest.number),
+                this.github.addIssueLabels(this.releaseLabels, pullRequest.number),
+            ]);
         }
-        // adjust tags on pullRequest
-        await Promise.all([
-            this.github.removeIssueLabels(this.labels, pullRequest.number),
-            this.github.addIssueLabels(this.releaseLabels, pullRequest.number),
-        ]);
         return githubReleases;
     }
     async createRelease(release) {

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

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

package/build/src/strategy.d.ts

@@ -36,6 +36,12 @@ export interface Strategy {
      * @returns {string}
      */
     getComponent(): Promise<string | undefined>;
+    /**
+     * Return the component for this strategy used in the branch name.
+     * This may be a computed field.
+     * @returns {string}
+     */
+    getBranchComponent(): Promise<string | undefined>;
     /**
      * Validate whether version is a valid release.
      * @param version Released version.

package/build/src/util/commit-split.d.ts

@@ -3,9 +3,24 @@ export interface CommitSplitOptions {
     includeEmpty?: boolean;
     packagePaths?: string[];
 }
+/**
+ * Helper class for splitting commits by component path. If `packagePaths`
+ * is configured, then only consider the provided paths. If `includeEmpty`
+ * is configured, then commits without any touched files apply to all
+ * configured component paths.
+ */
 export declare class CommitSplit {
     includeEmpty: boolean;
     packagePaths?: string[];
     constructor(opts?: CommitSplitOptions);
+    /**
+     * Split commits by component path. If the commit splitter is configured
+     * with a set of tracked package paths, then only consider paths for
+     * configured components. If `includeEmpty` is configured, then a commit
+     * that does not touch any files will be applied to all components'
+     * commits.
+     * @param {Commit[]} commits The commits to split
+     * @returns {Record<string, Commit[]>} Commits indexed by component path
+     */
     split<T extends Commit>(commits: T[]): Record<string, T[]>;
 }

package/build/src/util/commit-split.js

@@ -15,6 +15,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommitSplit = void 0;
 const manifest_1 = require("../manifest");
+/**
+ * Helper class for splitting commits by component path. If `packagePaths`
+ * is configured, then only consider the provided paths. If `includeEmpty`
+ * is configured, then commits without any touched files apply to all
+ * configured component paths.
+ */
 class CommitSplit {
     constructor(opts) {
         opts = opts || {};
@@ -50,7 +56,15 @@ class CommitSplit {
             this.packagePaths = paths;
         }
     }
-    // split(commits: Commit[]): Record<string, Commit[]>
+    /**
+     * Split commits by component path. If the commit splitter is configured
+     * with a set of tracked package paths, then only consider paths for
+     * configured components. If `includeEmpty` is configured, then a commit
+     * that does not touch any files will be applied to all components'
+     * commits.
+     * @param {Commit[]} commits The commits to split
+     * @returns {Record<string, Commit[]>} Commits indexed by component path
+     */
     split(commits) {
         const splitCommits = {};
         commits.forEach(commit => {
@@ -85,8 +99,16 @@ class CommitSplit {
                 splitCommits[pkgName].push(commit);
             }
             if (commit.files.length === 0 && this.includeEmpty) {
-                for (const pkgName in splitCommits) {
-                    splitCommits[pkgName].push(commit);
+                if (this.packagePaths) {
+                    for (const pkgName of this.packagePaths) {
+                        splitCommits[pkgName] = splitCommits[pkgName] || [];
+                        splitCommits[pkgName].push(commit);
+                    }
+                }
+                else {
+                    for (const pkgName in splitCommits) {
+                        splitCommits[pkgName].push(commit);
+                    }
                 }
             }
         });

package/package.json

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