From 1f4002a6170e75d62c3ba526a3e016dc7ff81192 Mon Sep 17 00:00:00 2001 From: Teddy Katz Date: Tue, 29 Jan 2019 23:50:50 -0500 Subject: [PATCH] Chore: remove dead code for loading rules The `lib/rules.js` file contains a code path that was previously needed to load core rules, but is no longer used as of aa56247746a0095996a41dd03bdbbf659f0f93b6. --- conf/eslint-all.js | 8 +++----- lib/config/config-rule.js | 6 ++---- lib/load-rules.js | 7 ++----- tests/lib/config/config-rule.js | 4 ++-- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/conf/eslint-all.js b/conf/eslint-all.js index 43db54fb718..3850fcea3ab 100644 --- a/conf/eslint-all.js +++ b/conf/eslint-all.js @@ -9,16 +9,14 @@ // Requirements //------------------------------------------------------------------------------ -const load = require("../lib/load-rules"), - Rules = require("../lib/rules"); -const rules = new Rules(); +const builtInRules = require("../lib/built-in-rules-index"); //------------------------------------------------------------------------------ // Helpers //------------------------------------------------------------------------------ -const enabledRules = Object.keys(load()).reduce((result, ruleId) => { - if (!rules.get(ruleId).meta.deprecated) { +const enabledRules = Object.keys(builtInRules).reduce((result, ruleId) => { + if (!builtInRules[ruleId].meta.deprecated) { result[ruleId] = "error"; } return result; diff --git a/lib/config/config-rule.js b/lib/config/config-rule.js index e4221406df1..29aac0b9a1a 100644 --- a/lib/config/config-rule.js +++ b/lib/config/config-rule.js @@ -10,7 +10,7 @@ //------------------------------------------------------------------------------ const Rules = require("../rules"), - loadRules = require("../load-rules"); + builtInRules = require("../built-in-rules-index"); const rules = new Rules(); @@ -299,9 +299,7 @@ function generateConfigsFromSchema(schema) { * @returns {rulesConfig} Hash of rule names and arrays of possible configurations */ function createCoreRuleConfigs() { - const ruleList = loadRules(); - - return Object.keys(ruleList).reduce((accumulator, id) => { + return Object.keys(builtInRules).reduce((accumulator, id) => { const rule = rules.get(id); const schema = (typeof rule === "function") ? rule.schema : rule.meta.schema; diff --git a/lib/load-rules.js b/lib/load-rules.js index a9da956bddc..a7383624651 100644 --- a/lib/load-rules.js +++ b/lib/load-rules.js @@ -20,15 +20,12 @@ const rulesDirCache = {}; /** * Load all rule modules from specified directory. - * @param {string} [relativeRulesDir] Path to rules directory, may be relative. Defaults to `lib/rules`. + * @param {string} relativeRulesDir Path to rules directory, may be relative. * @param {string} cwd Current working directory * @returns {Object} Loaded rule modules by rule ids (file names). */ module.exports = function(relativeRulesDir, cwd) { - - const rulesDir = relativeRulesDir - ? path.resolve(cwd, relativeRulesDir) - : path.join(__dirname, "rules"); + const rulesDir = path.resolve(cwd, relativeRulesDir); // cache will help performance as IO operation are expensive if (rulesDirCache[rulesDir]) { diff --git a/tests/lib/config/config-rule.js b/tests/lib/config/config-rule.js index 2a88eb91561..810f8aaccd2 100644 --- a/tests/lib/config/config-rule.js +++ b/tests/lib/config/config-rule.js @@ -11,7 +11,7 @@ const assert = require("chai").assert, ConfigRule = require("../../../lib/config/config-rule"), - loadRules = require("../../../lib/load-rules"), + builtInRules = require("../../../lib/built-in-rules-index"), schema = require("../../fixtures/config-rule/schemas"); //------------------------------------------------------------------------------ @@ -294,7 +294,7 @@ describe("ConfigRule", () => { const rulesConfig = ConfigRule.createCoreRuleConfigs(); it("should create a rulesConfig containing all core rules", () => { - const coreRules = loadRules(), + const coreRules = builtInRules, expectedRules = Object.keys(coreRules), actualRules = Object.keys(rulesConfig);