From 5d1519c54595f2403e5013cd64f5f67810d3f421 Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Mon, 14 Dec 2015 15:51:47 +1100 Subject: [PATCH 1/6] update node and npm versions to latest LTS --- Gruntfile.js | 8 ++++---- package.json | 4 +++- tasks/setup.js | 20 +++++++++++++------- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index e3fb67bf7..d8ebed864 100644 --- 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 index 10457e496..8238a0603 100644 --- 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 index 54c156622..7bcb858d8 100644 --- 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 From 52133aafe1e08e2a8ebf38a36bcbacef14ae4fe3 Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Tue, 17 May 2016 10:01:42 +1000 Subject: [PATCH 2/6] remove npm --- Gruntfile.js | 7 +++---- package.json | 4 +--- tasks/setup.js | 15 --------------- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d8ebed864..4bcaa50d8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -84,8 +84,7 @@ module.exports = function (grunt) { }, "node-win": { "dest" : "<%= downloads %>", - "src" : ["http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe", - "http://registry.npmjs.org/npm/-/npm-<%= npm.version %>.tgz"] + "src" : "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe" } }, "clean": { @@ -227,10 +226,10 @@ module.exports = function (grunt) { "version" : "3.2623.1397" }, "node": { - "version" : "4.2.3" + "version" : "4.4.4" }, "npm": { - "version" : "2.14.15" + "version" : "2.15.6" } }); diff --git a/package.json b/package.json index 8238a0603..10457e496 100644 --- a/package.json +++ b/package.json @@ -18,12 +18,10 @@ "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", - "tar-fs": "^1.8.1" + "semver": "^4.1.0" }, "scripts": { "preinstall": "bash -c 'mv appshell.gyp .appshell.gyp'", diff --git a/tasks/setup.js b/tasks/setup.js index 7bcb858d8..8a4a7993a 100644 --- a/tasks/setup.js +++ b/tasks/setup.js @@ -27,8 +27,6 @@ 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,19 +384,6 @@ module.exports = function (grunt) { // copy node.exe to Brackets-node grunt.file.copy(exeFile, "deps/node/node.exe"); - - // unzip NPM - 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 From 8e7ed7bb38709cd5d43d6153ed09d62f2722beeb Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Tue, 17 May 2016 10:04:04 +1000 Subject: [PATCH 3/6] fix incorrect reference --- tasks/setup.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/setup.js b/tasks/setup.js index 8a4a7993a..52406984a 100644 --- a/tasks/setup.js +++ b/tasks/setup.js @@ -377,8 +377,7 @@ module.exports = function (grunt) { var done = this.async(), nodeDest = grunt.config("nodeDest"), - exeFile = nodeDest[0], - npmFile = nodeDest[1]; + exeFile = nodeDest; grunt.file.mkdir("deps/node"); From ec0e60cddbbf5b1032e72bf8e0b65bfad5a2d8e8 Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Wed, 3 Aug 2016 09:59:11 +1000 Subject: [PATCH 4/6] update to latest node --- Gruntfile.js | 7 ++----- tasks/setup.js | 3 +-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 4bcaa50d8..cd3280857 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -71,7 +71,7 @@ module.exports = function (grunt) { }, "node-mac": { "dest" : "<%= downloads %>", - "src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x86.tar.gz" + "src" : "http://nodejs.org/dist/v<%= node.version %>/node-v<%= node.version %>-darwin-x64.tar.gz" }, /* win */ "cef-win": { @@ -226,10 +226,7 @@ module.exports = function (grunt) { "version" : "3.2623.1397" }, "node": { - "version" : "4.4.4" - }, - "npm": { - "version" : "2.15.6" + "version" : "6.3.1" } }); diff --git a/tasks/setup.js b/tasks/setup.js index 52406984a..f8844a31b 100644 --- a/tasks/setup.js +++ b/tasks/setup.js @@ -375,8 +375,7 @@ module.exports = function (grunt) { // requires node to set "nodeSrc" in config grunt.task.requires(["node"]); - var done = this.async(), - nodeDest = grunt.config("nodeDest"), + var nodeDest = grunt.config("nodeDest"), exeFile = nodeDest; grunt.file.mkdir("deps/node"); From 652cec03cb7e1467a4bbdf9fa99730b2e8f68f8c Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Wed, 3 Aug 2016 16:32:12 +1000 Subject: [PATCH 5/6] put nodeWriteVersion back --- tasks/setup.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/setup.js b/tasks/setup.js index f8844a31b..b16ceb2fe 100644 --- a/tasks/setup.js +++ b/tasks/setup.js @@ -382,6 +382,8 @@ module.exports = function (grunt) { // copy node.exe to Brackets-node grunt.file.copy(exeFile, "deps/node/node.exe"); + + nodeWriteVersion(); }); // task: node-mac From c2cb017c3c9d2375467fbbbf4050dddbf92cf0ab Mon Sep 17 00:00:00 2001 From: Martin Zagora Date: Sat, 6 Aug 2016 15:29:40 +1000 Subject: [PATCH 6/6] support downloading 64-bit nodejs --- Gruntfile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gruntfile.js b/Gruntfile.js index cd3280857..ce3fea580 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -84,7 +84,9 @@ module.exports = function (grunt) { }, "node-win": { "dest" : "<%= downloads %>", - "src" : "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe" + "src" : process.arch === "x64" ? + "http://nodejs.org/dist/v<%= node.version %>/win-x64/node.exe" : + "http://nodejs.org/dist/v<%= node.version %>/win-x86/node.exe" } }, "clean": {