@npmcli/arborist 6.2.2 → 6.2.4

package/lib/arborist/build-ideal-tree.js

@@ -1243,7 +1243,7 @@ This is a one-time fix-up, please be patient...
     if (isWorkspace) {
       const existingNode = this.idealTree.edgesOut.get(spec.name).to
       if (existingNode && existingNode.isWorkspace && existingNode.satisfies(edge)) {
-        return edge.to
+        return existingNode
       }
     }
 

package/lib/arborist/rebuild.js

@@ -89,7 +89,6 @@ module.exports = cls => class Builder extends cls {
     const {
       depNodes,
       linkNodes,
-      storeNodes,
     } = this[_retrieveNodesByType](nodes)
 
     // build regular deps
@@ -100,10 +99,6 @@ module.exports = cls => class Builder extends cls {
       this[_resetQueues]()
       await this[_build](linkNodes, { type: 'links' })
     }
-    if (storeNodes.size) {
-      this[_resetQueues]()
-      await this[_build](storeNodes, { type: 'storelinks' })
-    }
 
     process.emit('timeEnd', 'build')
   }
@@ -146,6 +141,12 @@ module.exports = cls => class Builder extends cls {
         depNodes.add(node)
       }
     }
+    // Make sure that store linked nodes are processed last.
+    // We can't process store links separately or else lifecycle scripts on
+    // standard nodes might not have bin links yet.
+    for (const node of storeNodes) {
+      depNodes.add(node)
+    }
 
     // deduplicates link nodes and their targets, avoids
     // calling lifecycle scripts twice when running `npm rebuild`
@@ -162,7 +163,6 @@ module.exports = cls => class Builder extends cls {
     return {
       depNodes,
       linkNodes,
-      storeNodes,
     }
   }
 
@@ -330,10 +330,12 @@ module.exports = cls => class Builder extends cls {
         devOptional,
         package: pkg,
         location,
+        isStoreLink,
       } = node.target
 
       // skip any that we know we'll be deleting
-      if (this[_trashList].has(path)) {
+      // or storeLinks
+      if (this[_trashList].has(path) || isStoreLink) {
         return
       }
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@npmcli/arborist",
-  "version": "6.2.2",
+  "version": "6.2.4",
   "description": "Manage node_modules trees",
   "dependencies": {
     "@isaacs/string-locale-compare": "^1.1.0",
     "@npmcli/fs": "^3.1.0",
-    "@npmcli/installed-package-contents": "^2.0.0",
+    "@npmcli/installed-package-contents": "^2.0.2",
     "@npmcli/map-workspaces": "^3.0.2",
     "@npmcli/metavuln-calculator": "^5.0.0",
     "@npmcli/name-from-folder": "^2.0.0",