release-please 16.12.0 → 16.12.2

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

@@ -79,6 +79,6 @@ function replaceIssueLink(note, host, owner, repo) {
     return note;
 }
 function htmlEscape(message) {
-    return message.replace('<', '&lt;').replace('>', '&gt;');
+    return message.replace(/``[^`].*[^`]``|`[^`]*`|<|>/g, match => match.length > 1 ? match : match === '<' ? '&lt;' : '&gt;');
 }
 //# sourceMappingURL=default.js.map

package/build/src/commit.js

@@ -331,6 +331,7 @@ function parseConventionalCommits(commits, logger = logger_1.logger) {
             }
             catch (_err) {
                 logger.debug(`commit could not be parsed: ${commit.sha} ${commit.message.split('\n')[0]}`);
+                logger.debug(`error message: ${_err}`);
             }
         }
     }

package/build/src/github.js

@@ -510,8 +510,8 @@ class GitHub {
         }
     }
     async mergeCommitsGraphQL(targetBranch, cursor, options = {}) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        var _h;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _j;
         this.logger.debug(`Fetching merge commits on branch ${targetBranch} with cursor: ${cursor}`);
         const query = `query pullRequestsSince($owner: String!, $repo: String!, $num: Int!, $maxFilesChanged: Int, $targetBranch: String!, $cursor: String) {
       repository(owner: $owner, name: $repo) {
@@ -589,7 +589,7 @@ class GitHub {
         for (const commit of commits) {
             for (const pr of commit.associatedPullRequests.nodes) {
                 if ((_b = pr.mergeCommit) === null || _b === void 0 ? void 0 : _b.oid) {
-                    (_c = mergeCommitCount[_h = pr.mergeCommit.oid]) !== null && _c !== void 0 ? _c : (mergeCommitCount[_h] = 0);
+                    (_c = mergeCommitCount[_j = pr.mergeCommit.oid]) !== null && _c !== void 0 ? _c : (mergeCommitCount[_j] = 0);
                     mergeCommitCount[pr.mergeCommit.oid]++;
                 }
             }
@@ -619,14 +619,15 @@ class GitHub {
                     number: pullRequest.number,
                     baseBranchName: pullRequest.baseRefName,
                     headBranchName: pullRequest.headRefName,
+                    mergeCommitOid: (_d = pullRequest.mergeCommit) === null || _d === void 0 ? void 0 : _d.oid,
                     title: pullRequest.title,
                     body: pullRequest.body,
                     labels: pullRequest.labels.nodes.map(node => node.name),
-                    files: (((_d = pullRequest.files) === null || _d === void 0 ? void 0 : _d.nodes) || []).map(node => node.path),
+                    files: (((_e = pullRequest.files) === null || _e === void 0 ? void 0 : _e.nodes) || []).map(node => node.path),
                 };
             }
             if (mergePullRequest) {
-                if (((_f = (_e = mergePullRequest.files) === null || _e === void 0 ? void 0 : _e.pageInfo) === null || _f === void 0 ? void 0 : _f.hasNextPage) &&
+                if (((_g = (_f = mergePullRequest.files) === null || _f === void 0 ? void 0 : _f.pageInfo) === null || _g === void 0 ? void 0 : _g.hasNextPage) &&
                     options.backfillFiles) {
                     this.logger.info(`PR #${mergePullRequest.number} has many files, backfilling`);
                     commit.files = await this.getCommitFiles(graphCommit.sha);
@@ -634,7 +635,7 @@ class GitHub {
                 else {
                     // We cannot directly fetch files on commits via graphql, only provide file
                     // information for commits with associated pull requests
-                    commit.files = (((_g = mergePullRequest.files) === null || _g === void 0 ? void 0 : _g.nodes) || []).map(node => node.path);
+                    commit.files = (((_h = mergePullRequest.files) === null || _h === void 0 ? void 0 : _h.nodes) || []).map(node => node.path);
                 }
             }
             else if (options.backfillFiles) {

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.12.0";
+export declare const VERSION = "16.12.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.12.0';
+exports.VERSION = '16.12.2';
 // x-release-please-end
 //# sourceMappingURL=index.js.map

package/build/src/manifest.d.ts

@@ -69,7 +69,6 @@ export interface ReleaserConfig {
     releaseLabels?: string[];
     extraLabels?: string[];
     initialVersion?: string;
-    signoff?: string;
     changelogSections?: ChangelogSection[];
     changelogPath?: string;
     changelogType?: ChangelogNotesType;
@@ -100,7 +99,6 @@ interface ReleaserConfigJson {
     'changelog-sections'?: ChangelogSection[];
     'release-as'?: string;
     'skip-github-release'?: boolean;
-    signoff?: string;
     draft?: boolean;
     prerelease?: boolean;
     'draft-pull-request'?: boolean;
@@ -183,6 +181,7 @@ export interface ManifestConfig extends ReleaserConfigJson {
     'last-release-sha'?: string;
     'always-link-local'?: boolean;
     plugins?: PluginType[];
+    signoff?: string;
     'group-pull-request-title-pattern'?: string;
     'release-search-depth'?: number;
     'commit-search-depth'?: number;

package/build/src/manifest.js

@@ -321,7 +321,7 @@ class Manifest {
                 const component = await strategy.getComponent();
                 this.logger.info(`No latest release found for path: ${path}, component: ${component}, but a previous version (${version.toString()}) was specified in the manifest.`);
                 releasesByPath[path] = {
-                    tag: new tag_name_1.TagName(version, component),
+                    tag: new tag_name_1.TagName(version, component, this.repositoryConfig[path].tagSeparator, this.repositoryConfig[path].includeVInTag),
                     sha: '',
                     notes: '',
                 };
@@ -710,7 +710,7 @@ class Manifest {
             const releaseList = githubReleases
                 .map(({ tagName, url }) => `- [${tagName}](${url})`)
                 .join('\n');
-            const comment = `:robot: Created releases:\n${releaseList}\n:sunflower:`;
+            const comment = `🤖 Created releases:\n\n${releaseList}\n\n:sunflower:`;
             await this.github.commentOnIssue(comment, pullRequest.number);
         }
         if (error) {
@@ -826,7 +826,6 @@ function extractReleaserConfig(config) {
         skipSnapshot: config['skip-snapshot'],
         initialVersion: config['initial-version'],
         excludePaths: config['exclude-paths'],
-        signoff: config['signoff'],
     };
 }
 /**
@@ -862,6 +861,7 @@ async function parseConfig(github, configFile, branch, onlyPath, releaseAs) {
         separatePullRequests: config['separate-pull-requests'],
         groupPullRequestTitlePattern: config['group-pull-request-title-pattern'],
         plugins: config['plugins'],
+        signoff: config['signoff'],
         labels: configLabel === null || configLabel === void 0 ? void 0 : configLabel.split(','),
         releaseLabels: configReleaseLabel === null || configReleaseLabel === void 0 ? void 0 : configReleaseLabel.split(','),
         snapshotLabels: configSnapshotLabel === null || configSnapshotLabel === void 0 ? void 0 : configSnapshotLabel.split(','),
@@ -968,7 +968,7 @@ async function latestReleaseVersion(github, targetBranch, releaseFilter, config,
     for await (const commitWithPullRequest of generator) {
         commitShas.add(commitWithPullRequest.sha);
         const mergedPullRequest = commitWithPullRequest.pullRequest;
-        if (!mergedPullRequest) {
+        if (!(mergedPullRequest === null || mergedPullRequest === void 0 ? void 0 : mergedPullRequest.mergeCommitOid)) {
             logger.trace(`skipping commit: ${commitWithPullRequest.sha} missing merged pull request`);
             continue;
         }

package/build/src/plugins/cargo-workspace.d.ts

@@ -2,6 +2,9 @@ import { CandidateReleasePullRequest } from '../manifest';
 import { WorkspacePlugin, DependencyGraph } from './workspace';
 import { CargoManifest } from '../updaters/rust/common';
 import { VersionsMap, Version } from '../version';
+import { Strategy } from '../strategy';
+import { Commit } from '../commit';
+import { Release } from '../release';
 interface CrateInfo {
     /**
      * e.g. `crates/crate-a`
@@ -36,6 +39,8 @@ interface CrateInfo {
  * into a single rust package.
  */
 export declare class CargoWorkspace extends WorkspacePlugin<CrateInfo> {
+    private strategiesByPath;
+    private releasesByPath;
     protected buildAllPackages(candidates: CandidateReleasePullRequest[]): Promise<{
         allPackages: CrateInfo[];
         candidatesByPackage: Record<string, CandidateReleasePullRequest>;
@@ -48,5 +53,6 @@ export declare class CargoWorkspace extends WorkspacePlugin<CrateInfo> {
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(pkg: CrateInfo): string;
     protected pathFromPackage(pkg: CrateInfo): string;
+    preconfigure(strategiesByPath: Record<string, Strategy>, _commitsByPath: Record<string, Commit[]>, _releasesByPath: Record<string, Release>): Promise<Record<string, Strategy>>;
 }
 export {};

package/build/src/plugins/cargo-workspace.js

@@ -35,6 +35,11 @@ const errors_1 = require("../errors");
  * into a single rust package.
  */
 class CargoWorkspace extends workspace_1.WorkspacePlugin {
+    constructor() {
+        super(...arguments);
+        this.strategiesByPath = {};
+        this.releasesByPath = {};
+    }
     async buildAllPackages(candidates) {
         var _a, _b, _c, _d;
         const cargoManifestContent = await this.github.getFileContentsOnBranch('Cargo.toml', this.targetBranch);
@@ -143,6 +148,26 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
         const originalManifest = (0, common_1.parseCargoManifest)(pkg.manifestContent);
         const updatedManifest = (0, common_1.parseCargoManifest)(updatedContent);
         const dependencyNotes = getChangelogDepsNotes(originalManifest, updatedManifest);
+        const updatedPackage = {
+            ...pkg,
+            version: version.toString(),
+        };
+        const strategy = this.strategiesByPath[updatedPackage.path];
+        const latestRelease = this.releasesByPath[updatedPackage.path];
+        const basePullRequest = strategy
+            ? await strategy.buildReleasePullRequest([], latestRelease, false, [], {
+                newVersion: version,
+            })
+            : undefined;
+        if (basePullRequest) {
+            return this.updateCandidate({
+                path: pkg.path,
+                pullRequest: basePullRequest,
+                config: {
+                    releaseType: 'rust',
+                },
+            }, pkg, updatedVersions);
+        }
         const pullRequest = {
             title: pull_request_title_1.PullRequestTitle.ofTargetBranch(this.targetBranch),
             body: new pull_request_body_1.PullRequestBody([
@@ -236,6 +261,12 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
     pathFromPackage(pkg) {
         return pkg.path;
     }
+    async preconfigure(strategiesByPath, _commitsByPath, _releasesByPath) {
+        // Using preconfigure to siphon releases and strategies.
+        this.strategiesByPath = strategiesByPath;
+        this.releasesByPath = _releasesByPath;
+        return strategiesByPath;
+    }
 }
 exports.CargoWorkspace = CargoWorkspace;
 function getChangelogDepsNotes(originalManifest, updatedManifest) {

package/build/src/plugins/node-workspace.js

@@ -21,9 +21,9 @@ const pull_request_body_1 = require("../util/pull-request-body");
 const branch_name_1 = require("../util/branch-name");
 const changelog_1 = require("../updaters/changelog");
 const workspace_1 = require("./workspace");
-const versioning_strategy_1 = require("../versioning-strategy");
 const composite_1 = require("../updaters/composite");
 const package_json_1 = require("../updaters/node/package-json");
+const versioning_strategy_1 = require("../versioning-strategy");
 /**
  * The plugin analyzed a cargo workspace and will bump dependencies
  * of managed packages if those dependencies are being updated.
@@ -99,6 +99,9 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
     }
     bumpVersion(pkg) {
         const version = version_1.Version.parse(pkg.version);
+        const strategy = this.strategiesByPath[pkg.path];
+        if (strategy)
+            return strategy.versioningStrategy.bump(version, []);
         return new versioning_strategy_1.PatchVersionUpdate().bump(version);
     }
     updateCandidate(existingCandidate, pkg, updatedVersions) {

package/build/src/pull-request.d.ts

@@ -2,6 +2,7 @@ export interface PullRequest {
     readonly headBranchName: string;
     readonly baseBranchName: string;
     readonly number: number;
+    readonly mergeCommitOid?: string;
     readonly title: string;
     readonly body: string;
     readonly labels: string[];

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

@@ -71,7 +71,7 @@ class PHPYoshi extends base_1.BaseStrategy {
         const versionsMap = new Map();
         const directoryVersionContents = {};
         const component = await this.getComponent();
-        const newVersionTag = new tag_name_1.TagName(newVersion, component);
+        const newVersionTag = new tag_name_1.TagName(newVersion, component, this.tagSeparator, this.includeVInTag);
         let releaseNotesBody = `## ${newVersion.toString()}`;
         for (const directory of topLevelDirectories) {
             try {

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

@@ -17,6 +17,7 @@ exports.GenericJson = void 0;
 const jp = require("jsonpath");
 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.]+))?/;
 class GenericJson {
     constructor(jsonpath, version) {
         this.jsonpath = jsonpath;
@@ -29,8 +30,16 @@ class GenericJson {
      */
     updateContent(content, logger = logger_1.logger) {
         const data = JSON.parse(content);
-        const nodes = jp.apply(data, this.jsonpath, _val => {
-            return this.version.toString();
+        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());
         });
         if (!nodes) {
             logger.warn(`No entries modified in ${this.jsonpath}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "16.12.0",
+  "version": "16.12.2",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -55,14 +55,14 @@
     "@types/yargs": "^17.0.0",
     "ajv": "^8.11.0",
     "ajv-formats": "^3.0.0",
-    "c8": "^9.0.0",
+    "c8": "^10.0.0",
     "chai": "^4.2.0",
     "config-chain": "^1.1.13",
     "cross-env": "^7.0.0",
     "gts": "^3.1.0",
     "mocha": "^9.2.2",
     "nock": "^13.0.0",
-    "sinon": "18.0.0",
+    "sinon": "18.0.1",
     "snap-shot-it": "^7.0.0"
   },
   "dependencies": {
@@ -81,7 +81,7 @@
     "conventional-changelog-writer": "^6.0.0",
     "conventional-commits-filter": "^3.0.0",
     "detect-indent": "^6.1.0",
-    "diff": "^5.0.0",
+    "diff": "^7.0.0",
     "figures": "^3.0.0",
     "http-proxy-agent": "^7.0.0",
     "https-proxy-agent": "^7.0.0",

package/schemas/config.json

@@ -188,6 +188,25 @@
                   }
                 },
                 "required": ["type", "path"]
+              },
+              {
+                "description": "An extra arbitrary file that includes release-please generic updater's annotation.",
+                "type": "object",
+                "properties": {
+                  "type": {
+                    "description": "The file format type.",
+                    "enum": ["generic"]
+                  },
+                  "path": {
+                    "description": "The path to the file.",
+                    "type": "string"
+                  },
+                  "glob": {
+                    "description": "Whether to treat the path as a glob. Defaults to `false`.",
+                    "type": "boolean"
+                  }
+                },
+                "required": ["type", "path"]
               }
             ]
           }
@@ -377,6 +396,10 @@
             ]
           }
         },
+        "signoff": {
+          "description": "Text to be used as Signed-off-by in the commit.",
+          "type": "string"
+        },
         "group-pull-request-title-pattern": {
           "description": "When grouping multiple release pull requests use this pattern for the title.",
           "type": "string"
@@ -412,6 +435,7 @@
     "last-release-sha": true,
     "always-link-local": true,
     "plugins": true,
+    "signoff": true,
     "group-pull-request-title-pattern": true,
     "release-search-depth": true,
     "commit-search-depth": true,