aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js19
-rw-r--r--package.json3
2 files changed, 14 insertions, 8 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index ef5e18421..b0cf75ce3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -73,7 +73,14 @@ module.exports = function( grunt ) {
]
}
},
-
+ jsonlint: {
+ pkg: {
+ src: [ "package.json" ]
+ },
+ bower: {
+ src: [ "bower.json" ]
+ }
+ },
jshint: {
dist: {
src: [ "dist/jquery.js" ],
@@ -92,16 +99,13 @@ module.exports = function( grunt ) {
}
}
},
-
testswarm: {
tests: "ajax attributes callbacks core css data deferred dimensions effects event manipulation offset queue selector serialize support traversing Sizzle".split(" ")
},
-
watch: {
files: [ "<%= jshint.grunt.src %>", "<%= jshint.tests.src %>", "src/**/*.js" ],
tasks: "dev"
},
-
"pre-uglify": {
all: {
files: {
@@ -578,10 +582,11 @@ module.exports = function( grunt ) {
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-contrib-jshint");
grunt.loadNpmTasks("grunt-contrib-uglify");
-
- // Default grunt
- grunt.registerTask( "default", [ "selector", "build:*:*", "jshint", "pre-uglify", "uglify", "post-uglify", "dist:*", "compare_size" ] );
+ grunt.loadNpmTasks("grunt-jsonlint");
// Short list as a high frequency watch task
grunt.registerTask( "dev", [ "selector", "build:*:*", "jshint" ] );
+
+ // Default grunt
+ grunt.registerTask( "default", [ "jsonlint", "dev", "pre-uglify", "uglify", "post-uglify", "dist:*", "compare_size" ] );
};
diff --git a/package.json b/package.json
index 01fe0df25..4d260b497 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,8 @@
"grunt-contrib-uglify": "~0.2.2",
"gzip-js": "0.3.2",
"testswarm": "~1.1.0",
- "archiver": "~0.4.6"
+ "archiver": "~0.4.6",
+ "grunt-jsonlint": "~1.0.0"
},
"keywords": []
}