Merge pull request #118 from simonihmig/fix-ts-resolve

Fix resolving of peer deps
ember-tooling · Jan 15, 2025 · ff785cf · ff785cf
2 parents 8b10aef + cdb0284
commit ff785cf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/parser/transforms.js b/src/parser/transforms.js
@@ -9,9 +9,12 @@ const mathMLTags = require('mathml-tag-names');
 
 let TypescriptScope = null;
 try {
-  const path = require.resolve('@typescript-eslint/parser');
+  const parserPath = require.resolve('@typescript-eslint/parser');
   // eslint-disable-next-line n/no-unpublished-require
-  TypescriptScope = require('@typescript-eslint/scope-manager', { paths: [path] });
+  const scopeManagerPath = require.resolve('@typescript-eslint/scope-manager', {
+    paths: [parserPath],
+  });
+  TypescriptScope = require(scopeManagerPath);
 } catch {
   // not available
 }

diff --git a/src/parser/ts-patch.js b/src/parser/ts-patch.js
@@ -5,9 +5,10 @@ const { replaceRange } = require('./transforms');
 let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched;
 
 try {
-  const tsPath = require.resolve('@typescript-eslint/parser');
+  const parserPath = require.resolve('@typescript-eslint/parser');
   // eslint-disable-next-line n/no-unpublished-require
-  const ts = require('typescript', { paths: [tsPath] });
+  const tsPath = require.resolve('typescript', { paths: [parserPath] });
+  const ts = require(tsPath);
   typescriptParser = require('@typescript-eslint/parser');
   patchTs = function patchTs() {
     if (isPatched) {