Editor SDK support for resolving portaled dependencies (#4091)

yarnpkg · Feb 21, 2022 · 43a35de · 43a35de
1 parent b1e0e64
commit 43a35de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.yarn/versions/88da1151.yml b/.yarn/versions/88da1151.yml
@@ -0,0 +1,2 @@
+releases:
+  "@yarnpkg/sdks": patch
diff --git a/packages/yarnpkg-sdks/sources/sdks/base.ts b/packages/yarnpkg-sdks/sources/sdks/base.ts
@@ -45,6 +45,7 @@ export const generateTypescriptBaseWrapper: GenerateBaseWrapper = async (pnpApi:
       const pnpApi = require(\`pnpapi\`);
 
       const isVirtual = str => str.match(/\\/(\\$\\$virtual|__virtual__)\\//);
+      const isPortal = str => str.startsWith("portal:/");
       const normalize = str => str.replace(/\\\\/g, \`/\`).replace(/^\\/?/, \`/\`);
 
       const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => {
@@ -71,7 +72,7 @@ export const generateTypescriptBaseWrapper: GenerateBaseWrapper = async (pnpApi:
           const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str;
           if (resolved) {
             const locator = pnpApi.findPackageLocator(resolved);
-            if (locator && dependencyTreeRoots.has(\`\${locator.name}@\${locator.reference}\`)) {
+            if (locator && (dependencyTreeRoots.has(\`\${locator.name}@\${locator.reference}\`) || isPortal(locator.reference))) {
               str = resolved;
             }
           }