X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=Gruntfile.js;h=4cc9721857c37fdfcc9afad2d93db6d05870c015;hb=4f79b0d11fc5503f64352fcb6cf2602686fbf34c;hp=a08db5c780ad06ba46602e9a3fddedffb0da1b13;hpb=57eaa2bf04ce1b48bd89c10defe4de5b7d31f047;p=lhc%2Fweb%2Fwiklou.git

diff --git a/Gruntfile.js b/Gruntfile.js
index a08db5c780..4cc9721857 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,33 +1,47 @@
-/*jshint node:true */
+/* eslint-env node */
+
 module.exports = function ( grunt ) {
-	grunt.loadNpmTasks( 'grunt-contrib-copy' );
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
-	grunt.loadNpmTasks( 'grunt-stylelint' );
-	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 ] = {
+		target: wgServer + wgScriptPath,
+		changeOrigin: true
+	};
 
 	grunt.initConfig( {
-		jshint: {
-			options: {
-				jshintrc: true
-			},
-			all: '.'
-		},
-		jscs: {
-			all: '.'
+		eslint: {
+			all: [
+				'**/*.js',
+				'!docs/**',
+				'!tests/**',
+				'!node_modules/**',
+				'!resources/lib/**',
+				'!resources/src/jquery.tipsy/**',
+				'!resources/src/jquery/jquery.farbtastic.js',
+				'!resources/src/mediawiki.libs/**',
+				'!vendor/**',
+				// Explicitly say "**/*.js" here in case of symlinks
+				'!extensions/**/*.js',
+				'!skins/**/*.js',
+				// 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}/**'
 			]
@@ -48,7 +62,7 @@ module.exports = function ( grunt ) {
 		},
 		watch: {
 			files: [
-				'.{stylelintrc,jscsrc,jshintignore,jshintrc}',
+				'.{stylelintrc,eslintrc.json}',
 				'**/*',
 				'!{docs,extensions,node_modules,skins,vendor}/**'
 			],
@@ -74,6 +88,9 @@ module.exports = function ( grunt ) {
 			main: {
 				browsers: [ 'Chrome' ]
 			},
+			chromium: {
+				browsers: [ 'Chromium' ]
+			},
 			more: {
 				browsers: [ 'Chrome', 'Firefox' ]
 			}
@@ -103,7 +120,7 @@ module.exports = function ( grunt ) {
 		return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
 	} );
 
-	grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana', 'stylelint' ] );
+	grunt.registerTask( 'lint', [ 'eslint', 'banana', 'stylelint' ] );
 	grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
 
 	grunt.registerTask( 'test', [ 'lint' ] );