release-please 13.18.4 → 13.18.7

package/CHANGELOG.md

@@ -4,6 +4,29 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [13.18.7](https://github.com/googleapis/release-please/compare/v13.18.6...v13.18.7) (2022-06-30)
+
+
+### Bug Fixes
+
+* correctly parse the changelog-type from the manifest config ([#1498](https://github.com/googleapis/release-please/issues/1498)) ([452f084](https://github.com/googleapis/release-please/commit/452f084ef8f664830c560472802e5942804df02d))
+* pull request title component can include '/' ([#1499](https://github.com/googleapis/release-please/issues/1499)) ([19a8e82](https://github.com/googleapis/release-please/commit/19a8e8263500dedd32f3b555a9f00f8627f27a6d))
+
+## [13.18.6](https://github.com/googleapis/release-please/compare/v13.18.5...v13.18.6) (2022-06-27)
+
+
+### Bug Fixes
+
+* **dotnet-yoshi:** autodetect component from path ([563ef02](https://github.com/googleapis/release-please/commit/563ef02210cc8bd52eedbfaa0a00787bc2e41ee6))
+* **dotnet-yoshi:** handle existing google-cloud-dotnet history format ([#1486](https://github.com/googleapis/release-please/issues/1486)) ([563ef02](https://github.com/googleapis/release-please/commit/563ef02210cc8bd52eedbfaa0a00787bc2e41ee6))
+
+## [13.18.5](https://github.com/googleapis/release-please/compare/v13.18.4...v13.18.5) (2022-06-24)
+
+
+### Bug Fixes
+
+* **ruby-yoshi:** don't remove PR link from changelog ([#1479](https://github.com/googleapis/release-please/issues/1479)) ([6faaebe](https://github.com/googleapis/release-please/commit/6faaebe3c317bfa1b4d98992733283296bafa20f))
+
 ## [13.18.4](https://github.com/googleapis/release-please/compare/v13.18.3...v13.18.4) (2022-06-24)
 
 

package/build/src/manifest.js

@@ -933,7 +933,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, config,
     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, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
     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,
@@ -941,19 +941,20 @@ function mergeReleaserConfig(defaultConfig, pathConfig) {
         changelogSections: (_e = pathConfig.changelogSections) !== null && _e !== void 0 ? _e : defaultConfig.changelogSections,
         changelogPath: (_f = pathConfig.changelogPath) !== null && _f !== void 0 ? _f : defaultConfig.changelogPath,
         changelogHost: (_g = pathConfig.changelogHost) !== null && _g !== void 0 ? _g : defaultConfig.changelogHost,
-        releaseAs: (_h = pathConfig.releaseAs) !== null && _h !== void 0 ? _h : defaultConfig.releaseAs,
-        skipGithubRelease: (_j = pathConfig.skipGithubRelease) !== null && _j !== void 0 ? _j : defaultConfig.skipGithubRelease,
-        draft: (_k = pathConfig.draft) !== null && _k !== void 0 ? _k : defaultConfig.draft,
-        prerelease: (_l = pathConfig.prerelease) !== null && _l !== void 0 ? _l : defaultConfig.prerelease,
-        component: (_m = pathConfig.component) !== null && _m !== void 0 ? _m : defaultConfig.component,
-        packageName: (_o = pathConfig.packageName) !== null && _o !== void 0 ? _o : defaultConfig.packageName,
-        versionFile: (_p = pathConfig.versionFile) !== null && _p !== void 0 ? _p : defaultConfig.versionFile,
-        extraFiles: (_q = pathConfig.extraFiles) !== null && _q !== void 0 ? _q : defaultConfig.extraFiles,
-        includeComponentInTag: (_r = pathConfig.includeComponentInTag) !== null && _r !== void 0 ? _r : defaultConfig.includeComponentInTag,
-        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,
+        changelogType: (_h = pathConfig.changelogType) !== null && _h !== void 0 ? _h : defaultConfig.changelogType,
+        releaseAs: (_j = pathConfig.releaseAs) !== null && _j !== void 0 ? _j : defaultConfig.releaseAs,
+        skipGithubRelease: (_k = pathConfig.skipGithubRelease) !== null && _k !== void 0 ? _k : defaultConfig.skipGithubRelease,
+        draft: (_l = pathConfig.draft) !== null && _l !== void 0 ? _l : defaultConfig.draft,
+        prerelease: (_m = pathConfig.prerelease) !== null && _m !== void 0 ? _m : defaultConfig.prerelease,
+        component: (_o = pathConfig.component) !== null && _o !== void 0 ? _o : defaultConfig.component,
+        packageName: (_p = pathConfig.packageName) !== null && _p !== void 0 ? _p : defaultConfig.packageName,
+        versionFile: (_q = pathConfig.versionFile) !== null && _q !== void 0 ? _q : defaultConfig.versionFile,
+        extraFiles: (_r = pathConfig.extraFiles) !== null && _r !== void 0 ? _r : defaultConfig.extraFiles,
+        includeComponentInTag: (_s = pathConfig.includeComponentInTag) !== null && _s !== void 0 ? _s : defaultConfig.includeComponentInTag,
+        includeVInTag: (_t = pathConfig.includeVInTag) !== null && _t !== void 0 ? _t : defaultConfig.includeVInTag,
+        tagSeparator: (_u = pathConfig.tagSeparator) !== null && _u !== void 0 ? _u : defaultConfig.tagSeparator,
+        pullRequestTitlePattern: (_v = pathConfig.pullRequestTitlePattern) !== null && _v !== void 0 ? _v : defaultConfig.pullRequestTitlePattern,
+        separatePullRequests: (_w = pathConfig.separatePullRequests) !== null && _w !== void 0 ? _w : defaultConfig.separatePullRequests,
     };
 }
 /**

package/build/src/strategies/dotnet-yoshi.d.ts

@@ -8,5 +8,6 @@ export declare class DotnetYoshi extends BaseStrategy {
     constructor(options: BaseStrategyOptions);
     protected buildReleaseNotes(conventionalCommits: ConventionalCommit[], newVersion: Version, newVersionTag: TagName, latestRelease?: Release): Promise<string>;
     private getApi;
+    getDefaultComponent(): Promise<string | undefined>;
     protected buildUpdates(options: BuildUpdatesOptions): Promise<Update[]>;
 }

package/build/src/strategies/dotnet-yoshi.js

@@ -63,6 +63,11 @@ class DotnetYoshi extends base_1.BaseStrategy {
             throw e;
         }
     }
+    async getDefaultComponent() {
+        // default component is based on the path
+        const pathParts = this.path.split('/');
+        return pathParts[pathParts.length - 1];
+    }
     async buildUpdates(options) {
         const updates = [];
         const version = options.newVersion;
@@ -78,17 +83,18 @@ class DotnetYoshi extends base_1.BaseStrategy {
                 updater: new changelog_1.Changelog({
                     version,
                     changelogEntry: options.changelogEntry,
+                    versionHeaderRegex: '\n## Version [0-9[]+',
                 }),
             });
         }
-        if (!this.component) {
+        if (!component) {
             logger_1.logger.warn('Dotnet strategy expects to use components, could not update all files');
             return updates;
         }
         updates.push({
             path: 'apis/apis.json',
             createIfMissing: false,
-            updater: new apis_1.Apis(this.component, version),
+            updater: new apis_1.Apis(component, version),
         });
         return updates;
     }

package/build/src/strategies/ruby-yoshi.js

@@ -85,7 +85,7 @@ class RubyYoshi extends base_1.BaseStrategy {
             // Remove bolded scope from change lines
             .replace(/^\* \*\*[\w-]+:\*\* /gm, '* ')
             // Remove PR and commit links from pull request title suffixes
-            .replace(/( \(\[(\w+|#\d+)\]\(https:\/\/github\.com\/[^)]*\)\))+\s*$/gm, '')
+            .replace(/(\(\[(\w+)\]\(https:\/\/github\.com\/[^)]*\)\))+\s*$/gm, '')
             // Standardize on h4 for change type subheaders
             .replace(/^### (Features|Bug Fixes|Documentation)$/gm, '#### $1')
             // Collapse 2 or more blank lines

package/build/src/updaters/changelog.d.ts

@@ -1,9 +1,11 @@
 import { DefaultUpdater, UpdateOptions } from './default';
 interface ChangelogOptions extends UpdateOptions {
     changelogEntry: string;
+    versionHeaderRegex?: string;
 }
 export declare class Changelog extends DefaultUpdater {
     changelogEntry: string;
+    readonly versionHeaderRegex: RegExp;
     constructor(options: ChangelogOptions);
     updateContent(content: string | undefined): string;
     private header;

package/build/src/updaters/changelog.js

@@ -15,15 +15,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Changelog = void 0;
 const default_1 = require("./default");
+const DEFAULT_VERSION_HEADER_REGEX = '\n###? v?[0-9[]';
 class Changelog extends default_1.DefaultUpdater {
     constructor(options) {
+        var _a;
         super(options);
         this.changelogEntry = options.changelogEntry;
+        this.versionHeaderRegex = new RegExp((_a = options.versionHeaderRegex) !== null && _a !== void 0 ? _a : DEFAULT_VERSION_HEADER_REGEX, 's');
     }
     updateContent(content) {
         content = content || '';
         // Handle both H2 (features/BREAKING CHANGES) and H3 (fixes).
-        const lastEntryIndex = content.search(/\n###? v?[0-9[]/s);
+        const lastEntryIndex = content.search(this.versionHeaderRegex);
         if (lastEntryIndex === -1) {
             return `${this.header()}\n${this.changelogEntry}\n`;
         }

package/build/src/updaters/changelog.js.map

@@ -1 +1 @@
-{"version":3,"file":"changelog.js","sourceRoot":"","sources":["../../../src/updaters/changelog.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,uCAAwD;AAMxD,MAAa,SAAU,SAAQ,wBAAc;IAG3C,YAAY,OAAyB;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IAC/C,CAAC;IAED,aAAa,CAAC,OAA2B;QACvC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,6DAA6D;QAC7D,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QAC1D,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE;YACzB,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,cAAc,IAAI,CAAC;SACrD;aAAM;YACL,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;SACpE;IACH,CAAC;IACO,MAAM;QACZ,OAAO;;CAEV,CAAC;IACA,CAAC;CACF;AAzBD,8BAyBC"}
+{"version":3,"file":"changelog.js","sourceRoot":"","sources":["../../../src/updaters/changelog.ts"],"names":[],"mappings":";AAAA,4BAA4B;AAC5B,EAAE;AACF,kEAAkE;AAClE,mEAAmE;AACnE,0CAA0C;AAC1C,EAAE;AACF,kDAAkD;AAClD,EAAE;AACF,sEAAsE;AACtE,oEAAoE;AACpE,2EAA2E;AAC3E,sEAAsE;AACtE,iCAAiC;;;AAEjC,uCAAwD;AAOxD,MAAM,4BAA4B,GAAG,iBAAiB,CAAC;AAEvD,MAAa,SAAU,SAAQ,wBAAc;IAI3C,YAAY,OAAyB;;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;QAC7C,IAAI,CAAC,kBAAkB,GAAG,IAAI,MAAM,CAClC,MAAA,OAAO,CAAC,kBAAkB,mCAAI,4BAA4B,EAC1D,GAAG,CACJ,CAAC;IACJ,CAAC;IAED,aAAa,CAAC,OAA2B;QACvC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QACxB,6DAA6D;QAC7D,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC/D,IAAI,cAAc,KAAK,CAAC,CAAC,EAAE;YACzB,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,cAAc,IAAI,CAAC;SACrD;aAAM;YACL,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;YAC5C,OAAO,GAAG,MAAM,KAAK,IAAI,CAAC,cAAc,KAAK,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC;SACpE;IACH,CAAC;IACO,MAAM;QACZ,OAAO;;CAEV,CAAC;IACA,CAAC;CACF;AA9BD,8BA8BC"}

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

@@ -34,7 +34,7 @@ function generateMatchPattern(pullRequestTitlePattern) {
         .replace('[', '\\[') // TODO: handle all regex escaping
         .replace(']', '\\]')
         .replace('${scope}', '(\\((?<branch>[\\w-./]+)\\))?')
-        .replace('${component}', ' ?(?<component>[\\w-.]*)?')
+        .replace('${component}', ' ?(?<component>[\\w-./]*)?')
         .replace('${version}', 'v?(?<version>[0-9].*)')
         .replace('${branch}', '(?<branch>[\\w-./]+)?')}$`);
 }

package/package.json

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