@@ -904,6 +904,7 @@ class CssModulesPlugin {
904904
905905 // Get ordered list of modules per chunk group
906906 // Lists are in reverse order to allow to use Array.pop()
907+ const numberOfGroups = chunk . getNumberOfGroups ( ) ;
907908 const modulesByChunkGroup = Array . from (
908909 chunk . groupsIterable ,
909910 ( chunkGroup ) => {
@@ -919,11 +920,14 @@ class CssModulesPlugin {
919920 )
920921 . map ( ( item ) => item . module ) ;
921922
922- return { list : sortedModules , set : new Set ( sortedModules ) } ;
923+ return {
924+ list : sortedModules ,
925+ set : numberOfGroups > 1 ? new Set ( sortedModules ) : undefined
926+ } ;
923927 }
924928 ) ;
925929
926- if ( modulesByChunkGroup . length === 1 ) {
930+ if ( numberOfGroups === 1 ) {
927931 return modulesByChunkGroup [ 0 ] . list . reverse ( ) ;
928932 }
929933
@@ -967,7 +971,7 @@ class CssModulesPlugin {
967971 if ( list . length === 0 ) continue ;
968972 const lastModule = list [ list . length - 1 ] ;
969973 if ( lastModule === selectedModule ) continue ;
970- if ( ! set . has ( selectedModule ) ) continue ;
974+ if ( ! ( /** @type { Set<Module> } */ ( set ) . has ( selectedModule ) ) ) continue ;
971975 failedModules . add ( selectedModule ) ;
972976 if ( failedModules . has ( lastModule ) ) {
973977 // There is a conflict, try other alternatives
@@ -1026,7 +1030,10 @@ class CssModulesPlugin {
10261030 const lastModule = list [ list . length - 1 ] ;
10271031 if ( lastModule === selectedModule ) {
10281032 list . pop ( ) ;
1029- } else if ( hasFailed && set . has ( selectedModule ) ) {
1033+ } else if (
1034+ hasFailed &&
1035+ /** @type {Set<Module> } */ ( set ) . has ( selectedModule )
1036+ ) {
10301037 const idx = list . indexOf ( selectedModule ) ;
10311038 if ( idx >= 0 ) list . splice ( idx , 1 ) ;
10321039 }
0 commit comments