Merge "build: Update linters"

.eslintignore

@@ -0,0 +1 @@
+/resources/lib/

Gruntfile.js

@@ -13,11 +13,7 @@ module.exports = function ( grunt ) {
 				cache: true,
 				fix: grunt.option( 'fix' )
 			},
-			all: [
-				'**/*.{js,json}',
-				'!resources/lib/**',
-				'!{vendor,node_modules}/**'
-			]
+			all: [ '.' ]
 		},
 		stylelint: {
 			all: [

package.json

@@ -15,9 +15,9 @@
 		"eslint-config-wikimedia": "0.25.1",
 		"grunt": "1.6.1",
 		"grunt-banana-checker": "0.11.0",
-		"grunt-eslint": "24.1.0",
-		"grunt-stylelint": "0.18.0",
-		"stylelint-config-wikimedia": "0.15.0",
+		"grunt-eslint": "24.3.0",
+		"grunt-stylelint": "0.19.0",
+		"stylelint-config-wikimedia": "0.16.1",
 		"wdio-mediawiki": "2.1.0"
 	}
 }

resources/.eslintrc.json

@@ -11,5 +11,16 @@
 	"rules": {
 		"max-len": "off",
 		"no-implicit-globals": "off"
-	}
+	},
+	"overrides": [
+		{
+			"files": [
+				"addon/edit/*.js"
+			],
+			"rules": {
+				"computed-property-spacing": [ "error", "never" ],
+				"indent": [ "error", 2 ]
+			}
+		}
+	]
 }

resources/addon/.eslintrc.json

@@ -1,11 +0,0 @@
-{
-	"root": true,
-	"extends": [
-		"wikimedia/client-es5",
-		"wikimedia/mediawiki"
-	],
-	"rules": {
-		"computed-property-spacing": [ "error", "never" ],
-		"indent": [ "error", 2 ]
-	}
-}

resources/mode/mediawiki/colorblind-colors.less

@@ -1,6 +1,3 @@
-/* stylelint-disable selector-list-comma-newline-after, block-opening-brace-newline-before,
-	block-opening-brace-newline-after, block-closing-brace-space-after */
-
 /*
  * This style sheet overrides colors in mediawiki.less
  * with more colorblind-friendly colors.
@@ -15,7 +12,9 @@
 	.cm-mw-hr,
 	.cm-mw-indenting,
 	.cm-mw-apostrophes-bold,
-	.cm-mw-apostrophes-italic { color: #e4a400; }
+	.cm-mw-apostrophes-italic {
+		color: #e4a400;
+	}
 
 	/* tags */
 	.cm-mw-exttag-name,
@@ -23,7 +22,9 @@
 	.cm-mw-exttag-attribute,
 	.cm-mw-htmltag-name,
 	.cm-mw-htmltag-bracket,
-	.cm-mw-htmltag-attribute { color: #56b4e9; }
+	.cm-mw-htmltag-attribute {
+		color: #56b4e9;
+	}
 
 	/* templates */
 	.cm-mw-template,
@@ -31,20 +32,28 @@
 	.cm-mw-template-name-mnemonic,
 	.cm-mw-template-argument-name,
 	.cm-mw-template-delimiter,
-	.cm-mw-template-bracket { color: #9c3a00; }
+	.cm-mw-template-bracket {
+		color: #9c3a00;
+	}
 
 	/* variables */
 	.cm-mw-templatevariable,
 	.cm-mw-templatevariable-name,
 	.cm-mw-templatevariable-bracket,
-	.cm-mw-templatevariable-delimiter { color: #009e73; }
+	.cm-mw-templatevariable-delimiter {
+		color: #009e73;
+	}
 
 	/* remove background colors */
 	.cm-mw-matching,
 	.cm-mw-skipformatting,
-	.cm-mw-doubleUnderscore, .cm-mw-signature, .cm-mw-hr,
+	.cm-mw-doubleUnderscore,
+	.cm-mw-signature,
+	.cm-mw-hr,
 	pre.CodeMirror-line-like.cm-mw-exttag,
-	.cm-mw-exttag, .cm-mw-tag-pre, .cm-mw-tag-nowiki,
+	.cm-mw-exttag,
+	.cm-mw-tag-pre,
+	.cm-mw-tag-nowiki,
 	.cm-mw-template2-ground,
 	.cm-mw-template3-ground,
 	.cm-mw-template-ext-ground,
@@ -74,5 +83,7 @@
 	.cm-mw-ext-link-ground,
 	.cm-mw-ext2-link-ground,
 	.cm-mw-ext3-link-ground,
-	.cm-mw-link-ground { background-color: transparent; }
+	.cm-mw-link-ground {
+		background-color: transparent;
+	}
 }

resources/mode/mediawiki/mediawiki.less

@@ -18,9 +18,14 @@
 	background-color: average( average( @template-shade, @ext-shade ), @link-shade );
 }
 
-/* stylelint-disable block-opening-brace-newline-before, block-opening-brace-newline-after,
-	block-closing-brace-space-after, declaration-block-single-line-max-declarations,
-	declaration-block-semicolon-newline-after, selector-list-comma-newline-after */
+/* stylelint-disable
+declaration-block-single-line-max-declarations,
+stylistic/block-closing-brace-space-after,
+stylistic/block-opening-brace-newline-after,
+stylistic/block-opening-brace-newline-before,
+stylistic/declaration-block-semicolon-newline-after,
+stylistic/selector-list-comma-newline-after
+*/
 
 .cm-mw-pagename { text-decoration: underline; }
 

resources/modules/ve-cm/.eslintrc.json

@@ -1,5 +1,5 @@
 {
 	"globals": {
-		"ve": false
+		"ve": "readonly"
 	}
 }

resources/modules/ve-cm/ve.ui.CodeMirror.less

@@ -15,12 +15,10 @@
 
 		// Skin specific paddings
 		.skin-vector & {
-			/* stylelint-disable-next-line unit-disallowed-list */
 			padding: 0 1rem;
 
 			@media screen and ( min-width: 982px ) {
 				.skin-vector-legacy& {
-					/* stylelint-disable-next-line unit-disallowed-list */
 					padding: 0 1.5rem;
 				}
 			}