From d4f25c73779f0a9ba509de6307d56290d5d03542 Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Tue, 29 Aug 2023 22:21:44 +0100 Subject: [PATCH 1/2] fix: searching outside folder unnecessarily --- app-builder-bin/package.json | 4 ++-- pkg/node-modules/nodeModuleCollector.go | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app-builder-bin/package.json b/app-builder-bin/package.json index 9c7d76d..d488202 100644 --- a/app-builder-bin/package.json +++ b/app-builder-bin/package.json @@ -1,7 +1,7 @@ { - "name": "app-builder-bin", + "name": "@julusian/app-builder-bin", "description": "app-builder precompiled binaries", - "version": "4.0.0", + "version": "4.0.1", "files": [ "*.js", "mac", diff --git a/pkg/node-modules/nodeModuleCollector.go b/pkg/node-modules/nodeModuleCollector.go index 105900e..06b3abe 100644 --- a/pkg/node-modules/nodeModuleCollector.go +++ b/pkg/node-modules/nodeModuleCollector.go @@ -103,7 +103,9 @@ func (t *Collector) processDependencies(list *map[string]string, nodeModuleDir s } if childDependency == nil { - unresolved = append(unresolved, name) + if !t.hasResolvedDependency(nodeModuleDir, name){ + unresolved = append(unresolved, name) + } } else { (*queue)[queueIndex] = childDependency correctOptionalState(isOptional, childDependency) @@ -146,7 +148,7 @@ func (t *Collector) processDependencies(list *map[string]string, nodeModuleDir s } if childDependency == nil { - hasUnresolved = true + hasUnresolved = !t.hasResolvedDependency(nodeModuleDir, name) } else { (*queue)[queueIndex] = childDependency correctOptionalState(isOptional, childDependency) @@ -178,6 +180,17 @@ func correctOptionalState(isOptional bool, childDependency *Dependency) { } } +func (t *Collector) hasResolvedDependency(parentNodeModuleDir string, name string) bool { + dependencyNameToDependency := t.NodeModuleDirToDependencyMap[parentNodeModuleDir] + if dependencyNameToDependency != nil { + dependency := (*dependencyNameToDependency)[name] + if dependency != nil { + return true + } + } + return false +} + // nil if already handled func (t *Collector) resolveDependency(parentNodeModuleDir string, name string) (*Dependency, error) { dependencyNameToDependency := t.NodeModuleDirToDependencyMap[parentNodeModuleDir] From a1aebee335a3fa18eecc511cbd604e49abd500c4 Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Mon, 18 Sep 2023 20:21:00 +0100 Subject: [PATCH 2/2] chore: undo accidental change --- app-builder-bin/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-builder-bin/package.json b/app-builder-bin/package.json index d488202..71f8c8a 100644 --- a/app-builder-bin/package.json +++ b/app-builder-bin/package.json @@ -1,5 +1,5 @@ { - "name": "@julusian/app-builder-bin", + "name": "app-builder-bin", "description": "app-builder precompiled binaries", "version": "4.0.1", "files": [ @@ -16,4 +16,4 @@ "appimage", "icns" ] -} \ No newline at end of file +}