Build: Rename the -selector-full flag to -selector

mgol · mgol · commit 25c9cd88986f · 2022-10-10T19:47:38.000+02:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -61,8 +61,7 @@ module.exports = function( grunt ) {
 			all: {
 				dest: "dist/jquery.js",
 				minimum: [
-					"core",
-					"selector"
+					"core"
 				],
 
 				// Exclude specified modules if the module matching the key is removed
@@ -76,7 +75,7 @@ module.exports = function( grunt ) {
 						include: [ "core/ready-no-deferred" ]
 					},
 					event: [ "deprecated/ajax-event-alias", "deprecated/event" ],
-					"selector-full": [ "css/hiddenVisibleSelectors", "effects/animatedSelector" ]
+					selector: [ "css/hiddenVisibleSelectors", "effects/animatedSelector" ]
 				}
 			}
 		},
diff --git a/README.md b/README.md
@@ -103,7 +103,7 @@ Some example modules that can be excluded are:
 
 As a special case, you may also replace the full jQuery `selector` module by using a special flag `grunt custom:-selector`.
 
-- **selector-full**: The full jQuery selector engine. When this module is excluded, it is replaced by a rudimentary selector engine based on the browser's `querySelectorAll` method that does not support jQuery selector extensions or enhanced semantics. See the [selector-native.js](https://github.com/jquery/jquery/blob/main/src/selector-native.js) file for details.
+- **selector**: The full jQuery selector engine. When this module is excluded, it is replaced by a rudimentary selector engine based on the browser's `querySelectorAll` method that does not support jQuery selector extensions or enhanced semantics. See the [selector-native.js](https://github.com/jquery/jquery/blob/main/src/selector-native.js) file for details.
 
 *Note*: Excluding the full `selector` module will also exclude all jQuery selector extensions (such as `effects/animatedSelector` and `css/hiddenVisibleSelectors`).
 
diff --git a/build/tasks/build.js b/build/tasks/build.js
@@ -150,10 +150,16 @@ module.exports = function( grunt ) {
 							// These are the removable dependencies
 							// It's fine if the directory is not there
 							try {
-								excludeList(
-									fs.readdirSync( `${ srcFolder }/${ module }` ),
-									module
-								);
+
+								// `selector` is a special case as we don't just remove
+								// the module, but we replace it with `selector-native`
+								// which re-uses parts of the `src/selector` folder.
+								if ( module !== "selector" ) {
+									excludeList(
+										fs.readdirSync( `${ srcFolder }/${ module }` ),
+										module
+									);
+								}
 							} catch ( e ) {
 								grunt.verbose.writeln( e );
 							}
@@ -171,12 +177,6 @@ module.exports = function( grunt ) {
 						}
 					} else {
 						grunt.log.error( "Module \"" + module + "\" is a minimum requirement." );
-						if ( module === "selector" ) {
-							grunt.log.error(
-								"If you meant to replace the full selector module, " +
-								"use `-selector-full` instead."
-							);
-						}
 					}
 				} else {
 					grunt.log.writeln( flag );
@@ -212,13 +212,6 @@ module.exports = function( grunt ) {
 				excluder( flag );
 			}
 
-			// Handle full selector module exclusion.
-			// Replace with selector-native.
-			if ( excluded.includes( "selector-full" ) ) {
-				setOverride( `${ srcFolder }/selector.js`,
-					read( "selector-native.js" ) );
-			}
-
 			// Remove the jQuery export from the entry file, we'll use our own
 			// custom wrapper.
 			setOverride( inputRollupOptions.input,
@@ -273,7 +266,13 @@ module.exports = function( grunt ) {
 
 				// Replace excluded modules with empty sources.
 				for ( const module of excluded ) {
-					setOverride( `${ srcFolder }/${ module }.js`, "" );
+					setOverride(
+						`${ srcFolder }/${ module }.js`,
+
+						// The `selector` module is not removed, but replaced
+						// with `selector-native`.
+						module === "selector" ? read( "selector-native.js" ) : ""
+					);
 				}
 			}
 
diff --git a/package.json b/package.json
@@ -77,7 +77,7 @@
     "test:esmodules": "grunt && grunt karma:esmodules",
     "test:amd": "grunt && grunt karma:amd",
     "test:no-deprecated": "grunt test:prepare && grunt custom:-deprecated && grunt karma:main",
-    "test:selector-native": "grunt test:prepare && grunt custom:-selector-full && grunt karma:main",
+    "test:selector-native": "grunt test:prepare && grunt custom:-selector && grunt karma:main",
     "test:slim": "grunt test:prepare && grunt custom:slim && grunt karma:main",
     "test": "npm run test:slim && npm run test:no-deprecated && npm run test:selector-native && grunt && grunt test:slow && grunt karma:main && grunt karma:esmodules && grunt karma:amd",
     "jenkins": "npm run test:browserless"
diff --git a/test/data/testinit.js b/test/data/testinit.js
@@ -382,12 +382,12 @@ this.loadTests = function() {
 		// A full selector engine is required to support them as they need to
 		// be evaluated left-to-right. Remove that property when support for
 		// positional selectors is dropped.
-		QUnit.jQuerySelectorsPos = includesModule( "selector-full" );
+		QUnit.jQuerySelectorsPos = includesModule( "selector" );
 
 		// Says whether jQuery selector extensions are supported. Change that
 		// to `false` if your custom jQuery versions relies more on native qSA.
 		// This doesn't include support for positional selectors (see above).
-		QUnit.jQuerySelectors = includesModule( "selector-full" );
+		QUnit.jQuerySelectors = includesModule( "selector" );
 
 		var i = 0,
 			tests = [
diff --git a/test/unit/support.js b/test/unit/support.js
@@ -82,7 +82,7 @@ testIframe(
 
 	// Make the selector-native build pass tests.
 	for ( browserKey in expectedMap ) {
-		if ( !includesModule( "selector-full" ) ) {
+		if ( !includesModule( "selector" ) ) {
 			delete expectedMap[ browserKey ].cssSupportsSelector;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ testIframe(`
`82`	`82`
`83`	`83`	`// Make the selector-native build pass tests.`
`84`	`84`	`for ( browserKey in expectedMap ) {`
`85`		`- if ( !includesModule( "selector-full" ) ) {`
	`85`	`+ if ( !includesModule( "selector" ) ) {`
`86`	`86`	`delete expectedMap[ browserKey ].cssSupportsSelector;`
`87`	`87`	`}`
`88`	`88`	`}`