From a6401ba042e68fbe0f252949aa11c377c7581a28 Mon Sep 17 00:00:00 2001 From: Jiahao Guo Date: Fri, 8 Mar 2024 10:59:25 +0800 Subject: [PATCH 1/3] feat: add CJS export for cz-commitlint relates to: https://github.com/conventional-changelog/commitlint/pull/3850#issuecomment-1984932236 resolves #3949 --- @commitlint/cz-commitlint/package.json | 4 ++++ @commitlint/cz-commitlint/src/index.cts | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 @commitlint/cz-commitlint/src/index.cts diff --git a/@commitlint/cz-commitlint/package.json b/@commitlint/cz-commitlint/package.json index 8b754f3e48..72b9396d8d 100644 --- a/@commitlint/cz-commitlint/package.json +++ b/@commitlint/cz-commitlint/package.json @@ -4,6 +4,10 @@ "version": "19.0.3", "description": "Commitizen adapter using the commitlint.config.js", "main": "./lib/index.js", + "exports": { + "import": "./lib/index.js", + "require": "./lib/index.cjs" + }, "files": [ "lib" ], diff --git a/@commitlint/cz-commitlint/src/index.cts b/@commitlint/cz-commitlint/src/index.cts new file mode 100644 index 0000000000..e38a21064e --- /dev/null +++ b/@commitlint/cz-commitlint/src/index.cts @@ -0,0 +1,7 @@ +const esmPrompterPromise = import('./index.js'); + +export const prompter: Awaited['prompter'] = async ( + ...args +) => { + (await esmPrompterPromise).prompter(...args); +}; From 9aa3ca015e0511816baea6483ae5382ea683890f Mon Sep 17 00:00:00 2001 From: Jiahao Guo Date: Fri, 8 Mar 2024 13:18:07 +0800 Subject: [PATCH 2/3] chore: add .cts to eslintrc --- .eslintrc.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 38db2dd88a..17ae1dbce9 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -37,7 +37,7 @@ module.exports = { }, overrides: [ { - files: ['*.ts'], + files: ['*.cts', '*.ts'], parser: '@typescript-eslint/parser', extends: [ 'plugin:@typescript-eslint/eslint-recommended', From 87821d716fff6565f76d25ce1fd0e600460345d3 Mon Sep 17 00:00:00 2001 From: Jiahao Guo Date: Mon, 11 Mar 2024 10:51:28 +0800 Subject: [PATCH 3/3] fix: workaround cts issues of vitest and typescript --- @commitlint/cz-commitlint/src/index.cjs | 4 ++++ @commitlint/cz-commitlint/src/index.cts | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) create mode 100644 @commitlint/cz-commitlint/src/index.cjs delete mode 100644 @commitlint/cz-commitlint/src/index.cts diff --git a/@commitlint/cz-commitlint/src/index.cjs b/@commitlint/cz-commitlint/src/index.cjs new file mode 100644 index 0000000000..d5e416c9c0 --- /dev/null +++ b/@commitlint/cz-commitlint/src/index.cjs @@ -0,0 +1,4 @@ +/** @type {Awaited['prompter']} */ +exports.prompter = async (...args) => { + (await import('./index.js')).prompter(...args); +}; diff --git a/@commitlint/cz-commitlint/src/index.cts b/@commitlint/cz-commitlint/src/index.cts deleted file mode 100644 index e38a21064e..0000000000 --- a/@commitlint/cz-commitlint/src/index.cts +++ /dev/null @@ -1,7 +0,0 @@ -const esmPrompterPromise = import('./index.js'); - -export const prompter: Awaited['prompter'] = async ( - ...args -) => { - (await esmPrompterPromise).prompter(...args); -};