Lint both PHP and JS during the pre-commit

Gruntfile.js

@@ -1,4 +1,5 @@
-/* jshint es3: false, esversion: 5, node: true */
+/* eslint-env es6, node */
+/* eslint camelcase: warn, comma-dangle: off */
 
 const ignoreParse = require( 'parse-gitignore' );
 const exec = require( 'child_process' ).exec;
@@ -21,9 +22,9 @@ module.exports = function( grunt ) {
 	// Get a list of all the files and directories to exclude from the distribution.
 	const releaseFiles = ignoreParse( '.distignore', {
 		invert: true,
-	} );
+	});
 
-	grunt.initConfig( {
+	grunt.initConfig({
 		pkg: grunt.file.readJSON( 'package.json' ),
 
 		dist_dir: 'dist',
@@ -86,23 +87,23 @@ module.exports = function( grunt ) {
 			trunk: {
 				options: Object.assign( deployConfig, {
 					deploy_tag: false,
-				} )
+				})
 			}
 		},
-	} );
+	});
 
 	grunt.registerTask( 'check-diff', function() {
 		const done = this.async(); // This won't work with the ES6 fat arrow syntax.
 
-		exec( 'git diff HEAD --quiet', (err) => {
+		exec( 'git diff HEAD --quiet', ( err ) => {
 			if ( err ) {
 				grunt.log.error( 'Found uncommited changes in your current working directory.' );
-				done(false);
+				done( false );
 			}
 
 			done();
-		} );
-	} );
+		});
+	});
 
 	grunt.registerTask(
 		'build', [

assets/js/admin.js

@@ -1,13 +1,13 @@
-jQuery(document).ready(function($){
+jQuery( document ).ready( function( $ ) {
 
-	$('input[data-toggle-on]').each(function(){
-		var target = $(this).data('toggle-on');
+	$( 'input[data-toggle-on]' ).each( function() {
+		var target = $( this ).data( 'toggle-on' );
 
-		$(target).toggle( ! $(this).is(':checked') );
+		$( target ).toggle( ! $( this ).is( ':checked' ) );
 
-		$(this).on('change', function() {
-			$(target).toggle( ! $(this).is(':checked') );
+		$( this ).on( 'change', function() {
+			$( target ).toggle( ! $( this ).is( ':checked' ) );
 		});
 	});
 
-});
+});

assets/js/controls.js

@@ -3,21 +3,21 @@
 		return;
 	}
 
-	var trackAnalyticsEvent = function( eventCategory, eventAction, eventTitle ) {
+	function trackAnalyticsEvent( eventCategory, eventAction, eventTitle ) {
 		if ( 'function' === typeof ga ) { // Universal Google Analytics is available
 			ga( 'send', 'event', eventCategory, eventAction, eventTitle );
 		} else if ( 'undefined' !== typeof _gaq ) { // Classic Google Analytics is available
-			_gaq.push( [ '_trackEvent', eventCategory, eventAction, eventTitle ] );
+			_gaq.push([ '_trackEvent', eventCategory, eventAction, eventTitle ]);
 		}
 		if ( 'undefined' !== typeof _paq ) { // Matomo (formerly Piwik) is available
 			_paq.push([ 'trackEvent', eventCategory, eventAction, eventTitle ]);
 		}
 	};
 
-	var formEventEnabled = function( formId, eventName ) {
+	function trackAnalyticsEvent( formId, eventName ) {
 		formId = parseInt( formId );
 
-		if ( ! formId || ! window.cf7_extras.events[ eventName ] ) {
+		if ( ! formId || ! window.cf7_extras.events[ eventName ]) {
 			return false;
 		}
 
@@ -28,49 +28,57 @@
 		return false;
 	};
 
-	var getFormConfig = function( formId ) {
+	function getFormConfig( formId ) {
 		formId = parseInt( formId );
 
-		if ( window.cf7_extras.forms && window.cf7_extras.forms[ formId ] ) {
+		if ( window.cf7_extras.forms && window.cf7_extras.forms[ formId ]) {
 			return window.cf7_extras.forms[ formId ];
 		}
 
 		return false;
-	}
+	};
 
 	$( document ).on( 'wpcf7:mailsent', function( event, form ) {
+		var formConfig;
+
 		if ( form.contactFormId && formEventEnabled( form.contactFormId, 'track-ga' ) ) {
-			var formConfig = getFormConfig( form.contactFormId );
+			formConfig = getFormConfig( form.contactFormId );
 			trackAnalyticsEvent( 'Contact Form', 'Sent', formConfig.title );
 		}
-	} );
+	});
 
 	$( document ).on( 'wpcf7:mailfailed', function( event, form ) {
+		var formConfig;
+
 		if ( form.contactFormId && formEventEnabled( form.contactFormId, 'track-ga' ) ) {
-			var formConfig = getFormConfig( form.contactFormId );
+			formConfig = getFormConfig( form.contactFormId );
 			trackAnalyticsEvent( 'Contact Form', 'Error', formConfig.title );
 		}
-	} );
+	});
 
 	$( document ).on( 'wpcf7:spam', function( event, form ) {
+		var formConfig;
+
 		if ( form.contactFormId && formEventEnabled( form.contactFormId, 'track-ga' ) ) {
-			var formConfig = getFormConfig( form.contactFormId );
+			formConfig = getFormConfig( form.contactFormId );
 			trackAnalyticsEvent( 'Contact Form', 'Spam', formConfig.title );
 		}
-	} );
+	});
 
 	$( document ).on( 'wpcf7:submit', function( event, form ) {
+		var formConfig;
+
 		if ( form.contactFormId && formEventEnabled( form.contactFormId, 'track-ga' ) ) {
-			var formConfig = getFormConfig( form.contactFormId );
+			formConfig = getFormConfig( form.contactFormId );
 			trackAnalyticsEvent( 'Contact Form', 'Submit', formConfig.title );
 		}
 
 		if ( form.contactFormId && 'mail_sent' === form.status && formEventEnabled( form.contactFormId, 'redirect-success' ) ) {
-			var formConfig = getFormConfig( form.contactFormId );
+			formConfig = getFormConfig( form.contactFormId );
 
 			if ( formConfig.redirect_url ) {
 				window.location = formConfig.redirect_url;
 			}
 		}
-	} );
-} )( jQuery );
+	});
+}( jQuery ) );

package.json

@@ -41,7 +41,7 @@
   },
   "husky": {
     "hooks": {
-      "pre-commit": "composer lint"
+      "pre-commit": "npm run lint && composer lint"
     }
   }
 }