From b4582b23dce3a5250c8a1669e2c96558ffe8fe3e Mon Sep 17 00:00:00 2001 From: Martin Artola Date: Tue, 28 Jun 2022 14:52:41 +0200 Subject: [PATCH 1/2] fix to support Windows - https://github.com/Quramy/typescript-eslint-language-service/issues/466 --- src/eslint-adapter.ts | 3 ++- src/eslint-config-provider.ts | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/eslint-adapter.ts b/src/eslint-adapter.ts index 98b83655..f7a0499e 100644 --- a/src/eslint-adapter.ts +++ b/src/eslint-adapter.ts @@ -1,3 +1,4 @@ +import path from "path"; import ts from "typescript"; import { Linter, ESLint } from "eslint"; import { AstConverter } from "./ast-converter"; @@ -115,7 +116,7 @@ export class ESLintAdapter { if (this.ignoredFilepathMap.get(fileName) === true) return []; const configArray = this.configProvider.getConfigArrayForFile(fileName); const configFileContent = configArray.extractConfig(fileName).toCompatibleObjectAsConfigFileContent(); - if (!isParserModuleNameValid(configFileContent.parser, "@typescript-eslint/parser")) { + if (!isParserModuleNameValid(configFileContent.parser, path.join("@typescript-eslint", "parser"))) { throw new InvalidParserError(); } const parserOptions = (configFileContent.parserOptions ? configFileContent.parserOptions : {}) as ParserOptions; diff --git a/src/eslint-config-provider.ts b/src/eslint-config-provider.ts index ddeb785f..08ff1db5 100644 --- a/src/eslint-config-provider.ts +++ b/src/eslint-config-provider.ts @@ -73,8 +73,8 @@ export class ESLintConfigProvider implements ConfigProvider { private resolveESLintIntrinsicConfigPath(name: "eslint-all" | "eslint-recommended") { let ret: string | undefined = undefined; try { - const fragments = require.resolve("eslint").split("node_modules/eslint"); - ret = [...fragments.slice(0, fragments.length - 1), `/conf/${name}.js`].join("node_modules/eslint"); + const fragments = require.resolve("eslint").split(path.join("node_modules", "eslint")); + ret = path.join(...fragments.slice(0, fragments.length - 1), "node_modules", "eslint", "conf", `${name}.js`); } catch (e: any) { this.log(e); } From 07c52aea494457ee3e5b1aa7455eba817fd4b8f4 Mon Sep 17 00:00:00 2001 From: Martin Artola Date: Wed, 5 Apr 2023 17:03:55 +0200 Subject: [PATCH 2/2] oss sensible path for "checkFileToBeIgnored" --- src/eslint-adapter.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/eslint-adapter.ts b/src/eslint-adapter.ts index f7a0499e..8a4225ae 100644 --- a/src/eslint-adapter.ts +++ b/src/eslint-adapter.ts @@ -127,7 +127,7 @@ export class ESLintAdapter { } public checkFileToBeIgnored(fileName: string) { - if (fileName.indexOf("node_modules/") !== -1) return; + if (fileName.indexOf("node_modules" + path.sep) !== -1) return; if (!fileName.endsWith(".ts") && !fileName.endsWith(".tsx")) return; Promise.resolve() .then(() => new ESLint())