From 2105a6586d734dad318f99cc9a0644aae2e99587 Mon Sep 17 00:00:00 2001 From: Armano Date: Fri, 7 Feb 2020 00:54:21 +0100 Subject: [PATCH 1/2] refactor: use builtin Object.values instead of lodash --- @commitlint/ensure/src/index.test.ts | 3 +-- @commitlint/lint/src/lint.ts | 3 +-- @commitlint/rules/package.json | 4 +--- @commitlint/rules/src/index.test.ts | 3 +-- @packages/utils/package.json | 1 - @packages/utils/pkg-check.js | 3 +-- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/@commitlint/ensure/src/index.test.ts b/@commitlint/ensure/src/index.test.ts index 73097266ee..21e3147f31 100644 --- a/@commitlint/ensure/src/index.test.ts +++ b/@commitlint/ensure/src/index.test.ts @@ -1,6 +1,5 @@ import path from 'path'; import globby from 'globby'; -import values from 'lodash/values'; import camelCase from 'lodash/camelCase'; import * as ensure from '.'; @@ -15,7 +14,7 @@ test('exports all checkers', async () => { }); test('rules export functions', () => { - const actual = values(ensure); + const actual = Object.values(ensure); expect(actual.every(rule => typeof rule === 'function')).toBe(true); }); diff --git a/@commitlint/lint/src/lint.ts b/@commitlint/lint/src/lint.ts index fb3985734b..505744c9cd 100644 --- a/@commitlint/lint/src/lint.ts +++ b/@commitlint/lint/src/lint.ts @@ -3,7 +3,6 @@ import isIgnored from '@commitlint/is-ignored'; import parse from '@commitlint/parse'; import defaultRules from '@commitlint/rules'; import toPairs from 'lodash/toPairs'; -import values from 'lodash/values'; import {buildCommitMesage} from './commit-message'; import { LintRuleConfig, @@ -43,7 +42,7 @@ export default async function lint( ); if (opts.plugins) { - values(opts.plugins).forEach((plugin: Plugin) => { + Object.values(opts.plugins).forEach((plugin: Plugin) => { if (plugin.rules) { Object.keys(plugin.rules).forEach(ruleKey => allRules.set(ruleKey, plugin.rules[ruleKey]) diff --git a/@commitlint/rules/package.json b/@commitlint/rules/package.json index a95fc8bf49..3cee9a2dab 100644 --- a/@commitlint/rules/package.json +++ b/@commitlint/rules/package.json @@ -37,10 +37,8 @@ "@commitlint/parse": "^8.3.4", "@commitlint/test": "8.2.0", "@commitlint/utils": "^8.3.4", - "@types/lodash": "4.14.149", "conventional-changelog-angular": "5.0.6", - "globby": "^11.0.0", - "lodash": "^4.17.15" + "globby": "^11.0.0" }, "dependencies": { "@commitlint/ensure": "^8.3.4", diff --git a/@commitlint/rules/src/index.test.ts b/@commitlint/rules/src/index.test.ts index 9ee9603da2..273eb9e49c 100644 --- a/@commitlint/rules/src/index.test.ts +++ b/@commitlint/rules/src/index.test.ts @@ -1,6 +1,5 @@ import path from 'path'; import globby from 'globby'; -import values from 'lodash/values'; import rules from '.'; test('exports all rules', async () => { @@ -10,7 +9,7 @@ test('exports all rules', async () => { }); test('rules export functions', () => { - const actual = values(rules); + const actual = Object.values(rules); expect(actual.every(rule => typeof rule === 'function')).toBe(true); }); diff --git a/@packages/utils/package.json b/@packages/utils/package.json index c04d775bfb..cc2285a2f1 100644 --- a/@packages/utils/package.json +++ b/@packages/utils/package.json @@ -39,7 +39,6 @@ "@commitlint/test": "8.2.0", "execa": "0.11.0", "is-builtin-module": "3.0.0", - "lodash": "^4.17.15", "meow": "4.0.1", "read-pkg": "5.2.0", "require-from-string": "2.0.2", diff --git a/@packages/utils/pkg-check.js b/@packages/utils/pkg-check.js index 9cc5c7bd8a..54947924e7 100755 --- a/@packages/utils/pkg-check.js +++ b/@packages/utils/pkg-check.js @@ -8,7 +8,6 @@ const meow = require('meow'); const readPkg = require('read-pkg'); const requireFromString = require('require-from-string'); const tar = require('tar-fs'); -const values = require('lodash/values'); const {fix} = require('@commitlint/test'); const builtin = require.resolve('is-builtin-module'); @@ -198,7 +197,7 @@ function getPkgBinFiles(bin) { } if (typeof bin === 'object') { - return values(bin).map(b => path.normalize(b)); + return Object.values(bin).map(b => path.normalize(b)); } } From 7c2ddd3de7cf3720aa1dda286b2347283128732e Mon Sep 17 00:00:00 2001 From: Armano Date: Fri, 7 Feb 2020 00:58:45 +0100 Subject: [PATCH 2/2] chore: plugin type can be now correctly inherited --- @commitlint/lint/src/lint.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/@commitlint/lint/src/lint.ts b/@commitlint/lint/src/lint.ts index 505744c9cd..5ac511d9fa 100644 --- a/@commitlint/lint/src/lint.ts +++ b/@commitlint/lint/src/lint.ts @@ -9,7 +9,6 @@ import { LintOptions, LintRuleOutcome, Rule, - Plugin, RuleSeverity } from '@commitlint/types'; @@ -42,7 +41,7 @@ export default async function lint( ); if (opts.plugins) { - Object.values(opts.plugins).forEach((plugin: Plugin) => { + Object.values(opts.plugins).forEach(plugin => { if (plugin.rules) { Object.keys(plugin.rules).forEach(ruleKey => allRules.set(ruleKey, plugin.rules[ruleKey])