node-install-release 0.4.1 → 0.4.4

package/lib/installNPM/installLib.js

@@ -1,29 +1,39 @@
 var path = require('path');
-var match = require('match-semver');
-var find = require('lodash.find');
 var get = require('get-remote');
 
 var conditionalCache = require('../conditionalCache');
 var conditionalExtract = require('../conditionalExtract');
-var npmVersions = require('./npmVersions');
 
-var DIST_URL = 'https://registry.npmjs.org/npm';
+var NODE_DIST_URL = 'https://nodejs.org/dist/index.json';
+var NPM_DIST_URL = 'https://registry.npmjs.org/npm';
+var NPM_MIN_VERSION = '1.0.0';
 
 module.exports = function installLib(version, dest, options, callback) {
   var platform = options.platform || process.platform;
-  var maximumVersion = find(npmVersions, match.bind(null, version.version)).maximum;
   var libPath = platform === 'win32' ? dest : path.join(dest, 'lib');
   var installPath = path.join(libPath, 'node_modules', 'npm');
 
-  get(DIST_URL).json(function (err, res) {
+  get(NODE_DIST_URL).json(function (err, res1) {
     if (err) return callback(err);
+    var releases = res1.body;
 
-    var installVersion = res.body['dist-tags'][maximumVersion ? 'latest-' + maximumVersion : 'latest'];
-    var downloadPath = DIST_URL + '/-/npm-' + installVersion + '.tgz';
-    var cachePath = path.join(options.cacheDirectory, path.basename(downloadPath));
-    conditionalCache(downloadPath, cachePath, function (err) {
+    var found = releases.find(function (record) {
+      return record.version === version.version;
+    });
+    var npm = (found ? found.npm : null) || NPM_MIN_VERSION;
+    var maximumVersion = +npm.split('.')[0];
+
+    get(NPM_DIST_URL).json(function (err, res2) {
       if (err) return callback(err);
-      conditionalExtract(cachePath, installPath, callback);
+      var distTags = res2.body['dist-tags'];
+
+      var installVersion = distTags['latest-' + maximumVersion] || distTags.latest;
+      var downloadPath = NPM_DIST_URL + '/-/npm-' + installVersion + '.tgz';
+      var cachePath = path.join(options.cacheDirectory, path.basename(downloadPath));
+      conditionalCache(downloadPath, cachePath, function (err) {
+        if (err) return callback(err);
+        conditionalExtract(cachePath, installPath, callback);
+      });
     });
   });
 };

package/lib/installNode/installCompressed.js

@@ -1,4 +1,6 @@
 var path = require('path');
+var access = require('fs-access-compat');
+var rimraf = require('rimraf');
 
 var conditionalCache = require('../conditionalCache');
 var conditionalExtract = require('../conditionalExtract');
@@ -10,9 +12,20 @@ module.exports = function installCompressed(relativePath, dest, record, options,
 
   conditionalCache(downloadPath, cachePath, function (err) {
     if (err) return callback(err);
-    conditionalExtract(cachePath, dest, Object.assign({ strip: 1, progress: progress, time: 1000 }, options), function (err) {
-      console.log('');
-      callback(err);
+    access(dest, function (err) {
+      if (!err) return callback(); // already exists
+      conditionalExtract(cachePath, dest, Object.assign({ strip: 1, progress: progress, time: 1000 }, options), function (err) {
+        console.log('');
+        if (err) return callback(err);
+
+        // some compressed versions of node come with npm pre-installed, but we want to override with a specific version
+        var platform = options.platform || process.platform;
+        var libPath = platform === 'win32' ? dest : path.join(dest, 'lib');
+        var installPath = path.join(libPath, 'node_modules', 'npm');
+        rimraf(installPath, function () {
+          callback(err);
+        });
+      });
     });
   });
 };

package/lib/installNode/installExe.js

@@ -1,8 +1,8 @@
 var path = require('path');
+var access = require('fs-access-compat');
 
 var conditionalCache = require('../conditionalCache');
 var copyFile = require('../copyFile');
-var access = require('fs-access-compat');
 
 module.exports = function installExe(relativePath, dest, record, options, callback) {
   var downloadPath = options.downloadURL(relativePath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-install-release",
-  "version": "0.4.1",
+  "version": "0.4.4",
   "description": "Cross-platform solution for installing releases of Node.js",
   "keywords": [
     "node",
@@ -44,7 +44,6 @@
     "isarray": "^2.0.5",
     "lodash.find": "^4.6.0",
     "lodash.keys": "^4.2.0",
-    "match-semver": "^0.1.1",
     "mkpath": "^1.0.0",
     "node-filename-to-dist-paths": "^0.2.1",
     "node-resolve-versions": "^0.3.9",

package/lib/installNPM/npmVersions.js

@@ -1,8 +0,0 @@
-module.exports = [
-  { gte: '10.0.0', bundled: '6.14.4' },
-  { gte: '8.0.0', lt: '10.0.0', bundled: '6.13.4' },
-  { gte: '6.0.0', lt: '8.0.0', bundled: '3.10.10' },
-  { gte: '4.0.0', lt: '6.0.0', bundled: '2.15.11', maximum: 5 },
-  { gte: '0.12.0', lt: '4.0.0', bundled: '2.15.11', maximum: 3 },
-  { lt: '0.12.0', bundled: '1.2.30', maximum: 3 },
-];