Skip to content

Commit 9fe4416

Browse files
committed
ci: try upgrading unrs-resolver
1 parent 27b175f commit 9fe4416

File tree

9 files changed

+442
-202
lines changed

9 files changed

+442
-202
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,29 +14,29 @@ jobs:
1414
strategy:
1515
matrix:
1616
os:
17-
- macos-latest
18-
- ubuntu-latest
17+
# - macos-latest
18+
# - ubuntu-latest
1919
- windows-latest
2020
node:
21-
- 18
22-
- 20
23-
- 22
21+
# - 18
22+
# - 20
23+
# - 22
2424
# https://github.com/nodejs/node/issues/59480
2525
- 24.5
2626
eslint:
27-
- 8.56
28-
- 8
27+
# - 8.56
28+
# - 8
2929
- 9
3030

31-
include:
32-
- executeLint: true
33-
node: lts/*
34-
eslint: 9
35-
os: ubuntu-latest
36-
- legacyNodeResolver: true
37-
node: lts/*
38-
eslint: 9
39-
os: ubuntu-latest
31+
# include:
32+
# - executeLint: true
33+
# node: lts/*
34+
# eslint: 9
35+
# os: ubuntu-latest
36+
# - legacyNodeResolver: true
37+
# node: lts/*
38+
# eslint: 9
39+
# os: ubuntu-latest
4040
fail-fast: false
4141

4242
runs-on: ${{ matrix.os }}

jest.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default {
1515
'^eslint-plugin-import-x/(.+)$': `<rootDir>/${srcDir}/$1`,
1616
},
1717
snapshotSerializers: ['<rootDir>/test/jest.serializer.cjs'],
18-
testMatch: ['<rootDir>/test/**/*.spec.ts'],
18+
testMatch: ['<rootDir>/test/**/fixtures.spec.ts'],
1919
transform: {
2020
'^.+\\.(m?[jt]s|[jt]sx?)$': [
2121
'@swc-node/jest',

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"minimatch": "^9.0.3 || ^10.0.1",
8484
"semver": "^7.7.2",
8585
"stable-hash-x": "^0.2.0",
86-
"unrs-resolver": "^1.9.2"
86+
"unrs-resolver": "~1.10.0"
8787
},
8888
"devDependencies": {
8989
"@1stg/commitlint-config": "^5.1.0",

src/utils/legacy-resolver-settings.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ export function resolveWithLegacyResolver(
2323
sourceFile: string,
2424
): ResolvedResult {
2525
if (resolver.interfaceVersion === 2) {
26-
return resolver.resolve(modulePath, sourceFile, config)
26+
console.log(modulePath, sourceFile, config)
27+
const result = resolver.resolve(modulePath, sourceFile, config)
28+
console.log('result', result)
29+
return result
2730
}
2831

2932
try {

test/fixtures/yarn-pnp/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
"devDependencies": {
1616
"epix-oxc": "link:.",
1717
"eslint": "^9.29.0",
18-
"eslint-plugin-import-x": "link:../../.."
18+
"eslint-plugin-import-x": "link:../../..",
19+
"unrs-resolver": "~1.10.0"
1920
}
2021
}

test/fixtures/yarn-pnp/test-package/package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"private": true,
66
"scripts": {
77
"demo": "tsx test.ts",
8-
"lint": "eslint"
8+
"lint": "tsx resolve.cts"
99
},
1010
"dependencies": {
1111
"nanoid": "^5.1.5"
@@ -15,10 +15,11 @@
1515
"@types/node": "^22.15.32",
1616
"@typescript-eslint/parser": "^8.34.1",
1717
"eslint": "^9.29.0",
18-
"eslint-import-resolver-typescript": "^4.4.3",
18+
"eslint-import-resolver-typescript": "^4.4.4",
1919
"eslint-plugin-import-x": "link:../../../..",
2020
"globals": "^16.2.0",
2121
"tsx": "^4.20.3",
22-
"typescript": "^5.8.3"
22+
"typescript": "^5.8.3",
23+
"unrs-resolver": "1.11.0"
2324
}
2425
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
import path from 'node:path'
2+
import {
3+
defaultConditionNames,
4+
defaultExtensionAlias,
5+
defaultExtensions,
6+
defaultMainFields,
7+
resolve,
8+
} from 'eslint-import-resolver-typescript'
9+
import { ResolverFactory } from 'unrs-resolver'
10+
11+
const eslintJsTypes = require.resolve('@eslint/js/types/index.d.ts')
12+
13+
console.log('eslintJs', eslintJsTypes)
14+
15+
console.log(resolve('eslint', eslintJsTypes))
16+
17+
const resolver = new ResolverFactory({
18+
conditionNames: defaultConditionNames,
19+
extensions: defaultExtensions,
20+
extensionAlias: defaultExtensionAlias,
21+
mainFields: defaultMainFields,
22+
})
23+
24+
console.log(resolver.sync(path.dirname(eslintJsTypes), 'eslint'))

0 commit comments

Comments
 (0)