Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: hoist dependencies to the real parent #118

Merged
merged 4 commits into from
Jul 4, 2024
Merged

fix: hoist dependencies to the real parent #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b3f078
hoist dependencies to the real parent
fabienr Jun 4, 2024
8c73761
Merge branch 'develar:master' into hoist
fabienr Jun 26, 2024
82fd85f
log.IsDebugEnabled() segfault in test, remove log from common path.
fabienr Jun 26, 2024
1a985df
Create tasty-houses-drum.md
mmaietta Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/tasty-houses-drum.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"app-builder-bin": patch
---

fix: hoist dependencies to the real parent in nodeModuleCollector
13 changes: 13 additions & 0 deletions pkg/node-modules/nodeModuleCollector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,19 @@ func (t *Collector) resolveDependency(parentNodeModuleDir string, name string) (
if realParentNodeModuleDir == "" {
return nil, nil
}

// XXX consumers expect the node_modules shape or the dependency tree ?
// hoist the depends to the actual parent
if realParentNodeModuleDir != parentNodeModuleDir {
dependencyNameToDependency = t.NodeModuleDirToDependencyMap[realParentNodeModuleDir]
if dependencyNameToDependency != nil {
dependency := (*dependencyNameToDependency)[name]
if dependency != nil {
return nil, nil
}
}
}

dependencyDir := filepath.Join(realParentNodeModuleDir, name)
dependency, err := readPackageJson(dependencyDir)
if err != nil {
Expand Down
Loading