Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/large-insects-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eslint-import-resolver-typescript": patch
---

fix: check tsconfig matching before using resolver
12 changes: 7 additions & 5 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@ export const resolve = (
// must be an array with 2+ items here already ensured by `normalizeOptions`
const projects = sortProjectsByAffinity(options.project as string[], file)
for (const tsconfigPath of projects) {
const resolverCached = resolverCache.get(tsconfigPath)
if (resolverCached) {
resolver = resolverCached
break createResolver
}
let tsconfigCached = tsconfigCache.get(tsconfigPath)
if (!tsconfigCached) {
tsconfigCache.set(
Expand All @@ -126,6 +121,13 @@ export const resolve = (
continue
}
log('matched tsconfig at:', tsconfigPath, 'for', file)

const resolverCached = resolverCache.get(tsconfigPath)
if (resolverCached) {
resolver = resolverCached
break createResolver
}

options = {
...options,
tsconfig: {
Expand Down
8 changes: 8 additions & 0 deletions tests/e2e/__snapshots__/e2e.spec.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ exports[`e2e cases > should exec eslint successfully > multipleTsconfigs 1`] = `
}
`;

exports[`e2e cases > should exec eslint successfully > multipleTsconfigsWithReferences 1`] = `
{
"exitCode": 0,
"stderr": "",
"stdout": "",
}
`;

exports[`e2e cases > should exec eslint successfully > nearestTsconfig 1`] = `
{
"exitCode": 0,
Expand Down
8 changes: 8 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const path = require('node:path')

const project = [
path.resolve(__dirname, 'tsconfig.node.json'),
path.resolve(__dirname, 'tsconfig.web.json'),
]

module.exports = require('../base.eslintrc.cjs')(project)
10 changes: 10 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/backend/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// import relative
import './utils'

// import using tsconfig path mapping
import '@backend/utils'
import '@shared/helper'

// import from node_module
import 'typescript'
import 'dummy.js'
3 changes: 3 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/backend/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const utilA = () => {
return 'backend utility'
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export default 'React Component'
10 changes: 10 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/frontend/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// import relative
import './component'

// import using tsconfig path mapping
import '@frontend/component'
import '@shared/helper'

// import from node_module
import 'typescript'
import 'dummy.js'
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
export const helperB = () => {
return 'shared helper'
}
7 changes: 7 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"files": [],
"references": [
{ "path": "./tsconfig.node.json" },
{ "path": "./tsconfig.web.json" }
]
}
11 changes: 11 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"compilerOptions": {
"composite": true,
"baseUrl": ".",
"paths": {
"@backend/*": ["backend/*"],
"@shared/*": ["shared-utils/*"]
}
},
"include": ["backend/**/*", "shared-utils/**/*"]
}
12 changes: 12 additions & 0 deletions tests/e2e/multipleTsconfigsWithReferences/tsconfig.web.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"compilerOptions": {
"composite": true,
"jsx": "react",
"baseUrl": ".",
"paths": {
"@frontend/*": ["frontend/*"],
"@shared/*": ["shared-utils/*"]
}
},
"include": ["frontend/**/*", "shared-utils/**/*"]
}
Loading