Skip to content
This repository was archived by the owner on Sep 2, 2021. It is now read-only.

update shell node version to 6.3.1 #543

Merged
ficristo merged 6 commits into from
Sep 3, 2016
Merged

update shell node version to 6.3.1 #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d1519c
update node and npm versions to latest LTS
zaggino Dec 14, 2015
52133aa
remove npm
zaggino May 17, 2016
8e7ed7b
fix incorrect reference
zaggino May 17, 2016
ec0e60c
update to latest node
zaggino Aug 2, 2016
652cec0
put nodeWriteVersion back
zaggino Aug 3, 2016
c2cb017
support downloading 64-bit nodejs
zaggino Aug 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Copy Markdown
Contributor

@nethip nethip Sep 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might want to leave the mac node to be 32 bit, as our native node extensions are still 32 bit and they would not load on 64 bit node.

Copy link
Copy Markdown
Contributor Author

@zaggino zaggino Sep 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which native node extensions are you talking about?

Copy link
Copy Markdown
Contributor Author

@zaggino zaggino Sep 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Node doesn't have 32-bit builds for Mac anymore:
image

Copy link
Copy Markdown
Contributor

@nethip nethip Sep 2, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. Now that we have moved to Chokidar, I don't think we will have any references to native node extensions. I was referring to this library which we were using earlier for file watching.

https://github.com/adobe/brackets/tree/release/src/filesystem/impls/appshell/node/node_modules/fsevents

I think then it should be fine to go with 64 bit.

},
/* win */
"cef-win": {
Expand All @@ -84,8 +84,9 @@ 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" : 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": {
Expand Down Expand Up @@ -227,10 +228,7 @@ module.exports = function (grunt) {
"version" : "3.2623.1397"
},
"node": {
"version" : "0.10.24"
},
"npm": {
"version" : "1.2.11"
"version" : "6.3.1"
}
});

Expand Down
15 changes: 3 additions & 12 deletions tasks/setup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,24 +375,15 @@ module.exports = function (grunt) {
// requires node to set "nodeSrc" in config
grunt.task.requires(["node"]);

var done = this.async(),
nodeDest = grunt.config("nodeDest"),
exeFile = nodeDest[0],
npmFile = nodeDest[1];
var nodeDest = grunt.config("nodeDest"),
exeFile = nodeDest;

grunt.file.mkdir("deps/node");

// copy node.exe to Brackets-node
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);
});
nodeWriteVersion();
});

// task: node-mac
Expand Down
⚡