Skip to content

Commit 14683e6

Browse files
yuanyanyuanyan
committed
Fix strip define build mod bug.
1 parent 9bb7c0a commit 14683e6

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

‎lib/tasks/build.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ exports.options = {
3636
"stripDefine" : {
3737
default: false
3838
,describe: "strip all definitions in generated source"
39+
},
40+
"stubModules": {
41+
describe: "Specify modules to stub out in the optimized file [requirejs only]"
3942
}
4043
};
4144

@@ -364,7 +367,8 @@ exports.build = function (source, dest, options, done) {
364367
stripDefine: getStripDefine(attrs),
365368
mainFile: path.join(path.dirname(relativeRootMainSrc), path.basename(relativeRootMainSrc)),
366369
baseUrl: path.dirname(relativeRootMainSrc),
367-
miniLoader: true
370+
miniLoader: true,
371+
stubModules: options.stubModules
368372
};
369373

370374
}else if(loader.name === 'seajs'){
@@ -407,7 +411,7 @@ exports.build = function (source, dest, options, done) {
407411
if(loader.embed){
408412

409413
var tempPath = file.writeTemp(mainSrc, content);
410-
content = helpers.content(tempPath);
414+
content = helpers.content(tempPath, {noMinify: options.noMinify});
411415

412416
if(loader.name === 'requirejs'){
413417
code = '<script>'+ content +'</script>';
@@ -425,7 +429,7 @@ exports.build = function (source, dest, options, done) {
425429

426430
}else{
427431
// Minify compiled file by the content helper
428-
file.write(destPath, helpers.content(destPath));
432+
file.write(destPath, helpers.content(destPath, {noMinify: options.noMinify}));
429433
// rev, and use origin main src when gen src
430434
if(isRev(attrs)){
431435
src = path.join(path.dirname(mainSrc), helpers.rev(destPath));
@@ -642,7 +646,7 @@ exports.build = function (source, dest, options, done) {
642646
function outputHTML(){
643647
var destHTMLContent = buffer.join('');
644648
file.write(destHTMLPath, destHTMLContent);
645-
destHTMLContent = helpers.content(destHTMLPath);
649+
destHTMLContent = helpers.content(destHTMLPath, {noMinify: options.noMinify});
646650
// if there is a xml header, put it on the top of html again
647651
destHTMLContent = xmlHeader + destHTMLContent;
648652
file.write(destHTMLPath, destHTMLContent);

‎lib/tasks/compile.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ exports.compileSeaJS = function(inputFile, options){
321321
*/
322322
exports.advancedStripDefine = function(mainModuleName, varModules, stubModules, name, path, contents){
323323
// Remove requirejs plugin module like requirejs-tmpl
324-
if(stubModules && stubModules.indexOf(name) !== -1) return '';
324+
if( stubModules && stubModules.indexOf(name) !== -1 ) return '';
325325

326326
var rdefineEnd = /\}\)[;^}\w\s]*$/;
327327

@@ -369,7 +369,7 @@ exports.advancedStripDefine = function(mainModuleName, varModules, stubModules,
369369

370370
exports.normalStripDefine = function(mainModuleName, varModules, stubModules, name, path, contents){
371371
// Remove requirejs plugin module like requirejs-tmpl
372-
if(stubModules && stubModules.indexOf(name) !== -1) return '';
372+
if( stubModules && stubModules.indexOf(name) !== -1 ) return '';
373373

374374
try{
375375
return require('amdclean').clean(contents);
@@ -396,7 +396,8 @@ exports.compileRequireJS = function (inputFile, outputFile, options, callback) {
396396
out: function (text) {
397397
// Do what you want with the optimized text here.
398398
compiledCode = text;
399-
}
399+
},
400+
stubModules: options.stubModules || []
400401
};
401402

402403
if (options.name) {
@@ -412,6 +413,7 @@ exports.compileRequireJS = function (inputFile, outputFile, options, callback) {
412413
var onBuildWrite = options.stripDefine === 'advanced'? exports.advancedStripDefine: exports.normalStripDefine;
413414
config.onBuildWrite = onBuildWrite.bind(this, options.mainModuleName, options.varModules, options.stubModules);
414415
config.skipSemiColonInsertion = true;
416+
config.stubModules.push('requireLib');
415417
}
416418

417419
if (options.includeLoader || options.miniLoader){

0 commit comments

Comments
 (0)