jquery · mgol · Jun 16, 2016 · markelog · Jun 17, 2016 · thomaswelton
diff --git a/.jshintignore → .eslintignore b/.jshintignore → .eslintignore
@@ -1,4 +1,6 @@
 external
+node_modules
+*.min.js
 test/data/jquery-1.9.1.js
 test/data/badcall.js
 test/data/badjson.js

diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,7 @@
+{
+	"extends": "eslint-config-jquery",
+	"root": true,
+	"env": {
+		"node": true
+	}
+}
diff --git a/.gitignore b/.gitignore
@@ -10,7 +10,10 @@
 
 npm-debug.log
 
-/dist
+# Ignore everything in dist folder except for eslint config
+/dist/*
+!/dist/.eslintrc
+
 /node_modules
 
 /test/node_smoke_tests/lib/ensure_iterability.js
diff --git a/.jscsrc b/.jscsrc
diff --git a/.jshintrc b/.jshintrc
diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,5 @@
-.jshintignore
-.jshintrc
+.eslintignore
+.eslintrc
 
 /.editorconfig
 /.gitattributes

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,7 +14,6 @@ module.exports = function( grunt ) {
 
 	var fs = require( "fs" ),
 		gzip = require( "gzip-js" ),
-		srcHintOptions = readOptionalJSON( "src/.jshintrc" ),
 
 		// Skip jsdom-related tests in Node.js 0.10 & 0.12
 		runJsdomTests = !/^v0/.test( process.version );
@@ -103,34 +102,15 @@ module.exports = function( grunt ) {
 				src: [ "package.json" ]
 			}
 		},
-		jshint: {
-			all: {
-				src: [
-					"src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js"
-				],
-				options: {
-					jshintrc: true
-				}
+		eslint: {
+			options: {
+
+				// See https://github.com/sindresorhus/grunt-eslint/issues/119
+				quiet: true
 			},
-			dist: {
-				src: "dist/jquery.js",
-				options: srcHintOptions
-			}
-		},
-		jscs: {
-			src: "src",
-			gruntfile: "Gruntfile.js",
-
-			// Check parts of tests that pass
-			test: [
-				"test/data/testrunner.js",
-				"test/unit/animation.js",
-				"test/unit/basic.js",
-				"test/unit/support.js",
-				"test/unit/tween.js",
-				"test/unit/wrap.js"
-			],
-			build: "build"
+			all: ".",
+			dist: "dist/jquery.js",
+			dev: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ]
 		},
 		testswarm: {
 			tests: [
@@ -164,7 +144,7 @@ module.exports = function( grunt ) {
 			]
 		},
 		watch: {
-			files: [ "<%= jshint.all.src %>" ],
+			files: [ "<%= eslint.dev %>" ],
 			tasks: [ "dev" ]
 		},
 		uglify: {
@@ -201,7 +181,7 @@ module.exports = function( grunt ) {
 	// Integrate jQuery specific tasks
 	grunt.loadTasks( "build/tasks" );
 
-	grunt.registerTask( "lint", [ "jsonlint", "jshint", "jscs" ] );
+	grunt.registerTask( "lint", [ "jsonlint", "eslint:all" ] );
 
 	// Don't run Node-related tests in Node.js < 1.0.0 as they require an old
 	// jsdom version that needs compiling, making it harder for people to compile
@@ -213,9 +193,16 @@ module.exports = function( grunt ) {
 	) );
 
 	// Short list as a high frequency watch task
-	grunt.registerTask( "dev", [ "build:*:*", "lint", "uglify", "remove_map_comment", "dist:*" ] );
-
-	grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] );
-
-	grunt.registerTask( "precommit_lint", [ "newer:jsonlint", "newer:jshint:all", "newer:jscs" ] );
+	grunt.registerTask( "dev", [
+			"build:*:*",
+			"newer:eslint:dev",
+			"uglify",
+			"remove_map_comment",
+			"dist:*"
+		]
+	);
+
+	grunt.registerTask( "default", [ "dev", "eslint:dist", "test_fast", "compare_size" ] );
+
+	grunt.registerTask( "precommit_lint", [ "newer:jsonlint", "newer:eslint:all" ] );
 };
diff --git a/build/release.js b/build/release.js
@@ -21,13 +21,15 @@ module.exports = function( Release ) {
 	Release.define( {
 		npmPublish: true,
 		issueTracker: "github",
+
 		/**
 		 * Ensure the repo is in a proper state before release
 		 * @param {Function} callback
 		 */
 		checkRepoState: function( callback ) {
 			ensureSizzle( Release, callback );
 		},
+
 		/**
 		 * Set the version in the src folder for distributing AMD
 		 */
