Skip to content

Commit e7ac7aa

Browse files
PatrickJScaitp
authored andcommitted
chore(Gruntfile.js, package.json): use load-grunt-tasks and move grunt-contrib-jshint into devDependencies
Closes angular#6085
1 parent 37781ed commit e7ac7aa

File tree

2 files changed

+14
-24
lines changed

2 files changed

+14
-24
lines changed

Gruntfile.js

+2-12
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,8 @@ var path = require('path');
44

55
module.exports = function(grunt) {
66
//grunt plugins
7-
grunt.loadNpmTasks('grunt-bump');
8-
grunt.loadNpmTasks('grunt-contrib-clean');
9-
grunt.loadNpmTasks('grunt-contrib-connect');
10-
grunt.loadNpmTasks('grunt-contrib-compress');
11-
grunt.loadNpmTasks('grunt-contrib-copy');
12-
grunt.loadNpmTasks('grunt-contrib-jshint');
13-
grunt.loadNpmTasks('grunt-ddescribe-iit');
14-
grunt.loadNpmTasks('grunt-jasmine-node');
15-
grunt.loadNpmTasks("grunt-jscs-checker");
16-
grunt.loadNpmTasks('grunt-merge-conflict');
17-
grunt.loadNpmTasks('grunt-parallel');
18-
grunt.loadNpmTasks('grunt-shell');
7+
require('load-grunt-tasks')(grunt);
8+
199
grunt.loadTasks('lib/grunt');
2010

2111
var NG_VERSION = util.getVersion();

package.json

+12-12
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,20 @@
99
},
1010
"devDependencies": {
1111
"grunt": "~0.4.2",
12-
"bower": "~1.2.2",
1312
"grunt-bump": "~0.0.13",
1413
"grunt-contrib-clean": "~0.5.0",
15-
"grunt-contrib-compress": "~0.5.2",
1614
"grunt-contrib-connect": "~0.5.0",
15+
"grunt-contrib-compress": "~0.5.2",
1716
"grunt-contrib-copy": "~0.4.1",
17+
"grunt-contrib-jshint": "~0.7.2",
18+
"grunt-ddescribe-iit": "~0.0.1",
19+
"grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
20+
"grunt-jscs-checker": "~0.3.2",
21+
"grunt-merge-conflict": "~0.0.1",
22+
"grunt-parallel": "~0.3.1",
23+
"grunt-shell": "~0.4.0",
24+
"load-grunt-tasks": "~0.3.0",
25+
"bower": "~1.2.2",
1826
"jasmine-node": "~1.11.0",
1927
"q": "~0.9.2",
2028
"q-io": "~1.10.6",
@@ -33,24 +41,16 @@
3341
"yaml-js": "~0.0.8",
3442
"marked": "0.2.9",
3543
"rewire": "1.1.3",
36-
"grunt-jasmine-node": "git://github.com/vojtajina/grunt-jasmine-node.git#fix-grunt-exit-code",
37-
"grunt-parallel": "~0.3.1",
38-
"grunt-ddescribe-iit": "~0.0.1",
39-
"grunt-merge-conflict": "~0.0.1",
4044
"promises-aplus-tests": "~1.3.2",
41-
"grunt-shell": "~0.4.0",
4245
"semver": "~2.1.0",
4346
"lodash": "~2.1.0",
44-
"browserstacktunnel-wrapper": "~1.1.1",
45-
"grunt-jscs-checker": "~0.3.2"
47+
"browserstacktunnel-wrapper": "~1.1.1"
4648
},
4749
"licenses": [
4850
{
4951
"type": "MIT",
5052
"url": "https://github.com/angular/angular.js/blob/master/LICENSE"
5153
}
5254
],
53-
"dependencies": {
54-
"grunt-contrib-jshint": "~0.7.2"
55-
}
55+
"dependencies": {}
5656
}

0 commit comments

Comments
 (0)