release-please 14.15.0 → 14.15.2

package/CHANGELOG.md

@@ -4,6 +4,21 @@
 
 [1]: https://www.npmjs.com/package/release-please?activeTab=versions
 
+## [14.15.2](https://github.com/googleapis/release-please/compare/v14.15.1...v14.15.2) (2022-11-01)
+
+
+### Bug Fixes
+
+* Allow overlapping paths when splitting commits ([#1733](https://github.com/googleapis/release-please/issues/1733)) ([adcb99a](https://github.com/googleapis/release-please/commit/adcb99acdbff9ddeea527b673bc8820edff68f2a))
+* **cargo-workspace:** Update target dependencies in Cargo workspace packages ([#1730](https://github.com/googleapis/release-please/issues/1730)) ([3ca3bbc](https://github.com/googleapis/release-please/commit/3ca3bbcef729a359805473fdc798b5af5ab22861))
+
+## [14.15.1](https://github.com/googleapis/release-please/compare/v14.15.0...v14.15.1) (2022-10-28)
+
+
+### Bug Fixes
+
+* **maven-workspace:** SNAPSHOT versions should not be included in the manifest ([#1727](https://github.com/googleapis/release-please/issues/1727)) ([d926c84](https://github.com/googleapis/release-please/commit/d926c840ec99de013a0b5cb198f9fb2700930cf7))
+
 ## [14.15.0](https://github.com/googleapis/release-please/compare/v14.14.0...v14.15.0) (2022-10-27)
 
 

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

@@ -195,7 +195,7 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
         return candidates;
     }
     async buildGraph(allPackages) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f;
         const workspaceCrateNames = new Set(allPackages.map(crateInfo => crateInfo.name));
         const graph = new Map();
         for (const crateInfo of allPackages) {
@@ -204,6 +204,17 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
                 ...((_b = crateInfo.manifest['dev-dependencies']) !== null && _b !== void 0 ? _b : {}),
                 ...((_c = crateInfo.manifest['build-dependencies']) !== null && _c !== void 0 ? _c : {}),
             });
+            const targets = crateInfo.manifest.target;
+            if (targets) {
+                for (const targetName in targets) {
+                    const target = targets[targetName];
+                    allDeps.push(...Object.keys({
+                        ...((_d = target.dependencies) !== null && _d !== void 0 ? _d : {}),
+                        ...((_e = target['dev-dependencies']) !== null && _e !== void 0 ? _e : {}),
+                        ...((_f = target['build-dependencies']) !== null && _f !== void 0 ? _f : {}),
+                    }));
+                }
+            }
             const workspaceDeps = allDeps.filter(dep => workspaceCrateNames.has(dep));
             graph.set(crateInfo.name, {
                 deps: workspaceDeps,
@@ -224,7 +235,6 @@ class CargoWorkspace extends workspace_1.WorkspacePlugin {
 }
 exports.CargoWorkspace = CargoWorkspace;
 function getChangelogDepsNotes(originalManifest, updatedManifest) {
-    var _a;
     let depUpdateNotes = '';
     const depTypes = [
         'dependencies',
@@ -252,21 +262,32 @@ function getChangelogDepsNotes(originalManifest, updatedManifest) {
         }
         return result;
     };
-    const updates = new Map();
-    for (const depType of depTypes) {
-        const depUpdates = [];
-        const pkgDepTypes = updatedManifest[depType];
-        if (pkgDepTypes === undefined) {
-            continue;
-        }
-        for (const [depName, currentDepVer] of Object.entries(getDepMap(pkgDepTypes))) {
-            const origDepVer = depVer((_a = originalManifest[depType]) === null || _a === void 0 ? void 0 : _a[depName]);
-            if (currentDepVer !== origDepVer) {
-                depUpdates.push(`\n    * ${depName} bumped from ${origDepVer} to ${currentDepVer}`);
+    const populateUpdates = (originalScope, updatedScope, updates) => {
+        var _a;
+        for (const depType of depTypes) {
+            const depUpdates = [];
+            const pkgDepTypes = updatedScope[depType];
+            if (pkgDepTypes === undefined) {
+                continue;
+            }
+            for (const [depName, currentDepVer] of Object.entries(getDepMap(pkgDepTypes))) {
+                const origDepVer = depVer((_a = originalScope[depType]) === null || _a === void 0 ? void 0 : _a[depName]);
+                if (currentDepVer !== origDepVer) {
+                    depUpdates.push(`\n    * ${depName} bumped from ${origDepVer} to ${currentDepVer}`);
+                }
+            }
+            if (depUpdates.length > 0) {
+                const updatesForType = updates.get(depType) || new Set();
+                depUpdates.forEach(update => updatesForType.add(update));
+                updates.set(depType, updatesForType);
             }
         }
-        if (depUpdates.length > 0) {
-            updates.set(depType, depUpdates);
+    };
+    const updates = new Map();
+    populateUpdates(originalManifest, updatedManifest, updates);
+    if (updatedManifest.target && originalManifest.target) {
+        for (const targetName in updatedManifest.target) {
+            populateUpdates(originalManifest.target[targetName], updatedManifest.target[targetName], updates);
         }
     }
     for (const [dt, notes] of updates) {

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

@@ -63,6 +63,13 @@ export declare class MavenWorkspace extends WorkspacePlugin<MavenArtifact> {
         updatedPathVersions: VersionsMap;
     }>;
     protected buildGraph(allPackages: MavenArtifact[]): Promise<DependencyGraph<MavenArtifact>>;
+    /**
+     * Given a release version, determine if we should bump the manifest
+     * version as well. For maven artifacts, SNAPSHOT versions are not
+     * considered releases.
+     * @param {Version} version The release version
+     */
+    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;

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

@@ -155,7 +155,8 @@ class MavenWorkspace extends workspace_1.WorkspacePlugin {
                     this.logger.warn(`${pomUpdate.path} does not have cached contents`);
                 }
             }
-            if (candidate.pullRequest.version) {
+            if (candidate.pullRequest.version &&
+                this.isReleaseVersion(candidate.pullRequest.version)) {
                 updatedPathVersions.set(candidate.path, candidate.pullRequest.version);
             }
         }
@@ -176,7 +177,9 @@ class MavenWorkspace extends workspace_1.WorkspacePlugin {
                 else {
                     this.logger.debug(`version: ${version} forced bump`);
                     updatedVersions.set(packageName, version);
-                    updatedPathVersions.set(this.pathFromPackage(pkg), version);
+                    if (this.isReleaseVersion(version)) {
+                        updatedPathVersions.set(this.pathFromPackage(pkg), version);
+                    }
                 }
             }
         }
@@ -207,6 +210,16 @@ class MavenWorkspace extends workspace_1.WorkspacePlugin {
         }
         return graph;
     }
+    /**
+     * Given a release version, determine if we should bump the manifest
+     * version as well. For maven artifacts, SNAPSHOT versions are not
+     * considered releases.
+     * @param {Version} version The release version
+     */
+    isReleaseVersion(version) {
+        var _a;
+        return !((_a = version.preRelease) === null || _a === void 0 ? void 0 : _a.includes('SNAPSHOT'));
+    }
     bumpVersion(artifact) {
         const strategy = new java_snapshot_1.JavaSnapshot(new always_bump_patch_1.AlwaysBumpPatch());
         return strategy.bump(version_1.Version.parse(artifact.version), [FAKE_COMMIT]);

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

@@ -74,6 +74,12 @@ export declare abstract class WorkspacePlugin<T> extends ManifestPlugin {
         updatedVersions: VersionsMap;
         updatedPathVersions: VersionsMap;
     }>;
+    /**
+     * Given a release version, determine if we should bump the manifest
+     * version as well.
+     * @param {Version} _version The release version
+     */
+    protected isReleaseVersion(_version: Version): boolean;
     /**
      * Given a package, return the new bumped version after updating
      * the dependency.

package/build/src/plugins/workspace.js

@@ -173,7 +173,9 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
                 const version = this.bumpVersion(pkg);
                 this.logger.debug(`version: ${version} forced bump`);
                 updatedVersions.set(packageName, version);
-                updatedPathVersions.set(this.pathFromPackage(pkg), version);
+                if (this.isReleaseVersion(version)) {
+                    updatedPathVersions.set(this.pathFromPackage(pkg), version);
+                }
             }
         }
         return {
@@ -181,6 +183,14 @@ class WorkspacePlugin extends plugin_1.ManifestPlugin {
             updatedPathVersions,
         };
     }
+    /**
+     * Given a release version, determine if we should bump the manifest
+     * version as well.
+     * @param {Version} _version The release version
+     */
+    isReleaseVersion(_version) {
+        return true;
+    }
     /**
      * Helper to invert the graph from package => packages that it depends on
      * to package => packages that depend on it.

package/build/src/util/commit-split.js

@@ -41,19 +41,13 @@ class CommitSplit {
                 newPath = newPath.replace(/^\//, '');
                 newPath = newPath.replace(/$/, '/');
                 newPath = newPath.replace(/^/, '/');
-                for (let exPath of paths) {
-                    exPath = exPath.replace(/$/, '/');
-                    exPath = exPath.replace(/^/, '/');
-                    if (newPath.startsWith(exPath) || exPath.startsWith(newPath)) {
-                        throw new Error(`Path prefixes must be unique: ${newPath}, ${exPath}`);
-                    }
-                }
                 // store them with leading and trailing slashes removed.
                 newPath = newPath.replace(/\/$/, '');
                 newPath = newPath.replace(/^\//, '');
                 paths.push(newPath);
             }
-            this.packagePaths = paths;
+            // sort by longest paths first
+            this.packagePaths = paths.sort((a, b) => b.length - a.length);
         }
     }
     /**

package/package.json

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