From: Timmy Willison <timmywillisn@gmail.com>
Date: Fri, 16 Aug 2013 16:54:43 +0000 (-0400)
Subject: When converting the source to AMD, don't forget to AMD
X-Git-Tag: 1.11.0-beta1~78
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2f985ff826cf55f1fc1fe174716098f758fa5c4d;p=jquery.git

When converting the source to AMD, don't forget to AMD
---

diff --git a/build/tasks/build.js b/build/tasks/build.js
index 753ca60dc..adbc30923 100644
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -57,10 +57,13 @@ module.exports = function( grunt ) {
 			}
 
 			// Remove define wrappers, closure ends, and empty declarations
+			// Unless it's the proper AMD define
 			contents = contents
 				.replace( /define\([^{]*?{/, "" )
-				.replace( rdefineEnd, "" )
-				// Remove empty definitions
+				.replace( rdefineEnd, "" );
+
+			// Remove empty definitions
+			contents = contents
 				.replace( /define\(\[[^\]]+\]\)[\W\n]+$/, "" );
 		}
 		return contents;
diff --git a/src/exports/amd.js b/src/exports/amd.js
index abd874e81..4499d2def 100644
--- a/src/exports/amd.js
+++ b/src/exports/amd.js
@@ -1,3 +1,7 @@
+define([
+	"../core"
+], function( jQuery ) {
+
 // Register as a named AMD module, since jQuery can be concatenated with other
 // files that may use define, but not via a proper concatenation script that
 // understands anonymous AMD modules. A named AMD is safest and most robust
@@ -9,4 +13,6 @@ if ( typeof define === "function" && define.amd ) {
 	define( "jquery", [], function() {
 		return jQuery;
 	});
-}
\ No newline at end of file
+}
+
+});
\ No newline at end of file
diff --git a/src/jquery.js b/src/jquery.js
index 644f29255..2c63e3606 100644
--- a/src/jquery.js
+++ b/src/jquery.js
@@ -27,7 +27,8 @@ define([
 	"./effects/animated-selector",
 	"./offset",
 	"./dimensions",
-	"./deprecated"
+	"./deprecated",
+	"./exports/amd"
 ], function( jQuery ) {
 
 // Expose jQuery and $ identifiers, even in