Build: Remove empty define({}) from build output

Fixes gh-1768
Closes gh-1569
(cherry picked from commit 2c1b556d98da597b0490f204e3561f656987f17c)

diff --git a/build/tasks/build.js b/build/tasks/build.js
index caec8f153c9576fed8f061189637969fc9bb13c5..199f78120b1bbead0c6788b17f8b27e633ffd8f2 100644 (file)
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -20,6 +20,8 @@ module.exports = function( grunt ) {
                        optimize: "none",
                        // Include dependencies loaded with require
                        findNestedDependencies: true,
+                       // Avoid inserting define() placeholder
+                       skipModuleInsertion: true,
                        // Avoid breaking semicolons inserted by r.js
                        skipSemiColonInsertion: true,
                        wrap: {
@@ -81,7 +83,7 @@ module.exports = function( grunt ) {
 
                        // Remove empty definitions
                        contents = contents
-                               .replace( /define\(\[[^\]]+\]\)[\W\n]+$/, "" );
+                               .replace( /define\(\[[^\]]*\]\)[\W\n]+$/, "" );
                }
                // AMD Name
                if ( (amdName = grunt.option( "amd" )) != null && /^exports\/amd$/.test( name ) ) {