Fix for AMD when using concatenated file; fixes twbs#13812

hnrch02 · Jun 18, 2014 · 65dff0b · 65dff0b
1 parent 4582d75
commit 65dff0b
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -34,6 +34,10 @@ module.exports = function (grunt) {
             ' */\n',
     // NOTE: This jqueryCheck code is duplicated in customizer.js; if making changes here, be sure to update the other copy too.
     jqueryCheck: 'if (typeof define == \'undefined\' && typeof exports == \'undefined\' && typeof jQuery == \'undefined\') { throw new Error(\'Bootstrap\\\'s JavaScript requires jQuery\') }\n\n',
+    umdWrap: '(function (o_o) {\n' +
+             '  typeof define  == \'function\' && define.amd ? define([\'jquery\'], o_o) :\n' +
+             '  typeof exports == \'object\' ? o_o(require(\'jquery\')) : o_o(jQuery)\n' +
+             '})(function ($) {\n\n',
 
     // Task configuration.
     clean: {
@@ -87,8 +91,21 @@ module.exports = function (grunt) {
 
     concat: {
       options: {
-        banner: '<%= banner %>\n<%= jqueryCheck %>',
-        stripBanners: false
+        banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= umdWrap %>',
+        footer: '});\n',
+        stripBanners: false,
+        process: function (src) {
+          var umd = '\n\n' +
+                    '  (function (o_o) {\n' +
+                    '    typeof define  == \'function\' && define.amd ? define([\'jquery\'], o_o) :\n' +
+                    '    typeof exports == \'object\' ? o_o(require(\'jquery\')) : o_o(jQuery)\n' +
+                    '  })(function ($) {'
+
+          var footer = '  })\n\n' +
+                       '}();\n'
+
+          return src.replace(umd, '').replace(footer, '}();\n')
+        }
       },
       bootstrap: {
         src: [