release-please 13.16.2 → 13.16.3

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+### [13.16.3](https://github.com/googleapis/release-please/compare/v13.16.2...v13.16.3) (2022-05-13)
+
+
+### Bug Fixes
+
+* workspace plugins should update manifest versions ([#1429](https://github.com/googleapis/release-please/issues/1429)) ([ab802a9](https://github.com/googleapis/release-please/commit/ab802a924704044b26017b40a2da48657022faad))
+
 ### [13.16.2](https://github.com/googleapis/release-please/compare/v13.16.1...v13.16.2) (2022-05-12)
 
 

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

@@ -7,6 +7,7 @@ export interface PluginFactoryOptions {
     github: GitHub;
     targetBranch: string;
     repositoryConfig: RepositoryConfig;
+    manifestPath: string;
     alwaysLinkLocal?: boolean;
     updateAllPackages?: boolean;
 }

package/build/src/manifest.js

@@ -314,6 +314,7 @@ class Manifest {
             github: this.github,
             targetBranch: this.targetBranch,
             repositoryConfig: this.repositoryConfig,
+            manifestPath: this.manifestPath,
         }));
         let strategies = strategiesByPath;
         for (const plugin of plugins) {

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

@@ -47,5 +47,6 @@ export declare class CargoWorkspace extends WorkspacePlugin<CrateInfo> {
     protected buildGraph(allPackages: CrateInfo[]): Promise<DependencyGraph<CrateInfo>>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(pkg: CrateInfo): string;
+    protected pathFromPackage(pkg: CrateInfo): string;
 }
 export {};

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

@@ -213,6 +213,9 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
     packageNameFromPackage(pkg) {
         return pkg.name;
     }
+    pathFromPackage(pkg) {
+        return pkg.path;
+    }
 }
 exports.CargoWorkspace = CargoWorkspace;
 function getChangelogDepsNotes(originalManifest, updatedManifest) {

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

@@ -33,5 +33,6 @@ export declare class NodeWorkspace extends WorkspacePlugin<Package> {
     protected buildGraph(allPackages: Package[]): Promise<DependencyGraph<Package>>;
     protected inScope(candidate: CandidateReleasePullRequest): boolean;
     protected packageNameFromPackage(pkg: Package): string;
+    protected pathFromPackage(pkg: Package): string;
 }
 export {};

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

@@ -235,6 +235,9 @@ class NodeWorkspace extends workspace_1.WorkspacePlugin {
     packageNameFromPackage(pkg) {
         return pkg.name;
     }
+    pathFromPackage(pkg) {
+        return pkg.location;
+    }
 }
 exports.NodeWorkspace = NodeWorkspace;
 function getChangelogDepsNotes(original, updated) {

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

@@ -8,6 +8,7 @@ export interface DependencyNode<T> {
     value: T;
 }
 export interface WorkspacePluginOptions {
+    manifestPath?: string;
     updateAllPackages?: boolean;
 }
 interface AllPackages<T> {
@@ -27,6 +28,7 @@ interface AllPackages<T> {
  */
 export declare abstract class WorkspacePlugin<T> extends ManifestPlugin {
     private updateAllPackages;
+    private manifestPath;
     constructor(github: GitHub, targetBranch: string, repositoryConfig: RepositoryConfig, options?: WorkspacePluginOptions);
     run(candidates: CandidateReleasePullRequest[]): Promise<CandidateReleasePullRequest[]>;
     /**
@@ -83,6 +85,12 @@ export declare abstract class WorkspacePlugin<T> extends ManifestPlugin {
      * @returns {string} The package name.
      */
     protected abstract packageNameFromPackage(pkg: T): string;
+    /**
+     * Given a package, return the path in the repo to the package.
+     * @param {T} pkg The package definition.
+     * @returns {string} The package path.
+     */
+    protected abstract pathFromPackage(pkg: T): string;
     /**
      * Amend any or all in-scope candidates once all other processing has occured.
      *

package/build/src/plugins/workspace.js

@@ -15,8 +15,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkspacePlugin = void 0;
 const plugin_1 = require("../plugin");
+const manifest_1 = require("../manifest");
 const logger_1 = require("../util/logger");
 const merge_1 = require("./merge");
+const release_please_manifest_1 = require("../updaters/release-please-manifest");
 /**
  * The plugin generalizes the logic for handling a workspace and
  * will bump dependencies of managed packages if those dependencies
@@ -30,9 +32,10 @@ const merge_1 = require("./merge");
  */
 class WorkspacePlugin extends plugin_1.ManifestPlugin {
     constructor(github, targetBranch, repositoryConfig, options = {}) {
-        var _a;
+        var _a, _b;
         super(github, targetBranch, repositoryConfig);
-        this.updateAllPackages = (_a = options.updateAllPackages) !== null && _a !== void 0 ? _a : false;
+        this.manifestPath = (_a = options.manifestPath) !== null && _a !== void 0 ? _a : manifest_1.DEFAULT_RELEASE_PLEASE_MANIFEST;
+        this.updateAllPackages = (_b = options.updateAllPackages) !== null && _b !== void 0 ? _b : false;
     }
     async run(candidates) {
         logger_1.logger.info('Running workspace plugin');
@@ -63,6 +66,7 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
         const orderedPackages = this.buildGraphOrder(graph, packageNamesToUpdate);
         logger_1.logger.info(`Updating ${orderedPackages.length} packages`);
         const updatedVersions = new Map();
+        const updatedPathVersions = new Map();
         for (const pkg of orderedPackages) {
             const packageName = this.packageNameFromPackage(pkg);
             logger_1.logger.debug(`package: ${packageName}`);
@@ -76,6 +80,7 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
                 const version = this.bumpVersion(pkg);
                 logger_1.logger.debug(`version: ${version} forced bump`);
                 updatedVersions.set(packageName, version);
+                updatedPathVersions.set(this.pathFromPackage(pkg), version);
             }
         }
         let newCandidates = [];
@@ -98,6 +103,20 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
         logger_1.logger.info(`Merging ${newCandidates.length} in-scope candidates`);
         const mergePlugin = new merge_1.Merge(this.github, this.targetBranch, this.repositoryConfig);
         newCandidates = await mergePlugin.run(newCandidates);
+        if (newCandidates.length === 1) {
+            const newUpdates = newCandidates[0].pullRequest.updates;
+            newUpdates.push({
+                path: this.manifestPath,
+                createIfMissing: false,
+                updater: new release_please_manifest_1.ReleasePleaseManifest({
+                    version: newCandidates[0].pullRequest.version,
+                    versionsMap: updatedPathVersions,
+                }),
+            });
+        }
+        else {
+            logger_1.logger.warn(`Expected 1 merged candidate, got ${newCandidates.length}`);
+        }
         logger_1.logger.info(`Post-processing ${newCandidates.length} in-scope candidates`);
         newCandidates = this.postProcessCandidates(newCandidates, updatedVersions);
         return [...outOfScopeCandidates, ...newCandidates];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "release-please",
-  "version": "13.16.2",
+  "version": "13.16.3",
   "description": "generate release PRs based on the conventionalcommits.org spec",
   "main": "./build/src/index.js",
   "bin": "./build/src/bin/release-please.js",