Merge bc699e4 into 61d725b

mooeypoo · Oct 3, 2019 · 80a9cfe · 80a9cfe
2 parents 61d725b + bc699e4
commit 80a9cfe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 23 deletions.
diff --git a/templates/.gitignore.twig b/templates/.gitignore.twig
@@ -0,0 +1 @@
+.eslintcache
diff --git a/templates/Gruntfile.js.twig b/templates/Gruntfile.js.twig
@@ -4,38 +4,29 @@ module.exports = function ( grunt ) {
 	var conf = grunt.file.readJSON( 'extension.json' );
 	grunt.loadNpmTasks( 'grunt-banana-checker' );
 	grunt.loadNpmTasks( 'grunt-eslint' );
-	grunt.loadNpmTasks( 'grunt-jsonlint' );
 	grunt.loadNpmTasks( 'grunt-stylelint' );
 
 	grunt.initConfig( {
 		eslint: {
 			options: {
-				reportUnusedDisableDirectives: true
+				reportUnusedDisableDirectives: true,
+				extensions: [ '.js', '.json' ],
+				cache: true
 			},
 			all: [
-				'*.js',
-				'modules/**/*.js'
+				'*.{js,json}',
+				'modules/**/*.{js,json}'
 			]
 		},
 		stylelint: {
-			options: {
-				syntax: 'less'
-			},
 			all: [
 				'*.{css,less}',
 				'modules/**/*.{css,less}'
 			]
 		},
-		banana: conf.MessagesDirs,
-		jsonlint: {
-			all: [
-				'*.json',
-				'**/*.json',
-				'!node_modules/**'
-			]
-		}
+		banana: conf.MessagesDirs
 	} );
 
-	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'test', [ 'eslint', 'stylelint', 'banana' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/templates/package.json.twig b/templates/package.json.twig
@@ -2,12 +2,11 @@
   "name": "{{ name }}",
   "version": "{{ version }}",
   "devDependencies": {
-    "eslint-config-wikimedia": "0.9.0",
-    "grunt": "1.0.3",
-    "grunt-banana-checker": "0.6.0",
-    "grunt-eslint": "21.0.0",
-    "grunt-jsonlint": "1.1.0",
-    "grunt-stylelint": "0.10.1",
-    "stylelint-config-wikimedia": "0.5.0"
+    "eslint-config-wikimedia": "0.14.3",
+    "grunt": "1.0.4",
+    "grunt-banana-checker": "0.8.1",
+    "grunt-eslint": "22.0.0",
+    "grunt-stylelint": "0.11.1",
+    "stylelint-config-wikimedia": "0.6.0"
   }
 }