fix(pnp): fallback to initialApiPath when api can't be located for vi…

…rtual path
yarnpkg · Sep 23, 2020 · 47e6452 · 47e6452
1 parent 290c685
commit 47e6452
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 9 deletions.
diff --git a/.pnp.js b/.pnp.js
diff --git a/.yarn/versions/109cba4d.yml b/.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"
diff --git a/packages/yarnpkg-pnp/sources/hook.js b/packages/yarnpkg-pnp/sources/hook.js
diff --git a/packages/yarnpkg-pnp/sources/loader/makeManager.ts b/packages/yarnpkg-pnp/sources/loader/makeManager.ts
@@ -91,9 +91,8 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
   }
 
   function findApiPathFor(modulePath: NativePath) {
-    const start = VirtualFS.resolveVirtual(
-      ppath.resolve(npath.toPortablePath(modulePath)),
-    );
+    const pModulePath = ppath.resolve(npath.toPortablePath(modulePath));
+    const start = VirtualFS.resolveVirtual(pModulePath);
 
     let curr: PortablePath;
     let next = start;
@@ -122,8 +121,12 @@ export function makeManager(pnpapi: PnpApi, opts: MakeManagerOptions) {
       next = ppath.dirname(curr);
     } while (curr !== PortablePath.root);
 
-    addToCache(start, curr, null);
-    return null;
+    if (pModulePath === start) {
+      addToCache(start, curr, null);
+      return null;
+    } else {
+      return initialApiPath;
+    }
   }
 
   function getApiPathFromParent(parent: Module | null | undefined): PortablePath | null {