Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
9 changes: 9 additions & 0 deletions napi/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@ impl ResolverFactory {
symlinks: op.symlinks.unwrap_or(default.symlinks),
builtin_modules: op.builtin_modules.unwrap_or(default.builtin_modules),
enable_pnp: op.enable_pnp.unwrap_or_default(),
pnp_manifest: op.pnp_manifest.map(PathBuf::from).or_else(|| {
if op.enable_pnp.unwrap_or_default() {
std::env::current_dir()
.ok()
.and_then(|cwd| pnp::find_closest_pnp_manifest_path(&cwd))
} else {
None
}
}),
}
}
}
5 changes: 5 additions & 0 deletions napi/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,11 @@ pub struct NapiResolveOptions {
///
/// Default `false`
pub enable_pnp: Option<bool>,

/// Path to yarn Plug'n'Play manifest file.
///
/// Default `None`
pub pnp_manifest: Option<String>,
}

#[napi]
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
.pnp_manifest_path_cache
.entry(base_path.clone())
.or_insert_with(|| {
pnp::find_closest_pnp_manifest_path(&base_path).map(|p| self.cache.value(&p))
self.options.pnp_manifest.as_ref().map_or_else(|| pnp::find_closest_pnp_manifest_path(&base_path).map(|p| self.cache.value(&p)), |manifest_path| Some(self.cache.value(manifest_path)))
});

let cache_key = cached_manifest_path.as_ref().unwrap_or(cached_path);
Expand Down
10 changes: 10 additions & 0 deletions src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ pub struct ResolveOptions {
#[cfg(feature = "yarn_pnp")]
pub enable_pnp: bool,

/// The path to the yarn Plug'n'Play manifest file.
///
/// Default `None`
#[cfg(feature = "yarn_pnp")]
pub pnp_manifest: Option<PathBuf>,

/// Set to [EnforceExtension::Enabled] for [ESM Mandatory file extensions](https://nodejs.org/api/esm.html#mandatory-file-extensions).
///
/// If `enforce_extension` is set to [EnforceExtension::Enabled], resolution will not allow extension-less files.
Expand Down Expand Up @@ -495,6 +501,8 @@ impl Default for ResolveOptions {
modules: vec!["node_modules".into()],
#[cfg(feature = "yarn_pnp")]
enable_pnp: true,
#[cfg(feature = "yarn_pnp")]
pnp_manifest: None,
resolve_to_context: false,
prefer_relative: false,
prefer_absolute: false,
Expand Down Expand Up @@ -635,6 +643,8 @@ mod test {
description_files: vec![],
#[cfg(feature = "yarn_pnp")]
enable_pnp: true,
#[cfg(feature = "yarn_pnp")]
pnp_manifest: None,
enforce_extension: EnforceExtension::Disabled,
exports_fields: vec![],
extension_alias: vec![],
Expand Down
23 changes: 23 additions & 0 deletions src/tests/pnp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,26 @@ async fn resolve_pnp_pkg_should_failed_while_disable_pnp_mode() {
Err(NotFound("is-even".to_string()))
);
}

#[tokio::test]
async fn resolve_pnp_with_manifest_option() {
let fixture = super::fixture_root().join("pnp");
let manifest = fixture.join(".pnp.cjs");

let resolver = Resolver::new(ResolveOptions {
extensions: vec![".js".into()],
condition_names: vec!["import".into()],
pnp_manifest: Some(manifest),
..ResolveOptions::default()
});

assert_eq!(
resolver
.resolve(&fixture, "lodash.zip")
.await
.map(|r| r.full_path()),
Ok(fixture.join(
".yarn/cache/lodash.zip-npm-4.2.0-5299417ec8-e596da80a6.zip/node_modules/lodash.zip/index.js"
))
);
}