Skip to content

Commit ff785cf

Browse files
Merge pull request #118 from simonihmig/fix-ts-resolve
Fix resolving of peer deps
2 parents 8b10aef + cdb0284 commit ff785cf

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/parser/transforms.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@ const mathMLTags = require('mathml-tag-names');
99

1010
let TypescriptScope = null;
1111
try {
12-
const path = require.resolve('@typescript-eslint/parser');
12+
const parserPath = require.resolve('@typescript-eslint/parser');
1313
// eslint-disable-next-line n/no-unpublished-require
14-
TypescriptScope = require('@typescript-eslint/scope-manager', { paths: [path] });
14+
const scopeManagerPath = require.resolve('@typescript-eslint/scope-manager', {
15+
paths: [parserPath],
16+
});
17+
TypescriptScope = require(scopeManagerPath);
1518
} catch {
1619
// not available
1720
}

src/parser/ts-patch.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@ const { replaceRange } = require('./transforms');
55
let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched;
66

77
try {
8-
const tsPath = require.resolve('@typescript-eslint/parser');
8+
const parserPath = require.resolve('@typescript-eslint/parser');
99
// eslint-disable-next-line n/no-unpublished-require
10-
const ts = require('typescript', { paths: [tsPath] });
10+
const tsPath = require.resolve('typescript', { paths: [parserPath] });
11+
const ts = require(tsPath);
1112
typescriptParser = require('@typescript-eslint/parser');
1213
patchTs = function patchTs() {
1314
if (isPatched) {

0 commit comments

Comments
 (0)