From c84561dfdaf9b47771cd872790738dc1965113d8 Mon Sep 17 00:00:00 2001
From: Ben Newman <ben@meteor.com>
Date: Sun, 14 Jan 2018 17:39:02 -0500
Subject: [PATCH] Fix #9477 by implementing @klaussner's suggestion.

https://github.com/meteor/meteor/issues/9477#issuecomment-353975219
---
 tools/isobuild/meteor-npm.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tools/isobuild/meteor-npm.js b/tools/isobuild/meteor-npm.js
index a52b93e10c..3bb8317a41 100644
--- a/tools/isobuild/meteor-npm.js
+++ b/tools/isobuild/meteor-npm.js
@@ -939,10 +939,18 @@ function getInstalledDependenciesTree(dir) {
       };
 
       const from = pkg._from || pkg.from;
-      if (from &&
-          utils.isNpmUrl(from) &&
-          ! utils.isNpmUrl(info.version)) {
-        info.version = from;
+      if (from) {
+        // Fix for https://github.com/meteor/meteor/issues/9477:
+        const prefix = name + "@";
+        let fromUrl = from;
+        if (fromUrl.startsWith(prefix)) {
+          fromUrl = fromUrl.slice(prefix.length);
+        }
+
+        if (utils.isNpmUrl(fromUrl) &&
+            ! utils.isNpmUrl(info.version)) {
+          info.version = fromUrl;
+        }
       }
 
       const resolved = pkg._resolved || pkg.resolved;