Skip to content

Commit fce9c63

Browse files
JounQinJounQin
committed
fix: use rspack-resolver fork for pnp support
1 parent 7d50d38 commit fce9c63

File tree

3 files changed

+131
-131
lines changed

3 files changed

+131
-131
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
"debug": "^4.4.0",
8686
"get-tsconfig": "^4.10.0",
8787
"is-bun-module": "^1.3.0",
88-
"oxc-resolver": "^5.0.0",
88+
"rspack-resolver": "^1.1.0",
8989
"stable-hash": "^0.0.5",
9090
"tinyglobby": "^0.2.12"
9191
},
@@ -104,7 +104,7 @@
104104
"dummy.js": "link:dummy.js",
105105
"eslint": "^9.22.0",
106106
"eslint-import-resolver-typescript": "link:.",
107-
"eslint-plugin-import-x": "^4.7.0",
107+
"eslint-plugin-import-x": "^4.7.2",
108108
"lint-staged": "^15.5.0",
109109
"npm-run-all2": "^7.0.2",
110110
"prettier": "^3.5.3",

‎src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type { TsConfigResult } from 'get-tsconfig'
77
import { createPathsMatcher, getTsconfig } from 'get-tsconfig'
88
import type { Version } from 'is-bun-module'
99
import { isBunModule } from 'is-bun-module'
10-
import { type NapiResolveOptions, ResolverFactory } from 'oxc-resolver'
10+
import { type NapiResolveOptions, ResolverFactory } from 'rspack-resolver'
1111
import { stableHash } from 'stable-hash'
1212
import { globSync, isDynamicPattern } from 'tinyglobby'
1313
import type { SetRequired } from 'type-fest'

‎yarn.lock

+128-128
Original file line numberDiff line numberDiff line change
@@ -3376,85 +3376,6 @@ __metadata:
33763376
languageName: node
33773377
linkType: hard
33783378

3379-
"@oxc-resolver/binding-darwin-arm64@npm:5.0.0":
3380-
version: 5.0.0
3381-
resolution: "@oxc-resolver/binding-darwin-arm64@npm:5.0.0"
3382-
conditions: os=darwin & cpu=arm64
3383-
languageName: node
3384-
linkType: hard
3385-
3386-
"@oxc-resolver/binding-darwin-x64@npm:5.0.0":
3387-
version: 5.0.0
3388-
resolution: "@oxc-resolver/binding-darwin-x64@npm:5.0.0"
3389-
conditions: os=darwin & cpu=x64
3390-
languageName: node
3391-
linkType: hard
3392-
3393-
"@oxc-resolver/binding-freebsd-x64@npm:5.0.0":
3394-
version: 5.0.0
3395-
resolution: "@oxc-resolver/binding-freebsd-x64@npm:5.0.0"
3396-
conditions: os=freebsd & cpu=x64
3397-
languageName: node
3398-
linkType: hard
3399-
3400-
"@oxc-resolver/binding-linux-arm-gnueabihf@npm:5.0.0":
3401-
version: 5.0.0
3402-
resolution: "@oxc-resolver/binding-linux-arm-gnueabihf@npm:5.0.0"
3403-
conditions: os=linux & cpu=arm
3404-
languageName: node
3405-
linkType: hard
3406-
3407-
"@oxc-resolver/binding-linux-arm64-gnu@npm:5.0.0":
3408-
version: 5.0.0
3409-
resolution: "@oxc-resolver/binding-linux-arm64-gnu@npm:5.0.0"
3410-
conditions: os=linux & cpu=arm64 & libc=glibc
3411-
languageName: node
3412-
linkType: hard
3413-
3414-
"@oxc-resolver/binding-linux-arm64-musl@npm:5.0.0":
3415-
version: 5.0.0
3416-
resolution: "@oxc-resolver/binding-linux-arm64-musl@npm:5.0.0"
3417-
conditions: os=linux & cpu=arm64 & libc=musl
3418-
languageName: node
3419-
linkType: hard
3420-
3421-
"@oxc-resolver/binding-linux-x64-gnu@npm:5.0.0":
3422-
version: 5.0.0
3423-
resolution: "@oxc-resolver/binding-linux-x64-gnu@npm:5.0.0"
3424-
conditions: os=linux & cpu=x64 & libc=glibc
3425-
languageName: node
3426-
linkType: hard
3427-
3428-
"@oxc-resolver/binding-linux-x64-musl@npm:5.0.0":
3429-
version: 5.0.0
3430-
resolution: "@oxc-resolver/binding-linux-x64-musl@npm:5.0.0"
3431-
conditions: os=linux & cpu=x64 & libc=musl
3432-
languageName: node
3433-
linkType: hard
3434-
3435-
"@oxc-resolver/binding-wasm32-wasi@npm:5.0.0":
3436-
version: 5.0.0
3437-
resolution: "@oxc-resolver/binding-wasm32-wasi@npm:5.0.0"
3438-
dependencies:
3439-
"@napi-rs/wasm-runtime": "npm:^0.2.7"
3440-
conditions: cpu=wasm32
3441-
languageName: node
3442-
linkType: hard
3443-
3444-
"@oxc-resolver/binding-win32-arm64-msvc@npm:5.0.0":
3445-
version: 5.0.0
3446-
resolution: "@oxc-resolver/binding-win32-arm64-msvc@npm:5.0.0"
3447-
conditions: os=win32 & cpu=arm64
3448-
languageName: node
3449-
linkType: hard
3450-
3451-
"@oxc-resolver/binding-win32-x64-msvc@npm:5.0.0":
3452-
version: 5.0.0
3453-
resolution: "@oxc-resolver/binding-win32-x64-msvc@npm:5.0.0"
3454-
conditions: os=win32 & cpu=x64
3455-
languageName: node
3456-
linkType: hard
3457-
34583379
"@pkgjs/parseargs@npm:^0.11.0":
34593380
version: 0.11.0
34603381
resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -4320,6 +4241,85 @@ __metadata:
43204241
languageName: node
43214242
linkType: hard
43224243

