Commits on Feb 12, 2021

1. Do not ERESOLVE on peerOptionals not added to tree …

   For these dependency graphs:
   
       # case a
       root -> (x, y@1)
       x -> PEEROPTIONAL(z)
       z -> PEER(y@2)
   
       # case b
       root -> (x) PEEROPTIONAL(y@1)
       x -> PEEROPTIONAL(y@2)
   
       # case c
       root -> (x) PEEROPTIONAL(y@1)
       x -> PEER(z)
       z -> PEEROPTIONAL(y@2)
   
   The peerOptional dependency is included in the peerSet, which would
   raise an ERESOLVE conflict at the peerSet generation stage, even though
   the peerOptional dependencies will not actually be added to the tree.
   
   To address this, this commit tracks the nodes which are actually
   required in the peerSet generation phase, by virtue of being
   non-optionally depended upon by a required node in the peerSet.
   
   If a conflict occurs on a node which is not in the required set during
   the peerSet generation phase, we ignore it in much the same way that we
   would ignore peerSet errors in metadependencies or when --force is used.
   
   Of course, if the peerOptional dependency is _actually_ required, to
   avoid a conflict with an invalid resolution present in the tree already,
   and there is no suitable placement for it, then ERESOLVE will still be
   raised.
   
   Fix: #223
   Fix: npm/cli#2667
   
   PR-URL: #227
   Credit: @isaacs
   Close: #227
   Reviewed-by: @ruyadorno

   

   isaacs committed Feb 12, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for f375873
   • Browse repository at this point

   Copy the full SHA

   f375873 View commit details

   Browse the repository at this point in the history

2. bin: remove outdated ERESOLVE printing code

   

   isaacs committed Feb 12, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for 828990c
   • Browse repository at this point

   Copy the full SHA

   828990c View commit details

   Browse the repository at this point in the history

3. Allow --force to override conflicted peerOptional …

   With a dependency graph like this:
   
   ```
   root -> (a, b@1)
   a -> PEEROPTIONAL(b@2)
   ```
   
   We do not install the peerOptional dependency by default, so even though
   `b@2` is included in the peerSet of `a`, it is not added to the tree.
   
   Then, the `b@1` dependency is added to satisfy root's direct dependency
   on it, causing the `a -> b@2` edge to become invalid.
   
   We then try to resolve the `a -> b@2` edge, and find that we cannot
   place it anywhere, causing an `ERESOLVE` error.
   
   However, because `b@2` is no longer a part of a peerSet sourced on the
   `root` node, we miss the chance to detect that it should be overridden,
   resulting in an `ERESOLVE` failure even when `--force` is used.
   
   This commit adds the check for `this[_force]` prior to crashing with
   ERESOLVE, so that cases that avoid our earlier heuristics still accept
   the invalid resolution when `--force` is in effect.
   
   Fix: #226
   Fix: npm/cli#2504
   
   PR-URL: #228
   Credit: @isaacs
   Close: #228
   Reviewed-by: @ruyadorno

   

   isaacs committed Feb 12, 2021
   Configuration menu

   • View commit details
   • Copy full SHA for 1d68907
   • Browse repository at this point

   Copy the full SHA

   1d68907 View commit details

   Browse the repository at this point in the history