diff --git a/src/main/java/com/blackduck/integration/detect/tool/detector/DetectorRuleFactory.java b/src/main/java/com/blackduck/integration/detect/tool/detector/DetectorRuleFactory.java index de9cc70277..b5a0519277 100644 --- a/src/main/java/com/blackduck/integration/detect/tool/detector/DetectorRuleFactory.java +++ b/src/main/java/com/blackduck/integration/detect/tool/detector/DetectorRuleFactory.java @@ -206,6 +206,11 @@ public DetectorRuleSet createRules(DetectDetectableFactory detectableFactory) { .search().defaultLock(); }).yieldsTo(DetectorType.LERNA); + rules.addDetector(DetectorType.PNPM, detector -> { + detector.entryPoint(PnpmLockDetectable.class) + .search().defaultLock(); + }).yieldsTo(DetectorType.LERNA); + rules.addDetector(DetectorType.NPM, detector -> { detector.entryPoint(NpmShrinkwrapDetectable.class) .search().defaultLock(); @@ -218,11 +223,6 @@ public DetectorRuleSet createRules(DetectDetectableFactory detectableFactory) { }).allEntryPointsFallbackToNext() .yieldsTo(DetectorType.LERNA, DetectorType.YARN, DetectorType.PNPM); - rules.addDetector(DetectorType.PNPM, detector -> { - detector.entryPoint(PnpmLockDetectable.class) - .search().defaultLock(); - }).yieldsTo(DetectorType.LERNA); - rules.addDetector(DetectorType.NUGET, detector -> { //four different detectables, last one will be the project inspector detector.entryPoint(NugetSolutionDetectable.class)