fix(cli): upgrade error

Akryum · Jan 24, 2019 · d068ca4 · d068ca4
1 parent c153a44
commit d068ca4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/@nodepack/cli/src/lib/PluginUpgradeJob.js b/packages/@nodepack/cli/src/lib/PluginUpgradeJob.js
@@ -183,7 +183,7 @@ module.exports = class PluginUpgradeJob {
       let link = null
       const medata = await getPackageMetadata(id)
       if (medata) {
-        link = medata.body.homepage
+        link = medata.homepage
       }
       updateInfos.push({
         id,

diff --git a/packages/@nodepack/utils/src/deps.js b/packages/@nodepack/utils/src/deps.js
@@ -187,7 +187,7 @@ exports.getPackageMetadata = async function (id, range = '') {
     : `https://registry.npmjs.org`
   let result
   try {
-    result = await request.get(`${registry}/${encodeURIComponent(id).replace(/^%40/, '@')}/${range}`)
+    result = (await request.get(`${registry}/${encodeURIComponent(id).replace(/^%40/, '@')}/${range}`)).body
     if (result) metadataCache.set(cacheId, result)
   } catch (e) {
     warn(`Couldn't get medata for ${cacheId}: ${e.message}`)
@@ -204,7 +204,7 @@ exports.getPackageMetadata = async function (id, range = '') {
 exports.getPackageTaggedVersion = async function (id, tag = 'latest') {
   try {
     const res = await exports.getPackageMetadata(id)
-    if (res) res.body['dist-tags'][tag]
+    if (res) res['dist-tags'][tag]
   } catch (e) {
     error(e)
   }
@@ -234,8 +234,13 @@ exports.getPackageVersionsInfo = async function (cwd, id, versionRange) {
   if (metadata) {
     result.latest = metadata['dist-tags'].latest
 
-    const versions = Array.isArray(metadata.versions) ? metadata.versions : Object.keys(metadata.versions)
-    result.wanted = semver.maxSatisfying(versions, versionRange)
+    const wantedTagVersion = metadata['dist-tags'][versionRange]
+    if (wantedTagVersion) {
+      result.wanted = wantedTagVersion
+    } else {
+      const versions = Array.isArray(metadata.versions) ? metadata.versions : Object.keys(metadata.versions)
+      result.wanted = semver.maxSatisfying(versions, versionRange)
+    }
   }
 
   return result