For parity with modern Core/Gutenberg code, set one-var to "never"

Author: kadamwhite

.eslintrc

@@ -3,5 +3,8 @@
         "es6": true,
         "node": true
     },
-    "extends": "plugin:@wordpress/eslint-plugin/recommended"
+    "extends": "plugin:@wordpress/eslint-plugin/recommended",
+    "rules": {
+        "one-var": ["error", "never"]
+    }
 }

lib/trac.js

@@ -1,5 +1,5 @@
-const url = require( 'url' ),
-	grunt = require( 'grunt' );
+const url = require( 'url' );
+const grunt = require( 'grunt' );
 
 module.exports = {
 	convertToRaw( parsedUrl ) {

tasks/patch_wordpress.js

@@ -137,10 +137,10 @@ module.exports = function( grunt ) {
 	}
 
 	function getPatchFromTicket( patchUrl, options ) {
-		let matches,
-			longMatches,
-			matchUrl,
-			possiblePatches;
+		let matches;
+		let longMatches;
+		let matchUrl;
+		let possiblePatches;
 
 		grunt.log.debug( 'getPatchFromTicket: ' + patchUrl );
 		request( patchUrl, function( error, response, body ) {
@@ -185,9 +185,9 @@ module.exports = function( grunt ) {
 	}
 
 	function getLocalPatch( patchUrl ) {
-		const body = grunt.file.read( patchUrl ),
-			level = patch.isAb( body ) ? 1 : 0,
-			moveToSrc = patch.moveToSrc( body );
+		const body = grunt.file.read( patchUrl );
+		const level = patch.isAb( body ) ? 1 : 0;
+		const moveToSrc = patch.moveToSrc( body );
 
 		grunt.file.copy( patchUrl, tempFile );
 		grunt.event.emit( 'fileReady', level, moveToSrc );

test/patch_wordpress_test.js

@@ -1,10 +1,10 @@
 'use strict';
 
-const grunt = require( 'grunt' ),
-	patch = require( '../lib/patch.js' ),
-	url = require( 'url' ),
-	trac = require( '../lib/trac.js' ),
-	mapOldToNewFilePath = require( '../lib/map_old_to_new_file_path.js' );
+const grunt = require( 'grunt' );
+const patch = require( '../lib/patch.js' );
+const url = require( 'url' );
+const trac = require( '../lib/trac.js' );
+const mapOldToNewFilePath = require( '../lib/map_old_to_new_file_path.js' );
 
 describe( 'grunt_patch_wordpress', function() {
 	describe( 'sanity checks', function() {

test/patches.js

@@ -1,19 +1,19 @@
-const grunt = require( 'grunt' ),
-	patch = require( '../lib/patch.js' ),
-	coreGit = grunt.file.read( 'test/fixtures/core.git.diff' ),
-	coreSvn = grunt.file.read( 'test/fixtures/core.svn.diff' ),
-	developGit = grunt.file.read( 'test/fixtures/develop.git.diff' ),
-	developSvn = grunt.file.read( 'test/fixtures/develop.svn.diff' ),
-	coreIndexGit = grunt.file.read( 'test/fixtures/core.git.index.diff' ),
-	coreIndexSvn = grunt.file.read( 'test/fixtures/core.svn.index.diff' ),
-	developIndexGit = grunt.file.read( 'test/fixtures/develop.git.index.diff' ),
-	developIndexSvn = grunt.file.read( 'test/fixtures/develop.svn.index.diff' ),
-	developSampleGit = grunt.file.read( 'test/fixtures/develop.git.wp-config-sample.diff' ),
-	developSampleSvn = grunt.file.read( 'test/fixtures/develop.svn.wp-config-sample.diff' ),
-	testsSvn = grunt.file.read( 'test/fixtures/tests.develop.svn.diff' ),
-	testsGit = grunt.file.read( 'test/fixtures/tests.develop.git.diff' ),
-	abyes = grunt.file.read( 'test/fixtures/git.diff.ab.diff' ),
-	coreTrunkSvn = grunt.file.read( 'test/fixtures/core.svn.trunk.diff' );
+const grunt = require( 'grunt' );
+const patch = require( '../lib/patch.js' );
+const coreGit = grunt.file.read( 'test/fixtures/core.git.diff' );
+const coreSvn = grunt.file.read( 'test/fixtures/core.svn.diff' );
+const developGit = grunt.file.read( 'test/fixtures/develop.git.diff' );
+const developSvn = grunt.file.read( 'test/fixtures/develop.svn.diff' );
+const coreIndexGit = grunt.file.read( 'test/fixtures/core.git.index.diff' );
+const coreIndexSvn = grunt.file.read( 'test/fixtures/core.svn.index.diff' );
+const developIndexGit = grunt.file.read( 'test/fixtures/develop.git.index.diff' );
+const developIndexSvn = grunt.file.read( 'test/fixtures/develop.svn.index.diff' );
+const developSampleGit = grunt.file.read( 'test/fixtures/develop.git.wp-config-sample.diff' );
+const developSampleSvn = grunt.file.read( 'test/fixtures/develop.svn.wp-config-sample.diff' );
+const testsSvn = grunt.file.read( 'test/fixtures/tests.develop.svn.diff' );
+const testsGit = grunt.file.read( 'test/fixtures/tests.develop.git.diff' );
+const abyes = grunt.file.read( 'test/fixtures/git.diff.ab.diff' );
+const coreTrunkSvn = grunt.file.read( 'test/fixtures/core.svn.trunk.diff' );
 
 describe( 'Patch helpers', function() {
 	it( 'git a/b diffs should not automatticaly trigger moving to src', function() {