semantic-release-lerna 2.0.0 → 2.2.0

package/lib/generate-notes.js

@@ -8,8 +8,8 @@ import { readPackageUp } from "read-pkg-up";
 import debugFactory from "debug";
 import loadChangelogConfig from "@semantic-release/release-notes-generator/lib/load-changelog-config.js";
 import HOSTS_CONFIG from "@semantic-release/release-notes-generator/lib/hosts-config.js";
-import { makeDiffPredicate } from "@lerna/collect-updates/lib/make-diff-predicate.js";
 import { Project } from "@lerna/project";
+import { makeDiffPredicate } from "./utils/index.js";
 
 const debug = debugFactory("semantic-release:release-notes-generator");
 
@@ -87,8 +87,8 @@ export async function generateNotes(pluginConfig, context) {
 				fillScope({
 					...rawCommit,
 					...parser(rawCommit.message, { referenceActions, issuePrefixes, ...parserOpts }),
-				})
-			)
+				}),
+			),
 	);
 	const previousTag = lastRelease.gitTag || lastRelease.gitHead;
 	const currentTag = nextRelease.gitTag || nextRelease.gitHead;

package/lib/get-changed-packages.js

@@ -1,11 +1,9 @@
 import { format } from "node:util";
 import { PackageGraph } from "@lerna/package-graph";
 import { Project } from "@lerna/project";
-import childProcess from "@lerna/child-process";
-import { hasTags } from "@lerna/collect-updates/lib/has-tags.js";
-import { collectPackages } from "@lerna/collect-updates/lib/collect-packages.js";
-import { makeDiffPredicate } from "@lerna/collect-updates/lib/make-diff-predicate.js";
+import { execaSync } from "execa";
 import { shouldLatch } from "./should-latch.js";
+import { collectPackages, hasTags, makeDiffPredicate } from "./utils/index.js";
 
 function describeRefSync(execOptions) {
 	const args = [
@@ -20,7 +18,7 @@ function describeRefSync(execOptions) {
 		// Prefer tags originating on upstream branch
 		"--first-parent",
 	];
-	const stdout = childProcess.execSync("git", args, execOptions);
+	const { stdout } = execaSync("git", args, execOptions);
 	return parse(stdout, execOptions);
 }
 
@@ -101,14 +99,14 @@ export default async function getChangedPackages(latch, context) {
 	logger.log(
 		`%d package${packages.length === 1 ? "" : "s"} found: %s`,
 		packages.length,
-		format(packages.map((pkg) => pkg.name))
+		format(packages.map((pkg) => pkg.name)),
 	);
 
 	const updates = collectUpdates(
 		packageGraph.rawPackageList,
 		packageGraph,
 		{ cwd },
-		{ logger, version, latch }
+		{ logger, version, latch },
 	);
 
 	return updates.map((node) => packages.find((pkg) => pkg.name === node.name));

package/lib/prepare.js

@@ -96,7 +96,7 @@ async function updateLockfile(npmrc, pkg, context) {
 		{
 			cwd: pkg.location,
 			env,
-		}
+		},
 	);
 	versionResult.stdout.pipe(stdout, { end: false });
 	versionResult.stderr.pipe(stderr, { end: false });
@@ -199,11 +199,11 @@ export default async function (npmrc, pluginConfig, context) {
 
 	const s = changed.length > 1 ? "s" : "";
 	logger.log(
-		`${changed.length} package${s} need version bump: ${format(changed.map((pkg) => pkg.name))}`
+		`${changed.length} package${s} need version bump: ${format(changed.map((pkg) => pkg.name))}`,
 	);
 
 	const currentVersions = Object.fromEntries(
-		await Promise.all(changed.map((pkg) => getCurrentVersion(pkg)))
+		await Promise.all(changed.map((pkg) => getCurrentVersion(pkg))),
 	);
 
 	/* Bump version in all changed packages */

package/lib/publish.js

@@ -49,7 +49,7 @@ export default async function (npmrc, config, pkg, context) {
 					/* Lerna does not support --userconfig */
 					NPM_CONFIG_USERCONFIG: npmrc,
 				},
-			}
+			},
 		);
 		result.stdout.pipe(stdout, { end: false });
 		result.stderr.pipe(stderr, { end: false });

package/lib/utils/collect-dependents.js

