Bump cosmiconfig version and conditionally support mjs config

.github/workflows/CI.yml

@@ -8,77 +8,25 @@ on:
     types: [opened, synchronize]
 
 jobs:
-  v18:
-    runs-on: ubuntu-22.04
-    container:
-      image: 'ubuntu:22.04'
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, windows-2022]
+        node: [18, 20]
+    runs-on: ${{ matrix.os }}
     steps:
-      - name: Install required dependencies
-        run: |
-          apt update
-          apt install --yes sudo
-          sudo apt install --yes git
-          sudo apt install --yes curl
-          curl --location https://deb.nodesource.com/setup_18.x | sudo --preserve-env bash -
-          sudo DEBIAN_FRONTEND=noninteractive apt install --yes nodejs
       - uses: actions/checkout@v4
-      # workaround for https://github.com/actions/runner/issues/2033
-      - name: ownership workaround
-        run: git config --global --add safe.directory '*'
-      - name: Install yarn
-        run: |
-          npm install --global yarn
-          node --version
-          yarn global add yarn@latest
-      - name: Install dependencies
-        run: yarn install --ignore-engines --frozen-lockfile
-      - name: Build packages
-        run: yarn build
-      - name: Test
-        run: yarn test-ci
-
-  v20:
-    runs-on: ubuntu-22.04
-    container:
-      image: 'ubuntu:22.04'
-    steps:
-      - name: Install required dependencies
-        run: |
-          apt update
-          apt install --yes sudo
-          sudo apt install --yes git
-          sudo apt install --yes curl
-          curl --location https://deb.nodesource.com/setup_20.x | sudo --preserve-env bash -
-          sudo DEBIAN_FRONTEND=noninteractive apt install --yes nodejs
-      - uses: actions/checkout@v4
-      # workaround for https://github.com/actions/runner/issues/2033
-      - name: ownership workaround
-        run: git config --global --add safe.directory '*'
-      - name: Install yarn
-        run: |
-          npm install --global yarn
-          node --version
-          yarn global add yarn@latest
-      - name: Install dependencies
-        run: yarn install --ignore-engines --frozen-lockfile
-      - name: Build packages
-        run: yarn build
-      - name: Test
-        run: yarn test-ci
 
-  windows:
-    runs-on: windows-2022
-    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v3
         with:
-          max_attempts: 3
-      - name: Update yarn
-        run: |
-          node --version
-          yarn global add yarn@latest
+          node-version: ${{ matrix.node }}
+          cache: yarn
+
       - name: Install dependencies
         run: yarn install --ignore-engines --frozen-lockfile
+
       - name: Build packages
         run: yarn build
+
       - name: Test
         run: yarn test-ci

@commitlint/load/fixtures/config/.commitlintrc

@@ -0,0 +1,4 @@
+extends:
+  - './first-extended'
+rules:
+  zero: [0, 'never']

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

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

@commitlint/load/fixtures/recursive-extends-js/.commitlintrc.js → @commitlint/load/fixtures/config/.commitlintrc.js

@@ -3,4 +3,4 @@ module.exports = {
 	rules: {
 		zero: [0, 'never'],
 	},
-};
+};

@commitlint/load/fixtures/recursive-extends-json/.commitlintrc.json → @commitlint/load/fixtures/config/.commitlintrc.json

@@ -3,4 +3,4 @@
   "rules": {
     "zero": [0, "never"]
   }
-}
+}

@commitlint/load/fixtures/config/.commitlintrc.mjs

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

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

@@ -0,0 +1,4 @@
+extends:
+  - './first-extended'
+rules:
+  zero: [0, 'never']

@commitlint/load/fixtures/recursive-extends-yaml/.commitlintrc.yml → @commitlint/load/fixtures/config/.commitlintrc.yml

@@ -1,4 +1,4 @@
 extends:
   - './first-extended'
 rules:
-  zero: [0, 'never']
+  zero: [0, 'never']

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

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

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

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

@commitlint/load/fixtures/config/commitlint.config.mjs

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

@commitlint/load/fixtures/recursive-extends-package/package.json → @commitlint/load/fixtures/config/package.json

@@ -10,4 +10,4 @@
       ]
     }
   }
-}
+}

