@@ -46881,6 +46881,7 @@ const signoff_commit_message_1 = __nccwpck_require__(2686);
4688146881const git_file_utils_1 = __nccwpck_require__(32997);
4688246882const https_proxy_agent_1 = __nccwpck_require__(77219);
4688346883const http_proxy_agent_1 = __nccwpck_require__(23764);
46884+ const composite_1 = __nccwpck_require__(40911);
4688446885class GitHub {
4688546886 constructor(options) {
4688646887 var _a;
@@ -47898,8 +47899,12 @@ class GitHub {
4789847899 * @throws {GitHubAPIError} on an API error
4789947900 */
4790047901 async buildChangeSet(updates, defaultBranch) {
47902+ // Sometimes multiple updates are proposed for the same file,
47903+ // such as when the manifest file is additionally changed by the
47904+ // node-workspace plugin. We need to merge these updates.
47905+ const mergedUpdates = (0, composite_1.mergeUpdates)(updates);
4790147906 const changes = new Map();
47902- for (const update of updates ) {
47907+ for (const update of mergedUpdates ) {
4790347908 let content;
4790447909 try {
4790547910 content = await this.getFileContentsOnBranch(update.path, defaultBranch);
@@ -48159,7 +48164,7 @@ Object.defineProperty(exports, "GitHub", ({ enumerable: true, get: function () {
4815948164exports.configSchema = __nccwpck_require__(38623);
4816048165exports.manifestSchema = __nccwpck_require__(45314);
4816148166// x-release-please-start-version
48162- exports.VERSION = '17.1.2 ';
48167+ exports.VERSION = '17.1.3 ';
4816348168// x-release-please-end
4816448169//# sourceMappingURL=index.js.map
4816548170
@@ -55516,6 +55521,7 @@ exports.Generic = exports.DEFAULT_DATE_FORMAT = void 0;
5551655521const default_1 = __nccwpck_require__(69995);
5551755522const logger_1 = __nccwpck_require__(68809);
5551855523const VERSION_REGEX = /(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(-(?<preRelease>[\w.]+))?(\+(?<build>[-\w.]+))?/;
55524+ const MAJOR_VERSION_REGEX = /\d+\b/;
5551955525const SINGLE_VERSION_REGEX = /\b\d+\b/;
5552055526const INLINE_UPDATE_REGEX = /x-release-please-(?<scope>major|minor|patch|version-date|version|date)/;
5552155527const BLOCK_START_REGEX = /x-release-please-start-(?<scope>major|minor|patch|version-date|version|date)/;
@@ -55593,7 +55599,7 @@ class Generic extends default_1.DefaultUpdater {
5559355599 newLines.push(line.replace(VERSION_REGEX, version.toString()));
5559455600 return;
5559555601 case 'major':
55596- newLines.push(line.replace(SINGLE_VERSION_REGEX , `${version.major}`));
55602+ newLines.push(line.replace(MAJOR_VERSION_REGEX , `${version.major}`));
5559755603 return;
5559855604 case 'minor':
5559955605 newLines.push(line.replace(SINGLE_VERSION_REGEX, `${version.minor}`));
@@ -105409,7 +105415,7 @@ exports.JSONPath = JSONPath;
105409105415/***/ ((module) => {
105410105416
105411105417"use strict";
105412- module.exports = {"i8":"17.1.2 "};
105418+ module.exports = {"i8":"17.1.3 "};
105413105419
105414105420/***/ }),
105415105421
0 commit comments