4244+
"@unrs/rspack-resolver-binding-darwin-arm64@npm:1.1.0":
4245+
version: 1.1.0
4246+
resolution: "@unrs/rspack-resolver-binding-darwin-arm64@npm:1.1.0"
4247+
conditions: os=darwin & cpu=arm64
4248+
languageName: node
4249+
linkType: hard
4250+
4251+
"@unrs/rspack-resolver-binding-darwin-x64@npm:1.1.0":
4252+
version: 1.1.0
4253+
resolution: "@unrs/rspack-resolver-binding-darwin-x64@npm:1.1.0"
4254+
conditions: os=darwin & cpu=x64
4255+
languageName: node
4256+
linkType: hard
4257+
4258+
"@unrs/rspack-resolver-binding-freebsd-x64@npm:1.1.0":
4259+
version: 1.1.0
4260+
resolution: "@unrs/rspack-resolver-binding-freebsd-x64@npm:1.1.0"
4261+
conditions: os=freebsd & cpu=x64
4262+
languageName: node
4263+
linkType: hard
4264+
4265+
"@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.1.0":
4266+
version: 1.1.0
4267+
resolution: "@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.1.0"
4268+
conditions: os=linux & cpu=arm
4269+
languageName: node
4270+
linkType: hard
4271+
4272+
"@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.1.0":
4273+
version: 1.1.0
4274+
resolution: "@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.1.0"
4275+
conditions: os=linux & cpu=arm64 & libc=glibc
4276+
languageName: node
4277+
linkType: hard
4278+
4279+
"@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.1.0":
4280+
version: 1.1.0
4281+
resolution: "@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.1.0"
4282+
conditions: os=linux & cpu=arm64 & libc=musl
4283+
languageName: node
4284+
linkType: hard
4285+
4286+
"@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.1.0":
4287+
version: 1.1.0
4288+
resolution: "@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.1.0"
4289+
conditions: os=linux & cpu=x64 & libc=glibc
4290+
languageName: node
4291+
linkType: hard
4292+
4293+
"@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.1.0":
4294+
version: 1.1.0
4295+
resolution: "@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.1.0"
4296+
conditions: os=linux & cpu=x64 & libc=musl
4297+
languageName: node
4298+
linkType: hard
4299+
4300+
"@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.1.0":
4301+
version: 1.1.0
4302+
resolution: "@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.1.0"
4303+
dependencies:
4304+
"@napi-rs/wasm-runtime": "npm:^0.2.7"
4305+
conditions: cpu=wasm32
4306+
languageName: node
4307+
linkType: hard
4308+
4309+
"@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.1.0":
4310+
version: 1.1.0
4311+
resolution: "@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.1.0"
4312+
conditions: os=win32 & cpu=arm64
4313+
languageName: node
4314+
linkType: hard
4315+
4316+
"@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.1.0":
4317+
version: 1.1.0
4318+
resolution: "@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.1.0"
4319+
conditions: os=win32 & cpu=x64
4320+
languageName: node
4321+
linkType: hard
4322+
43234323
"@vue/babel-helper-vue-jsx-merge-props@npm:^1.4.0":
43244324
version: 1.4.0
43254325
resolution: "@vue/babel-helper-vue-jsx-merge-props@npm:1.4.0"
@@ -6700,14 +6700,14 @@ __metadata:
67006700
dummy.js: "link:dummy.js"
67016701
eslint: "npm:^9.22.0"
67026702
eslint-import-resolver-typescript: "link:."
6703-
eslint-plugin-import-x: "npm:^4.7.0"
6703+
eslint-plugin-import-x: "npm:^4.7.2"
67046704
get-tsconfig: "npm:^4.10.0"
67056705
is-bun-module: "npm:^1.3.0"
67066706
lint-staged: "npm:^15.5.0"
67076707
npm-run-all2: "npm:^7.0.2"
6708-
oxc-resolver: "npm:^5.0.0"
67096708
prettier: "npm:^3.5.3"
67106709
react: "npm:^19.0.0"
6710+
rspack-resolver: "npm:^1.1.0"
67116711
simple-git-hooks: "npm:^2.11.1"
67126712
size-limit: "npm:^11.2.0"
67136713
size-limit-preset-node-lib: "npm:^0.3.0"
@@ -6796,9 +6796,9 @@ __metadata:
67966796
languageName: node
67976797
linkType: hard
67986798

