Merge branch 'jquery:main' into master

build/release.js

@@ -140,7 +140,7 @@ Release.define( {
 };
 
 module.exports.dependencies = [
-	"download.jqueryui.com@2.2.1",
+	"download.jqueryui.com@2.2.4",
 	"node-packager@0.0.6",
 	"shelljs@0.8.4"
 ];

package.json

@@ -51,19 +51,19 @@
 	"devDependencies": {
 		"commitplease": "3.2.0",
 		"eslint-config-jquery": "3.0.0",
-		"glob": "7.1.6",
-		"grunt": "1.3.0",
+		"glob": "7.1.7",
+		"grunt": "1.4.1",
 		"grunt-bowercopy": "1.2.5",
-		"grunt-cli": "1.3.2",
+		"grunt-cli": "1.4.3",
 		"grunt-compare-size": "0.4.2",
 		"grunt-contrib-concat": "1.0.1",
 		"grunt-contrib-csslint": "2.0.0",
-		"grunt-contrib-qunit": "4.0.0",
+		"grunt-contrib-qunit": "5.0.1",
 		"grunt-contrib-requirejs": "1.0.0",
-		"grunt-contrib-uglify": "5.0.0",
+		"grunt-contrib-uglify": "5.0.1",
 		"grunt-eslint": "23.0.0",
 		"grunt-git-authors": "3.2.0",
-		"grunt-html": "14.2.0",
+		"grunt-html": "14.5.0",
 		"load-grunt-tasks": "5.1.0",
 		"rimraf": "3.0.2",
 		"testswarm": "1.1.2"

ui/core.js

@@ -1,4 +1,4 @@
-// This file is deprecated in 1.12.0 to be removed in 1.13
+// This file is deprecated in 1.12.0 to be removed in 1.14
 ( function() {
 "use strict";
 

ui/effect.js

@@ -23,6 +23,7 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
+			"./jquery-var-for-color",
 			"./vendor/jquery-color/jquery.color",
 			"./version"
 		], factory );
@@ -36,11 +37,7 @@
 
 var dataSpace = "ui-effects-",
 	dataSpaceStyle = "ui-effects-style",
-	dataSpaceAnimated = "ui-effects-animated",
-
-	// Create a local jQuery because jQuery Color relies on it and the
-	// global may not exist with AMD and a custom build (#10199)
-	jQuery = $;
+	dataSpaceAnimated = "ui-effects-animated";
 
 $.effects = {
 	effect: {}
@@ -704,7 +701,7 @@ $.fn.extend( {
 				// as the .show() below destroys the initial state
 				modes.push( normalizedMode );
 
-				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.13
+				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.14
 				if ( defaultMode && ( normalizedMode === "show" ||
 						( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
 					el.show();

ui/jquery-var-for-color.js

@@ -0,0 +1,22 @@
+( function( factory ) {
+	"use strict";
+
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [ "jquery", "./version" ], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+} )( function( $ ) {
+	"use strict";
+
+// Create a local jQuery because jQuery Color relies on it and the
+// global may not exist with AMD and a custom build (#10199).
+// This module is a noop if used as a regular AMD module.
+// eslint-disable-next-line no-unused-vars
+var jQuery = $;
+
+} );

ui/widgets/droppable.js

@@ -241,7 +241,7 @@ $.widget( "ui.droppable", {
 	},
 
 	// Extension points just to make backcompat sane and avoid duplicating logic
-	// TODO: Remove in 1.13 along with call to it below
+	// TODO: Remove in 1.14 along with call to it below
 	_addHoverClass: function() {
 		this._addClass( "ui-droppable-hover" );
 	},