@@ -449,21 +449,19 @@ Builder.prototype.buildAliases = function(fn){
449
449
var name = builder . conf . name ;
450
450
451
451
var aliases = conf . scripts . map ( function ( script ) {
452
- // TODO: remove special-casing root
453
452
var alias = self . root
454
453
? self . conf . name + '/deps/' + name + '/' + script
455
454
: self . basename + '/deps/' + name + '/' + script ;
456
455
457
- var js = 'require.alias("' + builder . basename + '/' + script + '", "' + alias + '");\n' ;
458
- return js ;
456
+ return builder . alias ( alias , script ) ;
459
457
} ) ;
460
458
461
459
if ( main ) {
462
460
var alias = self . root
463
461
? self . conf . name + '/deps/' + name + '/index.js'
464
462
: self . basename + '/deps/' + name + '/index.js' ;
465
463
466
- aliases . push ( 'require .alias("' + builder . basename + '/' + main + '", "' + alias + '");\n' ) ;
464
+ aliases . push ( builder . alias ( alias , main ) ) ;
467
465
}
468
466
469
467
aliases = aliases . join ( '' ) ;
@@ -486,14 +484,31 @@ Builder.prototype.buildAliases = function(fn){
486
484
: self . basename ;
487
485
488
486
if ( conf . main ) {
489
- res . push ( 'require .alias("' + name + '/' + conf . main + '", "' + name + '/index.js");\n' ) ;
487
+ res . push ( self . alias ( name + '/index.js' , conf . main ) ) ;
490
488
}
491
489
492
490
fn ( null , res . join ( '\n' ) ) ;
493
491
} ) ;
494
492
} ) ;
495
493
} ;
496
494
495
+ /**
496
+ * Return an alias from script `a` to `b`.
497
+ *
498
+ * @param {String } a
499
+ * @param {String } b
500
+ * @return {String }
501
+ * @api private
502
+ */
503
+
504
+ Builder . prototype . alias = function ( a , b ) {
505
+ var name = this . root
506
+ ? this . conf . name
507
+ : this . basename ;
508
+
509
+ return 'require.alias("' + name + '/' + b + '", "' + a + '");\n' ;
510
+ } ;
511
+
497
512
/**
498
513
* Build `type` and invoke `fn`.
499
514
*
0 commit comments