@@ -37,6 +39,7 @@ module.exports = function( Release ) {
 			contents = contents.replace( /@VERSION/g, Release.newVersion );
 			fs.writeFileSync( corePath, contents, "utf8" );
 		},
+
 		/**
 		 * Generates any release artifacts that should be included in the release.
 		 * The callback must be invoked with an array of files that should be
@@ -54,6 +57,7 @@ module.exports = function( Release ) {
 			Release._setSrcVersion();
 			callback( files );
 		},
+
 		/**
 		 * Acts as insertion point for restoring Release.dir.repo
 		 * It was changed to reuse npm publish code in jquery-release
@@ -65,6 +69,7 @@ module.exports = function( Release ) {
 			Release.dir.repo = Release.dir.origRepo || Release.dir.repo;
 			return npmTags();
 		},
+
 		/**
 		 * Publish to distribution repo and npm
 		 * @param {Function} callback

diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -38,7 +38,7 @@ module.exports = function( grunt ) {
 			// Avoid breaking semicolons inserted by r.js
 			skipSemiColonInsertion: true,
 			wrap: {
-				start: wrapper[ 0 ].replace( /\/\*jshint .* \*\/\n/, "" ),
+				start: wrapper[ 0 ].replace( /\/\*eslint .* \*\/\n/, "" ),
 				end: globals.replace(
 					/\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
 					""
@@ -64,7 +64,12 @@ module.exports = function( grunt ) {
 		// Convert var modules
 		if ( /.\/var\//.test( path.replace( process.cwd(), "" ) ) ) {
 			contents = contents
-				.replace( /define\([\w\W]*?return/, "var " + ( /var\/([\w-]+)/.exec( name )[ 1 ] ) + " =" )
+				.replace(
+					/define\([\w\W]*?return/,
+					"var " +
+					( /var\/([\w-]+)/.exec( name )[ 1 ] ) +
+					" ="
+				)
 				.replace( rdefineEnd, "" );
 
 		// Sizzle treatment
@@ -130,6 +135,7 @@ module.exports = function( grunt ) {
 			excluded = [],
 			included = [],
 			version = grunt.config( "pkg.version" ),
+
 			/**
 			 * Recursively calls the excluder to remove on all modules in the list
 			 * @param {Array} list
@@ -167,6 +173,7 @@ module.exports = function( grunt ) {
 					} );
 				}
 			},
+
 			/**
 			 * Adds the specified module to the excluded or included list, depending on the flag
 			 * @param {String} flag A module path relative to

diff --git a/build/tasks/lib/spawn_test.js b/build/tasks/lib/spawn_test.js
@@ -1,5 +1,3 @@
-/* jshint node: true */
-
 "use strict";
 
 // Run Node with provided parameters: the first one being the Grunt
@@ -13,4 +11,4 @@ module.exports = function spawnTest( done ) {
 		.on( "close", function( code ) {
 			done( code === 0 );
 		} );
-} ;
+};
diff --git a/build/tasks/promises_aplus_tests.js b/build/tasks/promises_aplus_tests.js
@@ -5,19 +5,19 @@ module.exports = function( grunt ) {
 	var spawnTest = require( "./lib/spawn_test.js" );
 
 	grunt.registerTask( "promises_aplus_tests",
-		[ "promises_aplus_tests_deferred", "promises_aplus_tests_when" ] );
+		[ "promises_aplus_tests:deferred", "promises_aplus_tests:when" ] );
 
-	grunt.registerTask( "promises_aplus_tests_deferred", function() {
+	grunt.registerTask( "promises_aplus_tests:deferred", function() {
 		spawnTest( this.async(),
 			"./node_modules/.bin/promises-aplus-tests",
-			"test/promises_aplus_adapter_deferred.js"
+			"test/promises_aplus_adapters/deferred.js"
 		);
 	} );
 
-	grunt.registerTask( "promises_aplus_tests_when", function() {
+	grunt.registerTask( "promises_aplus_tests:when", function() {
 		spawnTest( this.async(),
 			"./node_modules/.bin/promises-aplus-tests",
-			"test/promises_aplus_adapter_when.js"
+			"test/promises_aplus_adapters/when.js"
 		);
 	} );
 };
diff --git a/dist/.eslintrc b/dist/.eslintrc
@@ -0,0 +1,17 @@
+{
+	"extends": "../src/.eslintrc",
+	"rules": {
+		// That is okay for built version
+		"no-multiple-empty-lines": "off",
+
+		// Because sizze is not compatible to jquery code style
+		"lines-around-comment": "off",
+		"space-in-parens": "off",
+		"camelcase": "off",
+		"computed-property-spacing": "off",
+		"max-len": "off",
+		"dot-notation": "off",
+		"semi-spacing": "off",
+		"brace-style": "off"
+	}
+}