feat(pnp)!: support yarn PnP global cache (#174)

stormslowly · Copilot · web-flow · commit b5ce4334f67d · 2026-03-16T21:19:44.000+08:00
Co-authored-by: Copilot Autofix powered by AI &lt;175728472+Copilot@users.noreply.github.com&gt;
diff --git a/.github/actions/pnpm/action.yml b/.github/actions/pnpm/action.yml
@@ -1,6 +1,6 @@
 name: Pnpm
 
-description: Install pnpm
+description: Set up pnpm and install dependencies (including yarn fixture installs)
 
 inputs:
   node-version:
@@ -35,6 +35,8 @@ runs:
       run: |
         cd fixtures/pnp
         yarn install
+        cd ../pnp-global-cache-enabled
+        yarn install
 
     - name: pnpm
       shell: bash
diff --git a/.prettierignore b/.prettierignore
@@ -1,3 +1,4 @@
 fixtures/tsconfig/tsconfig_broken.json
 fixtures/enhanced_resolve/test/fixtures/incorrect-package/pack1/package.json
-pnpm-lock.yaml
+pnpm-lock.yaml
+**/.pnp.cjs
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -93,6 +93,7 @@ thiserror           = "2.0.17"
 
 pnp = { version = "0.12.5", optional = true }
 
+arc-swap          = { version = "1.8.2", optional = true }
 async-trait       = "0.1.89"
 document-features = { version = "0.2.8", optional = true }
 futures           = "0.3.31"
@@ -118,7 +119,7 @@ default = ["yarn_pnp"]
 ## which returns the `package.json` with `serde_json::Value`.
 package_json_raw_json_api = []
 ## [Yarn Plug'n'Play](https://yarnpkg.com/features/pnp)
-yarn_pnp = ["pnp"]
+yarn_pnp = ["pnp", "arc-swap"]
 # For remove tracing calls in release build
 enable_instrument = []
 
diff --git a/fixtures/pnp-global-cache-enabled/.gitignore b/fixtures/pnp-global-cache-enabled/.gitignore
@@ -0,0 +1,2 @@
+install-state.gz
+.pnp.cjs
diff --git a/fixtures/pnp-global-cache-enabled/.yarnrc.yml b/fixtures/pnp-global-cache-enabled/.yarnrc.yml
@@ -0,0 +1 @@
+enableGlobalCache: true
diff --git a/fixtures/pnp-global-cache-enabled/package.json b/fixtures/pnp-global-cache-enabled/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "pnp",
+  "packageManager": "yarn@4.3.1",
+  "dependencies": {
+    "is-odd": "^1.0.0",
+    "path-to-regexp": "1.9.0"
+  }
+}
diff --git a/fixtures/pnp-global-cache-enabled/yarn.lock b/fixtures/pnp-global-cache-enabled/yarn.lock
@@ -0,0 +1,65 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"is-buffer@npm:^1.1.5":
+  version: 1.1.6
+  resolution: "is-buffer@npm:1.1.6"
+  checksum: 10c0/ae18aa0b6e113d6c490ad1db5e8df9bdb57758382b313f5a22c9c61084875c6396d50bbf49315f5b1926d142d74dfb8d31b40d993a383e0a158b15fea7a82234
+  languageName: node
+  linkType: hard
+
+"is-number@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-number@npm:3.0.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10c0/e639c54640b7f029623df24d3d103901e322c0c25ea5bde97cd723c2d0d4c05857a8364ab5c58d963089dbed6bf1d0ffe975cb6aef917e2ad0ccbca653d31b4f
+  languageName: node
+  linkType: hard
+
+"is-odd@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-odd@npm:1.0.0"
+  dependencies:
+    is-number: "npm:^3.0.0"
+  checksum: 10c0/4016c9a72931167f447fbc464d6da3b6c08eab7c07d2b264c43331d116f021596615da6255f121bbc29413a7be65c548528610e15a2c8b4e58d11d99b89a5c0d
+  languageName: node
+  linkType: hard
+
+"isarray@npm:0.0.1":
+  version: 0.0.1
+  resolution: "isarray@npm:0.0.1"
+  checksum: 10c0/ed1e62da617f71fe348907c71743b5ed550448b455f8d269f89a7c7ddb8ae6e962de3dab6a74a237b06f5eb7f6ece7a45ada8ce96d87fe972926530f91ae3311
+  languageName: node
+  linkType: hard
+
+"kind-of@npm:^3.0.2":
+  version: 3.2.2
+  resolution: "kind-of@npm:3.2.2"
+  dependencies:
+    is-buffer: "npm:^1.1.5"
+  checksum: 10c0/7e34bc29d4b02c997f92f080de34ebb92033a96736bbb0bb2410e033a7e5ae6571f1fa37b2d7710018f95361473b816c604234197f4f203f9cf149d8ef1574d9
+  languageName: node
+  linkType: hard
+
+"path-to-regexp@npm:1.9.0":
+  version: 1.9.0
+  resolution: "path-to-regexp@npm:1.9.0"
+  dependencies:
+    isarray: "npm:0.0.1"
+  checksum: 10c0/de9ddb01b84d9c2c8e2bed18630d8d039e2d6f60a6538595750fa08c7a6482512257464c8da50616f266ab2cdd2428387e85f3b089e4c3f25d0c537e898a0751
+  languageName: node
+  linkType: hard
+
+"pnp@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "pnp@workspace:."
+  dependencies:
+    is-odd: "npm:^1.0.0"
+    path-to-regexp: "npm:1.9.0"
+  languageName: unknown
+  linkType: soft
diff --git a/napi/src/lib.rs b/napi/src/lib.rs
@@ -215,7 +215,6 @@ 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),
     }
   }
 }
