Skip to content

Commit 115568c

Browse files
JounQinJounQin
committed
fix: known incompatible issues
1 parent 87250de commit 115568c

File tree

5 files changed

+86
-84
lines changed

5 files changed

+86
-84
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Install Dependencies
5858
run: yarn --immutable
5959

60-
- name: Uninstall Legacy Node Resolver
60+
- name: Install Legacy Node Resolver
6161
if: ${{ matrix.legacyNodeResolver }}
6262
run: yarn add -D eslint-import-resolver-node
6363

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"semver": "^7.7.2",
8383
"stable-hash": "^0.0.5",
8484
"tslib": "^2.8.1",
85-
"unrs-resolver": "^1.7.2"
85+
"unrs-resolver": "^1.7.5"
8686
},
8787
"devDependencies": {
8888
"@1stg/commitlint-config": "^5.0.6",

‎src/utils/resolve.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -305,11 +305,13 @@ function fullResolve(
305305
if (LEGACY_NODE_RESOLVERS.has(name)) {
306306
const resolverOptions = (options || {}) as NodeResolverOptions
307307
const resolved = legacyNodeResolve(
308-
{
309-
...resolverOptions,
310-
extensions:
311-
resolverOptions.extensions || settings['import-x/extensions'],
312-
},
308+
resolverOptions,
309+
// TODO: enable the following in the next major
310+
// {
311+
// ...resolverOptions,
312+
// extensions:
313+
// resolverOptions.extensions || settings['import-x/extensions'],
314+
// },
313315
context,
314316
modulePath,
315317
sourceFile,

‎test/__snapshots__/node-resolver.spec.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ exports[`modules jest => true 2`] = `
6969
"expected": true,
7070
"result": {
7171
"found": true,
72-
"path": "<ROOT>/node_modules/jest/build/index.js",
72+
"path": "<ROOT>/node_modules/jest/build/index.mjs",
7373
},
7474
"source": "jest",
7575
}

‎yarn.lock‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -2725,7 +2725,7 @@ __metadata:
27252725
languageName: node
27262726
linkType: hard
27272727

2728-
"@napi-rs/wasm-runtime@npm:^0.2.4, @napi-rs/wasm-runtime@npm:^0.2.5, @napi-rs/wasm-runtime@npm:^0.2.9":
2728+
"@napi-rs/wasm-runtime@npm:^0.2.10, @napi-rs/wasm-runtime@npm:^0.2.4, @napi-rs/wasm-runtime@npm:^0.2.5, @napi-rs/wasm-runtime@npm:^0.2.9":
27292729
version: 0.2.10
27302730
resolution: "@napi-rs/wasm-runtime@npm:0.2.10"
27312731
dependencies:
@@ -4083,123 +4083,123 @@ __metadata:
40834083
languageName: node
40844084
linkType: hard
40854085

4086-
"@unrs/resolver-binding-darwin-arm64@npm:1.7.2":
4087-
version: 1.7.2
4088-
resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.2"
4086+
"@unrs/resolver-binding-darwin-arm64@npm:1.7.5":
4087+
version: 1.7.5
4088+
resolution: "@unrs/resolver-binding-darwin-arm64@npm:1.7.5"
40894089
conditions: os=darwin & cpu=arm64
40904090
languageName: node
40914091
linkType: hard
40924092

4093-
"@unrs/resolver-binding-darwin-x64@npm:1.7.2":
4094-
version: 1.7.2
4095-
resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.2"
4093+
"@unrs/resolver-binding-darwin-x64@npm:1.7.5":
4094+
version: 1.7.5
4095+
resolution: "@unrs/resolver-binding-darwin-x64@npm:1.7.5"
40964096
conditions: os=darwin & cpu=x64
40974097
languageName: node
40984098
linkType: hard
40994099

4100-
"@unrs/resolver-binding-freebsd-x64@npm:1.7.2":
4101-
version: 1.7.2
4102-
resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.2"
4100+
"@unrs/resolver-binding-freebsd-x64@npm:1.7.5":
4101+
version: 1.7.5
4102+
resolution: "@unrs/resolver-binding-freebsd-x64@npm:1.7.5"
41034103
conditions: os=freebsd & cpu=x64
41044104
languageName: node
41054105
linkType: hard
41064106

4107-
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.2":
4108-
version: 1.7.2
4109-
resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.2"
4107+
"@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.5":
4108+
version: 1.7.5
4109+
resolution: "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.7.5"
41104110
conditions: os=linux & cpu=arm
41114111
languageName: node
41124112
linkType: hard
41134113

4114-
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.2":
4115-
version: 1.7.2
4116-
resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.2"
4114+
"@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.5":
4115+
version: 1.7.5
4116+
resolution: "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.7.5"
41174117
conditions: os=linux & cpu=arm
41184118
languageName: node
41194119
linkType: hard
41204120

4121-
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.2":
4122-
version: 1.7.2
4123-
resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.2"
4121+
"@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.5":
4122+
version: 1.7.5
4123+
resolution: "@unrs/resolver-binding-linux-arm64-gnu@npm:1.7.5"
41244124
conditions: os=linux & cpu=arm64 & libc=glibc
41254125
languageName: node
41264126
linkType: hard
41274127

4128-
"@unrs/resolver-binding-linux-arm64-musl@npm:1.7.2":
4129-
version: 1.7.2
4130-
resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.2"
4128+
"@unrs/resolver-binding-linux-arm64-musl@npm:1.7.5":
4129+
version: 1.7.5
4130+
resolution: "@unrs/resolver-binding-linux-arm64-musl@npm:1.7.5"
41314131
conditions: os=linux & cpu=arm64 & libc=musl
41324132
languageName: node
41334133
linkType: hard
41344134

4135-
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.2":
4136-
version: 1.7.2
4137-
resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.2"
4135+
"@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.5":
4136+
version: 1.7.5
4137+
resolution: "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.7.5"
41384138
conditions: os=linux & cpu=ppc64 & libc=glibc
41394139
languageName: node
41404140
linkType: hard
41414141

4142-
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.2":
4143-
version: 1.7.2
4144-
resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.2"
4142+
"@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.5":
4143+
version: 1.7.5
4144+
resolution: "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.7.5"
41454145
conditions: os=linux & cpu=riscv64 & libc=glibc
41464146
languageName: node
41474147
linkType: hard
41484148

4149-
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.2":
4150-
version: 1.7.2
4151-
resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.2"
4149+
"@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.5":
4150+
version: 1.7.5
4151+
resolution: "@unrs/resolver-binding-linux-riscv64-musl@npm:1.7.5"
41524152
conditions: os=linux & cpu=riscv64 & libc=musl
41534153
languageName: node
41544154
linkType: hard
41554155

4156-
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.2":
4157-
version: 1.7.2
4158-
resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.2"
4156+
"@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.5":
4157+
version: 1.7.5
4158+
resolution: "@unrs/resolver-binding-linux-s390x-gnu@npm:1.7.5"
41594159
conditions: os=linux & cpu=s390x & libc=glibc
41604160
languageName: node
41614161
linkType: hard
41624162

4163-
"@unrs/resolver-binding-linux-x64-gnu@npm:1.7.2":
4164-
version: 1.7.2
4165-
resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.2"
4163+
"@unrs/resolver-binding-linux-x64-gnu@npm:1.7.5":
4164+
version: 1.7.5
4165+
resolution: "@unrs/resolver-binding-linux-x64-gnu@npm:1.7.5"
41664166
conditions: os=linux & cpu=x64 & libc=glibc
41674167
languageName: node
41684168
linkType: hard
41694169

4170-
"@unrs/resolver-binding-linux-x64-musl@npm:1.7.2":
4171-
version: 1.7.2
4172-
resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.2"
4170+
"@unrs/resolver-binding-linux-x64-musl@npm:1.7.5":
4171+
version: 1.7.5
4172+
resolution: "@unrs/resolver-binding-linux-x64-musl@npm:1.7.5"
41734173
conditions: os=linux & cpu=x64 & libc=musl
41744174
languageName: node
41754175
linkType: hard
41764176

4177-
"@unrs/resolver-binding-wasm32-wasi@npm:1.7.2":
4178-
version: 1.7.2
4179-
resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.2"
4177+
"@unrs/resolver-binding-wasm32-wasi@npm:1.7.5":
4178+
version: 1.7.5
4179+
resolution: "@unrs/resolver-binding-wasm32-wasi@npm:1.7.5"
41804180
dependencies:
4181-
"@napi-rs/wasm-runtime": "npm:^0.2.9"
4181+
"@napi-rs/wasm-runtime": "npm:^0.2.10"
41824182
conditions: cpu=wasm32
41834183
languageName: node
41844184
linkType: hard
41854185

4186-
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.2":
4187-
version: 1.7.2
4188-
resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.2"
4186+
"@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.5":
4187+
version: 1.7.5
4188+
resolution: "@unrs/resolver-binding-win32-arm64-msvc@npm:1.7.5"
41894189
conditions: os=win32 & cpu=arm64
41904190
languageName: node
41914191
linkType: hard
41924192

4193-
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.2":
4194-
version: 1.7.2
4195-
resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.2"
4193+
"@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.5":
4194+
version: 1.7.5
4195+
resolution: "@unrs/resolver-binding-win32-ia32-msvc@npm:1.7.5"
41964196
conditions: os=win32 & cpu=ia32
41974197
languageName: node
41984198
linkType: hard
41994199

4200-
"@unrs/resolver-binding-win32-x64-msvc@npm:1.7.2":
4201-
version: 1.7.2
4202-
resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.2"
4200+
"@unrs/resolver-binding-win32-x64-msvc@npm:1.7.5":
4201+
version: 1.7.5
4202+
resolution: "@unrs/resolver-binding-win32-x64-msvc@npm:1.7.5"
42034203
conditions: os=win32 & cpu=x64
42044204
languageName: node
42054205
linkType: hard
@@ -5981,7 +5981,7 @@ __metadata:
59815981
type-fest: "npm:^4.41.0"
59825982
typescript: "npm:^5.8.3"
59835983
typescript-eslint: "npm:^8.32.1"
5984-
unrs-resolver: "npm:^1.7.2"
5984+
unrs-resolver: "npm:^1.7.5"
59855985
yarn-berry-deduplicate: "npm:^6.1.3"
59865986
zod: "npm:~3.24.4"
59875987
peerDependencies:
@@ -12827,27 +12827,27 @@ __metadata:
1282712827
languageName: node
1282812828
linkType: hard
1282912829

12830-
"unrs-resolver@npm:^1.7.2":
12831-
version: 1.7.2
12832-
resolution: "unrs-resolver@npm:1.7.2"
12833-
dependencies:
12834-
"@unrs/resolver-binding-darwin-arm64": "npm:1.7.2"
12835-
"@unrs/resolver-binding-darwin-x64": "npm:1.7.2"
12836-
"@unrs/resolver-binding-freebsd-x64": "npm:1.7.2"
12837-
"@unrs/resolver-binding-linux-arm-gnueabihf": "npm:1.7.2"
12838-
"@unrs/resolver-binding-linux-arm-musleabihf": "npm:1.7.2"
12839-
"@unrs/resolver-binding-linux-arm64-gnu": "npm:1.7.2"
12840-
"@unrs/resolver-binding-linux-arm64-musl": "npm:1.7.2"
12841-
"@unrs/resolver-binding-linux-ppc64-gnu": "npm:1.7.2"
12842-
"@unrs/resolver-binding-linux-riscv64-gnu": "npm:1.7.2"
12843-
"@unrs/resolver-binding-linux-riscv64-musl": "npm:1.7.2"
12844-
"@unrs/resolver-binding-linux-s390x-gnu": "npm:1.7.2"
12845-
"@unrs/resolver-binding-linux-x64-gnu": "npm:1.7.2"
12846-
"@unrs/resolver-binding-linux-x64-musl": "npm:1.7.2"
12847-
"@unrs/resolver-binding-wasm32-wasi": "npm:1.7.2"
12848-
"@unrs/resolver-binding-win32-arm64-msvc": "npm:1.7.2"
12849-
"@unrs/resolver-binding-win32-ia32-msvc": "npm:1.7.2"
12850-
"@unrs/resolver-binding-win32-x64-msvc": "npm:1.7.2"
12830+
"unrs-resolver@npm:^1.7.2, unrs-resolver@npm:^1.7.5":
12831+
version: 1.7.5
12832+
resolution: "unrs-resolver@npm:1.7.5"
12833+
dependencies:
12834+
"@unrs/resolver-binding-darwin-arm64": "npm:1.7.5"
12835+
"@unrs/resolver-binding-darwin-x64": "npm:1.7.5"
12836+
"@unrs/resolver-binding-freebsd-x64": "npm:1.7.5"
12837+
"@unrs/resolver-binding-linux-arm-gnueabihf": "npm:1.7.5"
12838+
"@unrs/resolver-binding-linux-arm-musleabihf": "npm:1.7.5"
12839+
"@unrs/resolver-binding-linux-arm64-gnu": "npm:1.7.5"
12840+
"@unrs/resolver-binding-linux-arm64-musl": "npm:1.7.5"
12841+
"@unrs/resolver-binding-linux-ppc64-gnu": "npm:1.7.5"
12842+
"@unrs/resolver-binding-linux-riscv64-gnu": "npm:1.7.5"
12843+
"@unrs/resolver-binding-linux-riscv64-musl": "npm:1.7.5"
12844+
"@unrs/resolver-binding-linux-s390x-gnu": "npm:1.7.5"
12845+
"@unrs/resolver-binding-linux-x64-gnu": "npm:1.7.5"
12846+
"@unrs/resolver-binding-linux-x64-musl": "npm:1.7.5"
12847+
"@unrs/resolver-binding-wasm32-wasi": "npm:1.7.5"
12848+
"@unrs/resolver-binding-win32-arm64-msvc": "npm:1.7.5"
12849+
"@unrs/resolver-binding-win32-ia32-msvc": "npm:1.7.5"
12850+
"@unrs/resolver-binding-win32-x64-msvc": "npm:1.7.5"
1285112851
napi-postinstall: "npm:^0.2.2"
1285212852
dependenciesMeta:
1285312853
"@unrs/resolver-binding-darwin-arm64":
@@ -12884,7 +12884,7 @@ __metadata:
1288412884
optional: true
1288512885
"@unrs/resolver-binding-win32-x64-msvc":
1288612886
optional: true
12887-
checksum: 10c0/c293db95c59b08e33f3bfb00042120fb90fd5448bd1790cd2dc779a13eb6062dddf04a91b72c73d3635b0c539552435675ce816fa52e66bb0cd7b7e5a2f6399c
12887+
checksum: 10c0/b71bc6fadb0f513b8db6e7166a6d0dd3e133b5091a1ef71eaf36878e116b0a7710de16a4e4c17a0f7a93395909177af445fddab711f5d26230acec76d1055677
1288812888
languageName: node
1288912889
linkType: hard
1289012890

0 commit comments

Comments
 (0)