6799-
"eslint-plugin-import-x@npm:^4.6.1, eslint-plugin-import-x@npm:^4.7.0":
6800-
version: 4.7.0
6801-
resolution: "eslint-plugin-import-x@npm:4.7.0"
6799+
"eslint-plugin-import-x@npm:^4.6.1, eslint-plugin-import-x@npm:^4.7.2":
6800+
version: 4.7.2
6801+
resolution: "eslint-plugin-import-x@npm:4.7.2"
68026802
dependencies:
68036803
"@types/doctrine": "npm:^0.0.9"
68046804
"@typescript-eslint/utils": "npm:^8.26.1"
@@ -6808,13 +6808,13 @@ __metadata:
68086808
get-tsconfig: "npm:^4.10.0"
68096809
is-glob: "npm:^4.0.3"
68106810
minimatch: "npm:^10.0.1"
6811-
oxc-resolver: "npm:^5.0.0"
6811+
rspack-resolver: "npm:^1.1.0"
68126812
semver: "npm:^7.7.1"
68136813
stable-hash: "npm:^0.0.5"
68146814
tslib: "npm:^2.8.1"
68156815
peerDependencies:
68166816
eslint: ^8.57.0 || ^9.0.0
6817-
checksum: 10/183c92c526d01d8b40debe49a01a287fabdc75ec0f0d678e4a88570767a3aa8ab2e3659a7ae8b7dd10d36266aad62ff9b0719f5414abefd63728e6d0e3e966e5
6817+
checksum: 10/866ef0301576310fb55a07748909373d93593bc891ef869e05a6122ffc1dc60b609aa016a70a4be1ff9186d9608422357e2949d7f09a6e38d6d95a494e9b8805
68186818
languageName: node
68196819
linkType: hard
68206820

@@ -11267,48 +11267,6 @@ __metadata:
1126711267
languageName: node
1126811268
linkType: hard
1126911269

