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

diff --git a/build/tasks/build.js b/build/tasks/build.js
index 3193cd630b6ba16e201ae00b17d73a71b1b9f87a..8256603a30c61a52cb04a118ddc37716ba60e778 100644 (file)
--- 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 abd874e81ada41f2fc4dbce96e96ef25ab65f58d..4499d2defc5fb4f661730f8b2dd693c0120d6e07 100644 (file)
--- 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 644f2925561f43162dad842630d31c8c9f811ccf..2c63e36060e3f99d7b3047b447043cf0bc36f8dd 100644 (file)
--- 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