Restore optIn behavior for builds

Conflicts:
	build/tasks/build.js

diff --git a/build/tasks/build.js b/build/tasks/build.js
index e0cdc078f329868d8ece638d7c57058e30c565a5..79c7860e1c78ae4932cb39d9d9b159057436a4c7 100644 (file)
--- a/build/tasks/build.js
+++ b/build/tasks/build.js
@@ -23,6 +23,7 @@ module.exports = function( grunt ) {
                                startFile: "src/intro.js",
                                endFile: "src/outro.js"
                        },
+                       rawText: {},
                        onBuildWrite: convert
                };
 
@@ -75,6 +76,7 @@ module.exports = function( grunt ) {
                var flag,
                        done = this.async(),
                        flags = this.flags,
+                       optIn = flags[ "*" ],
                        name = this.data.dest,
                        minimum = this.data.minimum,
                        removeWith = this.data.removeWith,
@@ -165,10 +167,9 @@ module.exports = function( grunt ) {
                //  *:*:-css           all except css and dependents (explicit > implicit)
                //  *:*:-css:+effects  same (excludes effects because explicit include is trumped by explicit exclude of dependency)
                //  *:+effects         none except effects and its dependencies (explicit include trumps implicit exclude of dependency)
+               delete flags[ "*" ];
                for ( flag in flags ) {
-                       if ( flag !== "*" ) {
-                               excluder( flag );
-                       }
+                       excluder( flag );
                }
 
                grunt.verbose.writeflags( excluded, "Excluded" );
@@ -201,6 +202,12 @@ module.exports = function( grunt ) {
                        grunt.file.write( name, compiled );
                };
 
+               // Turn off opt-in if necessary
+               if ( !optIn ) {
+                       // Overwrite the default inclusions with the explicit ones provided
+                       config.rawText.jquery = "define([" + (included.length ? included.join(",") : "") + "]);";
+               }
+
                // Trace dependencies and concatenate files
                requirejs.optimize( config, function( response ) {
                        grunt.verbose.writeln( response );