jenkins-bot has submitted this change and it was merged.

Change subject: Recurse into sub folders for jshint and jscs
......................................................................


Recurse into sub folders for jshint and jscs

Change-Id: I3799151bc4cf30f7bcb4bea2f860da9310959444
---
M .jshintignore
M Gruntfile.js
2 files changed, 13 insertions(+), 6 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.jshintignore b/.jshintignore
index f1f4c6a..2698b38 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,2 +1,4 @@
 tests/externals/
 modules/hooks.txt
+node_modules/
+vendor/
diff --git a/Gruntfile.js b/Gruntfile.js
index 4d28c5e..3466614 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,16 +10,21 @@
        grunt.initConfig( {
                jshint: {
                        options: {
-                               jshintrc: true
+                               jshintrc: true,
+                               ignores: [
+                                       'tests/externals/**'
+                               ]
                        },
                        all: [
-                               '*.js',
-                               'modules/**/*.js',
-                               'tests/qunit/**/*.js'
+                               '**/*.js',
+                               '!node_modules/**'
                        ]
                },
                jscs: {
-                       src: '<%= jshint.all %>'
+                       src: [
+                               '<%= jshint.all %>',
+                               '!tests/externals/**'
+                       ]
                },
                csslint: {
                        options: {
@@ -46,7 +51,7 @@
                }
        } );
 
-       grunt.registerTask( 'lint', [ 'jscs', 'jshint', 'csslint', 'jsonlint', 
'banana' ] );
+       grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint', 
'banana' ] );
        grunt.registerTask( 'test', 'lint' );
        grunt.registerTask( 'default', 'test' );
 };

-- 
To view, visit https://gerrit.wikimedia.org/r/250186
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3799151bc4cf30f7bcb4bea2f860da9310959444
Gerrit-PatchSet: 15
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to