From 3e0f3a302262b5543506ef6a7c822f96dcb3bf26 Mon Sep 17 00:00:00 2001 From: DoZerg Date: Wed, 16 Feb 2022 22:24:29 +0000 Subject: [PATCH 1/3] 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, From a69e0aae8a336d90f212f422608c19def2364df7 Mon Sep 17 00:00:00 2001 From: Milos Djermanovic Date: Fri, 25 Feb 2022 13:11:25 +0100 Subject: [PATCH 2/3] test: eslint/eslintrc#71 with eslint/eslint#15616 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5dd764327e..bf40f95f458 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "homepage": "https://eslint.org", "bugs": "https://github.com/eslint/eslint/issues/", "dependencies": { - "@eslint/eslintrc": "^1.1.0", + "@eslint/eslintrc": "github:daidodo/eslintrc#issue15575-2", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0", From 55cff37a66e05474e89ef9840ca7c39118ea44aa Mon Sep 17 00:00:00 2001 From: Milos Djermanovic Date: Fri, 25 Feb 2022 13:47:27 +0100 Subject: [PATCH 3/3] use eslint/eslintrc main branch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bf40f95f458..5b301563a94 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "homepage": "https://eslint.org", "bugs": "https://github.com/eslint/eslint/issues/", "dependencies": { - "@eslint/eslintrc": "github:daidodo/eslintrc#issue15575-2", + "@eslint/eslintrc": "github:eslint/eslintrc", "@humanwhocodes/config-array": "^0.9.2", "ajv": "^6.10.0", "chalk": "^4.0.0",