release-please 16.5.0 → 16.6.0

package/build/src/github.js

@@ -43,12 +43,14 @@ class GitHub {
         this.getCommitFiles = wrapAsync(async (sha) => {
             this.logger.debug(`Backfilling file list for commit: ${sha}`);
             const files = [];
-            for await (const resp of this.octokit.paginate.iterator(this.octokit.repos.getCommit, {
+            for await (const resp of this.octokit.paginate.iterator('GET /repos/{owner}/{repo}/commits/{ref}', {
                 owner: this.repository.owner,
                 repo: this.repository.repo,
                 ref: sha,
             })) {
-                for (const f of resp.data.files || []) {
+                // Paginate plugin doesn't have types for listing files on a commit
+                const data = resp.data;
+                for (const f of data.files || []) {
                     if (f.filename) {
                         files.push(f.filename);
                     }
@@ -711,7 +713,7 @@ class GitHub {
             MERGED: 'closed',
         };
         let results = 0;
-        for await (const { data: pulls } of this.octokit.paginate.iterator(this.octokit.rest.pulls.list, {
+        for await (const { data: pulls } of this.octokit.paginate.iterator('GET /repos/{owner}/{repo}/pulls', {
             state: statusMap[status],
             owner: this.repository.owner,
             repo: this.repository.repo,
@@ -921,7 +923,7 @@ class GitHub {
     async *tagIterator(options = {}) {
         const maxResults = options.maxResults || Number.MAX_SAFE_INTEGER;
         let results = 0;
-        for await (const response of this.octokit.paginate.iterator(this.octokit.rest.repos.listTags, {
+        for await (const response of this.octokit.paginate.iterator('GET /repos/{owner}/{repo}/tags', {
             owner: this.repository.owner,
             repo: this.repository.repo,
         })) {

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

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

@@ -42,7 +42,7 @@ export declare class CargoWorkspace extends WorkspacePlugin<CrateInfo> {
     }>;
     protected bumpVersion(pkg: CrateInfo): Version;
     protected updateCandidate(existingCandidate: CandidateReleasePullRequest, pkg: CrateInfo, updatedVersions: VersionsMap): CandidateReleasePullRequest;
-    protected newCandidate(pkg: CrateInfo, updatedVersions: VersionsMap): CandidateReleasePullRequest;
+    protected newCandidate(pkg: CrateInfo, updatedVersions: VersionsMap): Promise<CandidateReleasePullRequest>;
     protected postProcessCandidates(candidates: CandidateReleasePullRequest[], updatedVersions: VersionsMap): CandidateReleasePullRequest[];
     protected buildGraph(allPackages: CrateInfo[]): Promise<DependencyGraph<CrateInfo>>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;

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

@@ -130,7 +130,7 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
         }
         return existingCandidate;
     }
-    newCandidate(pkg, updatedVersions) {
+    async newCandidate(pkg, updatedVersions) {
         const version = updatedVersions.get(pkg.name);
         if (!version) {
             throw new Error(`Didn't find updated version for ${pkg.name}`);

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

@@ -72,7 +72,7 @@ export declare class MavenWorkspace extends WorkspacePlugin<MavenArtifact> {
     protected isReleaseVersion(version: Version): boolean;
     protected bumpVersion(artifact: MavenArtifact): Version;
     protected updateCandidate(existingCandidate: CandidateReleasePullRequest, artifact: MavenArtifact, updatedVersions: VersionsMap): CandidateReleasePullRequest;
-    protected newCandidate(artifact: MavenArtifact, updatedVersions: VersionsMap): CandidateReleasePullRequest;
+    protected newCandidate(artifact: MavenArtifact, updatedVersions: VersionsMap): Promise<CandidateReleasePullRequest>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(artifact: MavenArtifact): string;
     protected pathFromPackage(artifact: MavenArtifact): string;

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

@@ -266,7 +266,7 @@ class MavenWorkspace extends workspace_1.WorkspacePlugin {
         }
         return existingCandidate;
     }
-    newCandidate(artifact, updatedVersions) {
+    async newCandidate(artifact, updatedVersions) {
         const version = updatedVersions.get(artifact.name);
         if (!version) {
             throw new Error(`Didn't find updated version for ${artifact.name}`);

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

@@ -2,6 +2,9 @@ import { GitHub } from '../github';
 import { CandidateReleasePullRequest, RepositoryConfig } from '../manifest';
 import { Version, VersionsMap } from '../version';
 import { WorkspacePlugin, DependencyGraph, WorkspacePluginOptions } from './workspace';
+import { Strategy } from '../strategy';
+import { Commit } from '../commit';
+import { Release } from '../release';
 interface Package {
     path: string;
     name: string;
@@ -25,6 +28,8 @@ interface NodeWorkspaceOptions extends WorkspacePluginOptions {
  */
 export declare class NodeWorkspace extends WorkspacePlugin<Package> {
     private alwaysLinkLocal;
+    private strategiesByPath;
+    private releasesByPath;
     readonly updatePeerDependencies: boolean;
     constructor(github: GitHub, targetBranch: string, repositoryConfig: RepositoryConfig, options?: NodeWorkspaceOptions);
     protected buildAllPackages(candidates: CandidateReleasePullRequest[]): Promise<{
@@ -33,12 +38,13 @@ export declare class NodeWorkspace extends WorkspacePlugin<Package> {
     }>;
     protected bumpVersion(pkg: Package): Version;
     protected updateCandidate(existingCandidate: CandidateReleasePullRequest, pkg: Package, updatedVersions: VersionsMap): CandidateReleasePullRequest;
-    protected newCandidate(pkg: Package, updatedVersions: VersionsMap): CandidateReleasePullRequest;
+    protected newCandidate(pkg: Package, updatedVersions: VersionsMap): Promise<CandidateReleasePullRequest>;
     protected postProcessCandidates(candidates: CandidateReleasePullRequest[], _updatedVersions: VersionsMap): CandidateReleasePullRequest[];
     protected buildGraph(allPackages: Package[]): Promise<DependencyGraph<Package>>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(pkg: Package): string;
     protected pathFromPackage(pkg: Package): string;
     private combineDeps;
+    preconfigure(strategiesByPath: Record<string, Strategy>, _commitsByPath: Record<string, Commit[]>, _releasesByPath: Record<string, Release>): Promise<Record<string, Strategy>>;
 }
 export {};

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

@@ -33,6 +33,8 @@ const package_json_1 = require("../updaters/node/package-json");
 class NodeWorkspace extends workspace_1.WorkspacePlugin {
     constructor(github, targetBranch, repositoryConfig, options = {}) {
         super(github, targetBranch, repositoryConfig, options);
+        this.strategiesByPath = {};
+        this.releasesByPath = {};
         this.alwaysLinkLocal = options.alwaysLinkLocal === false ? false : true;
         this.updatePeerDependencies = options.updatePeerDependencies === true;
     }
@@ -142,7 +144,7 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
         }
         return existingCandidate;
     }
-    newCandidate(pkg, updatedVersions) {
+    async newCandidate(pkg, updatedVersions) {
         // Update version of the package
         const newVersion = updatedVersions.get(pkg.name);
         if (!newVersion) {
@@ -153,6 +155,22 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
             version: newVersion.toString(),
         };
         const dependencyNotes = getChangelogDepsNotes(pkg, updatedPackage, updatedVersions, this.logger);
+        const strategy = this.strategiesByPath[updatedPackage.path];
+        const latestRelease = this.releasesByPath[updatedPackage.path];
+        const basePullRequest = strategy
+            ? await strategy.buildReleasePullRequest([], latestRelease, false, [], {
+                newVersion,
+            })
+            : undefined;
+        if (basePullRequest) {
+            return this.updateCandidate({
+                path: pkg.path,
+                pullRequest: basePullRequest,
+                config: {
+                    releaseType: 'node',
+                },
+            }, pkg, updatedVersions);
+        }
         const pullRequest = {
             title: pull_request_title_1.PullRequestTitle.ofTargetBranch(this.targetBranch),
             body: new pull_request_body_1.PullRequestBody([
@@ -230,6 +248,12 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
                 : {}),
         };
     }
+    async preconfigure(strategiesByPath, _commitsByPath, _releasesByPath) {
+        // Using preconfigure to siphon releases and strategies.
+        this.strategiesByPath = strategiesByPath;
+        this.releasesByPath = _releasesByPath;
+        return strategiesByPath;
+    }
 }
 exports.NodeWorkspace = NodeWorkspace;
 function getChangelogDepsNotes(original, updated, updateVersions, logger) {

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

@@ -105,7 +105,7 @@ export declare abstract class WorkspacePlugin<T> extends ManifestPlugin {
      *   update.
      * @returns {CandidateReleasePullRequest} A new pull request
      */
-    protected abstract newCandidate(pkg: T, updatedVersions: VersionsMap): CandidateReleasePullRequest;
+    protected abstract newCandidate(pkg: T, updatedVersions: VersionsMap): Promise<CandidateReleasePullRequest>;
     /**
      * Collect all packages being managed in this workspace.
      * @param {CanididateReleasePullRequest[]} candidates Existing candidate pull

package/build/src/plugins/workspace.js

@@ -86,7 +86,7 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
             else {
                 // otherwise, build a new pull request with changelog and entry update
                 this.logger.info(`Creating new candidate pull request for ${this.packageNameFromPackage(pkg)}`);
-                const newCandidate = this.newCandidate(pkg, updatedVersions);
+                const newCandidate = await this.newCandidate(pkg, updatedVersions);
                 if (newCandidatePaths.has(newCandidate.path)) {
                     this.logger.info(`Already created new candidate for path: ${newCandidate.path}`);
                 }

package/build/src/strategies/base.d.ts

@@ -1,4 +1,4 @@
-import { Strategy, BuildReleaseOptions } from '../strategy';
+import { Strategy, BuildReleaseOptions, BumpReleaseOptions } from '../strategy';
 import { GitHub } from '../github';
 import { VersioningStrategy } from '../versioning-strategy';
 import { Repository } from '../repository';
@@ -115,7 +115,7 @@ export declare abstract class BaseStrategy implements Strategy {
      *   open for this path/component. Returns undefined if we should not
      *   open a pull request.
      */
-    buildReleasePullRequest(commits: ConventionalCommit[], latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest | undefined>;
+    buildReleasePullRequest(commits: ConventionalCommit[], latestRelease?: Release, draft?: boolean, labels?: string[], bumpOnlyOptions?: BumpReleaseOptions): Promise<ReleasePullRequest | undefined>;
     private extraFilePaths;
     protected extraFileUpdates(version: Version, versionsMap: VersionsMap): Promise<Update[]>;
     protected changelogEmpty(changelogEntry: string): boolean;

package/build/src/strategies/base.js

@@ -142,14 +142,15 @@ class BaseStrategy {
      *   open for this path/component. Returns undefined if we should not
      *   open a pull request.
      */
-    async buildReleasePullRequest(commits, latestRelease, draft, labels = []) {
+    async buildReleasePullRequest(commits, latestRelease, draft, labels = [], bumpOnlyOptions) {
+        var _a;
         const conventionalCommits = await this.postProcessCommits(commits);
         this.logger.info(`Considering: ${conventionalCommits.length} commits`);
-        if (conventionalCommits.length === 0) {
+        if (!bumpOnlyOptions && conventionalCommits.length === 0) {
             this.logger.info(`No commits for path: ${this.path}, skipping`);
             return undefined;
         }
-        const newVersion = await this.buildNewVersion(conventionalCommits, latestRelease);
+        const newVersion = (_a = bumpOnlyOptions === null || bumpOnlyOptions === void 0 ? void 0 : bumpOnlyOptions.newVersion) !== null && _a !== void 0 ? _a : (await this.buildNewVersion(conventionalCommits, latestRelease));
         const versionsMap = await this.updateVersionsMap(await this.buildVersionsMap(conventionalCommits), conventionalCommits, newVersion);
         const component = await this.getComponent();
         this.logger.debug('component:', component);
@@ -161,7 +162,7 @@ class BaseStrategy {
             ? branch_name_1.BranchName.ofComponentTargetBranch(branchComponent, this.targetBranch)
             : branch_name_1.BranchName.ofTargetBranch(this.targetBranch);
         const releaseNotesBody = await this.buildReleaseNotes(conventionalCommits, newVersion, newVersionTag, latestRelease, commits);
-        if (this.changelogEmpty(releaseNotesBody)) {
+        if (!bumpOnlyOptions && this.changelogEmpty(releaseNotesBody)) {
             this.logger.info(`No user facing commits found since ${latestRelease ? latestRelease.sha : 'beginning of time'} - skipping`);
             return undefined;
         }

package/build/src/strategies/java.d.ts

@@ -5,6 +5,7 @@ import { ConventionalCommit } from '../commit';
 import { Release } from '../release';
 import { ReleasePullRequest } from '../release-pull-request';
 import { VersioningStrategy } from '../versioning-strategy';
+import { BumpReleaseOptions } from '../strategy';
 export interface JavaBuildUpdatesOption extends BuildUpdatesOptions {
     isSnapshot?: boolean;
 }
@@ -18,7 +19,7 @@ export declare class Java extends BaseStrategy {
     protected readonly snapshotLabels: string[];
     readonly skipSnapshot: boolean;
     constructor(options: BaseStrategyOptions);
-    buildReleasePullRequest(commits: ConventionalCommit[], latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest | undefined>;
+    buildReleasePullRequest(commits: ConventionalCommit[], latestRelease?: Release, draft?: boolean, labels?: string[], _bumpOnlyOptions?: BumpReleaseOptions): Promise<ReleasePullRequest | undefined>;
     protected buildSnapshotPullRequest(latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest>;
     isPublishedVersion(version: Version): boolean;
     protected needsSnapshot(commits: ConventionalCommit[], latestRelease?: Release): Promise<boolean>;

package/build/src/strategies/java.js

@@ -58,7 +58,7 @@ class Java extends base_1.BaseStrategy {
         this.snapshotLabels = options.snapshotLabels || manifest_1.DEFAULT_SNAPSHOT_LABELS;
         this.skipSnapshot = (_c = options.skipSnapshot) !== null && _c !== void 0 ? _c : false;
     }
-    async buildReleasePullRequest(commits, latestRelease, draft, labels = []) {
+    async buildReleasePullRequest(commits, latestRelease, draft, labels = [], _bumpOnlyOptions) {
         if (await this.needsSnapshot(commits, latestRelease)) {
             this.logger.info('Repository needs a snapshot bump.');
             return await this.buildSnapshotPullRequest(latestRelease, draft, this.snapshotLabels);

package/build/src/strategies/php-yoshi.d.ts

@@ -4,9 +4,10 @@ import { Commit } from '../commit';
 import { Release } from '../release';
 import { ReleasePullRequest } from '../release-pull-request';
 import { PullRequestBody } from '../util/pull-request-body';
+import { BumpReleaseOptions } from '../strategy';
 export declare class PHPYoshi extends BaseStrategy {
     constructor(options: BaseStrategyOptions);
-    buildReleasePullRequest(commits: Commit[], latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest | undefined>;
+    buildReleasePullRequest(commits: Commit[], latestRelease?: Release, draft?: boolean, labels?: string[], bumpOnlyOptions?: BumpReleaseOptions): Promise<ReleasePullRequest | undefined>;
     protected parsePullRequestBody(pullRequestBody: string): Promise<PullRequestBody | undefined>;
     protected buildUpdates(options: BuildUpdatesOptions): Promise<Update[]>;
 }

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

@@ -48,10 +48,10 @@ class PHPYoshi extends base_1.BaseStrategy {
             changelogSections: CHANGELOG_SECTIONS,
         });
     }
-    async buildReleasePullRequest(commits, latestRelease, draft, labels = []) {
+    async buildReleasePullRequest(commits, latestRelease, draft, labels = [], bumpOnlyOptions) {
         var _a, _b, _c;
         const conventionalCommits = await this.postProcessCommits((0, commit_1.parseConventionalCommits)(commits, this.logger));
-        if (conventionalCommits.length === 0) {
+        if (!bumpOnlyOptions && conventionalCommits.length === 0) {
             this.logger.info(`No commits for path: ${this.path}, skipping`);
             return undefined;
         }

package/build/src/strategy.d.ts

@@ -8,6 +8,9 @@ import { Version } from './version';
 export interface BuildReleaseOptions {
     groupPullRequestTitlePattern?: string;
 }
+export interface BumpReleaseOptions {
+    newVersion: Version;
+}
 /**
  * A strategy is responsible for determining which files are
  * necessary to update in a release pull request.
@@ -23,11 +26,15 @@ export interface Strategy {
      *   component if available.
      * @param {boolean} draft Optional. Whether or not to create the pull
      *   request as a draft. Defaults to `false`.
+     * @param {BumpReleaseOptions} bumpOnlyOptions Optional. Options, that when
+     * present, indicate a release should be created even if there are no
+     * conventional commits. This is used when a release is required for
+     * a dependency update with a workspace plugin.
      * @returns {ReleasePullRequest | undefined} The release pull request to
      *   open for this path/component. Returns undefined if we should not
      *   open a pull request.
      */
-    buildReleasePullRequest(commits: Commit[], latestRelease?: Release, draft?: boolean, labels?: string[]): Promise<ReleasePullRequest | undefined>;
+    buildReleasePullRequest(commits: Commit[], latestRelease?: Release, draft?: boolean, labels?: string[], bumpOnlyOptions?: BumpReleaseOptions): Promise<ReleasePullRequest | undefined>;
     /**
      * Given a merged pull request, build the candidate release.
      * @param {PullRequest} mergedPullRequest The merged release pull request.

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

@@ -54,10 +54,10 @@ var SUPPORTED_RANGE_PREFIXES;
 (function (SUPPORTED_RANGE_PREFIXES) {
     SUPPORTED_RANGE_PREFIXES["CARET"] = "^";
     SUPPORTED_RANGE_PREFIXES["TILDE"] = "~";
-    SUPPORTED_RANGE_PREFIXES["GREATER_THAN"] = ">";
-    SUPPORTED_RANGE_PREFIXES["LESS_THAN"] = "<";
     SUPPORTED_RANGE_PREFIXES["EQUAL_OR_GREATER_THAN"] = ">=";
     SUPPORTED_RANGE_PREFIXES["EQUAL_OR_LESS_THAN"] = "<=";
+    SUPPORTED_RANGE_PREFIXES["GREATER_THAN"] = ">";
+    SUPPORTED_RANGE_PREFIXES["LESS_THAN"] = "<";
 })(SUPPORTED_RANGE_PREFIXES || (SUPPORTED_RANGE_PREFIXES = {}));
 function detectRangePrefix(version) {
     return (Object.values(SUPPORTED_RANGE_PREFIXES).find(supportedRangePrefix => version.startsWith(supportedRangePrefix)) || '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "16.5.0",
+  "version": "16.6.0",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",
@@ -67,7 +67,7 @@
   },
   "dependencies": {
     "@conventional-commits/parser": "^0.4.1",
-    "@google-automations/git-file-utils": "^1.2.5",
+    "@google-automations/git-file-utils": "^2.0.0",
     "@iarna/toml": "^3.0.0",
     "@octokit/graphql": "^5.0.0",
     "@octokit/request": "^6.0.0",
@@ -94,7 +94,7 @@
     "typescript": "^4.6.4",
     "unist-util-visit": "^2.0.3",
     "unist-util-visit-parents": "^3.1.1",
-    "xpath": "^0.0.32",
+    "xpath": "^0.0.34",
     "yaml": "^2.2.2",
     "yargs": "^17.0.0"
   },