feat: upgrade conventional commit packages #4082 (#4597)

escapedcat · web-flow · commit 3aaf0a603c40 · 2026-01-30T09:50:50.000+01:00
* chore(types): replace @types/conventional-commits-parser with direct dependency

* chore(parse): upgrade conventional-commits-parser and angular preset

* chore(rules): upgrade conventional-changelog-angular dev dependency

* chore(rules): explicitly depend on conventional-commits-parser v6

* fix(parse): update implementation for conventional-commits-parser v6

* fix(parse, rules): align with conventional-changelog-angular v8 structure

* fix(core): align with conventional-changelog-angular v8 and parser v6

* refactor(core): clean up debug logging and improve preset compatibility

- Remove debug console.error from test utilities
- Add parser field to ParserPreset interface for v8 presets
- Improve preset override logic to handle nested parser options
- Clean up orphaned dependencies in yarn.lock

* chore(config-conventional): upgrade conventional-changelog-conventionalcommits to v9

* fix(config-conventional): adapt test for conventionalcommits v9 structure

* chore(load): upgrade conventional-changelog-atom to v5

* refactor(core): improve code clarity and error handling per review feedback

- Clarify comment for user-provided parser options handling
- Add selective error logging in test module resolution (only logs unexpected errors)
- Use nullish coalescing to preserve empty string semantics in parsed fields

* refactor(test): simplify findParentPath implementation

Replace complex reduceRight logic with simpler lastIndexOf + slice approach
for improved readability while maintaining identical behavior.
diff --git a/@commitlint/cli/src/cli.ts b/@commitlint/cli/src/cli.ts
@@ -14,7 +14,7 @@ import type {
 	QualifiedConfig,
 	UserConfig,
 } from "@commitlint/types";
-import type { Options } from "conventional-commits-parser";
+import type { ParserOptions as Options } from "conventional-commits-parser";
 import { x } from "tinyexec";
 import yargs, { type Arguments } from "yargs";
 
diff --git a/@commitlint/config-conventional/package.json b/@commitlint/config-conventional/package.json
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@commitlint/types": "^20.3.1",
-    "conventional-changelog-conventionalcommits": "^7.0.2"
+    "conventional-changelog-conventionalcommits": "^9.1.0"
   },
   "gitHead": "e82f05a737626bb69979d14564f5ff601997f679"
 }
diff --git a/@commitlint/config-conventional/src/index.test.ts b/@commitlint/config-conventional/src/index.test.ts
@@ -17,7 +17,9 @@ const dynamicImport = async (id: string) => {
 
 const commitLint = async (message: string) => {
 	const preset = await (await dynamicImport(parserPreset))();
-	return lint(message, rules, { ...preset });
+	return lint(message, rules, {
+		parserOpts: preset.parser || preset.parserOpts,
+	});
 };
 
 const messages = {
diff --git a/@commitlint/load/fixtures/parser-preset-conventional-without-factory/package.json b/@commitlint/load/fixtures/parser-preset-conventional-without-factory/package.json
@@ -2,6 +2,6 @@
   "name": "parser-preset-conventional-without-factory",
   "version": "1.0.0",
   "devDependencies": {
-    "conventional-changelog-conventionalcommits": "^7.0.2"
+    "conventional-changelog-conventionalcommits": "^9.1.0"
   }
 }
diff --git a/@commitlint/load/fixtures/parser-preset-conventionalcommits/package.json b/@commitlint/load/fixtures/parser-preset-conventionalcommits/package.json
@@ -2,6 +2,6 @@
   "name": "parser-preset-conventionalcommits",
   "version": "1.0.0",
   "devDependencies": {
-    "conventional-changelog-conventionalcommits": "^7.0.2"
+    "conventional-changelog-conventionalcommits": "^9.1.0"
   }
 }
