Skip to content
This repository was archived by the owner on Feb 18, 2024. It is now read-only.

Commit 1807434

Browse files
committed
optionalDependencies handling
1 parent a251d39 commit 1807434

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

github.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,12 +465,15 @@ GithubLocation.prototype = {
465465

466466
var self = this;
467467

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))) {
469470
var hasDependencies = false;
470471
for (var p in packageConfig.dependencies)
471472
hasDependencies = true;
472473
for (var p in packageConfig.peerDependencies)
473474
hasDependencies = true;
475+
for (var p in packageConfig.optionalDependencies)
476+
hasDependencies = true;
474477

475478
if (packageName && hasDependencies) {
476479
var looksLikeNpm = packageConfig.name && packageConfig.version && (packageConfig.description || packageConfig.repository || packageConfig.author || packageConfig.license || packageConfig.scripts);
@@ -491,12 +494,14 @@ GithubLocation.prototype = {
491494
if (noDepsMsg) {
492495
delete packageConfig.dependencies;
493496
delete packageConfig.peerDependencies;
497+
delete packageConfig.optionalDependencies;
494498
this.ui.log('warn', '`' + packageName + '` dependency installs skipped as it\'s a GitHub package with no registry property set.\n' + noDepsMsg + '\n');
495499
}
496500
}
497501
else {
498502
delete packageConfig.dependencies;
499503
delete packageConfig.peerDependencies;
504+
delete packageConfig.optionalDependencies;
500505
}
501506
}
502507

@@ -507,6 +512,8 @@ GithubLocation.prototype = {
507512
packageConfig.dependencies[d] = convertDependency(d, packageConfig.dependencies[d]);
508513
for (var d in packageConfig.peerDependencies)
509514
packageConfig.peerDependencies[d] = convertDependency(d, packageConfig.peerDependencies[d]);
515+
for (var d in packageConfig.optionalDependencies)
516+
packageConfig.optionalDependencies[d] = convertDependency(d, packageConfig.optionalDependencies[d]);
510517

511518
function convertDependency(d, depName) {
512519
var depVersion;

0 commit comments

Comments
 (0)