Skip to content

Commit 81bd5ca

Browse files
More small fixes
1 parent ce88227 commit 81bd5ca

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
66

77
## [Unreleased]
88

9+
### Fixed
10+
- More cases of `undefined` in logging that was overlooked.
11+
912
## [2.0.1] - 2020-04-27
1013

1114
### Fixed

src/main.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ function mergePackageDependencies<TTemplate extends INodeTemplate|IBowerTemplate
512512
// Merge resolutions for each package.
513513
for (let pkg of pkgs) {
514514
if (!_.isUndefined(pkg.resolutions)) {
515-
log(`Starting merge of dependency resolutions from package '${pkg.name}'`);
515+
log(`Starting merge of dependency resolutions from package '${pkg.name ?? pkg.path}'`);
516516
for (let dependency in pkg.resolutions) {
517517
// Handle dependency resolution
518518
if (tml.resolutions.hasOwnProperty(dependency)) {
@@ -524,7 +524,7 @@ function mergePackageDependencies<TTemplate extends INodeTemplate|IBowerTemplate
524524
tml.resolutions[dependency] = pkg.resolutions[dependency];
525525
}
526526
}
527-
log(`Finished merge of dependency resolutions from package '${pkg.name}'`);
527+
log(`Finished merge of dependency resolutions from package '${pkg.name ?? pkg.path}'`);
528528
}
529529
}
530530

@@ -537,7 +537,7 @@ function mergePackageDependencies<TTemplate extends INodeTemplate|IBowerTemplate
537537
log("Starting dependency merge.");
538538
// Iterate over pkgs
539539
for (let pkg of pkgs) {
540-
log(`Starting merge of dependencies from package '${pkg.name}'`);
540+
log(`Starting merge of dependencies from package '${pkg.name ?? pkg.path}'`);
541541
// And dependency types...
542542
for (let dependencyType of depTypes) {
543543
if (dependencyType in pkg) {

0 commit comments

Comments
 (0)