X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=b38bc9adfcd81eadf64232a364c6fcc570f5a7f0;hb=c0fb8a883633f110a8083a164672e8334714d450;hp=868fa4a20570f0c1665426c9b71163072170914f;hpb=6b1a173f07f1a04188735f4688ce6335da14c3b7;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index 868fa4a205..b38bc9adfc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,65 +1,67 @@
-/*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 = {};
 
-	karmaProxy[wgScriptPath] = wgServer + wgScriptPath;
+	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
-			},
+		eslint: {
 			all: [
-				'*.js',
-				'{includes,languages,resources,tests}/**/*.js'
+				'**/*.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/json-skip.js',
+				'!resources/src/mediawiki.hidpi-skip.js'
 			]
 		},
-		jscs: {
-			all: [
-				'<%= jshint.all %>',
-				// Auto-generated file with JSON (double quotes)
-				'!tests/qunit/data/mediawiki.jqueryMsg.data.js',
-				// Skip functions are stored as script files but wrapped in a function when
-				// executed. node-jscs trips on the would-be "Illegal return statement".
-				'!resources/src/*-skip.js'
-
-			// Exclude all files ignored by jshint
-			].concat( grunt.file.read( '.jshintignore' ).split( '\n' ).reduce( function ( patterns, pattern ) {
-				// Filter out empty lines
-				if ( pattern.length && pattern[0] !== '#' ) {
-					patterns.push( '!' + pattern );
-				}
-				return patterns;
-			}, [] ) )
-		},
 		jsonlint: {
 			all: [
-				'.jscsrc',
-				'{languages,maintenance,resources}/**/*.json',
-				'package.json'
+				'**/*.json',
+				'!{docs/js,extensions,node_modules,skins,vendor}/**'
 			]
 		},
 		banana: {
+			options: {
+				disallowBlankTranslations: false
+			},
 			core: 'languages/i18n/',
 			api: 'includes/api/i18n/',
 			installer: 'includes/installer/i18n/'
 		},
+		stylelint: {
+			options: {
+				syntax: 'less'
+			},
+			src: '{resources/src/*,mw-config/**}/*.{css,less}'
+		},
 		watch: {
 			files: [
-				'<%= jscs.all %>',
-				'<%= jsonlint.all %>',
-				'.jshintignore',
-				'.jshintrc'
+				'.{stylelintrc,eslintrc.json}',
+				'**/*',
+				'!{docs,extensions,node_modules,skins,vendor}/**'
 			],
 			tasks: 'test'
 		},
@@ -72,8 +74,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)
@@ -106,14 +109,14 @@ module.exports = function ( grunt ) {
 		}
 		if ( !process.env.MW_SCRIPT_PATH ) {
 			grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' +
-				'Set this like $wgScriptPath, e.g. "/w"');
+				'Set this like $wgScriptPath, e.g. "/w"' );
 		}
 		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'] );
+	grunt.registerTask( 'test', [ 'lint' ] );
 	grunt.registerTask( 'default', 'test' );
 };