@yarnpkg/nm 4.0.0 → 4.0.2

package/lib/buildNodeModulesTree.js

@@ -123,7 +123,7 @@ const buildWorkspaceMap = (pnp) => {
         const pkg = pnp.getPackageInformation(locator);
         if (pkg) {
             const parentLocatorKey = parentLocator ? stringifyLocator(parentLocator) : ``;
-            if (stringifyLocator(locator) !== parentLocatorKey && pkg.linkType === LinkType.SOFT && !isExternalSoftLink(pkg, locator, pnp, topPkgPortableLocation)) {
+            if (stringifyLocator(locator) !== parentLocatorKey && pkg.linkType === LinkType.SOFT && !locator.reference.startsWith(`link:`) && !isExternalSoftLink(pkg, locator, pnp, topPkgPortableLocation)) {
                 const location = getRealPackageLocation(pkg, locator, pnp);
                 const prevLocator = workspaceLikeLocators.get(location);
                 // Give workspaces a priority over portals and other protocols pointing to the same location
@@ -405,7 +405,7 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
         for (const dep of pkg.dependencies) {
             const depReferences = Array.from(dep.references).sort().join(`#`);
             // We do not want self-references in node_modules, since they confuse existing tools
-            if (dep.identName === pkg.identName && depReferences === pkgReferences)
+            if (dep.identName === pkg.identName.replace(WORKSPACE_NAME_SUFFIX, ``) && depReferences === pkgReferences)
                 continue;
             const references = Array.from(dep.references).sort();
             const locator = { name: dep.identName, reference: references[0] };
@@ -423,8 +423,7 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
                 const workspace = options.project.workspacesByCwd.get(leafNode.target.slice(0, -1));
                 isAnonymousWorkspace = !!(workspace && !workspace.manifest.name);
             }
-            const isCircularSymlink = leafNode.linkType === LinkType.SOFT && nodeModulesLocation.startsWith(leafNode.target);
-            if (!dep.name.endsWith(WORKSPACE_NAME_SUFFIX) && !isAnonymousWorkspace && !isCircularSymlink) {
+            if (!dep.name.endsWith(WORKSPACE_NAME_SUFFIX) && !isAnonymousWorkspace) {
                 const prevNode = tree.get(nodeModulesLocation);
                 if (prevNode) {
                     if (prevNode.dirList) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yarnpkg/nm",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "exports": {
@@ -9,9 +9,9 @@
   },
   "sideEffects": false,
   "dependencies": {
-    "@yarnpkg/core": "^4.0.0",
-    "@yarnpkg/fslib": "^3.0.0",
-    "@yarnpkg/pnp": "^4.0.0"
+    "@yarnpkg/core": "^4.0.3",
+    "@yarnpkg/fslib": "^3.0.2",
+    "@yarnpkg/pnp": "^4.0.2"
   },
   "scripts": {
     "postpack": "rm -rf lib",