Core: Remove support for jQuery 4.x

.github/workflows/browser-tests.yml

@@ -47,7 +47,6 @@ jobs:
           npm run pretest
           npm run test:unit -- -b ${{ matrix.BROWSER }} -h \
             --jquery-migrate ${{ matrix.MIGRATE_VERSION }} \
-            --jquery git --jquery git.min --jquery git.slim --jquery git.slim.min \
             --jquery 3.x-git --jquery 3.x-git.min --jquery 3.x-git.slim --jquery 3.x-git.slim.min \
             --jquery 3.7.1 --jquery 3.7.1.slim \
             --jquery 3.6.4 --jquery 3.5.1 --jquery 3.4.1 \
@@ -84,7 +83,6 @@ jobs:
         run: |
           npm run test:ie -- ^
             --jquery-migrate ${{ env.MIGRATE_VERSION }} ^
-            --jquery git --jquery git.min --jquery git.slim --jquery git.slim.min ^
             --jquery 3.x-git --jquery 3.x-git.min --jquery 3.x-git.slim --jquery 3.x-git.slim.min ^
             --jquery 3.7.1 --jquery 3.7.1.slim ^
             --jquery 3.6.4 --jquery 3.5.1 --jquery 3.4.1 ^
@@ -120,7 +118,6 @@ jobs:
         run: |
           npm run test:safari -- \
             --jquery-migrate ${{ env.MIGRATE_VERSION }} \
-            --jquery git --jquery git.min --jquery git.slim --jquery git.slim.min \
             --jquery 3.x-git --jquery 3.x-git.min --jquery 3.x-git.slim --jquery 3.x-git.slim.min \
             --jquery 3.7.1 --jquery 3.7.1.slim \
             --jquery 3.6.4 --jquery 3.5.1 --jquery 3.4.1 \

.github/workflows/browserstack-3.x.yml → .github/workflows/browserstack.yml

@@ -1,4 +1,4 @@
-name: Browserstack (Core 3.x)
+name: Browserstack
 
 on:
   push:

.github/workflows/filestash.yml

@@ -47,5 +47,5 @@ jobs:
 
       - name: Upload to Filestash
         run: |
-          rsync dist/jquery-migrate.js filestash@"${{ secrets.FILESTASH_SERVER }}":jquery-migrate-git.js
-          rsync dist/jquery-migrate.min.js filestash@"${{ secrets.FILESTASH_SERVER }}":jquery-migrate-git.min.js
+          rsync dist/jquery-migrate.js filestash@"${{ secrets.FILESTASH_SERVER }}":jquery-migrate-3.x-git.js
+          rsync dist/jquery-migrate.min.js filestash@"${{ secrets.FILESTASH_SERVER }}":jquery-migrate-3.x-git.min.js

CONTRIBUTING.md

@@ -47,7 +47,7 @@ Make sure you have reproduced the bug with all browser extensions and add-ons di
 
 ### Try the latest version of jQuery Migrate
 
