fix(pnp): resolve the virtual path of the pnpapi instead of the issuer (

#1851)

* fix(pnp): resolve the virtual path of the pnpapi instead of the issuer

* chore: fix typo in changelog

.yarn/versions/109cba4d.yml

@@ -0,0 +1,25 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-pnp": patch
+  "@yarnpkg/pnp": patch
+  "@yarnpkg/pnpify": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-node-modules"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - vscode-zipfs
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

CHANGELOG.md

@@ -15,7 +15,7 @@ via `nmHoistingLimits` global setting and `installConfig.hoistingLimits` `packag
 - Cyclic peer dependencies inside `node_modules` are hoisted now in all possible cases
 - `node-modules` linker is more forgiving now for packages with incorrect assumptions about hoisting layout,
   thanks to maximizing package exposure at the top-level first and only after that minimizing package duplicates during hoisting.
-- In case of `node_modules` the workspace peer dependencies are no longer ingnored. They are picked up
+- In case of `node_modules` the workspace peer dependencies are no longer ignored. They are picked up
   from the closest workspace, that is upper in directory hierarchy.
 
 ## Bugfixes

packages/yarnpkg-pnp/sources/loader/makeManager.ts

@@ -79,7 +79,10 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
 
   const findApiPathCache = new Map<PortablePath, PortablePath | null>();
 
-  function addToCache(start: PortablePath, end: PortablePath, target: PortablePath | null) {
+  function addToCacheAndReturn(start: PortablePath, end: PortablePath, target: PortablePath | null) {
+    if (target !== null)
+      target = VirtualFS.resolveVirtual(target);
+
     let curr: PortablePath;
     let next = start;
 
@@ -88,12 +91,12 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
       findApiPathCache.set(curr, target);
       next = ppath.dirname(curr);
     } while (curr !== end);
+
+    return target;
   }
 
   function findApiPathFor(modulePath: NativePath) {
-    const start = VirtualFS.resolveVirtual(
-      ppath.resolve(npath.toPortablePath(modulePath)),
-    );
+    const start = ppath.resolve(npath.toPortablePath(modulePath));
 
     let curr: PortablePath;
     let next = start;
@@ -102,28 +105,21 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
       curr = next;
 
       const cached = findApiPathCache.get(curr);
-      if (cached !== undefined) {
-        addToCache(start, curr, cached);
-        return cached;
-      }
+      if (cached !== undefined)
+        return addToCacheAndReturn(start, curr, cached);
 
       const candidate = ppath.join(curr, `.pnp.js` as Filename);
-      if (xfs.existsSync(candidate) && xfs.statSync(candidate).isFile()) {
-        addToCache(start, curr, candidate);
-        return candidate;
-      }
+      if (xfs.existsSync(candidate) && xfs.statSync(candidate).isFile())
+        return addToCacheAndReturn(start, curr, candidate);
 
       const cjsCandidate = ppath.join(curr, `.pnp.cjs` as Filename);
-      if (xfs.existsSync(cjsCandidate) && xfs.statSync(cjsCandidate).isFile()) {
-        addToCache(start, curr, cjsCandidate);
-        return cjsCandidate;
-      }
+      if (xfs.existsSync(cjsCandidate) && xfs.statSync(cjsCandidate).isFile())
+        return addToCacheAndReturn(start, curr, cjsCandidate);
 
       next = ppath.dirname(curr);
     } while (curr !== PortablePath.root);
 
-    addToCache(start, curr, null);
-    return null;
+    return addToCacheAndReturn(start, curr, null);
   }
 
   function getApiPathFromParent(parent: Module | null | undefined): PortablePath | null {