X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=f35d3b2296b720c6795bd5a5fec1e1f47e982bc3;hb=fd5c3b5817167ef59342aaca17ac6bfe44e5a719;hp=946b6522f42dd0b184029246793e7500be4436c0;hpb=ff9f2fa33719753ff0c708f9b4a84c57593b9e58;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 946b6522f4..f35d3b2296 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,32 +1,43 @@
-/*jshint node:true */
+/* eslint-env node */
+
 module.exports = function ( grunt ) {
-	grunt.loadNpmTasks( 'grunt-contrib-copy' );
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-	grunt.loadNpmTasks( 'grunt-contrib-watch' );
-	grunt.loadNpmTasks( 'grunt-banana-checker' );
-	grunt.loadNpmTasks( 'grunt-jscs' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
-	grunt.loadNpmTasks( 'grunt-karma' );
 
 	var wgServer = process.env.MW_SERVER,
 		wgScriptPath = process.env.MW_SCRIPT_PATH,
 		karmaProxy = {};
 
+	grunt.loadNpmTasks( 'grunt-banana-checker' );
+	grunt.loadNpmTasks( 'grunt-contrib-copy' );
+	grunt.loadNpmTasks( 'grunt-contrib-watch' );
+	grunt.loadNpmTasks( 'grunt-eslint' );
+	grunt.loadNpmTasks( 'grunt-jsonlint' );
+	grunt.loadNpmTasks( 'grunt-karma' );
+	grunt.loadNpmTasks( 'grunt-stylelint' );
+
 	karmaProxy[ wgScriptPath ] = wgServer + wgScriptPath;
 
 	grunt.initConfig( {
-		jshint: {
-			options: {
-				jshintrc: true
-			},
-			all: '.'
-		},
-		jscs: {
-			all: '.'
+		eslint: {
+			all: [
+				'**/*.js',
+				'!docs/**',
+				'!tests/**',
+				'!extensions/**',
+				'!node_modules/**',
+				'!resources/lib/**',
+				'!resources/src/jquery.tipsy/**',
+				'!resources/src/jquery/jquery.farbtastic.js',
+				'!resources/src/mediawiki.libs/**',
+				'!skins/**',
+				'!vendor/**',
+				// Skip functions aren't even parseable
+				'!resources/src/dom-level2-skip.js',
+				'!resources/src/es5-skip.js',
+				'!resources/src/mediawiki.hidpi-skip.js'
+			]
 		},
 		jsonlint: {
 			all: [
-				'.jscsrc',
 				'**/*.json',
 				'!{docs/js,extensions,node_modules,skins,vendor}/**'
 			]
@@ -39,9 +50,15 @@ module.exports = function ( grunt ) {
 			api: 'includes/api/i18n/',
 			installer: 'includes/installer/i18n/'
 		},
+		stylelint: {
+			options: {
+				syntax: 'less'
+			},
+			src: '{resources/src/*,mw-config/**}/*.{css,less}'
+		},
 		watch: {
 			files: [
-				'.js*',
+				'.{stylelintrc,eslintrc.json}',
 				'**/*',
 				'!{docs,extensions,node_modules,skins,vendor}/**'
 			],
@@ -56,8 +73,9 @@ module.exports = function ( grunt ) {
 					included: true,
 					served: false
 				} ],
+				logLevel: 'DEBUG',
 				frameworks: [ 'qunit' ],
-				reporters: [ 'dots' ],
+				reporters: [ 'progress' ],
 				singleRun: true,
 				autoWatch: false,
 				// Some tests in extensions don't yield for more than the default 10s (T89075)
@@ -95,7 +113,7 @@ module.exports = function ( grunt ) {
 		return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
 	} );
 
-	grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'lint', [ 'eslint', 'banana', 'stylelint' ] );
 	grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
 
 	grunt.registerTask( 'test', [ 'lint' ] );