Merge branch 'jsfmt' into next

This commit is contained in:
Leo Horie 2015-01-19 22:59:53 -05:00
commit 15721a089e
2 changed files with 12 additions and 0 deletions

View file

@ -184,6 +184,16 @@ module.exports = function(grunt) {
clean: {
options: {force: true},
generated: [tempFolder]
},
jsfmt: {
default: {
files: [{
expand: true,
src: ['mithril.js'],
cwd: '.',
dest: '.'
}]
}
}
});
@ -198,6 +208,7 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-saucelabs');
grunt.loadNpmTasks('grunt-jsfmt');
grunt.registerTask("build", ["test", "uglify", "zip", "md2html", "replace", "copy", "clean"]);
grunt.registerTask("testall", ["test", "teste2e"]);

View file

@ -20,6 +20,7 @@
"grunt-replace": "*",
"grunt-contrib-qunit": "*",
"grunt-zip": "*",
"grunt-jsfmt": "git://github.com/ysimonson/grunt-jsfmt",
"grunt-contrib-connect": "~0.7.1",
"grunt-contrib-jshint": "~0.10.0",