@commitlint/load/fixtures/recursive-extends-ts/commitlint.config.ts

@@ -1,7 +1,7 @@
 import type {UserConfig} from './types';
 
 const Configuration: UserConfig = {
-	extends: ['./first-extended'],
+	extends: ['./first-extended/index.ts'],
 	rules: {
 		zero: [0, 'never', 'zero']
 	}

@commitlint/load/fixtures/recursive-extends-ts/first-extended/index.ts

@@ -1,6 +1,6 @@
 import type {UserConfig} from '../types';
 module.exports = {
-	extends: ['./second-extended'],
+	extends: ['./second-extended/index.ts'],
 	rules: {
 		one: [1, 'never', 'one']
 	}

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

@@ -7,10 +7,12 @@ jest.mock('@scope/commitlint-plugin-example', () => scopedPlugin, {
 });
 
 import path from 'path';
+import {readFileSync, writeFileSync} from 'fs';
 import resolveFrom from 'resolve-from';
 import {fix, git, npm} from '@commitlint/test';
 
 import load from './load';
+import {isDynamicAwaitSupported} from './utils/load-config';
 
 const fixBootstrap = (name: string) => fix.bootstrap(name, __dirname);
 const gitBootstrap = (name: string) => git.bootstrap(name, __dirname);
@@ -186,24 +188,30 @@ test('respects cwd option', async () => {
 	});
 });
 
-test('recursive extends', async () => {
-	const cwd = await gitBootstrap('fixtures/recursive-extends');
-	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 mjsConfigFiles = isDynamicAwaitSupported()
+	? ['commitlint.config.mjs', '.commitlintrc.mjs']
+	: [];
+
+test.each(
+	[
+		'commitlint.config.cjs',
+		'commitlint.config.js',
+		'package.json',
+		'.commitlintrc',
+		'.commitlintrc.cjs',
+		'.commitlintrc.js',
+		'.commitlintrc.json',
+		'.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);
 
-test('recursive extends with json file', async () => {
-	const cwd = await gitBootstrap('fixtures/recursive-extends-json');
 	const actual = await load({}, {cwd});
 
 	expect(actual).toMatchObject({
@@ -218,63 +226,13 @@ test('recursive extends with json file', async () => {
 	});
 });
 
-test('recursive extends with yaml file', async () => {
-	const cwd = await gitBootstrap('fixtures/recursive-extends-yaml');
-	const actual = await load({}, {cwd});
-
-	expect(actual).toMatchObject({
-		formatter: '@commitlint/format',
-		extends: ['./first-extended'],
-		plugins: {},
-		rules: {
-			zero: [0, 'never'],
-			one: [1, 'never'],
-			two: [2, 'always'],
-		},
-	});
-});
-
-test('recursive extends with js file', async () => {
-	const cwd = await gitBootstrap('fixtures/recursive-extends-js');
-	const actual = await load({}, {cwd});
-
-	expect(actual).toMatchObject({
-		formatter: '@commitlint/format',
-		extends: ['./first-extended'],
-		plugins: {},
-		rules: {
-			zero: [0, 'never'],
-			one: [1, 'never'],
-			two: [2, 'always'],
-		},
-	});
-});
-
-test('recursive extends with package.json file', async () => {
-	const cwd = await gitBootstrap('fixtures/recursive-extends-package');
-	const actual = await load({}, {cwd});
-
-	expect(actual).toMatchObject({
-		formatter: '@commitlint/format',
-		extends: ['./first-extended'],
-		plugins: {},
-		rules: {
-			zero: [0, 'never'],
-			one: [1, 'never'],
-			two: [2, 'never'],
-		},
-	});
-});
-
-// fails since a jest update: https://github.com/conventional-changelog/commitlint/pull/3362
-// eslint-disable-next-line jest/no-disabled-tests
-test.skip('recursive extends with ts file', async () => {
+test('recursive extends with ts file', async () => {
 	const cwd = await gitBootstrap('fixtures/recursive-extends-ts');
 	const actual = await load({}, {cwd});
 
 	expect(actual).toMatchObject({
 		formatter: '@commitlint/format',
-		extends: ['./first-extended'],
+		extends: ['./first-extended/index.ts'],
 		plugins: {},
 		rules: {
 			zero: [0, 'never', 'zero'],