shrinkwrap: lean on from field for better forward-compat (#17076)

PR-URL: https://github.com/npm/npm/pull/17076
Credit: @zkat
Reviewed-By: @iarna

1 files changed, 7 insertions, 4 deletions

diff --git a/lib/install/realize-shrinkwrap-specifier.js b/lib/install/realize-shrinkwrap-specifier.js
index 91030bfa8..ac700278f 100644
--- a/lib/install/realize-shrinkwrap-specifier.js
+++ b/lib/install/realize-shrinkwrap-specifier.js
@@ -5,14 +5,17 @@ module.exports = function (name, sw, where) {
   try {
     if (sw.version && sw.integrity) {
       return npa.resolve(name, sw.version, where)
+    } else if (sw.from) {
+      const spec = npa(sw.from, where)
+      if (spec.registry && sw.version) {
+        return npa.resolve(name, sw.version, where)
+      } else if (!sw.resolved) {
+        return spec
+      }
     }
     if (sw.resolved) {
       return npa.resolve(name, sw.resolved, where)
     }
-    if (sw.from) {
-      var spec = npa(sw.from, where)
-      if (!spec.registry) return spec
-    }
   } catch (_) { }
   return npa.resolve(name, sw.version, where)
 }