From ce643432d17c2b1edf18013e2279bea2c48a52cc Mon Sep 17 00:00:00 2001 From: Zhao DAI Date: Sun, 13 Feb 2022 13:52:00 +0000 Subject: [PATCH] fix: Avoid dirname for built-in configs. Load eslint:recommended and eslint:all configs via import instead file paths. Fixes: #15575 --- lib/cli-engine/cli-engine.js | 7 ++++--- lib/cli-engine/file-enumerator.js | 6 ++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/cli-engine/cli-engine.js b/lib/cli-engine/cli-engine.js index 3ae8b685cf3..18ebdbf4506 100644 --- a/lib/cli-engine/cli-engine.js +++ b/lib/cli-engine/cli-engine.js @@ -19,7 +19,8 @@ const fs = require("fs"); const path = require("path"); const defaultOptions = require("../../conf/default-cli-options"); const pkg = require("../../package.json"); - +const eslintRecommendedConfig = require("../../conf/eslint-recommended.js"); +const eslintAllConfig = require("../../conf/eslint-all.js"); const { Legacy: { @@ -616,8 +617,8 @@ class CLIEngine { useEslintrc: options.useEslintrc, builtInRules, loadRules, - eslintRecommendedPath: path.resolve(__dirname, "../../conf/eslint-recommended.js"), - eslintAllPath: path.resolve(__dirname, "../../conf/eslint-all.js") + eslintRecommendedConfig, + eslintAllConfig }); const fileEnumerator = new FileEnumerator({ configArrayFactory, diff --git a/lib/cli-engine/file-enumerator.js b/lib/cli-engine/file-enumerator.js index f1442d150b8..7fdcb6cc29b 100644 --- a/lib/cli-engine/file-enumerator.js +++ b/lib/cli-engine/file-enumerator.js @@ -40,6 +40,8 @@ const getGlobParent = require("glob-parent"); const isGlob = require("is-glob"); const escapeRegExp = require("escape-string-regexp"); const { Minimatch } = require("minimatch"); +const eslintRecommendedConfig = require("../../conf/eslint-recommended.js"); +const eslintAllConfig = require("../../conf/eslint-all.js"); const { Legacy: { @@ -215,8 +217,8 @@ class FileEnumerator { cwd = process.cwd(), configArrayFactory = new CascadingConfigArrayFactory({ cwd, - eslintRecommendedPath: path.resolve(__dirname, "../../conf/eslint-recommended.js"), - eslintAllPath: path.resolve(__dirname, "../../conf/eslint-all.js") + eslintRecommendedConfig, + eslintAllConfig }), extensions = null, globInputPaths = true,