diff --git a/napi/src/options.rs b/napi/src/options.rs
@@ -157,11 +157,6 @@ 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]
diff --git a/src/lib.rs b/src/lib.rs
@@ -71,7 +71,7 @@ use std::{
   sync::Arc,
 };
 
-use dashmap::{mapref::one::Ref, DashMap};
+use dashmap::DashSet;
 use futures::future::{try_join_all, BoxFuture};
 use rustc_hash::FxHashSet;
 
@@ -115,9 +115,10 @@ pub struct ResolverGeneric<Fs> {
   options: ResolveOptions,
   cache: Arc<Cache<Fs>>,
   #[cfg(feature = "yarn_pnp")]
-  pnp_manifest_content_cache: Arc<DashMap<CachedPath, Option<pnp::Manifest>>>,
+  pnp_manifest: Arc<arc_swap::ArcSwapOption<pnp::Manifest>>,
+  /// Paths that have been searched and confirmed to have no `.pnp.cjs` reachable by filesystem walk.
   #[cfg(feature = "yarn_pnp")]
-  pnp_manifest_path_cache: Arc<DashMap<PathBuf, Option<CachedPath>>>,
+  pnp_no_manifest_cache: Arc<DashSet<CachedPath>>,
 }
 
 impl<Fs> fmt::Debug for ResolverGeneric<Fs> {
@@ -138,9 +139,9 @@ impl<Fs: Send + Sync + FileSystem + Default> ResolverGeneric<Fs> {
       options: options.sanitize(),
       cache: Arc::new(Cache::new(Fs::default())),
       #[cfg(feature = "yarn_pnp")]
-      pnp_manifest_content_cache: Arc::new(DashMap::default()),
+      pnp_manifest: Arc::new(arc_swap::ArcSwapOption::empty()),
       #[cfg(feature = "yarn_pnp")]
-      pnp_manifest_path_cache: Arc::new(DashMap::default()),
+      pnp_no_manifest_cache: Arc::new(DashSet::new()),
     }
   }
 }
@@ -151,9 +152,9 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
       options: options.sanitize(),
       cache: Arc::new(Cache::new(file_system)),
       #[cfg(feature = "yarn_pnp")]
-      pnp_manifest_content_cache: Arc::new(DashMap::default()),
+      pnp_manifest: Arc::new(arc_swap::ArcSwapOption::empty()),
       #[cfg(feature = "yarn_pnp")]
-      pnp_manifest_path_cache: Arc::new(DashMap::default()),
+      pnp_no_manifest_cache: Arc::new(DashSet::new()),
     }
   }
 
@@ -164,9 +165,9 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
       options: options.sanitize(),
       cache: Arc::clone(&self.cache),
       #[cfg(feature = "yarn_pnp")]
-      pnp_manifest_content_cache: Arc::clone(&self.pnp_manifest_content_cache),
+      pnp_manifest: Arc::clone(&self.pnp_manifest),
       #[cfg(feature = "yarn_pnp")]
-      pnp_manifest_path_cache: Arc::clone(&self.pnp_manifest_path_cache),
+      pnp_no_manifest_cache: Arc::clone(&self.pnp_no_manifest_cache),
     }
   }
 
@@ -180,8 +181,8 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
     self.cache.clear();
     #[cfg(feature = "yarn_pnp")]
     {
-      self.pnp_manifest_content_cache.clear();
-      self.pnp_manifest_path_cache.clear();
+      self.pnp_manifest.store(None);
+      self.pnp_no_manifest_cache.clear();
     }
   }
 
