release-please 16.14.0 → 16.14.2

package/build/src/commit.js

@@ -328,7 +328,7 @@ function splitMessages(message) {
         messages[0] = messages[0] + rest.join('END_NESTED_COMMIT');
     }
     const conventionalCommits = messages[0]
-        .split(/\n(?=(?:feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.*?\))?: )/)
+        .split(/\r?\n\r?\n(?=(?:feat|fix|docs|style|refactor|perf|test|build|ci|chore|revert)(?:\(.*?\))?: )/)
         .filter(Boolean);
     return [...conventionalCommits, ...messages.slice(1)];
 }

package/build/src/factories/plugin-factory.d.ts

@@ -9,6 +9,7 @@ export interface PluginFactoryOptions {
     targetBranch: string;
     repositoryConfig: RepositoryConfig;
     manifestPath: string;
+    separatePullRequests?: boolean;
     alwaysLinkLocal?: boolean;
     updatePeerDependencies?: boolean;
     updateAllPackages?: boolean;

package/build/src/factories/plugin-factory.js

@@ -22,26 +22,44 @@ const errors_1 = require("../errors");
 const sentence_case_1 = require("../plugins/sentence-case");
 const group_priority_1 = require("../plugins/group-priority");
 const pluginFactories = {
-    'linked-versions': options => new linked_versions_1.LinkedVersions(options.github, options.targetBranch, options.repositoryConfig, options.type.groupName, options.type.components, {
-        ...options,
-        ...options.type,
-    }),
-    'cargo-workspace': options => new cargo_workspace_1.CargoWorkspace(options.github, options.targetBranch, options.repositoryConfig, {
-        ...options,
-        ...options.type,
-    }),
-    'node-workspace': options => new node_workspace_1.NodeWorkspace(options.github, options.targetBranch, options.repositoryConfig, {
-        ...options,
-        ...options.type,
-    }),
-    'maven-workspace': options => new maven_workspace_1.MavenWorkspace(options.github, options.targetBranch, options.repositoryConfig, {
+    'linked-versions': options => 
+    // NOTE: linked-versions had already have a different behavior about merging
+    // see test/plugins/compatibility/linked-versions-workspace.ts
+    new linked_versions_1.LinkedVersions(options.github, options.targetBranch, options.repositoryConfig, options.type.groupName, options.type.components, {
         ...options,
         ...options.type,
     }),
+    'cargo-workspace': options => {
+        var _a;
+        return new cargo_workspace_1.CargoWorkspace(options.github, options.targetBranch, options.repositoryConfig, {
+            ...options,
+            ...options.type,
+            merge: (_a = options.type.merge) !== null && _a !== void 0 ? _a : !options.separatePullRequests,
+        });
+    },
+    'node-workspace': options => {
+        var _a;
+        return new node_workspace_1.NodeWorkspace(options.github, options.targetBranch, options.repositoryConfig, {
+            ...options,
+            ...options.type,
+            merge: (_a = options.type.merge) !== null && _a !== void 0 ? _a : !options.separatePullRequests,
+        });
+    },
+    'maven-workspace': options => {
+        var _a;
+        return new maven_workspace_1.MavenWorkspace(options.github, options.targetBranch, options.repositoryConfig, {
+            ...options,
+            ...options.type,
+            merge: (_a = options.type.merge) !== null && _a !== void 0 ? _a : !options.separatePullRequests,
+        });
+    },
     'sentence-case': options => new sentence_case_1.SentenceCase(options.github, options.targetBranch, options.repositoryConfig, options.type.specialWords),
     'group-priority': options => new group_priority_1.GroupPriority(options.github, options.targetBranch, options.repositoryConfig, options.type.groups),
 };
 function buildPlugin(options) {
+    if (!options.separatePullRequests) {
+        options.separatePullRequests = false;
+    }
     if (typeof options.type === 'object') {
         const builder = pluginFactories[options.type.type];
         if (builder) {

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 = "16.14.0";
+export declare const VERSION = "16.14.2";

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 = '16.14.0';
+exports.VERSION = '16.14.2';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/manifest.js

@@ -104,6 +104,7 @@ class Manifest {
             targetBranch: this.targetBranch,
             repositoryConfig: this.repositoryConfig,
             manifestPath: this.manifestPath,
+            separatePullRequests: this.separatePullRequests,
         }));
         this.pullRequestOverflowHandler = new pull_request_overflow_handler_1.FilePullRequestOverflowHandler(this.github, this.logger);
     }

package/build/src/updaters/generic-json.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericJson = void 0;
-const jp = require("jsonpath");
+const jsonpath_plus_1 = require("jsonpath-plus");
 const json_stringify_1 = require("../util/json-stringify");
 const logger_1 = require("../util/logger");
 const VERSION_REGEX = /(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(-(?<preRelease>[\w.]+))?(\+(?<build>[-\w.]+))?/;
@@ -30,21 +30,23 @@ class GenericJson {
      */
     updateContent(content, logger = logger_1.logger) {
         const data = JSON.parse(content);
-        const nodes = jp.apply(data, this.jsonpath, value => {
-            if (typeof value !== 'string') {
-                logger.warn(`No string in ${this.jsonpath}. Skipping.`);
-                return value;
-            }
-            if (!value.match(VERSION_REGEX)) {
-                logger.warn(`No version found in ${this.jsonpath}. Skipping.`);
-                return value;
-            }
-            return value.replace(VERSION_REGEX, this.version.toString());
+        (0, jsonpath_plus_1.JSONPath)({
+            resultType: 'all',
+            path: this.jsonpath,
+            json: data,
+            callback: (payload, _payloadType, _fullPayload) => {
+                if (typeof payload.value !== 'string') {
+                    logger.warn(`No string in ${this.jsonpath}. Skipping.`);
+                    return payload;
+                }
+                if (!payload.value.match(VERSION_REGEX)) {
+                    logger.warn(`No version found in ${this.jsonpath}. Skipping.`);
+                    return payload;
+                }
+                payload.parent[payload.parentProperty] = payload.parent[payload.parentProperty].replace(VERSION_REGEX, this.version.toString());
+                return payload;
+            },
         });
-        if (!nodes) {
-            logger.warn(`No entries modified in ${this.jsonpath}`);
-            return content;
-        }
         return (0, json_stringify_1.jsonStringify)(data, content);
     }
 }

package/build/src/updaters/generic-toml.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericToml = void 0;
-const jp = require("jsonpath");
+const jsonpath_plus_1 = require("jsonpath-plus");
 const toml_edit_1 = require("../util/toml-edit");
 const logger_1 = require("../util/logger");
 /**
@@ -43,7 +43,12 @@ class GenericToml {
             logger.warn('Invalid toml, cannot be parsed', e);
             return content;
         }
-        const paths = jp.paths(data, this.jsonpath);
+        const pointers = (0, jsonpath_plus_1.JSONPath)({
+            path: this.jsonpath,
+            json: data,
+            resultType: 'pointer',
+        });
+        const paths = pointers.map(pointer => pointer.split('/').filter(Boolean));
         if (!paths || paths.length === 0) {
             logger.warn(`No entries modified in ${this.jsonpath}`);
             return content;

package/build/src/updaters/generic-yaml.js

@@ -14,7 +14,7 @@
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenericYaml = void 0;
-const jp = require("jsonpath");
+const jsonpath_plus_1 = require("jsonpath-plus");
 const yaml = require("js-yaml");
 const logger_1 = require("../util/logger");
 const DOCUMENT_SEPARATOR = '---\n';
@@ -50,12 +50,20 @@ class GenericYaml {
         // Update each document
         let modified = false;
         docs.forEach(data => {
-            const nodes = jp.apply(data, this.jsonpath, _val => {
-                return this.version.toString();
+            (0, jsonpath_plus_1.JSONPath)({
+                resultType: 'all',
+                path: this.jsonpath,
+                json: data,
+                callback: (payload, _payloadType, _fullPayload) => {
+                    if (typeof payload.value !== 'string') {
+                        logger.warn(`No string in ${this.jsonpath}. Skipping.`);
+                        return payload;
+                    }
+                    modified = true;
+                    payload.parent[payload.parentProperty] = this.version.toString();
+                    return payload;
+                },
             });
-            if (nodes && nodes.length) {
-                modified = true;
-            }
         });
         // If nothing was modified, return original content
         if (!modified) {

package/build/src/updaters/java/versions-manifest.js

@@ -43,10 +43,10 @@ class VersionsManifest extends java_update_1.JavaUpdate {
         const newLines = [];
         content.split(/\r?\n/).forEach(line => {
             if (version.includes('SNAPSHOT')) {
-                newLines.push(line.replace(new RegExp(`${packageName}:(.*):(.*)`, 'g'), `${packageName}:$1:${version}`));
+                newLines.push(line.replace(new RegExp(`^${packageName}:(.*):(.*)`, 'g'), `${packageName}:$1:${version}`));
             }
             else {
-                newLines.push(line.replace(new RegExp(`${packageName}:(.*):(.*)`, 'g'), `${packageName}:${version}:${version}`));
+                newLines.push(line.replace(new RegExp(`^${packageName}:(.*):(.*)`, 'g'), `${packageName}:${version}:${version}`));
             }
         });
         return newLines.join('\n');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "16.14.0",
+  "version": "16.14.2",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -86,7 +86,7 @@
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.0",
     "js-yaml": "^4.0.0",
-    "jsonpath": "^1.1.1",
+    "jsonpath-plus": "^9.0.0",
     "node-html-parser": "^6.0.0",
     "parse-github-repo-url": "^1.4.1",
     "semver": "^7.5.3",