Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use rspack-resolver fork for pnp support #382

Merged
merged 3 commits into from
Mar 16, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
Next Next commit
fix: use rspack-resolver fork for pnp support
  • Loading branch information
JounQin committed Mar 16, 2025
commit fce9c63f0a04927eed9ebe39cdbef7d6b1d75999
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"debug": "^4.4.0",
"get-tsconfig": "^4.10.0",
"is-bun-module": "^1.3.0",
"oxc-resolver": "^5.0.0",
"rspack-resolver": "^1.1.0",
"stable-hash": "^0.0.5",
"tinyglobby": "^0.2.12"
},
Expand All @@ -104,7 +104,7 @@
"dummy.js": "link:dummy.js",
"eslint": "^9.22.0",
"eslint-import-resolver-typescript": "link:.",
"eslint-plugin-import-x": "^4.7.0",
"eslint-plugin-import-x": "^4.7.2",
"lint-staged": "^15.5.0",
"npm-run-all2": "^7.0.2",
"prettier": "^3.5.3",
Expand Down
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { TsConfigResult } from 'get-tsconfig'
import { createPathsMatcher, getTsconfig } from 'get-tsconfig'
import type { Version } from 'is-bun-module'
import { isBunModule } from 'is-bun-module'
import { type NapiResolveOptions, ResolverFactory } from 'oxc-resolver'
import { type NapiResolveOptions, ResolverFactory } from 'rspack-resolver'
import { stableHash } from 'stable-hash'
import { globSync, isDynamicPattern } from 'tinyglobby'
import type { SetRequired } from 'type-fest'
Expand Down
256 changes: 128 additions & 128 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3376,85 +3376,6 @@ __metadata:
languageName: node
linkType: hard

"@oxc-resolver/binding-darwin-arm64@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-darwin-arm64@npm:5.0.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@oxc-resolver/binding-darwin-x64@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-darwin-x64@npm:5.0.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@oxc-resolver/binding-freebsd-x64@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-freebsd-x64@npm:5.0.0"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard

"@oxc-resolver/binding-linux-arm-gnueabihf@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-linux-arm-gnueabihf@npm:5.0.0"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@oxc-resolver/binding-linux-arm64-gnu@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-linux-arm64-gnu@npm:5.0.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@oxc-resolver/binding-linux-arm64-musl@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-linux-arm64-musl@npm:5.0.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@oxc-resolver/binding-linux-x64-gnu@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-linux-x64-gnu@npm:5.0.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@oxc-resolver/binding-linux-x64-musl@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-linux-x64-musl@npm:5.0.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@oxc-resolver/binding-wasm32-wasi@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-wasm32-wasi@npm:5.0.0"
dependencies:
"@napi-rs/wasm-runtime": "npm:^0.2.7"
conditions: cpu=wasm32
languageName: node
linkType: hard

"@oxc-resolver/binding-win32-arm64-msvc@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-win32-arm64-msvc@npm:5.0.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@oxc-resolver/binding-win32-x64-msvc@npm:5.0.0":
version: 5.0.0
resolution: "@oxc-resolver/binding-win32-x64-msvc@npm:5.0.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@pkgjs/parseargs@npm:^0.11.0":
version: 0.11.0
resolution: "@pkgjs/parseargs@npm:0.11.0"
Expand Down Expand Up @@ -4320,6 +4241,85 @@ __metadata:
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-darwin-arm64@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-darwin-arm64@npm:1.1.0"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-darwin-x64@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-darwin-x64@npm:1.1.0"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-freebsd-x64@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-freebsd-x64@npm:1.1.0"
conditions: os=freebsd & cpu=x64
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-linux-arm-gnueabihf@npm:1.1.0"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-linux-arm64-gnu@npm:1.1.0"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-linux-arm64-musl@npm:1.1.0"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-linux-x64-gnu@npm:1.1.0"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-linux-x64-musl@npm:1.1.0"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-wasm32-wasi@npm:1.1.0"
dependencies:
"@napi-rs/wasm-runtime": "npm:^0.2.7"
conditions: cpu=wasm32
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-win32-arm64-msvc@npm:1.1.0"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard

"@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.1.0":
version: 1.1.0
resolution: "@unrs/rspack-resolver-binding-win32-x64-msvc@npm:1.1.0"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard

"@vue/babel-helper-vue-jsx-merge-props@npm:^1.4.0":
version: 1.4.0
resolution: "@vue/babel-helper-vue-jsx-merge-props@npm:1.4.0"
Expand Down Expand Up @@ -6700,14 +6700,14 @@ __metadata:
dummy.js: "link:dummy.js"
eslint: "npm:^9.22.0"
eslint-import-resolver-typescript: "link:."
eslint-plugin-import-x: "npm:^4.7.0"
eslint-plugin-import-x: "npm:^4.7.2"
get-tsconfig: "npm:^4.10.0"
is-bun-module: "npm:^1.3.0"
lint-staged: "npm:^15.5.0"
npm-run-all2: "npm:^7.0.2"
oxc-resolver: "npm:^5.0.0"
prettier: "npm:^3.5.3"
react: "npm:^19.0.0"
rspack-resolver: "npm:^1.1.0"
simple-git-hooks: "npm:^2.11.1"
size-limit: "npm:^11.2.0"
size-limit-preset-node-lib: "npm:^0.3.0"
Expand Down Expand Up @@ -6796,9 +6796,9 @@ __metadata:
languageName: node
linkType: hard

"eslint-plugin-import-x@npm:^4.6.1, eslint-plugin-import-x@npm:^4.7.0":
version: 4.7.0
resolution: "eslint-plugin-import-x@npm:4.7.0"
"eslint-plugin-import-x@npm:^4.6.1, eslint-plugin-import-x@npm:^4.7.2":
version: 4.7.2
resolution: "eslint-plugin-import-x@npm:4.7.2"
dependencies:
"@types/doctrine": "npm:^0.0.9"
"@typescript-eslint/utils": "npm:^8.26.1"
Expand All @@ -6808,13 +6808,13 @@ __metadata:
get-tsconfig: "npm:^4.10.0"
is-glob: "npm:^4.0.3"
minimatch: "npm:^10.0.1"
oxc-resolver: "npm:^5.0.0"
rspack-resolver: "npm:^1.1.0"
semver: "npm:^7.7.1"
stable-hash: "npm:^0.0.5"
tslib: "npm:^2.8.1"
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
checksum: 10/183c92c526d01d8b40debe49a01a287fabdc75ec0f0d678e4a88570767a3aa8ab2e3659a7ae8b7dd10d36266aad62ff9b0719f5414abefd63728e6d0e3e966e5
checksum: 10/866ef0301576310fb55a07748909373d93593bc891ef869e05a6122ffc1dc60b609aa016a70a4be1ff9186d9608422357e2949d7f09a6e38d6d95a494e9b8805
languageName: node
linkType: hard

Expand Down Expand Up @@ -11267,48 +11267,6 @@ __metadata:
languageName: node
linkType: hard