@@ -0,0 +1,41 @@
+/**
+ * Build a set of nodes that are dependents of the input set.
+ */
+export function collectDependents(nodes) {
+	const collected = new Set();
+
+	nodes.forEach((currentNode) => {
+		if (currentNode.localDependents.size === 0) {
+			// no point diving into a non-existent tree
+			return;
+		}
+
+		// breadth-first search
+		const queue = [currentNode];
+		const seen = new Set();
+
+		const visit = (dependentNode, dependentName, siblingDependents) => {
+			if (seen.has(dependentNode)) {
+				return;
+			}
+
+			seen.add(dependentNode);
+
+			if (dependentNode === currentNode || siblingDependents.has(currentNode.name)) {
+				// a direct or transitive cycle, skip it
+				return;
+			}
+
+			collected.add(dependentNode);
+			queue.push(dependentNode);
+		};
+
+		while (queue.length) {
+			const node = queue.shift();
+
+			node.localDependents.forEach(visit);
+		}
+	});
+
+	return collected;
+}

package/lib/utils/collect-packages.js

@@ -0,0 +1,35 @@
+import { collectDependents } from "./collect-dependents.js";
+
+/**
+ * Build a list of graph nodes, possibly including dependents, using predicate if available.
+ */
+export function collectPackages(
+	packages,
+	{ isCandidate = () => true, onInclude, excludeDependents } = {},
+) {
+	const candidates = new Set();
+
+	packages.forEach((node, name) => {
+		if (isCandidate(node, name)) {
+			candidates.add(node);
+		}
+	});
+
+	if (!excludeDependents) {
+		collectDependents(candidates).forEach((node) => candidates.add(node));
+	}
+
+	// The result should always be in the same order as the input
+	const updates = [];
+
+	packages.forEach((node, name) => {
+		if (candidates.has(node)) {
+			if (onInclude) {
+				onInclude(name);
+			}
+			updates.push(node);
+		}
+	});
+
+	return updates;
+}

package/lib/utils/has-tags.js

@@ -0,0 +1,22 @@
+import { execaSync } from "execa";
+import log from "npmlog";
+
+/**
+ * Determine if any git tags are reachable.
+ * @param {import("execa").SyncOptions} [opts]
+ */
+export function hasTags(opts) {
+	log.silly("hasTags");
+	let result = false;
+
+	try {
+		result = !!execaSync("git", ["tag"], opts);
+	} catch (err) {
+		log.warn("ENOTAGS", "No git tags were reachable from this branch!");
+		log.verbose("hasTags error", err);
+	}
+
+	log.verbose("hasTags", result);
+
+	return result;
+}

package/lib/utils/index.js

@@ -0,0 +1,3 @@
+export { collectPackages } from "./collect-packages.js";
+export { hasTags } from "./has-tags.js";
+export { makeDiffPredicate } from "./make-diff-predicate.js";

package/lib/utils/make-diff-predicate.js

@@ -0,0 +1,69 @@
+import path from "node:path/posix";
+import { execaSync } from "execa";
+import log from "npmlog";
+import * as minimatch from "minimatch";
+
+/**
+ * @param {string} committish
+ * @param {import("execa").SyncOptions} [execOpts]
+ * @param {string[]} ignorePatterns
+ */
+export function makeDiffPredicate(committish, execOpts, ignorePatterns = []) {
+	const ignoreFilters = new Set(
+		ignorePatterns.map((p) =>
+			minimatch.filter(`!${p}`, {
+				matchBase: true,
+				// dotfiles inside ignored directories should also match
+				dot: true,
+			}),
+		),
+	);
+
+	if (ignoreFilters.size) {
+		log.info("ignoring diff in paths matching", ignorePatterns);
+	}
+
+	return function hasDiffSinceThatIsntIgnored(node) {
+		const diff = diffSinceIn(committish, node.location, execOpts);
+
+		if (diff === "") {
+			log.silly("", "no diff found in %s", node.name);
+			return false;
+		}
+
+		log.silly("found diff in", diff);
+		let changedFiles = diff.split("\n");
+
+		if (ignoreFilters.size) {
+			for (const ignored of ignoreFilters) {
+				changedFiles = changedFiles.filter(ignored);
+			}
+		}
+
+		if (changedFiles.length) {
+			log.verbose("filtered diff", changedFiles);
+		} else {
+			log.verbose("", "no diff found in %s (after filtering)", node.name);
+		}
+
+		return changedFiles.length > 0;
+	};
+}
+
+/**
+ * @param {string} committish
+ * @param {string} location
+ * @param {import("execa").SyncOptions} [opts]
+ */
+function diffSinceIn(committish, location, opts) {
+	const args = ["diff", "--name-only", committish];
+	const formattedLocation = path.relative(opts.cwd, location);
+
+	if (formattedLocation) {
+		// avoid same-directory path.relative() === ""
+		args.push("--", formattedLocation);
+	}
+
+	log.silly("checking diff", formattedLocation);
+	return execaSync("git", args, opts).stdout;
+}

