@yarnpkg/nm 4.0.2 → 4.0.4

package/lib/hoist.js

@@ -50,7 +50,8 @@ const hoist = (tree, opts = {}) => {
     let anotherRoundNeeded = false;
     let round = 0;
     do {
-        anotherRoundNeeded = hoistTo(treeCopy, [treeCopy], new Set([treeCopy.locator]), new Map(), options).anotherRoundNeeded;
+        const result = hoistTo(treeCopy, [treeCopy], new Set([treeCopy.locator]), new Map(), options);
+        anotherRoundNeeded = result.anotherRoundNeeded || result.isGraphChanged;
         options.fastLookupPossible = false;
         round++;
     } while (anotherRoundNeeded);
@@ -192,11 +193,10 @@ const getHoistIdentMap = (rootNode, preferenceMap) => {
         if (entry2.hoistPriority !== entry1.hoistPriority) {
             return entry2.hoistPriority - entry1.hoistPriority;
         }
-        else if (entry2.peerDependents.size !== entry1.peerDependents.size) {
-            return entry2.peerDependents.size - entry1.peerDependents.size;
-        }
         else {
-            return entry2.dependents.size - entry1.dependents.size;
+            const entry1Usages = entry1.dependents.size + entry1.peerDependents.size;
+            const entry2Usages = entry2.dependents.size + entry2.peerDependents.size;
+            return entry2Usages - entry1Usages;
         }
     });
     for (const key of keyList) {
@@ -351,23 +351,6 @@ const getNodeHoistInfo = (rootNode, rootNodePathLocators, nodePath, node, usedDe
             reason = `- external soft link with unhoisted dependencies`;
         }
     }
-    if (isHoistable) {
-        // Direct workspace dependencies must be hoisted to any common ancestor workspace of all the
-        // graph paths that include the dependency, because otherwise running app with
-        // `--preserve-symlinks` will become broken (without this flag the Node.js will pick dependency
-        // from the ancestor on the file system and with this flag it will pick ancestor from the graph
-        // and if these ancestors are different, the behavious of the application will be different).
-        // Another problem, which is prevented - is a creation of multiple hoisting layouts
-        // for the same workspace, because different dependencies of the same workspace might be hoisted
-        // differently, depending on the recepient workspace.
-        // It is difficult to find all common ancestors, but there is one easy to find common ancestor -
-        // the root workspace, so, for now, we either hoist direct dependencies into the root workspace, or we keep them
-        // unhoisted, thus we are safe from various pathological cases with `--preserve-symlinks`
-        isHoistable = parentNode.dependencyKind !== HoisterDependencyKind.WORKSPACE || parentNode.hoistedFrom.has(node.name) || rootNodePathLocators.size === 1;
-        if (outputReason && !isHoistable) {
-            reason = parentNode.reasons.get(node.name);
-        }
-    }
     if (isHoistable) {
         isHoistable = !rootNode.peerNames.has(node.name);
         if (outputReason && !isHoistable) {

package/package.json

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