diff --git a/@commitlint/load/src/load.ts b/@commitlint/load/src/load.ts index a86d25fc08..4b835a546f 100644 --- a/@commitlint/load/src/load.ts +++ b/@commitlint/load/src/load.ts @@ -60,9 +60,9 @@ export default async function load( parserPreset: config.parserPreset, }); - const preset = (pickConfig( + const preset = pickConfig( mergeWith(extended, config, w) - ) as unknown) as UserPreset; + ) as unknown as UserPreset; preset.plugins = {}; // TODO: check if this is still necessary with the new factory based conventional changelog parsers diff --git a/@commitlint/types/src/rules.ts b/@commitlint/types/src/rules.ts index f9bfbd3e6d..d729d36aba 100644 --- a/@commitlint/types/src/rules.ts +++ b/@commitlint/types/src/rules.ts @@ -68,12 +68,10 @@ export type QualifiedRuleConfig = | (() => RuleConfigTuple>) | RuleConfigTuple; -export type RuleConfig< - V = RuleConfigQuality.Qualified, - T = void -> = V extends RuleConfigQuality.Qualified - ? RuleConfigTuple - : QualifiedRuleConfig; +export type RuleConfig = + V extends RuleConfigQuality.Qualified + ? RuleConfigTuple + : QualifiedRuleConfig; export type CaseRuleConfig = RuleConfig< V, diff --git a/yarn.lock b/yarn.lock index 7b2f4152bf..fa5ac11cf5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8329,9 +8329,9 @@ prepend-http@^2.0.0: integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= prettier@^2.0.5: - version "2.2.1" - resolved "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + version "2.3.0" + resolved "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" + integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== pretty-format@^26.0.0: version "26.6.0"