Merge branch 'jquery:main' into master

Author: uplusware

.jshintignore .eslintignore.jshintignore renamed to .eslintignore

@@ -0,0 +1,21 @@
+{
+  "root": true,
+
+  "extends": "jquery",
+
+  // Uncomment to find useless comment disable directives
+  // "reportUnusedDisableDirectives": true,
+
+  "parserOptions": {
+    "ecmaVersion": 2018
+  },
+
+  "env": {
+    "es6": true,
+    "node": true
+  },
+
+  "rules": {
+    "strict": [ "error", "global" ]
+  }
+}

.eslintrc.json

@@ -1,8 +1,8 @@
 demos
 tests
 .editorconfig
-.jscsrc
-.jshintrc
+.eslintrc.json
+.eslintignore
 .mailmap
 .travis.yml
 Gruntfile.js

.jscsrc

@@ -1,7 +1,7 @@
-module.exports = function( grunt ) {
-
 "use strict";
 
+module.exports = function( grunt ) {
+
 var
 	glob = require( "glob" ),
 
@@ -177,33 +177,14 @@ grunt.initConfig( {
 		}
 	},
 
-	jscs: {
-		ui: {
-			options: {
-				config: true
-			},
-			files: {
-				src: [ "demos/**/*.js", "build/**/*.js", "ui/**/*.js" ]
-			}
-		},
-		tests: {
-			options: {
-				config: true,
-				maximumLineLength: null
-			},
-			files: {
-				src: [ "tests/**/*.js" ]
-			}
-		}
-	},
 	uglify: minify,
 	htmllint: {
 		good: {
 			options: {
 				ignore: [
 				/The text content of element “script” was not in the required format: Expected space, tab, newline, or slash but found “.” instead/
 			] },
-			src: glob.sync("{demos,tests}/**/*.html", {
+			src: glob.sync( "{demos,tests}/**/*.html", {
 				ignore: htmllintBad
 			} )
 		},
@@ -242,12 +223,10 @@ grunt.initConfig( {
 			}
 		}
 	},
-	jshint: {
-		options: {
-			jshintrc: true
-		},
+	eslint: {
 		all: [
-			"ui/*.js",
+			"ui/**/*.js",
+			"!ui/vendor/**/*.js",
 			"Gruntfile.js",
 			"build/**/*.js",
 			"tests/unit/**/*.js",
@@ -287,10 +266,12 @@ grunt.initConfig( {
 				"qunit/qunit.css": "qunit/qunit/qunit.css",
 				"qunit/LICENSE.txt": "qunit/LICENSE.txt",
 
-				"qunit-assert-classes/qunit-assert-classes.js": "qunit-assert-classes/qunit-assert-classes.js",
+				"qunit-assert-classes/qunit-assert-classes.js":
+					"qunit-assert-classes/qunit-assert-classes.js",
 				"qunit-assert-classes/LICENSE.txt": "qunit-assert-classes/LICENSE",
 
-				"qunit-assert-close/qunit-assert-close.js": "qunit-assert-close/qunit-assert-close.js",
+				"qunit-assert-close/qunit-assert-close.js":
+					"qunit-assert-close/qunit-assert-close.js",
 				"qunit-assert-close/MIT-LICENSE.txt": "qunit-assert-close/MIT-LICENSE.txt",
 
 				"qunit-composite/qunit-composite.js": "qunit-composite/qunit-composite.js",
@@ -305,9 +286,6 @@ grunt.initConfig( {
 				"jquery-simulate/jquery.simulate.js": "jquery-simulate/jquery.simulate.js",
 				"jquery-simulate/LICENSE.txt": "jquery-simulate/LICENSE.txt",
 
-				"jshint/jshint.js": "jshint/dist/jshint.js",
-				"jshint/LICENSE": "jshint/LICENSE",
-
 				"jquery/jquery.js": "jquery-1.x/dist/jquery.js",
 				"jquery/LICENSE.txt": "jquery-1.x/LICENSE.txt",
 
@@ -443,10 +421,12 @@ grunt.initConfig( {
 				"jquery-3.6.0/jquery.js": "jquery-3.6.0/dist/jquery.js",
 				"jquery-3.6.0/LICENSE.txt": "jquery-3.6.0/LICENSE.txt",
 
-				"jquery-migrate-1.4.1/jquery-migrate.js": "jquery-migrate-1.4.1/dist/jquery-migrate.js",
+				"jquery-migrate-1.4.1/jquery-migrate.js":
+					"jquery-migrate-1.4.1/dist/jquery-migrate.js",
 				"jquery-migrate-1.4.1/LICENSE.txt": "jquery-migrate-1.4.1/LICENSE.txt",
 
-				"jquery-migrate-3.3.2/jquery-migrate.js": "jquery-migrate-3.3.2/dist/jquery-migrate.js",
+				"jquery-migrate-3.3.2/jquery-migrate.js":
+					"jquery-migrate-3.3.2/dist/jquery-migrate.js",
 				"jquery-migrate-3.3.2/LICENSE.txt": "jquery-migrate-3.3.2/LICENSE.txt"
 			}
 		}
@@ -512,7 +492,7 @@ grunt.registerTask( "update-authors", function() {
 
 grunt.registerTask( "default", [ "lint", "requirejs", "test" ] );
 grunt.registerTask( "jenkins", [ "default", "concat" ] );
-grunt.registerTask( "lint", [ "asciilint", "jshint", "jscs", "csslint", "htmllint" ] );
+grunt.registerTask( "lint", [ "asciilint", "eslint", "csslint", "htmllint" ] );
 grunt.registerTask( "test", [ "qunit" ] );
 grunt.registerTask( "sizer", [ "requirejs:js", "uglify:main", "compare_size:all" ] );
 grunt.registerTask( "sizer_all", [ "requirejs:js", "uglify", "compare_size" ] );

.jshintrc

@@ -15,7 +15,6 @@
 		"jquery-color": "2.2.0",
 		"jquery-mousewheel": "3.1.12",
 		"jquery-simulate": "1.1.1",
-		"jshint": "2.4.4",
 		"qunit": "1.18.0",
 		"qunit-assert-classes": "1.0.2",
 		"qunit-assert-close": "JamesMGreene/qunit-assert-close#v1.1.1",

.npmignore

@@ -1,3 +1,5 @@
+"use strict";
+
 var shell = require( "shelljs" );
 var Release = {
 	define: function( props ) {

Gruntfile.js

@@ -1,3 +1,5 @@
+"use strict";
+
 module.exports = function( Release ) {
 
 var crypto = require( "crypto" );
@@ -35,7 +37,7 @@ function replaceAtVersion() {
 	return matches;
 }
 
-function removeExternals ( packager ) {
+function removeExternals( packager ) {
 	Object.keys( packager.builtFiles ).forEach( function( filepath ) {
 		if ( /^external\//.test( filepath ) ) {
 			delete packager.builtFiles[ filepath ];

bower.json

@@ -1,7 +1,7 @@
-module.exports = function( grunt ) {
-
 "use strict";
 
+module.exports = function( grunt ) {
+
 grunt.registerTask( "clean", function() {
 	require( "rimraf" ).sync( "dist" );
 } );