From 3e0f3a302262b5543506ef6a7c822f96dcb3bf26 Mon Sep 17 00:00:00 2001 From: DoZerg Date: Wed, 16 Feb 2022 22:24:29 +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 | 4 ++-- lib/cli-engine/file-enumerator.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cli-engine/cli-engine.js b/lib/cli-engine/cli-engine.js index 3ae8b685cf3..92b8755783f 100644 --- a/lib/cli-engine/cli-engine.js +++ b/lib/cli-engine/cli-engine.js @@ -616,8 +616,8 @@ class CLIEngine { useEslintrc: options.useEslintrc, builtInRules, loadRules, - eslintRecommendedPath: path.resolve(__dirname, "../../conf/eslint-recommended.js"), - eslintAllPath: path.resolve(__dirname, "../../conf/eslint-all.js") + getEslintRecommendedConfig: () => require("../../conf/eslint-recommended.js"), + getEslintAllConfig: () => require("../../conf/eslint-all.js") }); const fileEnumerator = new FileEnumerator({ configArrayFactory, diff --git a/lib/cli-engine/file-enumerator.js b/lib/cli-engine/file-enumerator.js index f1442d150b8..674e83e540d 100644 --- a/lib/cli-engine/file-enumerator.js +++ b/lib/cli-engine/file-enumerator.js @@ -215,8 +215,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") + getEslintRecommendedConfig: () => require("../../conf/eslint-recommended.js"), + getEslintAllConfig: () => require("../../conf/eslint-all.js") }), extensions = null, globInputPaths = true,