@@ -884,33 +885,47 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
   }
 
   #[cfg(feature = "yarn_pnp")]
-  #[cfg_attr(feature="enable_instrument", tracing::instrument(level=tracing::Level::DEBUG, skip_all, fields(path = %cached_path.path().to_string_lossy())))]
-  fn find_pnp_manifest(
-    &self,
-    cached_path: &CachedPath,
-  ) -> Ref<'_, CachedPath, Option<pnp::Manifest>> {
+  #[cfg_attr(feature = "enable_instrument", tracing::instrument(level=tracing::Level::DEBUG, skip_all, fields(path = %cached_path.path().to_string_lossy())))]
+  fn find_pnp_manifest(&self, cached_path: &CachedPath) -> Option<Arc<pnp::Manifest>> {
+    // 1. Already have a manifest → return it (covers global cache paths too)
+    if let Some(manifest) = self.pnp_manifest.load_full() {
+      return Some(manifest);
+    }
+
+    // 2. This path was searched before and found nothing → skip filesystem walk
+    if self.pnp_no_manifest_cache.contains(cached_path) {
+      return None;
+    }
+
+    // 3. Search for `.pnp.cjs` by walking up from this path
     let base_path = cached_path.to_path_buf();
+    let Some(manifest_path) = pnp::find_closest_pnp_manifest_path(&base_path) else {
+      self.pnp_no_manifest_cache.insert(cached_path.clone());
 
-    let cached_manifest_path = self
-      .pnp_manifest_path_cache
-      .entry(base_path.clone())
-      .or_insert_with(|| {
-        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)),
-        )
-      });
+      for p in base_path.ancestors() {
+        let p_cached = self.cache.value(p);
+        if self.pnp_no_manifest_cache.contains(&p_cached) {
+          break;
+        }
+        self.pnp_no_manifest_cache.insert(p_cached);
+      }
+      return None;
+    };
 
-    let cache_key = cached_manifest_path.as_ref().unwrap_or(cached_path);
+    tracing::debug!("use manifest path: {:?}", manifest_path);
 
-    tracing::debug!("use manifest path: {:?}", cache_key.path());
+    let manifest = pnp::load_pnp_manifest(&manifest_path).ok()?;
+    let manifest = Arc::new(manifest);
 
-    let entry = self
-      .pnp_manifest_content_cache
-      .entry(cache_key.clone())
-      .or_insert_with(|| pnp::load_pnp_manifest(cache_key.path()).ok());
+    let previous = self
+      .pnp_manifest
+      .compare_and_swap(&None::<Arc<_>>, Some(Arc::clone(&manifest)));
 
-    entry.downgrade()
+    if let Some(existing) = previous.as_ref() {
+      return Some(Arc::clone(existing));
+    }
+
+    Some(manifest)
   }
 
   #[cfg(feature = "yarn_pnp")]
@@ -921,19 +936,14 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
     specifier: &str,
     ctx: &mut Ctx,
   ) -> Result<Option<CachedPath>, ResolveError> {
-    let resolution = {
-      let pnp_manifest = self.find_pnp_manifest(cached_path);
-      pnp_manifest.as_ref().map(|manifest| {
-        let mut path = cached_path.to_path_buf();
-        path.push("");
-        pnp::resolve_to_unqualified_via_manifest(manifest, specifier, &path)
-      })
-    };
-
-    let Some(resolution) = resolution else {
+    let Some(manifest) = self.find_pnp_manifest(cached_path) else {
       return Ok(None);
     };
 
+    let mut path = cached_path.to_path_buf();
+    path.push("");
+    let resolution = pnp::resolve_to_unqualified_via_manifest(&manifest, specifier, &path);
+
     tracing::debug!("pnp resolve unqualified as: {:?}", resolution);
 
     match resolution {
diff --git a/src/options.rs b/src/options.rs
@@ -52,12 +52,6 @@ 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.
@@ -501,8 +495,6 @@ 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,
@@ -643,8 +635,6 @@ 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![],
diff --git a/src/tests/pnp.rs b/src/tests/pnp.rs

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,6 @@ impl ResolverFactory {`
`215`	`215`	`symlinks: op.symlinks.unwrap_or(default.symlinks),`
`216`	`216`	`builtin_modules: op.builtin_modules.unwrap_or(default.builtin_modules),`
`217`	`217`	`enable_pnp: op.enable_pnp.unwrap_or_default(),`
`218`		`- pnp_manifest: op.pnp_manifest.map(PathBuf::from),`
`219`	`218`	`}`
`220`	`219`	`}`
`221`	`220`	`}`