Skip to content
This repository was archived by the owner on Sep 17, 2023. It is now read-only.

Commit 082bc51

Browse files
authored
Merge pull request #90 from typescript-tools/fix-generated-makefile-package-json-paths
fix: stop appending package.json to path twice
2 parents f87134b + 6bab522 commit 082bc51

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/make_depend.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub fn make_dependency_makefile(opts: crate::opts::MakeDepend) -> Result<(), Box
3535
let internal_dependencies_exclusive = package_manifest
3636
.transitive_internal_dependency_package_names(&package_manifest_by_package_name);
3737

38-
let internal_dependency_package_directories_inclusive: Vec<PathBuf> = {
38+
let internal_dependency_package_json_filenames_inclusive: Vec<PathBuf> = {
3939
let mut dependency_dirs = internal_dependencies_exclusive
4040
.iter()
4141
.map(|internal_dependency| (*internal_dependency).path())
@@ -84,11 +84,10 @@ pub fn make_dependency_makefile(opts: crate::opts::MakeDepend) -> Result<(), Box
8484
.to_str()
8585
.expect("npm pack filename is not UTF-8 encodable"),
8686
internal_dependency_package_json_filenames_inclusive:
87-
&internal_dependency_package_directories_inclusive
87+
&internal_dependency_package_json_filenames_inclusive
8888
.iter()
8989
.map(|internal_dependency| {
9090
internal_dependency
91-
.join("package.json")
9291
.to_str()
9392
.expect("Internal package directory is not UTF-8 encodable")
9493
.to_owned()

0 commit comments

Comments
 (0)