Build: Fix AMD option for custom builds

Fixes #14859

diff --git a/build/tasks/build.js b/build/tasks/build.js
index e5794fe93469397b36780111462d58d599f42e96..fa164cf9265f99726c7469224327742d2e34448e 100644 (file)
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -55,12 +55,6 @@ module.exports = function( grunt ) {
                                // Remove EXPOSE lines from Sizzle
                                .replace( /\/\/\s*EXPOSE[\w\W]*\/\/\s*EXPOSE/, "return Sizzle;" );
 
-               // AMD Name
-               } else if ( (amdName = grunt.option( "amd" )) != null && /^exports\/amd$/.test( name ) ) {
-                       // Remove the comma for anonymous defines
-                       contents = contents
-                               .replace( /(\s*)"jquery"(\,\s*)/, amdName ? "$1\"" + amdName + "\"$2" : "" );
-
                } else {
 
                        // Ignore jQuery's exports (the only necessary one)
@@ -87,6 +81,18 @@ module.exports = function( grunt ) {
                        contents = contents
                                .replace( /define\(\[[^\]]+\]\)[\W\n]+$/, "" );
                }
+               // AMD Name
+               if ( (amdName = grunt.option( "amd" )) != null && /^exports\/amd$/.test( name ) ) {
+                       if (amdName) {
+                               grunt.log.writeln( "Naming jQuery with AMD name: " + amdName );
+                       } else {
+                               grunt.log.writeln( "AMD name now anonymous" );
+                       }
+                       // Remove the comma for anonymous defines
+                       contents = contents
+                               .replace( /(\s*)"jquery"(\,\s*)/, amdName ? "$1\"" + amdName + "\"$2" : "" );
+
+               }
                return contents;
        }