update node and npm versions to latest LTS

adobe · May 16, 2016 · ef2613d · ef2613d
1 parent 0894803
commit ef2613d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -84,8 +84,8 @@ module.exports = function (grunt) {
             },
             "node-win": {
                 "dest"      : "<%= downloads %>",
-                "src"       : ["http://nodejs.org/dist/v<%= node.version %>/node.exe",
-                               "http://nodejs.org/dist/npm/npm-<%= npm.version %>.zip"]
+                "src"       : ["http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe",
+                               "http://registry.npmjs.org/npm/-/npm-<%= npm.version %>.tgz"]
             }
         },
         "clean": {
@@ -227,10 +227,10 @@ module.exports = function (grunt) {
             "version"       : "3.2623.1397"
         },
         "node": {
-            "version"       : "0.10.24"
+            "version"       : "4.2.3"
         },
         "npm": {
-            "version"       : "1.2.11"
+            "version"       : "2.14.15"
         }
     });
 

diff --git a/package.json b/package.json
@@ -18,10 +18,12 @@
         "grunt-contrib-copy": "0.5.0",
         "grunt-contrib-clean": "0.4.0",
         "guid": "0.0.10",
+        "gunzip-maybe": "^1.2.1",
         "grunt-curl": "2.0.2",
         "grunt-shell": "0.2.1",
         "q": "0.9.2",
-        "semver": "^4.1.0"
+        "semver": "^4.1.0",
+        "tar-fs": "^1.8.1"
     },
     "scripts": {
         "preinstall": "bash -c 'mv appshell.gyp .appshell.gyp'",

diff --git a/tasks/setup.js b/tasks/setup.js
@@ -27,6 +27,8 @@ module.exports = function (grunt) {
 
     var common          = require("./common")(grunt),
         fs              = require("fs"),
+        gunzip          = require("gunzip-maybe"),
+        tar             = require("tar-fs"),
         child_process   = require("child_process"),
         path            = require("path"),
         q               = require("q"),
@@ -386,13 +388,17 @@ module.exports = function (grunt) {
         grunt.file.copy(exeFile,  "deps/node/node.exe");
 
         // unzip NPM
-        unzip(npmFile, "deps/node").then(function () {
-            nodeWriteVersion();
-            done();
-        }, function (err) {
-            grunt.log.error(err);
-            done(false);
-        });
+        fs.createReadStream(npmFile)
+            .pipe(gunzip())
+            .pipe(tar.extract("deps/node"))
+            .on("error", function (err) {
+                grunt.log.error(err);
+                done(false);
+            })
+            .on("finish", function () {
+                nodeWriteVersion();
+                done();
+            });
     });
 
     // task: node-mac