Skip to content

refactor: disable pnp when bench #134

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Nov 23, 2025
Merged

refactor: disable pnp when bench #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ee323a
refactor: disable pnp when bench
stormslowly Nov 21, 2025
ac07670
fix: disable resolver's PnP
stormslowly Nov 23, 2025
cfbf58f
Update benches/resolver.rs
stormslowly Nov 23, 2025
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
98 changes: 55 additions & 43 deletions benches/resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use std::{
};

use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
use rspack_resolver::{ResolveOptions, Resolver};
use rspack_resolver::{FileSystemOptions, FileSystemOs, ResolveOptions, Resolver};
use serde_json::Value;
use tokio::{
runtime::{self, Builder},
Expand Down Expand Up @@ -53,43 +53,54 @@ fn create_symlinks() -> io::Result<PathBuf> {
Ok(temp_path)
}

fn rspack_resolver() -> rspack_resolver::Resolver {
fn rspack_resolver(enable_pnp: bool) -> rspack_resolver::Resolver {
Copy link

Copilot AI Nov 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The enable_pnp parameter is only used when the yarn_pnp feature is enabled. To avoid compilation warnings about unused parameters when the feature is disabled, consider either:

  1. Prefixing the parameter with an underscore: _enable_pnp: bool
  2. Or applying a #[allow(unused_variables)] attribute when the feature is disabled

Example:

fn rspack_resolver(
  #[cfg_attr(not(feature = "yarn_pnp"), allow(unused_variables))]
  enable_pnp: bool
) -> rspack_resolver::Resolver {
Suggested change
fn rspack_resolver(enable_pnp: bool) -> rspack_resolver::Resolver {
fn rspack_resolver(
#[cfg_attr(not(feature = "yarn_pnp"), allow(unused_variables))]
enable_pnp: bool
) -> rspack_resolver::Resolver {

Copilot uses AI. Check for mistakes.
use rspack_resolver::{AliasValue, ResolveOptions, Resolver};
let alias_value = AliasValue::from("./");
Resolver::new(ResolveOptions {
extensions: vec![".ts".into(), ".js".into(), ".mjs".into()],
condition_names: vec!["import".into(), "webpack".into(), "require".into()],
alias_fields: vec![vec!["browser".into()]],
extension_alias: vec![(".js".into(), vec![".ts".into(), ".js".into()])],
// Real projects LOVE setting these many aliases.
// I saw them with my own eyes.
alias: vec![
("/absolute/path".into(), vec![alias_value.clone()]),
("aaa".into(), vec![alias_value.clone()]),
("bbb".into(), vec![alias_value.clone()]),
("ccc".into(), vec![alias_value.clone()]),
("ddd".into(), vec![alias_value.clone()]),
("eee".into(), vec![alias_value.clone()]),
("fff".into(), vec![alias_value.clone()]),
("ggg".into(), vec![alias_value.clone()]),
("hhh".into(), vec![alias_value.clone()]),
("iii".into(), vec![alias_value.clone()]),
("jjj".into(), vec![alias_value.clone()]),
("kkk".into(), vec![alias_value.clone()]),
("lll".into(), vec![alias_value.clone()]),
("mmm".into(), vec![alias_value.clone()]),
("nnn".into(), vec![alias_value.clone()]),
("ooo".into(), vec![alias_value.clone()]),
("ppp".into(), vec![alias_value.clone()]),
("qqq".into(), vec![alias_value.clone()]),
("rrr".into(), vec![alias_value.clone()]),
("sss".into(), vec![alias_value.clone()]),
("@".into(), vec![alias_value.clone()]),
("@@".into(), vec![alias_value.clone()]),
("@@@".into(), vec![alias_value]),
],
..ResolveOptions::default()
})

let fs = FileSystemOs::new(FileSystemOptions {
#[cfg(feature = "yarn_pnp")]
enable_pnp,
});

Resolver::new_with_file_system(
fs,
ResolveOptions {
#[cfg(feature = "yarn_pnp")]
enable_pnp,
extensions: vec![".ts".into(), ".js".into(), ".mjs".into()],
condition_names: vec!["import".into(), "webpack".into(), "require".into()],
alias_fields: vec![vec!["browser".into()]],
extension_alias: vec![(".js".into(), vec![".ts".into(), ".js".into()])],
// Real projects LOVE setting these many aliases.
// I saw them with my own eyes.
alias: vec![
("/absolute/path".into(), vec![alias_value.clone()]),
("aaa".into(), vec![alias_value.clone()]),
("bbb".into(), vec![alias_value.clone()]),
("ccc".into(), vec![alias_value.clone()]),
("ddd".into(), vec![alias_value.clone()]),
("eee".into(), vec![alias_value.clone()]),
("fff".into(), vec![alias_value.clone()]),
("ggg".into(), vec![alias_value.clone()]),
("hhh".into(), vec![alias_value.clone()]),
("iii".into(), vec![alias_value.clone()]),
("jjj".into(), vec![alias_value.clone()]),
("kkk".into(), vec![alias_value.clone()]),
("lll".into(), vec![alias_value.clone()]),
("mmm".into(), vec![alias_value.clone()]),
("nnn".into(), vec![alias_value.clone()]),
("ooo".into(), vec![alias_value.clone()]),
("ppp".into(), vec![alias_value.clone()]),
("qqq".into(), vec![alias_value.clone()]),
("rrr".into(), vec![alias_value.clone()]),
("sss".into(), vec![alias_value.clone()]),
("@".into(), vec![alias_value.clone()]),
("@@".into(), vec![alias_value.clone()]),
("@@@".into(), vec![alias_value]),
],
..ResolveOptions::default()
},
)
}

fn resolver_with_many_extensions() -> rspack_resolver::Resolver {
Expand All @@ -115,6 +126,7 @@ fn resolver_with_many_extensions() -> rspack_resolver::Resolver {
],
imports_fields: vec![],
exports_fields: vec![],
enable_pnp: false,
..Default::default()
})
}
Expand Down Expand Up @@ -145,7 +157,7 @@ fn bench_resolver(c: &mut Criterion) {
// check validity
runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
for (path, request) in &data {
let r = rspack_resolver().resolve(path, request).await;
let r = rspack_resolver(false).resolve(path, request).await;
if !r.is_ok() {
panic!("resolve failed {path:?} {request},\n\nplease run `pnpm install --ignore-workspace` in `/benches` before running the benchmarks");
}
Expand All @@ -164,7 +176,7 @@ fn bench_resolver(c: &mut Criterion) {
.block_on(async {
for i in symlinks_range.clone() {
assert!(
rspack_resolver()
rspack_resolver(false)
.resolve(&symlink_test_dir, &format!("./file{i}"))
.await
.is_ok(),
Expand Down Expand Up @@ -196,7 +208,7 @@ fn bench_resolver(c: &mut Criterion) {
let runner = runtime::Builder::new_current_thread()
.build()
.expect("failed to create tokio runtime");
let rspack_resolver = rspack_resolver();
let rspack_resolver = rspack_resolver(false);

b.to_async(runner).iter_with_setup(
|| {
Expand Down Expand Up @@ -240,7 +252,7 @@ fn bench_resolver(c: &mut Criterion) {
&data,
|b, data| {
let runner = multi_rt();
let rspack_resolver = Arc::new(rspack_resolver());
let rspack_resolver = Arc::new(rspack_resolver(false));

b.iter_with_setup(
|| {
Expand Down Expand Up @@ -268,7 +280,7 @@ fn bench_resolver(c: &mut Criterion) {
&symlinks_range,
|b, data| {
let runner = runtime::Runtime::new().expect("failed to create tokio runtime");
let rspack_resolver = rspack_resolver();
let rspack_resolver = rspack_resolver(false);

b.to_async(runner).iter_with_setup(
|| {
Expand All @@ -294,7 +306,7 @@ fn bench_resolver(c: &mut Criterion) {
&symlinks_range,
|b, data| {
let runner = multi_rt();
let rspack_resolver = Arc::new(rspack_resolver());
let rspack_resolver = Arc::new(rspack_resolver(false));

let symlink_test_dir = symlink_test_dir.clone();

Expand All @@ -321,7 +333,7 @@ fn bench_resolver(c: &mut Criterion) {
&root_range,
|b, data| {
let runner = runtime::Runtime::new().expect("failed to create tokio runtime");
let rspack_resolver = Arc::new(rspack_resolver());
let rspack_resolver = Arc::new(rspack_resolver(true));

b.to_async(runner).iter_with_setup(
|| {
Expand Down
10 changes: 10 additions & 0 deletions src/file_system.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,16 @@ impl Default for FileSystemOs {
}
}

impl FileSystemOs {
pub fn new(options: FileSystemOptions) -> Self {
Self {
options,
#[cfg(feature = "yarn_pnp")]
pnp_lru: LruZipCache::new(50, pnp::fs::open_zip_via_read_p),
}
}
}

#[cfg(not(target_arch = "wasm32"))]
#[async_trait::async_trait]
impl FileSystem for FileSystemOs {
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ use rustc_hash::FxHashSet;
pub use crate::{
builtins::NODEJS_BUILTINS,
error::{JSONError, ResolveError, SpecifierError},
file_system::{FileMetadata, FileSystem, FileSystemOs},
file_system::{FileMetadata, FileSystem, FileSystemOptions, FileSystemOs},
options::{
Alias, AliasValue, EnforceExtension, ResolveOptions, Restriction, TsconfigOptions,
TsconfigReferences,
Expand Down