Skip to content

Commit

Permalink
Merge pull request #422 from marionettejs/sjs/update-node-12
Browse files Browse the repository at this point in the history
Update to node 12 and fix dep issues
  • Loading branch information
samccone committed Oct 20, 2015
2 parents dc0f6cf + b44a98b commit 7e52eb5
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ marionettejs.com

To prep your repo, all you need to do is run our `setup` script.

As of Feb 2015, this repo doesn't work with Node v0.12.0. You'll want to use Node v0.10.16.

npm run setup

After that, development should be easy! Use our `dev` task to get everything up and running:
Expand Down
1 change: 0 additions & 1 deletion gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ module.exports = function(grunt) {
compress: true,
mangle: false,
preserveComments: false,
screwIE8: true,
sourceMap: false
},
dist: {
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@
"autoprefixer-core": "4.0.2",
"bluebird": "2.1.3",
"dox": "0.6.1",
"gitty": "samccone/gitty",
"gitty": "3.2.3",
"grunt": "0.4.5",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-concat": "0.5.0",
"grunt-contrib-connect": "0.9.0",
"grunt-contrib-copy": "0.5.0",
"grunt-contrib-imagemin": "0.9.4",
"grunt-contrib-jade": "0.12.0",
"grunt-contrib-uglify": "^0.8.0",
"grunt-contrib-uglify": "^0.9.0",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-watch": "0.6.1",
"grunt-critical": "^0.1.2",
"grunt-jscs": "^1.5.0",
"grunt-lintspaces": "^0.6.0",
"grunt-notify": "0.4.1",
"grunt-postcss": "0.2.0",
"grunt-sass": "0.17.0",
"grunt-sass": "^1.0.0",
"grunt-svgstore": "0.5.0",
"handlebars": "2.0.0",
"highlight.js": "8.2.0",
Expand Down
17 changes: 10 additions & 7 deletions tasks/utils/gitty-cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ module.exports = {
return this.sortedTags;
}

return repo.tagsAsync()
.then(sortTags)
.then(function(tags){
this.sortedTags = tags;
return this.sortedTags;
}.bind(this));
return new Promise(function(res, rej) {
repo.getTags(function(err, v) {
res(sortTags(v));
});
})
.then(function(tags){
this.sortedTags = tags;
return this.sortedTags;
}.bind(this));
});
},
getReleaseTag: function(repo) {
Expand All @@ -40,4 +43,4 @@ module.exports = {
setReleaseTag: function(tag) {
this.releaseTag = tag;
}
}
}

0 comments on commit 7e52eb5

Please sign in to comment.