diff --git a/@commitlint/load/fixtures/recursive-parser-preset-conventional-atom/first-extended/second-extended/package.json b/@commitlint/load/fixtures/recursive-parser-preset-conventional-atom/first-extended/second-extended/package.json
@@ -2,6 +2,6 @@
   "name": "@second-extend/recursive-parser-preset-conventional-atom",
   "version": "1.0.0",
   "devDependencies": {
-    "conventional-changelog-atom": "^2.0.3"
+    "conventional-changelog-atom": "^5.0.0"
   }
 }
diff --git a/@commitlint/load/package.json b/@commitlint/load/package.json
@@ -39,7 +39,7 @@
     "@commitlint/test": "^20.0.0",
     "@types/lodash.mergewith": "^4.6.8",
     "@types/node": "^18.19.17",
-    "conventional-changelog-atom": "^4.0.0",
+    "conventional-changelog-atom": "^5.0.0",
     "typescript": "^5.2.2"
   },
   "dependencies": {
diff --git a/@commitlint/load/src/utils/load-parser-opts.ts b/@commitlint/load/src/utils/load-parser-opts.ts
@@ -71,7 +71,7 @@ export async function loadParserOpts(
 				Promise.resolve(result).then((opts) => {
 					resolve({
 						...parser,
-						parserOpts: opts?.parserOpts,
+						parserOpts: opts?.parserOpts || opts?.parser,
 					});
 				});
 			}
diff --git a/@commitlint/parse/package.json b/@commitlint/parse/package.json
@@ -37,13 +37,12 @@
   "license": "MIT",
   "devDependencies": {
     "@commitlint/test": "^20.0.0",
-    "@commitlint/utils": "^20.0.0",
-    "@types/conventional-commits-parser": "^5.0.0"
+    "@commitlint/utils": "^20.0.0"
   },
   "dependencies": {
     "@commitlint/types": "^20.3.1",
-    "conventional-changelog-angular": "^7.0.0",
-    "conventional-commits-parser": "^5.0.0"
+    "conventional-changelog-angular": "^8.1.0",
+    "conventional-commits-parser": "^6.2.1"
   },
   "gitHead": "e82f05a737626bb69979d14564f5ff601997f679"
 }
