@@ -260,7 +260,6 @@ export class CycloneDxWebpackPlugin {
260260 // metadata matches this exact component.
261261 // -> so the component is actually treated as the root component.
262262 thisLogger . debug ( 'update bom.metadata.component - replace' , bom . metadata . component , 'with' , component )
263- this . #addRootComponentExtRefs( component , thisLogger )
264263 bom . metadata . component = component
265264 } else {
266265 thisLogger . debug ( 'add to bom.components' , component )
@@ -323,8 +322,7 @@ export class CycloneDxWebpackPlugin {
323322 )
324323 }
325324
326- #addRootComponentExtRefs ( component : CDX . Models . Component | undefined , logger : WebpackLogger ) : void {
327- if ( component === undefined ) { return }
325+ #addRootComponentExtRefs ( component : CDX . Models . Component , logger : WebpackLogger ) : void {
328326 if (
329327 typeof this . rootComponentBuildSystem === 'string' &&
330328 this . rootComponentBuildSystem . length > 0 &&
@@ -371,9 +369,7 @@ export class CycloneDxWebpackPlugin {
371369 : { name : this . rootComponentName , version : this . rootComponentVersion }
372370 if ( thisPackageJson === undefined ) { return undefined }
373371 normalizePackageJson ( thisPackageJson , w => { logger . debug ( 'normalizePackageJson from PkgPath' , path , 'caused:' , w ) } )
374- const component = builder . makeComponent ( thisPackageJson )
375- this . #addRootComponentExtRefs( component , logger )
376- return component
372+ return builder . makeComponent ( thisPackageJson )
377373 }
378374
379375 #finalizeBom (
@@ -399,6 +395,7 @@ export class CycloneDxWebpackPlugin {
399395 }
400396
401397 if ( bom . metadata . component !== undefined ) {
398+ this . #addRootComponentExtRefs( bom . metadata . component , logger )
402399 bom . metadata . component . type = this . rootComponentType
403400 bom . metadata . component . purl = cdxPurlFactory . makeFromComponent ( bom . metadata . component )
404401 bom . metadata . component . bomRef . value = bom . metadata . component . purl ?. toString ( )
0 commit comments