Skip to content
Draft
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
32 changes: 16 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@ jobs:
strategy:
matrix:
os:
- macos-latest
- ubuntu-latest
# - macos-latest
# - ubuntu-latest
- windows-latest
node:
- 18
- 20
- 22
# - 18
# - 20
# - 22
# https://github.com/nodejs/node/issues/59480
- 24.5
eslint:
- 8.56
- 8
# - 8.56
# - 8
- 9

include:
- executeLint: true
node: lts/*
eslint: 9
os: ubuntu-latest
- legacyNodeResolver: true
node: lts/*
eslint: 9
os: ubuntu-latest
# include:
# - executeLint: true
# node: lts/*
# eslint: 9
# os: ubuntu-latest
# - legacyNodeResolver: true
# node: lts/*
# eslint: 9
# os: ubuntu-latest
fail-fast: false

runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default {
'^eslint-plugin-import-x/(.+)$': `<rootDir>/${srcDir}/$1`,
},
snapshotSerializers: ['<rootDir>/test/jest.serializer.cjs'],
testMatch: ['<rootDir>/test/**/*.spec.ts'],
testMatch: ['<rootDir>/test/**/fixtures.spec.ts'],
transform: {
'^.+\\.(m?[jt]s|[jt]sx?)$': [
'@swc-node/jest',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
"minimatch": "^9.0.3 || ^10.0.1",
"semver": "^7.7.2",
"stable-hash-x": "^0.2.0",
"unrs-resolver": "^1.9.2"
"unrs-resolver": "~1.10.0"
},
"devDependencies": {
"@1stg/commitlint-config": "^5.1.0",
Expand Down
5 changes: 4 additions & 1 deletion src/utils/legacy-resolver-settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ export function resolveWithLegacyResolver(
sourceFile: string,
): ResolvedResult {
if (resolver.interfaceVersion === 2) {
return resolver.resolve(modulePath, sourceFile, config)
console.log(modulePath, sourceFile, config)
const result = resolver.resolve(modulePath, sourceFile, config)
console.log('result', result)
return result
}

try {
Expand Down
7 changes: 4 additions & 3 deletions test/fixtures/yarn-pnp/test-package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"scripts": {
"demo": "tsx test.ts",
"lint": "eslint"
"lint": "tsx resolve.cts"
},
"dependencies": {
"nanoid": "^5.1.5"
Expand All @@ -15,10 +15,11 @@
"@types/node": "^22.15.32",
"@typescript-eslint/parser": "^8.34.1",
"eslint": "^9.29.0",
"eslint-import-resolver-typescript": "^4.4.3",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import-x": "link:../../../..",
"globals": "^16.2.0",
"tsx": "^4.20.3",
"typescript": "^5.8.3"
"typescript": "^5.8.3",
"unrs-resolver": "~1.10.0"
}
}
24 changes: 24 additions & 0 deletions test/fixtures/yarn-pnp/test-package/resolve.cts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import path from 'node:path'
import {
defaultConditionNames,
defaultExtensionAlias,
defaultExtensions,
defaultMainFields,
resolve,
} from 'eslint-import-resolver-typescript'
import { ResolverFactory } from 'unrs-resolver'

const eslintJsTypes = require.resolve('@eslint/js/types/index.d.ts')

console.log('eslintJs', eslintJsTypes)

console.log(resolve('eslint', eslintJsTypes))

const resolver = new ResolverFactory({
conditionNames: defaultConditionNames,
extensions: defaultExtensions,
extensionAlias: defaultExtensionAlias,
mainFields: defaultMainFields,
})

console.log(resolver.sync(path.dirname(eslintJsTypes), 'eslint'))
Loading
Loading