-Bugs in old versions of jQuery Migrate may have already been fixed. In order to avoid reporting known issues, make sure you are always testing against the [latest build](https://releases.jquery.com/git/jquery-migrate-git.js). We cannot fix bugs in older released files, if a bug has been fixed in a subsequent version of jQuery Migrate the site should upgrade.
+Bugs in old versions of jQuery Migrate may have already been fixed. In order to avoid reporting known issues, make sure you are always testing against the [latest build](https://releases.jquery.com/git/jquery-migrate-3.x-git.js). We cannot fix bugs in older released files, if a bug has been fixed in a subsequent version of jQuery Migrate the site should upgrade.
 
 ### Simplify the test case
 

README.md

@@ -11,14 +11,14 @@ That way you can spot and fix what otherwise would have been errors, until you n
 
 The following table indicates which jQuery Migrate versions can be used with which jQuery versions:
 
-| jQuery version | jQuery Migrate version  |
-|----------------|-------------------------|
-| 1.x            | 1.x                     |
-| 2.x            | 1.x                     |
-| 3.x            | 3.x / 4.x<sup>[1]</sup> |
-| 4.x            | 3.x / 4.x<sup>[1]</sup> |
+| jQuery version | jQuery Migrate version |
+|----------------|------------------------|
+| 1.x            | 1.x                    |
+| 2.x            | 1.x                    |
+| 3.x            | 3.x                    |
+| 4.x            | 4.x                    |
 
-[1] NOTE: jQuery Migrate 4.x only supports the same browser as jQuery 4.x does. If you need to support Edge Legacy, Internet Explorer 9-10 or iOS 7+ (and not just 3 latest versions), use jQuery Migrate 3.x.
+Each jQuery Migrate version supports the same browsers that the jQuery version used with it.
 
 ## Usage
 
@@ -40,7 +40,7 @@ The production build is minified and does not generate console warnings. It will
 | Debugging enabled | <p align="center">✓</p> |  |
 | Minified |  | <p align="center">✓</p> |
 | Latest release (*may be hotlinked if desired*) | [jquery-migrate-3.5.2.js](https://code.jquery.com/jquery-migrate-3.5.2.js) | [jquery-migrate-3.5.2.min.js](https://code.jquery.com/jquery-migrate-3.5.2.min.js) |
-| \* Latest work-in-progress build | [jquery-migrate-git.js](https://releases.jquery.com/git/jquery-migrate-git.js) | [jquery-migrate-git.min.js](https://releases.jquery.com/git/jquery-migrate-git.min.js) |
+| \* Latest work-in-progress build | [jquery-migrate-3.x-git.js](https://releases.jquery.com/git/jquery-migrate-3.x-git.js) | [jquery-migrate-3.x-git.min.js](https://releases.jquery.com/git/jquery-migrate-3.x-git.min.js) |
 
 
 \* **Work-in-progress build:** Although this file represents the most recent updates to the plugin, it may not have been thoroughly tested. We do not recommend using this file on production sites since it may be unstable; use the released production version instead.

src/jquery/ajax.js

@@ -1,4 +1,3 @@
-import { jQueryVersionSince } from "../compareVersions.js";
 import { migrateWarn, migratePatchAndWarnFunc, migratePatchFunc } from "../main.js";
 
 // Support jQuery slim which excludes the ajax module
@@ -8,8 +7,7 @@ var oldAjax = jQuery.ajax,
 	oldCallbacks = [],
 	guid = "migrate-" + Date.now(),
 	origJsonpCallback = jQuery.ajaxSettings.jsonpCallback,
-	rjsonp = /(=)\?(?=&|$)|\?\?/,
-	rquery = /\?/;
+	rjsonp = /(=)\?(?=&|$)|\?\?/;
 
 migratePatchFunc( jQuery, "ajax", function() {
 	var jQXHR = oldAjax.apply( this, arguments );
@@ -45,120 +43,23 @@ jQuery.ajaxSetup( {
 // Register this prefilter before the jQuery one. Otherwise, a promoted
 // request is transformed into one with the script dataType, and we can't
 // catch it anymore.
-if ( jQueryVersionSince( "4.0.0" ) ) {
-
-	// Code mostly from:
-	// https://github.com/jquery/jquery/blob/fa0058af426c4e482059214c29c29f004254d9a1/src/ajax/jsonp.js#L20-L97
-	jQuery.ajaxPrefilter( "+json", function( s, originalSettings, jqXHR ) {
-
-		if ( !jQuery.migrateIsPatchEnabled( "jsonp-promotion" ) ) {
-			return;
-		}
-
-		var callbackName, overwritten, responseContainer,
-			jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-				"url" :
-				typeof s.data === "string" &&
-					( s.contentType || "" )
-						.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
-					rjsonp.test( s.data ) && "data"
-			);
-
-		// Handle iff the expected data type is "jsonp" or we have a parameter to set
-		if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-			migrateWarn( "jsonp-promotion", "JSON-to-JSONP auto-promotion is deprecated" );
-
-			// Get callback name, remembering preexisting value associated with it
-			callbackName = s.jsonpCallback = typeof s.jsonpCallback === "function" ?
-				s.jsonpCallback() :
-				s.jsonpCallback;
-
-			// Insert callback into url or form data
-			if ( jsonProp ) {
-				s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-			} else if ( s.jsonp !== false ) {
-				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-			}
-
-			// Use data converter to retrieve json after script execution
-			s.converters[ "script json" ] = function() {
-				if ( !responseContainer ) {
-					jQuery.error( callbackName + " was not called" );
-				}
-				return responseContainer[ 0 ];
-			};
-
-			// Force json dataType
-			s.dataTypes[ 0 ] = "json";
-
-			// Install callback
-			overwritten = window[ callbackName ];
-			window[ callbackName ] = function() {
-				responseContainer = arguments;
-			};
-
-			// Clean-up function (fires after converters)
-			jqXHR.always( function() {
-
-				// If previous value didn't exist - remove it
-				if ( overwritten === undefined ) {
-					jQuery( window ).removeProp( callbackName );
-
-					// Otherwise restore preexisting value
-				} else {
-					window[ callbackName ] = overwritten;
-				}
-
-				// Save back as free
-				if ( s[ callbackName ] ) {
-
-					// Make sure that re-using the options doesn't screw things around
-					s.jsonpCallback = originalSettings.jsonpCallback;
-
-					// Save the callback name for future use
-					oldCallbacks.push( callbackName );
-				}
-
-				// Call if it was a function and we have a response
-				if ( responseContainer && typeof overwritten === "function" ) {
-					overwritten( responseContainer[ 0 ] );
-				}
-
-				responseContainer = overwritten = undefined;
-			} );
-
-			// Delegate to script
-			return "script";
-		}
-	} );
-} else {
-
-	// jQuery <4 already contains this prefixer; don't duplicate the whole logic,
-	// but only enough to know when to warn.
-	jQuery.ajaxPrefilter( "+json", function( s ) {
-
-		if ( !jQuery.migrateIsPatchEnabled( "jsonp-promotion" ) ) {
-			return;
-		}
-
-		// Warn if JSON-to-JSONP auto-promotion happens.
-		if ( s.jsonp !== false && ( rjsonp.test( s.url ) ||
-				typeof s.data === "string" &&
-				( s.contentType || "" )
-					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
-				rjsonp.test( s.data )
-		) ) {
-			migrateWarn( "jsonp-promotion", "JSON-to-JSONP auto-promotion is deprecated" );
-		}
-	} );
-}
+// jQuery <4 already contains this prefixer; don't duplicate the whole logic,
+// but only enough to know when to warn.
+jQuery.ajaxPrefilter( "+json", function( s ) {
 
+	if ( !jQuery.migrateIsPatchEnabled( "jsonp-promotion" ) ) {
+		return;
+	}
 
-// Don't trigger the above logic in jQuery >=4 by default as the JSON-to-JSONP
-// auto-promotion behavior is gone in jQuery 4.0 and as it has security implications,
-// we don't want to restore the legacy behavior by default.
-if ( jQueryVersionSince( "4.0.0" ) ) {
-	jQuery.migrateDisablePatches( "jsonp-promotion" );
-}
+	// Warn if JSON-to-JSONP auto-promotion happens.
+	if ( s.jsonp !== false && ( rjsonp.test( s.url ) ||
+			typeof s.data === "string" &&
+			( s.contentType || "" )
+				.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
+			rjsonp.test( s.data )
+	) ) {
+		migrateWarn( "jsonp-promotion", "JSON-to-JSONP auto-promotion is deprecated" );
+	}
+} );
 
 }