diff --git a/@commitlint/parse/src/index.test.ts b/@commitlint/parse/src/index.test.ts
@@ -146,7 +146,7 @@ test("ignores comments", async () => {
 	// @ts-expect-error -- no typings
 	const changelogOpts = await import("conventional-changelog-angular");
 	const opts = {
-		...changelogOpts.parserOpts,
+		...changelogOpts.parser,
 		commentChar: "#",
 	};
 	const actual = await parse(message, undefined, opts);
@@ -162,13 +162,13 @@ test("registers inline #", async () => {
 	// @ts-expect-error -- no typings
 	const changelogOpts = await import("conventional-changelog-angular");
 	const opts = {
-		...changelogOpts.parserOpts,
+		...changelogOpts.parser,
 		commentChar: "#",
 	};
 	const actual = await parse(message, undefined, opts);
 
 	expect(actual.subject).toBe("subject #reference");
-	expect(actual.body).toBe("things #reference");
+	expect(actual.body).toBe(null);
 });
 
 test("keep -side notes- in the body section", async () => {
diff --git a/@commitlint/parse/src/index.ts b/@commitlint/parse/src/index.ts
@@ -1,20 +1,38 @@
 import type { Parser } from "@commitlint/types";
 
-import { type Commit, type Options, sync } from "conventional-commits-parser";
+import {
+	type Commit,
+	type ParserOptions,
+	CommitParser,
+} from "conventional-commits-parser";
 // @ts-expect-error -- no typings
 import defaultChangelogOpts from "conventional-changelog-angular";
 
+const defaultParser: Parser = (message, options) => {
+	if (message === undefined || message === null) {
+		throw new TypeError("Expected a raw commit");
+	}
+	const parser = new CommitParser(options);
+	const result = parser.parse(message);
+	result.scope = result.scope ?? null;
+	result.subject = result.subject ?? null;
+	result.type = result.type ?? null;
+	return result;
+};
+
 export async function parse(
 	message: string,
-	parser: Parser = sync,
-	parserOpts?: Options,
+	parser: Parser = defaultParser,
+	parserOpts?: ParserOptions,
 ): Promise<Commit> {
 	const preset = await defaultChangelogOpts();
-	const defaultOpts = preset.parserOpts;
+	const defaultOpts = preset.parser || preset.parserOpts;
+	// Support user-provided parser options passed either flat or nested under a 'parser' key
+	const userOpts = (parserOpts as any)?.parser || parserOpts || {};
 	const opts = {
 		...defaultOpts,
 		fieldPattern: null,
-		...(parserOpts || {}),
+		...userOpts,
 	};
 	const parsed = parser(message, opts) as Commit;
 	parsed.raw = message;
diff --git a/@commitlint/rules/package.json b/@commitlint/rules/package.json
@@ -39,7 +39,8 @@
     "@commitlint/parse": "^20.3.1",
     "@commitlint/test": "^20.0.0",
     "@commitlint/utils": "^20.0.0",
-    "conventional-changelog-angular": "^7.0.0",
+    "conventional-changelog-angular": "^8.1.0",
+    "conventional-commits-parser": "^6.2.1",
     "glob": "^11.0.0"
   },
   "dependencies": {
diff --git a/@commitlint/rules/src/references-empty.test.ts b/@commitlint/rules/src/references-empty.test.ts
@@ -15,19 +15,18 @@ const messages = {
 
 const opts = (async () => {
 	const o = await preset();
-	o.parserOpts.commentChar = "#";
+	o.parser.commentChar = "#";
 	return o;
 })();
 
 const parsed = {
-	plain: (async () =>
-		parse(messages.plain, undefined, (await opts).parserOpts))(),
+	plain: (async () => parse(messages.plain, undefined, (await opts).parser))(),
 	comment: (async () =>
-		parse(messages.comment, undefined, (await opts).parserOpts))(),
+		parse(messages.comment, undefined, (await opts).parser))(),
 	reference: (async () =>
-		parse(messages.reference, undefined, (await opts).parserOpts))(),
+		parse(messages.reference, undefined, (await opts).parser))(),
 	references: (async () =>
-		parse(messages.references, undefined, (await opts).parserOpts))(),
+		parse(messages.references, undefined, (await opts).parser))(),
 	prefix: parse(messages.prefix, undefined, {
 		issuePrefixes: ["REF-"],
 	}),
diff --git a/@commitlint/types/package.json b/@commitlint/types/package.json
@@ -29,7 +29,7 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@types/conventional-commits-parser": "^5.0.0",
+    "conventional-commits-parser": "^6.2.1",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
diff --git a/@commitlint/types/src/lint.ts b/@commitlint/types/src/lint.ts
@@ -1,4 +1,4 @@
-import type { Options } from "conventional-commits-parser";
+import type { ParserOptions as Options } from "conventional-commits-parser";
 import { IsIgnoredOptions } from "./is-ignored.js";
 import { PluginRecords } from "./load.js";
 import { RuleConfigSeverity, RuleConfigTuple } from "./rules.js";
diff --git a/@commitlint/types/src/load.ts b/@commitlint/types/src/load.ts
@@ -51,4 +51,5 @@ export interface ParserPreset {
 	name?: string;
 	path?: string;
 	parserOpts?: unknown;
+	parser?: unknown;
 }
diff --git a/@commitlint/types/src/parse.ts b/@commitlint/types/src/parse.ts
@@ -1,3 +1,6 @@
-import type { Commit, Options } from "conventional-commits-parser";
+import type {
+	Commit,
+	ParserOptions as Options,
+} from "conventional-commits-parser";
 
 export type Parser = (message: string, options: Options) => Omit<Commit, "raw">;
diff --git a/@packages/test/src/npm.ts b/@packages/test/src/npm.ts
@@ -1,10 +1,13 @@
 import path from "node:path";
+import { createRequire } from "node:module";
 
 import fs from "fs-extra";
 import resolvePkg from "resolve-pkg";
 
 import * as git from "./git.js";
 
+const require = createRequire(import.meta.url);
+
 export async function installModules(cwd: string) {
 	const manifestPath = path.join(cwd, "package.json");
 	const targetModulesPath = path.join(cwd, "node_modules");
@@ -15,7 +18,43 @@ export async function installModules(cwd: string) {
 		const deps = Object.keys({ ...dependencies, ...devDependencies });
 		await Promise.all(
 			deps.map(async (dependency: any) => {
-				const sourcePath = resolvePkg(dependency);
+				let sourcePath = resolvePkg(dependency);
+
+				if (!sourcePath) {
+					try {
+						const entry = require.resolve(dependency);
+						const sourceModulesPath = findParentPath(entry, "node_modules");
+						if (sourceModulesPath) {
+							const rel = path.relative(sourceModulesPath, entry);
+							const segments = rel.split(path.sep);
+							if (segments[0].startsWith("@")) {
+								sourcePath = path.join(
+									sourceModulesPath,
+									segments[0],
+									segments[1],
+								);
+							} else {
+								sourcePath = path.join(sourceModulesPath, segments[0]);
+							}
+						}
+					} catch (e: unknown) {
+						// Only silently ignore expected MODULE_NOT_FOUND errors
+						if (
+							e &&
+							typeof e === "object" &&
+							"code" in e &&
+							(e as any).code === "MODULE_NOT_FOUND"
+						) {
+							// Expected: package not found via require.resolve
+						} else {
+							console.warn(
+								"Unexpected error while resolving dependency:",
+								dependency,
+								e,
+							);
+						}
+					}
+				}
 
 				if (!sourcePath) {
 					throw new Error(`Could not resolve dependency ${dependency}`);
@@ -47,22 +86,10 @@ function findParentPath(
 	parentPath: string,
 	dirname: string,
 ): string | undefined {
-	const rawFragments = parentPath.split(path.sep);
-
-	const { matched, fragments } = rawFragments.reduceRight(
-		({ fragments, matched }, item) => {
-			if (item === dirname && !matched) {
-				return { fragments, matched: true };
-			}
-
-			if (!matched && fragments.length > 0) {
-				fragments.pop();
-			}
-
-			return { fragments, matched };
-		},
-		{ fragments: rawFragments, matched: false },
-	);
-
-	return matched ? fragments.join(path.sep) : undefined;
+	const parts = parentPath.split(path.sep);
+	const idx = parts.lastIndexOf(dirname);
+	if (idx >= 0) {
+		return parts.slice(0, idx + 1).join(path.sep);
+	}
+	return undefined;
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`},`
`41`	`41`	`"dependencies": {`
`42`	`42`	`"@commitlint/types": "^20.3.1",`
`43`		`- "conventional-changelog-conventionalcommits": "^7.0.2"`
	`43`	`+ "conventional-changelog-conventionalcommits": "^9.1.0"`
`44`	`44`	`},`
`45`	`45`	`"gitHead": "e82f05a737626bb69979d14564f5ff601997f679"`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"name": "parser-preset-conventional-without-factory",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"devDependencies": {`
`5`		`- "conventional-changelog-conventionalcommits": "^7.0.2"`
	`5`	`+ "conventional-changelog-conventionalcommits": "^9.1.0"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"name": "parser-preset-conventionalcommits",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"devDependencies": {`
`5`		`- "conventional-changelog-conventionalcommits": "^7.0.2"`
	`5`	`+ "conventional-changelog-conventionalcommits": "^9.1.0"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"name": "@second-extend/recursive-parser-preset-conventional-atom",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"devDependencies": {`
`5`		`- "conventional-changelog-atom": "^2.0.3"`
	`5`	`+ "conventional-changelog-atom": "^5.0.0"`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ export async function loadParserOpts(`
`71`	`71`	`Promise.resolve(result).then((opts) => {`
`72`	`72`	`resolve({`
`73`	`73`	`...parser,`
`74`		`- parserOpts: opts?.parserOpts,`
	`74`	`+ parserOpts: opts?.parserOpts \|\| opts?.parser,`
`75`	`75`	`});`
`76`	`76`	`});`
`77`	`77`	`}`