Chore: Extract some functionality to eslintrc (refs #13481)

lib/cli-engine/cli-engine.js

@@ -19,8 +19,8 @@ const fs = require("fs");
 const path = require("path");
 const defaultOptions = require("../../conf/default-cli-options");
 const pkg = require("../../package.json");
-const ConfigOps = require("../shared/config-ops");
-const naming = require("../shared/naming");
+const ConfigOps = require("@eslint/eslintrc/lib/shared/config-ops");
+const naming = require("@eslint/eslintrc/lib/shared/naming");
 const ModuleResolver = require("../shared/relative-module-resolver");
 const { Linter } = require("../linter");
 const builtInRules = require("../rules");

lib/cli-engine/config-array-factory.js

@@ -56,7 +56,7 @@ const path = require("path");
 const importFresh = require("import-fresh");
 const stripComments = require("strip-json-comments");
 const { validateConfigSchema } = require("../shared/config-validator");
-const naming = require("../shared/naming");
+const naming = require("@eslint/eslintrc/lib/shared/naming");
 const ModuleResolver = require("../shared/relative-module-resolver");
 const {
     ConfigArray,

lib/eslint/eslint.js

@@ -15,7 +15,13 @@ const fs = require("fs");
 const { promisify } = require("util");
 const { CLIEngine, getCLIEngineInternalSlots } = require("../cli-engine/cli-engine");
 const BuiltinRules = require("../rules");
-const { getRuleSeverity } = require("../shared/config-ops");
+const {
+    Legacy: {
+        ConfigOps: {
+            getRuleSeverity
+        }
+    }
+} = require("@eslint/eslintrc");
 const { version } = require("../../package.json");
 
 //------------------------------------------------------------------------------

lib/init/autoconfig.js

@@ -11,7 +11,7 @@
 
 const lodash = require("lodash"),
     recConfig = require("../../conf/eslint-recommended"),
-    ConfigOps = require("../shared/config-ops"),
+    ConfigOps = require("@eslint/eslintrc/lib/shared/config-ops"),
     { Linter } = require("../linter"),
     configRule = require("./config-rule");
 

lib/init/config-initializer.js

@@ -17,9 +17,9 @@ const util = require("util"),
     semver = require("semver"),
     espree = require("espree"),
     recConfig = require("../../conf/eslint-recommended"),
-    ConfigOps = require("../shared/config-ops"),
+    ConfigOps = require("@eslint/eslintrc/lib/shared/config-ops"),
     log = require("../shared/logging"),
-    naming = require("../shared/naming"),
+    naming = require("@eslint/eslintrc/lib/shared/naming"),
     ModuleResolver = require("../shared/relative-module-resolver"),
     autoconfig = require("./autoconfig.js"),
     ConfigFile = require("./config-file"),

lib/linter/config-comment-parser.js

@@ -11,7 +11,7 @@
 //------------------------------------------------------------------------------
 
 const levn = require("levn"),
-    ConfigOps = require("../shared/config-ops");
+    ConfigOps = require("@eslint/eslintrc/lib/shared/config-ops");
 
 const debug = require("debug")("eslint:config-comment-parser");
 

lib/linter/linter.js

@@ -16,11 +16,11 @@ const
     evk = require("eslint-visitor-keys"),
     espree = require("espree"),
     lodash = require("lodash"),
-    BuiltInEnvironments = require("../../conf/environments"),
+    BuiltInEnvironments = require("@eslint/eslintrc/conf/environments"),
     pkg = require("../../package.json"),
     astUtils = require("../shared/ast-utils"),
-    ConfigOps = require("../shared/config-ops"),
-    validator = require("../shared/config-validator"),
+    ConfigOps = require("@eslint/eslintrc/lib/shared/config-ops"),
+    ConfigValidator = require("@eslint/eslintrc/lib/shared/config-validator"),
     Traverser = require("../shared/traverser"),
     { SourceCode } = require("../source-code"),
     CodePathAnalyzer = require("./code-path-analysis/code-path-analyzer"),
@@ -293,6 +293,9 @@ function getDirectiveComments(filename, ast, ruleMapper, warnInlineConfig) {
     const exportedVariables = {};
     const problems = [];
     const disableDirectives = [];
+    const validator = new ConfigValidator({
+        builtInRules: Rules
+    });
 
     ast.comments.filter(token => token.type !== "Shebang").forEach(comment => {
         const trimmedCommentText = stripDirectiveComment(comment.value);