11270-
"oxc-resolver@npm:^5.0.0":
11271-
version: 5.0.0
11272-
resolution: "oxc-resolver@npm:5.0.0"
11273-
dependencies:
11274-
"@oxc-resolver/binding-darwin-arm64": "npm:5.0.0"
11275-
"@oxc-resolver/binding-darwin-x64": "npm:5.0.0"
11276-
"@oxc-resolver/binding-freebsd-x64": "npm:5.0.0"
11277-
"@oxc-resolver/binding-linux-arm-gnueabihf": "npm:5.0.0"
11278-
"@oxc-resolver/binding-linux-arm64-gnu": "npm:5.0.0"
11279-
"@oxc-resolver/binding-linux-arm64-musl": "npm:5.0.0"
11280-
"@oxc-resolver/binding-linux-x64-gnu": "npm:5.0.0"
11281-
"@oxc-resolver/binding-linux-x64-musl": "npm:5.0.0"
11282-
"@oxc-resolver/binding-wasm32-wasi": "npm:5.0.0"
11283-
"@oxc-resolver/binding-win32-arm64-msvc": "npm:5.0.0"
11284-
"@oxc-resolver/binding-win32-x64-msvc": "npm:5.0.0"
11285-
dependenciesMeta:
11286-
"@oxc-resolver/binding-darwin-arm64":
11287-
optional: true
11288-
"@oxc-resolver/binding-darwin-x64":
11289-
optional: true
11290-
"@oxc-resolver/binding-freebsd-x64":
11291-
optional: true
11292-
"@oxc-resolver/binding-linux-arm-gnueabihf":
11293-
optional: true
11294-
"@oxc-resolver/binding-linux-arm64-gnu":
11295-
optional: true
11296-
"@oxc-resolver/binding-linux-arm64-musl":
11297-
optional: true
11298-
"@oxc-resolver/binding-linux-x64-gnu":
11299-
optional: true
11300-
"@oxc-resolver/binding-linux-x64-musl":
11301-
optional: true
11302-
"@oxc-resolver/binding-wasm32-wasi":
11303-
optional: true
11304-
"@oxc-resolver/binding-win32-arm64-msvc":
11305-
optional: true
11306-
"@oxc-resolver/binding-win32-x64-msvc":
11307-
optional: true
11308-
checksum: 10/b3809bf78d736a3fd3d1038baf97d59428205b2973f120971f85b65f7fd73783fb0f1554c9a0f5dd70cc9a07a47ec72f83c6ed943f7e792221ef59d22fffc233
11309-
languageName: node
11310-
linkType: hard
11311-
1131211270
"p-cancelable@npm:^2.0.0":
1131311271
version: 2.1.1
1131411272
resolution: "p-cancelable@npm:2.1.1"
@@ -13265,6 +13223,48 @@ __metadata:
1326513223
languageName: node
1326613224
linkType: hard
1326713225

13226+
"rspack-resolver@npm:^1.1.0":
13227+
version: 1.1.0
13228+
resolution: "rspack-resolver@npm:1.1.0"
13229+
dependencies:
13230+
"@unrs/rspack-resolver-binding-darwin-arm64": "npm:1.1.0"
13231+
"@unrs/rspack-resolver-binding-darwin-x64": "npm:1.1.0"
13232+
"@unrs/rspack-resolver-binding-freebsd-x64": "npm:1.1.0"
13233+
"@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "npm:1.1.0"
13234+
"@unrs/rspack-resolver-binding-linux-arm64-gnu": "npm:1.1.0"
13235+
"@unrs/rspack-resolver-binding-linux-arm64-musl": "npm:1.1.0"
13236+
"@unrs/rspack-resolver-binding-linux-x64-gnu": "npm:1.1.0"
13237+
"@unrs/rspack-resolver-binding-linux-x64-musl": "npm:1.1.0"
13238+
"@unrs/rspack-resolver-binding-wasm32-wasi": "npm:1.1.0"
13239+
"@unrs/rspack-resolver-binding-win32-arm64-msvc": "npm:1.1.0"
13240+
"@unrs/rspack-resolver-binding-win32-x64-msvc": "npm:1.1.0"
13241+
dependenciesMeta:
13242+
"@unrs/rspack-resolver-binding-darwin-arm64":
13243+
optional: true
13244+
"@unrs/rspack-resolver-binding-darwin-x64":
13245+
optional: true
13246+
"@unrs/rspack-resolver-binding-freebsd-x64":
13247+
optional: true
13248+
"@unrs/rspack-resolver-binding-linux-arm-gnueabihf":
13249+
optional: true
13250+
"@unrs/rspack-resolver-binding-linux-arm64-gnu":
13251+
optional: true
13252+
"@unrs/rspack-resolver-binding-linux-arm64-musl":
13253+
optional: true
13254+
"@unrs/rspack-resolver-binding-linux-x64-gnu":
13255+
optional: true
13256+
"@unrs/rspack-resolver-binding-linux-x64-musl":
13257+
optional: true
13258+
"@unrs/rspack-resolver-binding-wasm32-wasi":
13259+
optional: true
13260+
"@unrs/rspack-resolver-binding-win32-arm64-msvc":
13261+
optional: true
13262+
"@unrs/rspack-resolver-binding-win32-x64-msvc":
13263+
optional: true
13264+
checksum: 10/b8582e0d28596ba9ed8a4cd19b04b6e96e0e0963cdc0d5f365fc7d46335e5bbdb44ef433c2e0a560dedb3f4cd55cc13788f1d3b223f83cf4a3a7f8550b96e305
13265+
languageName: node
13266+
linkType: hard
13267+
1326813268
"run-parallel@npm:^1.1.9":
1326913269
version: 1.2.0
1327013270
resolution: "run-parallel@npm:1.2.0"

0 commit comments

Comments
 (0)