Skip to content

Commit

Permalink
Merge pull request #973 from AlmogBaku/mean-grunt-rename
Browse files Browse the repository at this point in the history
change to use grunt-hook instead (npm package renamed)
  • Loading branch information
liorkesos committed Dec 18, 2014
2 parents 81c0cf7 + 8e81ba5 commit 41d02eb
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,18 @@ module.exports = function(grunt) {
/**
* Default Task
*/
grunt.mean.push('clean', -9999);
grunt.mean.push('concurrent', 9999);
grunt.hook.push('clean', -9999);
grunt.hook.push('concurrent', 9999);
if (process.env.NODE_ENV === 'production') {
grunt.mean.push('cssmin', 100);
grunt.mean.push('uglify', 200);
grunt.hook.push('cssmin', 100);
grunt.hook.push('uglify', 200);
} else {
grunt.mean.push('jshint', -200);
grunt.mean.push('csslint', 100);
grunt.hook.push('jshint', -200);
grunt.hook.push('csslint', 100);
}

//Default task.
grunt.registerTask('default', ['mean']);
grunt.registerTask('default', ['hook']);

//Test task.
grunt.registerTask('test', ['env:test', 'mochaTest', 'karma:unit']);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"forever": "^0.11.1",
"gridfs-stream": "^0.5.1",
"grunt-cli": "^0.1.13",
"grunt-mean": "~0.2.1",
"grunt-hook": "~0.3.0",
"grunt-concurrent": "^1.0.0",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-csslint": "^0.3.1",
Expand Down
14 changes: 7 additions & 7 deletions tools/grunt/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,18 @@ module.exports = function(grunt) {
/**
* Default Task
*/
grunt.mean.push('clean', -9999);
grunt.mean.push('concurrent', 9999);
grunt.hook.push('clean', -9999);
grunt.hook.push('concurrent', 9999);
if (process.env.NODE_ENV === 'production') {
grunt.mean.push('cssmin', 100);
grunt.mean.push('uglify', 200);
grunt.hook.push('cssmin', 100);
grunt.hook.push('uglify', 200);
} else {
grunt.mean.push('jshint', -200);
grunt.mean.push('csslint', 100);
grunt.hook.push('jshint', -200);
grunt.hook.push('csslint', 100);
}

//Default task.
grunt.registerTask('default', ['mean']);
grunt.registerTask('default', ['hook']);

//Test task.
grunt.registerTask('test', ['env:test', 'mochaTest', 'karma:unit']);
Expand Down
2 changes: 1 addition & 1 deletion tools/grunt/grunt.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"grunt-cli": "^0.1.13",
"grunt-mean": "~0.2.1",
"grunt-hook": "~0.3.0",
"grunt-concurrent": "^1.0.0",
"grunt-contrib-clean": "^0.6.0",
"grunt-contrib-csslint": "^0.3.1",
Expand Down

0 comments on commit 41d02eb

Please sign in to comment.