release-please 17.1.2 → 17.1.3

package/build/src/github.js

@@ -30,6 +30,7 @@ const signoff_commit_message_1 = require("./util/signoff-commit-message");
 const git_file_utils_1 = require("@google-automations/git-file-utils");
 const https_proxy_agent_1 = require("https-proxy-agent");
 const http_proxy_agent_1 = require("http-proxy-agent");
+const composite_1 = require("./updaters/composite");
 class GitHub {
     constructor(options) {
         var _a;
@@ -1047,8 +1048,12 @@ class GitHub {
      * @throws {GitHubAPIError} on an API error
      */
     async buildChangeSet(updates, defaultBranch) {
+        // Sometimes multiple updates are proposed for the same file,
+        // such as when the manifest file is additionally changed by the
+        // node-workspace plugin. We need to merge these updates.
+        const mergedUpdates = (0, composite_1.mergeUpdates)(updates);
         const changes = new Map();
-        for (const update of updates) {
+        for (const update of mergedUpdates) {
             let content;
             try {
                 content = await this.getFileContentsOnBranch(update.path, defaultBranch);

package/build/src/index.d.ts

@@ -14,4 +14,4 @@ export { Logger, setLogger } from './util/logger';
 export { GitHub } from './github';
 export declare const configSchema: any;
 export declare const manifestSchema: any;
-export declare const VERSION = "17.1.2";
+export declare const VERSION = "17.1.3";

package/build/src/index.js

@@ -36,6 +36,6 @@ Object.defineProperty(exports, "GitHub", { enumerable: true, get: function () {
 exports.configSchema = require('../../schemas/config.json');
 exports.manifestSchema = require('../../schemas/manifest.json');
 // x-release-please-start-version
-exports.VERSION = '17.1.2';
+exports.VERSION = '17.1.3';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/updaters/generic.js

@@ -17,6 +17,7 @@ exports.Generic = exports.DEFAULT_DATE_FORMAT = void 0;
 const default_1 = require("./default");
 const logger_1 = require("../util/logger");
 const VERSION_REGEX = /(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(-(?<preRelease>[\w.]+))?(\+(?<build>[-\w.]+))?/;
+const MAJOR_VERSION_REGEX = /\d+\b/;
 const SINGLE_VERSION_REGEX = /\b\d+\b/;
 const INLINE_UPDATE_REGEX = /x-release-please-(?<scope>major|minor|patch|version-date|version|date)/;
 const BLOCK_START_REGEX = /x-release-please-start-(?<scope>major|minor|patch|version-date|version|date)/;
@@ -94,7 +95,7 @@ class Generic extends default_1.DefaultUpdater {
                     newLines.push(line.replace(VERSION_REGEX, version.toString()));
                     return;
                 case 'major':
-                    newLines.push(line.replace(SINGLE_VERSION_REGEX, `${version.major}`));
+                    newLines.push(line.replace(MAJOR_VERSION_REGEX, `${version.major}`));
                     return;
                 case 'minor':
                     newLines.push(line.replace(SINGLE_VERSION_REGEX, `${version.minor}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "17.1.2",
+  "version": "17.1.3",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -101,5 +101,8 @@
   },
   "engines": {
     "node": ">=18.0.0"
+  },
+  "overrides": {
+    "tmp": "0.2.5"
   }
 }