Skip to content
Merged
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/cyan-icons-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"eslint-plugin-import-x": patch
---

fix: accept non-array resolver in `resolver-next` setting
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export interface ImportSettings {
resolve?: NodeResolverOptions
resolver?: LegacyImportResolver
'resolver-legacy'?: LegacyImportResolver
'resolver-next'?: NewResolver[]
'resolver-next'?: NewResolver[] | NewResolver
}

export type WithPluginName<T extends string | object> = T extends string
Expand Down
6 changes: 5 additions & 1 deletion src/utils/resolve.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,11 @@ function fullResolve(
Object.prototype.hasOwnProperty.call(settings, 'import-x/resolver-next') &&
settings['import-x/resolver-next']
) {
const configResolvers = settings['import-x/resolver-next']
let configResolvers = settings['import-x/resolver-next']

if (!Array.isArray(configResolvers)) {
configResolvers = [configResolvers]
}

for (let i = 0, len = configResolvers.length; i < len; i++) {
const resolver = configResolvers[i]
Expand Down
9 changes: 9 additions & 0 deletions test/utils/resolve.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,15 @@ describe('resolve', () => {
expect(resolve('../fixtures/foo', context)).toBe(testFilePath('./bar.jsx'))
})

it('non-array resolver interface v3', () => {
const context = testContext({
'import-x/resolver-next': require<{
foobarResolver: NewResolver
}>('../fixtures/foo-bar-resolver-v3').foobarResolver,
})
expect(resolve('../fixtures/foo', context)).toBe(testFilePath('./bar.jsx'))
})

it('reports invalid import-x/resolver config', () => {
const context = testContext({
// @ts-expect-error - testing
Expand Down