Skip to content
Permalink
Browse files

Restore optIn behavior for builds

  • Loading branch information
timmywil committed Sep 9, 2013
1 parent d4518ea commit 8791920183f9f13a7be1d513652b9c96d29648c7
Showing with 11 additions and 6 deletions.
  1. +11 −6 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, index,
done = this.async(),
flags = this.flags,
optIn = flags[ "*" ],
name = this.data.dest,
minimum = this.data.minimum,
removeWith = this.data.removeWith,
@@ -168,18 +170,15 @@ 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 );
}

// Handle Sizzle exclusion
// Replace with selector-native
if ( (index = excluded.indexOf( "sizzle" )) > -1 ) {
config.rawText = {
selector: "define(['./selector-native']);"
};
config.rawText.selector = "define(['./selector-native']);";
excluded.splice( index, 1 );
}

@@ -213,6 +212,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 );

0 comments on commit 8791920

Please sign in to comment.
You can’t perform that action at this time.