这是indexloc提供的服务，不要输入任何密码
Skip to content

fix(peer-deps): don't consider peer deps when constructing graph #813

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

Merged
merged 4 commits into from
Mar 8, 2022
Merged

fix(peer-deps): don't consider peer deps when constructing graph #813

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2df44bb
fix(peer-deps): don't consider peer deps when constructing graph
Mar 1, 2022
3f4e982
Merge branch 'main' into fix/peer-deps
Mar 4, 2022
cd49ba7
Merge branch 'main' into fix/peer-deps
Mar 7, 2022
48f56bd
Merge branch 'main' into fix/peer-deps
Mar 8, 2022
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
17 changes: 5 additions & 12 deletions cli/internal/context/context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,16 +274,13 @@ func (c *Context) resolveWorkspaceRootDeps(rootPackageJSON *fs.PackageJSON) erro
pkg := rootPackageJSON
depSet := mapset.NewSet()
pkg.UnresolvedExternalDeps = make(map[string]string)
for dep, version := range pkg.Dependencies {
pkg.UnresolvedExternalDeps[dep] = version
}
for dep, version := range pkg.DevDependencies {
pkg.UnresolvedExternalDeps[dep] = version
}
for dep, version := range pkg.OptionalDependencies {
pkg.UnresolvedExternalDeps[dep] = version
}
for dep, version := range pkg.PeerDependencies {
for dep, version := range pkg.Dependencies {
pkg.UnresolvedExternalDeps[dep] = version
}
if util.IsYarn(c.Backend.Name) {
Expand Down Expand Up @@ -317,10 +314,6 @@ func (c *Context) populateTopologicGraphForPackageJson(pkg *fs.PackageJSON) erro
externalDepSet := mapset.NewSet()
pkg.UnresolvedExternalDeps = make(map[string]string)

for dep, version := range pkg.Dependencies {
depMap[dep] = version
}

for dep, version := range pkg.DevDependencies {
depMap[dep] = version
}
Expand All @@ -329,7 +322,7 @@ func (c *Context) populateTopologicGraphForPackageJson(pkg *fs.PackageJSON) erro
depMap[dep] = version
}

for dep, version := range pkg.PeerDependencies {
for dep, version := range pkg.Dependencies {
depMap[dep] = version
}

Expand All @@ -345,15 +338,15 @@ func (c *Context) populateTopologicGraphForPackageJson(pkg *fs.PackageJSON) erro

for _, name := range externalUnresolvedDepsSet.List() {
name := name.(string)
if item, ok := pkg.Dependencies[name]; ok {
if item, ok := pkg.DevDependencies[name]; ok {
pkg.UnresolvedExternalDeps[name] = item
}

if item, ok := pkg.DevDependencies[name]; ok {
if item, ok := pkg.OptionalDependencies[name]; ok {
pkg.UnresolvedExternalDeps[name] = item
}

if item, ok := pkg.OptionalDependencies[name]; ok {
if item, ok := pkg.Dependencies[name]; ok {
pkg.UnresolvedExternalDeps[name] = item
}
}
Expand Down