Build: Updating the master version to 3.1.1-pre.

Build: More ESLint related changes
Build: Don't use ESLint 3.x
Since it is not supported by older node versions :/
jquery · Timmy Willison · markelog · markelog · mgol · mgol
diff --git a/.eslintrc → .eslintrc.json b/.eslintrc → .eslintrc.json
diff --git a/.gitignore b/.gitignore
@@ -8,11 +8,11 @@
 .bower.json
 .sizecache.json
 
-npm-debug.log
+npm-debug.log*
 
 # Ignore everything in dist folder except for eslint config
 /dist/*
-!/dist/.eslintrc
+!/dist/.eslintrc.json
 
 /node_modules
 
diff --git a/.mailmap b/.mailmap
@@ -86,8 +86,10 @@ Scott Jehl <scottjehl@gmail.com> <scott@scottjehl.com>
 Sebastian Burkhard <sebi.burkhard@gmail.com>
 Senya Pugach <upisfree@outlook.com>
 Thomas Tortorini <thomastortorini@gmail.com> Mr21
-Timmy Willison <timmywillisn@gmail.com>
-Timmy Willison <timmywillisn@gmail.com> <tim.willison@thisismedium.com>
+Timmy Willison <4timmywil@gmail.com>
+Timmy Willison <4timmywil@gmail.com> <timmywillisn@gmail.com>
+Timmy Willison <4timmywil@gmail.com> <tim.willison@thisismedium.com>
+Timmy Willison <4timmywil@gmail.com> <timmywil@users.noreply.github.com>
 Timo Tijhof <krinklemail@gmail.com>
 TJ Holowaychuk <tj@vision-media.ca>
 Tom H Fuertes <tomfuertes@gmail.com>
diff --git a/.npmignore b/.npmignore
@@ -1,5 +1,5 @@
 .eslintignore
-.eslintrc
+.eslintrc.json
 
 /.editorconfig
 /.gitattributes
diff --git a/AUTHORS.txt b/AUTHORS.txt
@@ -77,7 +77,7 @@ Jared Grippe <jared@deadlyicon.com>
 Sylvester Keil <sylvester@keil.or.at>
 Brandon Sterne <bsterne@mozilla.com>
 Mathias Bynens <mathias@qiwi.be>
-Timmy Willison <timmywillisn@gmail.com>
+Timmy Willison <4timmywil@gmail.com>
 Corey Frang <gnarf37@gmail.com>
 Digitalxero <digitalxero>
 Anton Kovalyov <anton@kovalyov.net>
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -14,9 +14,14 @@ module.exports = function( grunt ) {
 
 	var fs = require( "fs" ),
 		gzip = require( "gzip-js" ),
+		oldNode = /^v0\./.test( process.version );
 
-		// Skip jsdom-related tests in Node.js 0.10 & 0.12
-		runJsdomTests = !/^v0/.test( process.version );
+	// Support: Node.js <4
+	// Skip running tasks that dropped support for Node.js 0.10 & 0.12
+	// in those Node versions.
+	function runIfNewNode( task ) {
+		return oldNode ? "print_old_node_message:" + task : task;
+	}
 
 	if ( !grunt.option( "filename" ) ) {
 		grunt.option( "filename", "jquery.js" );
@@ -108,9 +113,15 @@ module.exports = function( grunt ) {
 				// See https://github.com/sindresorhus/grunt-eslint/issues/119
 				quiet: true
 			},
-			all: ".",
-			dist: "dist/jquery.js",
-			dev: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ]
+
+			// We have to explicitly declare "src" property otherwise "newer"
+			// task wouldn't work properly :/
+			dist: {
+				src: "dist/jquery.js"
+			},
+			dev: {
+				src: [ "src/**/*.js", "Gruntfile.js", "test/**/*.js", "build/**/*.js" ]
+			}
 		},
 		testswarm: {
 			tests: [
@@ -144,7 +155,7 @@ module.exports = function( grunt ) {
 			]
 		},
 		watch: {
-			files: [ "<%= eslint.dev %>" ],
+			files: [ "<%= eslint.dev.src %>" ],
 			tasks: [ "dev" ]
 		},
 		uglify: {
@@ -176,33 +187,55 @@ module.exports = function( grunt ) {
 	} );
 
 	// Load grunt tasks from NPM packages
-	require( "load-grunt-tasks" )( grunt );
+	// Support: Node.js <4
+	// Don't load the eslint task in old Node.js, it won't parse.
+	require( "load-grunt-tasks" )( grunt, {
+		pattern: oldNode ? [ "grunt-*", "!grunt-eslint" ] : [ "grunt-*" ]
+	} );
 
 	// Integrate jQuery specific tasks
 	grunt.loadTasks( "build/tasks" );
 
-	grunt.registerTask( "lint", [ "jsonlint", "eslint:all" ] );
+	grunt.registerTask( "print_old_node_message", function() {
+		var task = [].slice.call( arguments ).join( ":" );
+		grunt.log.writeln( "Old Node.js detected, running the task \"" + task + "\" skipped..." );
+	} );
 
-	// 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
-	// jQuery on Windows. (see gh-2519)
-	grunt.registerTask( "test_fast", runJsdomTests ? [ "node_smoke_tests" ] : [] );
+	grunt.registerTask( "lint", [
+		"jsonlint",
+		runIfNewNode( "eslint" )
+	] );
 
-	grunt.registerTask( "test", [ "test_fast" ].concat(
-		runJsdomTests ? [ "promises_aplus_tests" ] : []
-	) );
+	grunt.registerTask( "lint:newer", [
+		"newer:jsonlint",
+		runIfNewNode( "newer:eslint" )
+	] );
 
-	// Short list as a high frequency watch task
-	grunt.registerTask( "dev", [
-			"build:*:*",
-			"newer:eslint:dev",
-			"uglify",
-			"remove_map_comment",
-			"dist:*"
-		]
-	);
+	grunt.registerTask( "test:fast", runIfNewNode( "node_smoke_tests" ) );
+	grunt.registerTask( "test:slow", runIfNewNode( "promises_aplus_tests" ) );
 
-	grunt.registerTask( "default", [ "dev", "eslint:dist", "test_fast", "compare_size" ] );
+	grunt.registerTask( "test", [
+		"test:fast",
+		"test:slow"
+	] );
 
-	grunt.registerTask( "precommit_lint", [ "newer:jsonlint", "newer:eslint:all" ] );
+	grunt.registerTask( "dev", [
+		"build:*:*",
+		runIfNewNode( "newer:eslint:dev" ),
+		"newer:uglify",
+		"remove_map_comment",
+		"dist:*",
+		"compare_size"
+	] );
+
+	grunt.registerTask( "default", [
+		runIfNewNode( "eslint:dev" ),
+		"build:*:*",
+		"uglify",
+		"remove_map_comment",
+		"dist:*",
+		runIfNewNode( "eslint:dist" ),
+		"test:fast",
+		"compare_size"
+	] );
 };
