release-please 13.3.1 → 13.3.2

package/CHANGELOG.md

@@ -4,6 +4,16 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.3.2](https://github.com/googleapis/release-please/compare/v13.3.1...v13.3.2) (2022-01-13)
+
+
+### Bug Fixes
+
+* BranchName.parse should not throw exceptions ([#1227](https://github.com/googleapis/release-please/issues/1227)) ([364f1ac](https://github.com/googleapis/release-please/commit/364f1ac996b0120820d9bb37db96bb27a79aa936))
+* initial release version should respect Release-As commit ([#1222](https://github.com/googleapis/release-please/issues/1222)) ([22b9770](https://github.com/googleapis/release-please/commit/22b977028e2959aea088c09e3a021e2aa0e10f03))
+* Release-As commits should appear in the changelog correctly ([#1220](https://github.com/googleapis/release-please/issues/1220)) ([ab56c82](https://github.com/googleapis/release-please/commit/ab56c82e81091cbedeb8f328451ac486d7f986a4))
+* use latest Release-As commit when overriding version ([#1224](https://github.com/googleapis/release-please/issues/1224)) ([2d7cb8f](https://github.com/googleapis/release-please/commit/2d7cb8fa329d1c60b881bc0435523b81ea47a32d))
+
 ### [13.3.1](https://github.com/googleapis/release-please/compare/v13.3.0...v13.3.1) (2022-01-12)
 
 

package/build/src/changelog-notes/default.js

@@ -52,13 +52,16 @@ class DefaultChangelogNotes {
                 subject: commit.bareMessage,
                 type: commit.type,
                 scope: commit.scope,
-                notes: commit.notes,
+                notes: commit.notes.filter(note => note.title === 'BREAKING CHANGE'),
                 references: commit.references,
                 mentions: [],
                 merge: null,
                 revert: null,
                 header: commit.message,
-                footer: null,
+                footer: commit.notes
+                    .filter(note => note.title === 'RELEASE AS')
+                    .map(note => `Release-As: ${note.text}`)
+                    .join('\n'),
                 hash: commit.sha,
             };
         });

package/build/src/strategies/base.js

@@ -181,12 +181,17 @@ class BaseStrategy {
             logger_1.logger.warn(`Setting version for ${this.path} from release-as configuration`);
             return version_1.Version.parse(this.releaseAs);
         }
-        else if (latestRelease) {
-            return await this.versioningStrategy.bump(latestRelease.tag.version, conventionalCommits);
+        const releaseAsCommit = conventionalCommits.find(conventionalCommit => conventionalCommit.notes.find(note => note.title === 'RELEASE AS'));
+        if (releaseAsCommit) {
+            const note = releaseAsCommit.notes.find(note => note.title === 'RELEASE AS');
+            if (note) {
+                return version_1.Version.parse(note.text);
+            }
         }
-        else {
-            return this.initialReleaseVersion();
+        if (latestRelease) {
+            return await this.versioningStrategy.bump(latestRelease.tag.version, conventionalCommits);
         }
+        return this.initialReleaseVersion();
     }
     async buildVersionsMap(_conventionalCommits) {
         return new Map();

package/build/src/util/branch-name.js

@@ -15,6 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BranchName = void 0;
 const version_1 = require("../version");
+const logger_1 = require("./logger");
 // cannot import from '..' - transpiled code references to RELEASE_PLEASE
 // at the script level are undefined, they are only defined inside function
 // or instance methods/properties.
@@ -32,13 +33,19 @@ function getAllResourceNames() {
 class BranchName {
     constructor(_branchName) { }
     static parse(branchName) {
-        const branchNameClass = getAllResourceNames().find(clazz => {
-            return clazz.matches(branchName);
-        });
-        if (!branchNameClass) {
+        try {
+            const branchNameClass = getAllResourceNames().find(clazz => {
+                return clazz.matches(branchName);
+            });
+            if (!branchNameClass) {
+                return undefined;
+            }
+            return new branchNameClass(branchName);
+        }
+        catch (e) {
+            logger_1.logger.warn(`Error parsing branch name: ${branchName}`, e);
             return undefined;
         }
-        return new branchNameClass(branchName);
     }
     static ofComponentVersion(branchPrefix, version) {
         return new AutoreleaseBranchName(`release-${branchPrefix}-v${version}`);

package/build/src/versioning-strategies/default.js

@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultVersioningStrategy = void 0;
 const versioning_strategy_1 = require("../versioning-strategy");
 const version_1 = require("../version");
+const logger_1 = require("../util/logger");
 /**
  * This is the default VersioningStrategy for release-please. Breaking
  * changes should bump the major, features should bump the minor, and other
@@ -48,11 +49,12 @@ class DefaultVersioningStrategy {
         // iterate through list of commits and find biggest commit type
         let breaking = 0;
         let features = 0;
-        let customVersion;
         for (const commit of commits) {
             const releaseAs = commit.notes.find(note => note.title === 'RELEASE AS');
             if (releaseAs) {
-                customVersion = version_1.Version.parse(releaseAs.text);
+                // commits are handled newest to oldest, so take the first one (newest) found
+                logger_1.logger.debug(`found Release-As: ${releaseAs.text}, forcing version`);
+                return new versioning_strategy_1.CustomVersionUpdate(version_1.Version.parse(releaseAs.text).toString());
             }
             if (commit.breaking) {
                 breaking++;
@@ -61,9 +63,6 @@ class DefaultVersioningStrategy {
                 features++;
             }
         }
-        if (customVersion) {
-            return new versioning_strategy_1.CustomVersionUpdate(customVersion.toString());
-        }
         if (breaking > 0) {
             if (version.major < 1 && this.bumpMinorPreMajor) {
                 return new versioning_strategy_1.MinorVersionUpdate();

package/package.json

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