@@ -465,12 +465,15 @@ GithubLocation.prototype = {
465
465
466
466
var self = this ;
467
467
468
- if ( ( packageConfig . dependencies || packageConfig . peerDependencies ) && ! packageConfig . registry && ( ! packageConfig . jspm || ! ( packageConfig . jspm . dependencies || packageConfig . jspm . peerDependencies ) ) ) {
468
+ if ( ( packageConfig . dependencies || packageConfig . peerDependencies || packageConfig . optionalDependencies ) &&
469
+ ! packageConfig . registry && ( ! packageConfig . jspm || ! ( packageConfig . jspm . dependencies || packageConfig . jspm . peerDependencies || packageConfig . jspm . optionalDependencies ) ) ) {
469
470
var hasDependencies = false ;
470
471
for ( var p in packageConfig . dependencies )
471
472
hasDependencies = true ;
472
473
for ( var p in packageConfig . peerDependencies )
473
474
hasDependencies = true ;
475
+ for ( var p in packageConfig . optionalDependencies )
476
+ hasDependencies = true ;
474
477
475
478
if ( packageName && hasDependencies ) {
476
479
var looksLikeNpm = packageConfig . name && packageConfig . version && ( packageConfig . description || packageConfig . repository || packageConfig . author || packageConfig . license || packageConfig . scripts ) ;
@@ -491,12 +494,14 @@ GithubLocation.prototype = {
491
494
if ( noDepsMsg ) {
492
495
delete packageConfig . dependencies ;
493
496
delete packageConfig . peerDependencies ;
497
+ delete packageConfig . optionalDependencies ;
494
498
this . ui . log ( 'warn' , '`' + packageName + '` dependency installs skipped as it\'s a GitHub package with no registry property set.\n' + noDepsMsg + '\n' ) ;
495
499
}
496
500
}
497
501
else {
498
502
delete packageConfig . dependencies ;
499
503
delete packageConfig . peerDependencies ;
504
+ delete packageConfig . optionalDependencies ;
500
505
}
501
506
}
502
507
@@ -507,6 +512,8 @@ GithubLocation.prototype = {
507
512
packageConfig . dependencies [ d ] = convertDependency ( d , packageConfig . dependencies [ d ] ) ;
508
513
for ( var d in packageConfig . peerDependencies )
509
514
packageConfig . peerDependencies [ d ] = convertDependency ( d , packageConfig . peerDependencies [ d ] ) ;
515
+ for ( var d in packageConfig . optionalDependencies )
516
+ packageConfig . optionalDependencies [ d ] = convertDependency ( d , packageConfig . optionalDependencies [ d ] ) ;
510
517
511
518
function convertDependency ( d , depName ) {
512
519
var depVersion ;
0 commit comments