release-please 16.11.0 → 16.12.1

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/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.11.0";
+export declare const VERSION = "16.12.1";

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.11.0';
+exports.VERSION = '16.12.1';
 // 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: '',
                 };
@@ -687,7 +687,11 @@ class Manifest {
         this.logger.info(`Creating ${releases.length} releases for pull #${pullRequest.number}`);
         const duplicateReleases = [];
         const githubReleases = [];
+        let error;
         for (const release of releases) {
+            // stop releasing once we hit an error
+            if (error)
+                continue;
             try {
                 githubReleases.push(await this.createRelease(release));
             }
@@ -697,10 +701,21 @@ class Manifest {
                     duplicateReleases.push(err);
                 }
                 else {
-                    throw err;
+                    error = err;
                 }
             }
         }
+        if (githubReleases.length > 0) {
+            // comment on pull request about the successful releases
+            const releaseList = githubReleases
+                .map(({ tagName, url }) => `- [${tagName}](${url})`)
+                .join('\n');
+            const comment = `🤖 Created releases:\n\n${releaseList}\n\n:sunflower:`;
+            await this.github.commentOnIssue(comment, pullRequest.number);
+        }
+        if (error) {
+            throw error;
+        }
         if (duplicateReleases.length > 0) {
             if (duplicateReleases.length + githubReleases.length ===
                 releases.length) {
@@ -726,9 +741,6 @@ class Manifest {
             draft: release.draft,
             prerelease: release.prerelease,
         });
-        // comment on pull request
-        const comment = `:robot: Release is at ${githubRelease.url} :sunflower:`;
-        await this.github.commentOnIssue(comment, release.pullRequest.number);
         return {
             ...githubRelease,
             path: release.path,
@@ -814,7 +826,6 @@ function extractReleaserConfig(config) {
         skipSnapshot: config['skip-snapshot'],
         initialVersion: config['initial-version'],
         excludePaths: config['exclude-paths'],
-        signoff: config['signoff'],
     };
 }
 /**
@@ -850,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(','),
@@ -956,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/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/build/src/updaters/node/package-json.d.ts

@@ -35,6 +35,7 @@ export declare class PackageJson extends DefaultUpdater {
  * @param {Version} newVersion The new version to update with
  */
 export declare function newVersionWithRange(oldVersion: string, newVersion: Version): string;
+export declare const NPM_PROTOCOL_REGEXP: RegExp;
 /**
  * Helper function to update dependency versions for all new versions specified
  * in the updated versions map. Note that this mutates the existing input.

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

@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateDependencies = exports.newVersionWithRange = exports.PackageJson = void 0;
+exports.updateDependencies = exports.NPM_PROTOCOL_REGEXP = exports.newVersionWithRange = exports.PackageJson = void 0;
 const json_stringify_1 = require("../../util/json-stringify");
 const logger_1 = require("../../util/logger");
 const default_1 = require("../default");
@@ -82,6 +82,7 @@ function newVersionWithRange(oldVersion, newVersion) {
     return newVersion.toString();
 }
 exports.newVersionWithRange = newVersionWithRange;
+exports.NPM_PROTOCOL_REGEXP = /^[a-z]+:/;
 /**
  * Helper function to update dependency versions for all new versions specified
  * in the updated versions map. Note that this mutates the existing input.
@@ -91,9 +92,12 @@ exports.newVersionWithRange = newVersionWithRange;
  */
 function updateDependencies(dependencies, updatedVersions) {
     for (const depName of Object.keys(dependencies)) {
+        const oldVersion = dependencies[depName];
+        if (exports.NPM_PROTOCOL_REGEXP.test(oldVersion)) {
+            continue;
+        }
         const newVersion = updatedVersions.get(depName);
         if (newVersion) {
-            const oldVersion = dependencies[depName];
             dependencies[depName] = newVersionWithRange(oldVersion, newVersion);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "16.11.0",
+  "version": "16.12.1",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -55,7 +55,7 @@
     "@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",

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,