eslint: patch typescript-eslint-language-service to work on windows

Michel Schmid · Michel Schmid · commit 3c8cd7364e2a · 2024-02-01T21:14:34.000+01:00
It is a known issue that the paths in two places are broken for windows: Quramy/typescript-eslint-language-service#466 Hopefully this gets fixed at the source, but for now setup.sh patches the corresponding places.
diff --git a/strategy/typescript/eslint-plugin-erforce/eslint-adapter.js.patch b/strategy/typescript/eslint-plugin-erforce/eslint-adapter.js.patch
@@ -0,0 +1,19 @@
+--- node_modules/typescript-eslint-language-service/lib/eslint-adapter.js	2023-02-02 23:27:20.012112815 +0100
++++ eslint-adapter_patch.js	2023-02-02 23:26:31.336112346 +0100
+@@ -5,6 +5,7 @@
+ Object.defineProperty(exports, "__esModule", { value: true });
+ exports.ESLintAdapter = exports.translateToCodeFixesFromESLintResult = exports.isIntersect = exports.translateToDiagnosticsFromESLintResult = void 0;
+ const typescript_1 = __importDefault(require("typescript"));
++const path_1 = require("path");
+ const eslint_1 = require("eslint");
+ const errors_1 = require("./errors");
+ const consts_1 = require("./consts");
+@@ -88,7 +89,7 @@
+             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_1.join("@typescript-eslint", "parser"))) {
+             throw new errors_1.InvalidParserError();
+         }
+         const parserOptions = (configFileContent.parserOptions ? configFileContent.parserOptions : {});
diff --git a/strategy/typescript/eslint-plugin-erforce/eslint-config-provider.js.patch b/strategy/typescript/eslint-plugin-erforce/eslint-config-provider.js.patch
@@ -0,0 +1,21 @@
+--- node_modules/typescript-eslint-language-service/lib/eslint-config-provider.js	2023-02-02 23:27:20.048778950 +0100
++++ eslint-config-provider_patch.js	2023-02-02 23:27:08.628942334 +0100
+@@ -6,6 +6,7 @@
+ exports.ESLintConfigProvider = void 0;
+ const path_1 = __importDefault(require("path"));
+ const eslintrc_1 = require("@eslint/eslintrc");
++const path = require("path");
+ function getFactroyClass() {
+     return eslintrc_1.Legacy.CascadingConfigArrayFactory;
+ }
+@@ -50,8 +51,8 @@
+     resolveESLintIntrinsicConfigPath(name) {
+         let ret = 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) {
+             this.log(e);
diff --git a/strategy/typescript/setup.sh b/strategy/typescript/setup.sh
@@ -41,6 +41,10 @@ if ! npm ci; then
 	fi
 fi
 
+echo "${FBOLD}Apply patch to typescript-eslint-language-service"
+patch -u node_modules/typescript-eslint-language-service/lib/eslint-adapter.js -i eslint-plugin-erforce/eslint-adapter.js.patch
+patch -u node_modules/typescript-eslint-language-service/lib/eslint-config-provider.js -i eslint-plugin-erforce/eslint-config-provider.js.patch
+
 echo "${FBOLD}Fixing node_modules/@types/index.d.ts${FNORMAL}"
 # for whatever reason @types/json5/index.d.ts has some unnecessary unexpected character in the beginning,
 # that crashes our compiler if not removed
