Permalink
Browse files

Build: Simplify Gruntfile constructions

Fixes gh-3246
  • Loading branch information...
1 parent 9c90be9 commit 308e4b534b8b8bddff85b6327481d0cee6f70a2a @markelog markelog committed Jul 25, 2016
Showing with 41 additions and 31 deletions.
  1. +2 −2 .gitignore
  2. +1 −1 .npmignore
  3. +35 −25 Gruntfile.js
  4. +1 −1 dist/.eslintrc
  5. +2 −2 package.json
View
@@ -8,11 +8,11 @@
.bower.json
.sizecache.json
-npm-debug.log
+npm-debug.log*
# Ignore everything in dist folder except for eslint config
/dist/*
-!/dist/.eslintrc
+!/dist/.eslintrc.json
/node_modules
View
@@ -1,5 +1,5 @@
.eslintignore
-.eslintrc
+.eslintrc.json
/.editorconfig
/.gitattributes
View
@@ -113,8 +113,15 @@ module.exports = function( grunt ) {
// See https://github.com/sindresorhus/grunt-eslint/issues/119
quiet: true
},
- dist: "dist/jquery.js",
- dev: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ]
+
+ // We have to explicitly declare "src" property otherwise "newer"
+ // task wouldn't work properly :/
+ dist: {
+ src: "dist/jquery.js"
+ },
+ dev: {
+ src: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ]
+ }
},
testswarm: {
tests: [
@@ -148,7 +155,7 @@ module.exports = function( grunt ) {
]
},
watch: {
- files: [ "<%= eslint.dev %>" ],
+ files: [ "<%= eslint.dev.src %>" ],
tasks: [ "dev" ]
},
uglify: {
@@ -196,36 +203,39 @@ module.exports = function( grunt ) {
grunt.registerTask( "lint", [
"jsonlint",
- runIfNewNode( "eslint:dev" ),
- runIfNewNode( "eslint:dist" )
+ runIfNewNode( "eslint" )
] );
- grunt.registerTask( "test_fast", [ runIfNewNode( "node_smoke_tests" ) ] );
+ grunt.registerTask( "lint:newer", [
+ "newer:jsonlint",
+ runIfNewNode( "newer:eslint" )
+ ] );
- grunt.registerTask( "test", [ "test_fast" ].concat(
- [ runIfNewNode( "promises_aplus_tests" ) ]
- ) );
+ grunt.registerTask( "test:fast", runIfNewNode( "node_smoke_tests" ) );
+ grunt.registerTask( "test:slow", runIfNewNode( "promises_aplus_tests" ) );
+
+ grunt.registerTask( "test", [
+ "test:fast",
+ "test:slow"
+ ] );
- // Short list as a high frequency watch task
grunt.registerTask( "dev", [
- "build:*:*",
- runIfNewNode( "newer:eslint:dev" ),
- "uglify",
- "remove_map_comment",
- "dist:*"
- ]
- );
+ "build:*:*",
+ runIfNewNode( "newer:eslint:dev" ),
+ "newer:uglify",
+ "remove_map_comment",
+ "dist:*",
+ "compare_size"
+ ] );
grunt.registerTask( "default", [
- "dev",
+ runIfNewNode( "eslint:dev" ),
+ "build:*:*",
+ "uglify",
+ "remove_map_comment",
+ "dist:*",
runIfNewNode( "eslint:dist" ),
- "test_fast",
+ "test:fast",
"compare_size"
] );
-
- grunt.registerTask( "precommit_lint", [
- "newer:jsonlint",
- runIfNewNode( "newer:eslint:dev" ),
- runIfNewNode( "newer:eslint:dist" )
- ] );
};
View
@@ -1,7 +1,7 @@
{
"extends": "../src/.eslintrc",
"rules": {
- // That is okay for built version
+ // That is okay for the built version
"no-multiple-empty-lines": "off",
// Because sizze is not compatible to jquery code style
View
@@ -60,8 +60,8 @@
"scripts": {
"build": "npm install && grunt",
"start": "grunt watch",
- "test": "grunt && grunt test",
- "precommit": "grunt precommit_lint",
+ "test": "grunt && grunt test:slow",
+ "precommit": "grunt lint:newer",
"commitmsg": "node node_modules/commitplease"
},
"commitplease": {

0 comments on commit 308e4b5

Please sign in to comment.