diff --git a/build/release/cdn.js b/build/release/cdn.js
@@ -40,11 +40,12 @@ function makeReleaseCopies( Release ) {
 
 			// Map files need to reference the new uncompressed name;
 			// assume that all files reside in the same directory.
-			// "file":"jquery.min.js","sources":["jquery.js"]
+			// "file":"jquery.min.js" ... "sources":["jquery.js"]
 			text = fs.readFileSync( builtFile, "utf8" )
-				.replace( /"file":"([^"]+)","sources":\["([^"]+)"\]/,
-					"\"file\":\"" + unpathedFile.replace( /\.min\.map/, ".min.js" ) +
-					"\",\"sources\":[\"" + unpathedFile.replace( /\.min\.map/, ".js" ) + "\"]" );
+				.replace( /"file":"([^"]+)"/,
+					"\"file\":\"" + unpathedFile.replace( /\.min\.map/, ".min.js\"" ) )
+				.replace( /"sources":\["([^"]+)"\]/,
+					"\"sources\":[\"" + unpathedFile.replace( /\.min\.map/, ".js" ) + "\"]" );
 			fs.writeFileSync( releaseFile, text );
 		} else if ( builtFile !== releaseFile ) {
 			shell.cp( "-f", builtFile, releaseFile );
diff --git a/build/release/dist.js b/build/release/dist.js
@@ -94,17 +94,18 @@ module.exports = function( Release, files, complete ) {
 		fs.writeFileSync( Release.dir.dist + "/bower.json", generateBower() );
 
 		console.log( "Adding files to dist..." );
-		Release.exec( "git add .", "Error adding files." );
+
+		Release.exec( "git add -A", "Error adding files." );
 		Release.exec(
-			"git commit -m 'Release " + Release.newVersion + "'",
+			"git commit -m \"Release " + Release.newVersion + "\"",
 			"Error committing files."
 		);
 		console.log();
 
 		console.log( "Tagging release on dist..." );
 		Release.exec( "git tag " + Release.newVersion,
 			"Error tagging " + Release.newVersion + " on dist repo." );
-		Release.tagTime = Release.exec( "git log -1 --format='%ad'",
+		Release.tagTime = Release.exec( "git log -1 --format=\"%ad\"",
 			"Error getting tag timestamp." ).trim();
 	}
 
diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -17,7 +17,6 @@ module.exports = function( grunt ) {
 		read = function( fileName ) {
 			return grunt.file.read( srcFolder + fileName );
 		},
-		globals = read( "exports/global.js" ),
 		wrapper = read( "wrapper.js" ).split( /\/\/ \@CODE\n\/\/[^\n]+/ ),
 		config = {
 			baseUrl: "src",
@@ -38,11 +37,8 @@ module.exports = function( grunt ) {
 			// Avoid breaking semicolons inserted by r.js
 			skipSemiColonInsertion: true,
 			wrap: {
-				start: wrapper[ 0 ].replace( /\/\*eslint .* \*\/\n/, "" ),
-				end: globals.replace(
-					/\/\*\s*ExcludeStart\s*\*\/[\w\W]*?\/\*\s*ExcludeEnd\s*\*\//ig,
-					""
-				) + wrapper[ 1 ]
+				start: wrapper[ 0 ].replace( /\/\*\s*eslint(?: |-).*\s*\*\/\n/, "" ),
+				end: wrapper[ 1 ]
 			},
 			rawText: {},
 			onBuildWrite: convert
diff --git a/dist/.eslintrc → dist/.eslintrc.json b/dist/.eslintrc → dist/.eslintrc.json
@@ -1,10 +1,12 @@
 {
-	"extends": "../src/.eslintrc",
+	"extends": "../src/.eslintrc.json",
 	"rules": {
-		// That is okay for built version
+		// That is okay for the built version
 		"no-multiple-empty-lines": "off",
 
 		// Because sizze is not compatible to jquery code style
+		"no-nested-ternary": "off",
+		"no-unused-expressions": "off",
 		"lines-around-comment": "off",
 		"space-in-parens": "off",
 		"camelcase": "off",