admin/jasmine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #521 from robinboehm/load-grunt-tasks

Browse Source 
use load-grunt-tasks
This commit is contained in:
Sheel Choksi
2014-02-16 14:53:07 -08:00
parent 7cf899a4ea 2fc2802809
commit a937d8d74f
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@@ -10,10 +10,7 @@ module.exports = function(grunt) {
compress: require('./grunt/config/compress.js') compress: require('./grunt/config/compress.js')
}); });
grunt.loadNpmTasks('grunt-contrib-jshint'); require('load-grunt-tasks')(grunt);
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-compass');
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadTasks('grunt/tasks'); grunt.loadTasks('grunt/tasks');
@@ -37,7 +34,6 @@ module.exports = function(grunt) {
] ]
); );
var spec = require('./grunt/tasks/spec.js'); var spec = require('./grunt/tasks/spec.js');
grunt.registerTask("execSpecsInNode", grunt.registerTask("execSpecsInNode",

1
package.json
View File

@@ -18,6 +18,7 @@
"grunt-contrib-concat": "~0.3.0", "grunt-contrib-concat": "~0.3.0",
"grunt-contrib-compass": "~0.6.0", "grunt-contrib-compass": "~0.6.0",
"grunt-contrib-compress": "~0.5.2", "grunt-contrib-compress": "~0.5.2",
"load-grunt-tasks": "0.3.0",
"shelljs": "~0.1.4" "shelljs": "~0.1.4"
} }
} }