package/lib/verify-git.js

@@ -17,7 +17,7 @@ export default async function verifyGit(context) {
 		Object.entries(VALIDATORS).map(async ([name, validator]) => {
 			const details = await validator(context);
 			return [name, details];
-		})
+		}),
 	);
 	return result
 		.filter(([, details]) => details)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semantic-release-lerna",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "semantic-release plugin to publish lerna monorepo packages to npm",
   "keywords": [
     "npm",
@@ -39,7 +39,7 @@
     "prettier:check": "prettier --check .",
     "prettier:write": "prettier --write .",
     "semantic-release": "semantic-release",
-    "pretest": "npm run eslint",
+    "pretest": "npm run eslint && npm run prettier:check",
     "test": "jest --collectCoverage"
   },
   "prettier": "@html-validate/prettier-config",
@@ -48,8 +48,6 @@
     "transformIgnorePatterns": []
   },
   "dependencies": {
-    "@lerna/child-process": "^7.0.0",
-    "@lerna/collect-updates": "^6.0.0",
     "@lerna/package": "^6.0.0",
     "@lerna/package-graph": "^6.0.0",
     "@lerna/project": "^6.0.0",
@@ -64,33 +62,36 @@
     "get-stream": "^8.0.0",
     "into-stream": "^8.0.0",
     "libnpmversion": "^5.0.0",
+    "minimatch": "^9.0.0",
+    "npmlog": "^7.0.0",
     "read-pkg-up": "^10.0.0",
     "semver": "^7.0.0",
     "tempy": "^3.0.0",
     "write-json-file": "^5.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.23.2",
-    "@babel/preset-env": "7.23.2",
-    "@html-validate/eslint-config": "5.11.5",
-    "@html-validate/eslint-config-jest": "5.11.4",
-    "@html-validate/prettier-config": "2.4.7",
-    "@semantic-release/npm": "11.0.0",
-    "@types/jest": "29.5.6",
+    "@babel/core": "7.23.9",
+    "@babel/preset-env": "7.23.9",
+    "@html-validate/eslint-config": "5.12.8",
+    "@html-validate/eslint-config-jest": "5.12.7",
+    "@html-validate/prettier-config": "2.4.10",
+    "@semantic-release/npm": "11.0.2",
+    "@types/jest": "29.5.11",
+    "@types/npmlog": "7.0.0",
     "babel-plugin-transform-import-meta": "2.2.1",
     "codecov": "3.8.3",
-    "fs-extra": "11.1.1",
+    "fs-extra": "11.2.0",
     "jest": "29.7.0",
-    "lerna": "7.4.1",
-    "npm-pkg-lint": "2.0.3",
-    "semantic-release": "22.0.5",
+    "lerna": "8.0.2",
+    "npm-pkg-lint": "2.1.0",
+    "semantic-release": "23.0.0",
     "stream-buffers": "3.0.2",
-    "verdaccio": "5.27.0"
+    "verdaccio": "5.29.0"
   },
   "peerDependencies": {
     "@semantic-release/npm": ">= 10",
-    "lerna": "^5 || ^6 || ^7",
-    "semantic-release": "22"
+    "lerna": "^5 || ^6 || ^7 || ^8",
+    "semantic-release": "^22 || ^23"
   },
   "engines": {
     "node": ">= 18.17"
@@ -101,6 +102,20 @@
   "renovate": {
     "extends": [
       "gitlab>html-validate/renovate-config"
+    ],
+    "packageRules": [
+      {
+        "matchPackageNames": [
+          "lerna"
+        ],
+        "matchUpdateTypes": [
+          "major"
+        ],
+        "commitMessageAction": "support",
+        "commitMessageTopic": "{{depName}}",
+        "commitMessageExtra": "v{{newMajor}}",
+        "semanticCommitType": "feat"
+      }
     ]
   }
 }