Fix/3768: Consider ESM when selecting cosmiconfig loaders

@commitlint/load/fixtures/basic-config/.commitlintrc

@@ -0,0 +1,5 @@
+formatter: '@commitlint/format'
+rules:
+  zero: [0, 'never']
+  one: [1, 'always']
+  two: [2, 'never']

@commitlint/load/fixtures/basic-config/.commitlintrc.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/.commitlintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/.commitlintrc.json

@@ -0,0 +1,8 @@
+{
+  "formatter": "@commitlint/format",
+	"rules": {
+		"zero": [0, "never"],
+		"one": [1, "always"],
+		"two": [2, "never"]
+	}
+}

@commitlint/load/fixtures/basic-config/.commitlintrc.yaml

@@ -0,0 +1,5 @@
+formatter: '@commitlint/format'
+rules:
+  zero: [0, 'never']
+  one: [1, 'always']
+  two: [2, 'never']

@commitlint/load/fixtures/basic-config/.commitlintrc.yml

@@ -0,0 +1,5 @@
+formatter: '@commitlint/format'
+rules:
+  zero: [0, 'never']
+  one: [1, 'always']
+  two: [2, 'never']

@commitlint/load/fixtures/basic-config/commitlint.config.cjs

@@ -0,0 +1,8 @@
+module.exports = {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/commitlint.config.js

@@ -0,0 +1,8 @@
+module.exports = {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/esm/.commitlintrc.js

@@ -0,0 +1,8 @@
+export default {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/esm/.commitlintrc.mjs

@@ -0,0 +1,8 @@
+export default {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/esm/commitlint.config.js

@@ -0,0 +1,8 @@
+export default {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-config/esm/commitlint.config.mjs

@@ -0,0 +1,8 @@
+export default {
+	formatter: '@commitlint/format',
+	rules: {
+		zero: [0, 'never'],
+		one: [1, 'always'],
+		two: [2, 'never'],
+	},
+};

@commitlint/load/fixtures/basic-template/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "load-test-js"
+}

@commitlint/load/fixtures/extends-config/esm/commitlint.config.js

@@ -0,0 +1,6 @@
+export default {
+	extends: ['./first-extended'],
+	rules: {
+		zero: [0, 'never'],
+	},
+};

@commitlint/load/fixtures/extends-config/esm/commitlint.config.mjs

@@ -0,0 +1,6 @@
+export default {
+	extends: ['./first-extended'],
+	rules: {
+		zero: [0, 'never'],
+	},
+};

@commitlint/load/fixtures/extends-js-template/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "load-test-js"
+}

@commitlint/load/src/load.test.ts

@@ -188,41 +188,108 @@ test('respects cwd option', async () => {
 	});
 });
 
-const mjsConfigFiles = isDynamicAwaitSupported()
-	? ['commitlint.config.mjs', '.commitlintrc.mjs']
-	: [];
+describe.each([['basic'], ['extends']])('%s config', (template) => {
+	const isExtendsTemplate = template === 'extends';
 
-test.each(
-	[
+	const configFiles = [
 		'commitlint.config.cjs',
 		'commitlint.config.js',
+		'commitlint.config.mjs',
 		'package.json',
 		'.commitlintrc',
 		'.commitlintrc.cjs',
 		'.commitlintrc.js',
 		'.commitlintrc.json',
+		'.commitlintrc.mjs',
 		'.commitlintrc.yml',
 		'.commitlintrc.yaml',
-		...mjsConfigFiles,
-	].map((configFile) => [configFile])
-)('recursive extends with %s', async (configFile) => {
-	const cwd = await gitBootstrap(`fixtures/recursive-extends-js-template`);
-	const configPath = path.join(__dirname, `../fixtures/config/${configFile}`);
-	const config = readFileSync(configPath);
-
-	writeFileSync(path.join(cwd, configFile), config);
-
-	const actual = await load({}, {cwd});
-
-	expect(actual).toMatchObject({
-		formatter: '@commitlint/format',
-		extends: ['./first-extended'],
-		plugins: {},
-		rules: {
-			zero: [0, 'never'],
-			one: [1, 'always'],
-			two: [2, 'never'],
-		},
+	];
+
+	const configTestCases = [
+		...configFiles
+			.filter((filename) => !filename.endsWith('.mjs'))
+			.map((filename) => ({filename, isEsm: false})),
+		...configFiles
+			.filter((filename) =>
+				['.mjs', '.js'].some((ext) => filename.endsWith(ext))
+			)
+			.map((filename) => ({filename, isEsm: true})),
+	];
+
+	const getConfigContents = ({
+		filename,
+		isEsm,
+	}): string | NodeJS.ArrayBufferView => {
+		if (filename === 'package.json') {
+			const configPath = path.join(
+				__dirname,
+				`../fixtures/${template}-config/.commitlintrc.json`
+			);
+			const commitlint = JSON.parse(
+				readFileSync(configPath, {encoding: 'utf-8'})
+			);
+			return JSON.stringify({commitlint});
+		} else {
+			const filePath = ['..', 'fixtures', `${template}-config`, filename];
+
+			if (isEsm) {
+				filePath.splice(3, 0, 'esm');
+			}
+
+			const configPath = path.join(__dirname, filePath.join('/'));
+			return readFileSync(configPath);
+		}
+	};
+
+	const esmBootstrap = (cwd: string) => {
+		const packageJsonPath = path.join(cwd, 'package.json');
+		const packageJSON = JSON.parse(
+			readFileSync(packageJsonPath, {encoding: 'utf-8'})
+		);
+
+		writeFileSync(
+			packageJsonPath,
+			JSON.stringify({
+				...packageJSON,
+				type: 'module',
+			})
+		);
+	};
+
+	const templateFolder = [template, isExtendsTemplate ? 'js' : '', 'template']
+		.filter((elem) => elem)
+		.join('-');
+
+	it.each(
+		configTestCases
+			// Skip ESM tests for the extends suite until resolve-extends supports ESM
+			.filter(({isEsm}) => template !== 'extends' || !isEsm)
+			// Skip ESM tests if dynamic await is not supported; Jest will crash with a seg fault error
+			.filter(({isEsm}) => isDynamicAwaitSupported() || !isEsm)
+	)('$filename, ESM: $isEsm', async ({filename, isEsm}) => {
+		const cwd = await gitBootstrap(`fixtures/${templateFolder}`);
+
+		if (isEsm) {
+			esmBootstrap(cwd);
+		}
+
+		writeFileSync(
+			path.join(cwd, filename),
+			getConfigContents({filename, isEsm})
+		);
+
+		const actual = await load({}, {cwd});
+
+		expect(actual).toMatchObject({
+			formatter: '@commitlint/format',
+			extends: isExtendsTemplate ? ['./first-extended'] : [],
+			plugins: {},
+			rules: {
+				zero: [0, 'never'],
+				one: [1, 'always'],
+				two: [2, 'never'],
+			},
+		});
 	});
 });
 

@commitlint/load/src/utils/load-config.ts

@@ -1,10 +1,11 @@
 import {
 	cosmiconfig,
 	defaultLoadersSync,
-	Options,
 	type Loader,
+	defaultLoaders,
 } from 'cosmiconfig';
 import {TypeScriptLoader} from 'cosmiconfig-typescript-loader';
+import {existsSync, readFileSync} from 'fs';
 import path from 'path';
 
 export interface LoadConfigResult {
@@ -27,7 +28,12 @@ export async function loadConfig(
 		return tsLoaderInstance(...args);
 	};
 
-	const {searchPlaces, loaders} = getDynamicAwaitConfig();
+	// If dynamic await is supported (Node >= v20.8.0) or directory uses ESM, support
+	// async js/cjs loaders (dynamic import). Otherwise, use synchronous js/cjs loaders.
+	const loaders =
+		isDynamicAwaitSupported() || isEsmModule(cwd)
+			? defaultLoaders
+			: defaultLoadersSync;
 
 	const explorer = cosmiconfig(moduleName, {
 		searchPlaces: [
@@ -40,22 +46,22 @@ export async function loadConfig(
 			`.${moduleName}rc.yml`,
 			`.${moduleName}rc.js`,
 			`.${moduleName}rc.cjs`,
+			`.${moduleName}rc.mjs`,
 			`${moduleName}.config.js`,
 			`${moduleName}.config.cjs`,
+			`${moduleName}.config.mjs`,
 
 			// files supported by TypescriptLoader
 			`.${moduleName}rc.ts`,
 			`.${moduleName}rc.cts`,
 			`${moduleName}.config.ts`,
 			`${moduleName}.config.cts`,
-
-			...(searchPlaces || []),
 		],
 		loaders: {
 			'.ts': tsLoader,
 			'.cts': tsLoader,
-
-			...(loaders || {}),
+			'.cjs': loaders['.cjs'],
+			'.js': loaders['.js'],
 		},
 	});
 
@@ -71,7 +77,7 @@ export async function loadConfig(
 	return null;
 }
 
-// See the following issues for more context:
+// See the following issues for more context, contributing to failing Jest tests:
 //  - Issue: https://github.com/nodejs/node/issues/40058
 //  - Resolution: https://github.com/nodejs/node/pull/48510 (Node v20.8.0)
 export const isDynamicAwaitSupported = () => {
@@ -83,18 +89,14 @@ export const isDynamicAwaitSupported = () => {
 	return major >= 20 && minor >= 8;
 };
 
-// If dynamic await is supported (Node >= v20.8.0), support mjs config.
-// Otherwise, don't support mjs and use synchronous js/cjs loaders.
-export const getDynamicAwaitConfig = (): Partial<Options> =>
-	isDynamicAwaitSupported()
-		? {
-				searchPlaces: [`.${moduleName}rc.mjs`, `${moduleName}.config.mjs`],
-				loaders: {},
-		  }
-		: {
-				searchPlaces: [],
-				loaders: {
-					'.cjs': defaultLoadersSync['.cjs'],
-					'.js': defaultLoadersSync['.js'],
-				},
-		  };
+// Is the given directory set up to use ESM (ECMAScript Modules)?
+export const isEsmModule = (cwd: string) => {
+	const packagePath = path.join(cwd, 'package.json');
+
+	if (!existsSync(packagePath)) {
+		return false;
+	}
+
+	const packageJSON = readFileSync(packagePath, {encoding: 'utf-8'});
+	return JSON.parse(packageJSON)?.type === 'module';
+};

README.md

@@ -142,12 +142,12 @@ Check the [husky documentation](https://typicode.github.io/husky/#/?id=manual) o
   - `.commitlintrc.yml`
   - `.commitlintrc.js`
   - `.commitlintrc.cjs`
-  - `.commitlintrc.mjs` (Node >= v20.8.0)
+  - `.commitlintrc.mjs`
   - `.commitlintrc.ts`
   - `.commitlintrc.cts`
   - `commitlint.config.js`
   - `commitlint.config.cjs`
-  - `commitlint.config.mjs` (Node >= v20.8.0)
+  - `commitlint.config.mjs`
   - `commitlint.config.ts`
   - `commitlint.config.cts`
   - `commitlint` field in `package.json`