From aaf65e629adb74401092c3ccc9cb4e4bd1c8609b Mon Sep 17 00:00:00 2001 From: Brandon Mills Date: Fri, 7 May 2021 21:17:43 -0400 Subject: [PATCH] Upgrade: eslintrc for ModuleResolver fix (#14577) This incorporates https://github.com/eslint/eslintrc/pull/34, which allows fixing `CLIEngine`'s `ModuleResolver` import. --- lib/cli-engine/cli-engine.js | 9 ++------- package.json | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/lib/cli-engine/cli-engine.js b/lib/cli-engine/cli-engine.js index b1befaa04fc..ca298f9c356 100644 --- a/lib/cli-engine/cli-engine.js +++ b/lib/cli-engine/cli-engine.js @@ -27,16 +27,11 @@ const { naming, CascadingConfigArrayFactory, IgnorePattern, - getUsedExtractedConfigs + getUsedExtractedConfigs, + ModuleResolver } } = require("@eslint/eslintrc"); -/* - * For some reason, ModuleResolver must be included via filepath instead of by - * API exports in order to work properly. That's why this is separated out onto - * its own require() statement. - */ -const ModuleResolver = require("@eslint/eslintrc/lib/shared/relative-module-resolver"); const { FileEnumerator } = require("./file-enumerator"); const { Linter } = require("../linter"); diff --git a/package.json b/package.json index 72070e2a0f5..2e26bf1c7b2 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "bugs": "https://github.com/eslint/eslint/issues/", "dependencies": { "@babel/code-frame": "7.12.11", - "@eslint/eslintrc": "^0.4.0", + "@eslint/eslintrc": "^0.4.1", "ajv": "^6.10.0", "chalk": "^4.0.0", "cross-spawn": "^7.0.2",