"oxc-resolver@npm:^5.0.0":
version: 5.0.0
resolution: "oxc-resolver@npm:5.0.0"
dependencies:
"@oxc-resolver/binding-darwin-arm64": "npm:5.0.0"
"@oxc-resolver/binding-darwin-x64": "npm:5.0.0"
"@oxc-resolver/binding-freebsd-x64": "npm:5.0.0"
"@oxc-resolver/binding-linux-arm-gnueabihf": "npm:5.0.0"
"@oxc-resolver/binding-linux-arm64-gnu": "npm:5.0.0"
"@oxc-resolver/binding-linux-arm64-musl": "npm:5.0.0"
"@oxc-resolver/binding-linux-x64-gnu": "npm:5.0.0"
"@oxc-resolver/binding-linux-x64-musl": "npm:5.0.0"
"@oxc-resolver/binding-wasm32-wasi": "npm:5.0.0"
"@oxc-resolver/binding-win32-arm64-msvc": "npm:5.0.0"
"@oxc-resolver/binding-win32-x64-msvc": "npm:5.0.0"
dependenciesMeta:
"@oxc-resolver/binding-darwin-arm64":
optional: true
"@oxc-resolver/binding-darwin-x64":
optional: true
"@oxc-resolver/binding-freebsd-x64":
optional: true
"@oxc-resolver/binding-linux-arm-gnueabihf":
optional: true
"@oxc-resolver/binding-linux-arm64-gnu":
optional: true
"@oxc-resolver/binding-linux-arm64-musl":
optional: true
"@oxc-resolver/binding-linux-x64-gnu":
optional: true
"@oxc-resolver/binding-linux-x64-musl":
optional: true
"@oxc-resolver/binding-wasm32-wasi":
optional: true
"@oxc-resolver/binding-win32-arm64-msvc":
optional: true
"@oxc-resolver/binding-win32-x64-msvc":
optional: true
checksum: 10/b3809bf78d736a3fd3d1038baf97d59428205b2973f120971f85b65f7fd73783fb0f1554c9a0f5dd70cc9a07a47ec72f83c6ed943f7e792221ef59d22fffc233
languageName: node
linkType: hard

"p-cancelable@npm:^2.0.0":
version: 2.1.1
resolution: "p-cancelable@npm:2.1.1"
Expand Down Expand Up @@ -13265,6 +13223,48 @@ __metadata:
languageName: node
linkType: hard

"rspack-resolver@npm:^1.1.0":
version: 1.1.0
resolution: "rspack-resolver@npm:1.1.0"
dependencies:
"@unrs/rspack-resolver-binding-darwin-arm64": "npm:1.1.0"
"@unrs/rspack-resolver-binding-darwin-x64": "npm:1.1.0"
"@unrs/rspack-resolver-binding-freebsd-x64": "npm:1.1.0"
"@unrs/rspack-resolver-binding-linux-arm-gnueabihf": "npm:1.1.0"
"@unrs/rspack-resolver-binding-linux-arm64-gnu": "npm:1.1.0"
"@unrs/rspack-resolver-binding-linux-arm64-musl": "npm:1.1.0"
"@unrs/rspack-resolver-binding-linux-x64-gnu": "npm:1.1.0"
"@unrs/rspack-resolver-binding-linux-x64-musl": "npm:1.1.0"
"@unrs/rspack-resolver-binding-wasm32-wasi": "npm:1.1.0"
"@unrs/rspack-resolver-binding-win32-arm64-msvc": "npm:1.1.0"
"@unrs/rspack-resolver-binding-win32-x64-msvc": "npm:1.1.0"
dependenciesMeta:
"@unrs/rspack-resolver-binding-darwin-arm64":
optional: true
"@unrs/rspack-resolver-binding-darwin-x64":
optional: true
"@unrs/rspack-resolver-binding-freebsd-x64":
optional: true
"@unrs/rspack-resolver-binding-linux-arm-gnueabihf":
optional: true
"@unrs/rspack-resolver-binding-linux-arm64-gnu":
optional: true
"@unrs/rspack-resolver-binding-linux-arm64-musl":
optional: true
"@unrs/rspack-resolver-binding-linux-x64-gnu":
optional: true
"@unrs/rspack-resolver-binding-linux-x64-musl":
optional: true
"@unrs/rspack-resolver-binding-wasm32-wasi":
optional: true
"@unrs/rspack-resolver-binding-win32-arm64-msvc":
optional: true
"@unrs/rspack-resolver-binding-win32-x64-msvc":
optional: true
checksum: 10/b8582e0d28596ba9ed8a4cd19b04b6e96e0e0963cdc0d5f365fc7d46335e5bbdb44ef433c2e0a560dedb3f4cd55cc13788f1d3b223f83cf4a3a7f8550b96e305
languageName: node
linkType: hard

"run-parallel@npm:^1.1.9":
version: 1.2.0
resolution: "run-parallel@npm:1.2.0"
Expand Down
Loading