@@ -355,6 +355,7 @@ const MAX_INTERSECTION_PAIRS = 500000;
355355const MAX_INTERSECTION_COMPARISONS = 16000000 ;
356356const MAX_INTERSECTION_PROPAGATION_CHECKS = 500000 ;
357357const MAX_INTERSECTION_PROPAGATION_COMPARISONS = 16000000 ;
358+ const MAX_INTERSECTION_PROPAGATION_EXPANSIONS = 500000 ;
358359
359360/**
360361 * Returns normalized representation.
@@ -1010,20 +1011,26 @@ class SplitChunksPlugin {
10101011 const getChunkSetsInGraph = memoize ( ( ) => {
10111012 /** @type {Map<bigint, ChunkSet> } */
10121013 const chunkSetsInGraph = new Map ( ) ;
1014+ /** @type {Map<bigint, number> } */
1015+ const chunkSetModuleCounts = new Map ( ) ;
10131016 /** @type {ChunkSet } */
10141017 const singleChunkSets = new Set ( ) ;
10151018 for ( const module of compilation . modules ) {
10161019 const chunks = chunkGraph . getModuleChunksIterable ( module ) ;
10171020 const chunksKey = getKey ( chunks ) ;
10181021 if ( typeof chunksKey === "bigint" ) {
1022+ chunkSetModuleCounts . set (
1023+ chunksKey ,
1024+ ( chunkSetModuleCounts . get ( chunksKey ) || 0 ) + 1
1025+ ) ;
10191026 if ( ! chunkSetsInGraph . has ( chunksKey ) ) {
10201027 chunkSetsInGraph . set ( chunksKey , new Set ( chunks ) ) ;
10211028 }
10221029 } else {
10231030 singleChunkSets . add ( chunksKey ) ;
10241031 }
10251032 }
1026- return { chunkSetsInGraph, singleChunkSets } ;
1033+ return { chunkSetsInGraph, singleChunkSets, chunkSetModuleCounts } ;
10271034 } ) ;
10281035
10291036 /**
@@ -1055,6 +1062,8 @@ class SplitChunksPlugin {
10551062 const getExportsChunkSetsInGraph = memoize ( ( ) => {
10561063 /** @type {ChunkSetsInGraph } */
10571064 const chunkSetsInGraph = new Map ( ) ;
1065+ /** @type {Map<bigint, number> } */
1066+ const chunkSetModuleCounts = new Map ( ) ;
10581067 /** @type {ChunkSet } */
10591068 const singleChunkSets = new Set ( ) ;
10601069 for ( const module of compilation . modules ) {
@@ -1065,13 +1074,17 @@ class SplitChunksPlugin {
10651074 singleChunkSets . add ( chunks [ 0 ] ) ;
10661075 } else {
10671076 const chunksKey = /** @type {bigint } */ ( getKey ( chunks ) ) ;
1077+ chunkSetModuleCounts . set (
1078+ chunksKey ,
1079+ ( chunkSetModuleCounts . get ( chunksKey ) || 0 ) + 1
1080+ ) ;
10681081 if ( ! chunkSetsInGraph . has ( chunksKey ) ) {
10691082 chunkSetsInGraph . set ( chunksKey , new Set ( chunks ) ) ;
10701083 }
10711084 }
10721085 }
10731086 }
1074- return { chunkSetsInGraph, singleChunkSets } ;
1087+ return { chunkSetsInGraph, singleChunkSets, chunkSetModuleCounts } ;
10751088 } ) ;
10761089
10771090 /**
@@ -1149,9 +1162,13 @@ class SplitChunksPlugin {
11491162 /**
11501163 * Discovers intersections and associates them with containing original sets.
11511164 * @param {ChunkSetsInGraph } chunkSets original chunk sets
1165+ * @param {Map<bigint, number> } chunkSetModuleCounts module count by original set key
11521166 * @returns {Map<bigint, ChunkSet[]> } intersections grouped by original set key
11531167 */
1154- const getIntersectionsByChunkSet = ( chunkSets ) => {
1168+ const getIntersectionsByChunkSet = (
1169+ chunkSets ,
1170+ chunkSetModuleCounts
1171+ ) => {
11551172 /** @type {Map<bigint, ChunkSet> } */
11561173 const chunkSetsByMembership = new Map ( ) ;
11571174 for ( const [ key , chunks ] of chunkSets ) {
@@ -1169,31 +1186,42 @@ class SplitChunksPlugin {
11691186 const propagation = associateIntersections (
11701187 chunkSets ,
11711188 result . entries ,
1189+ chunkSetModuleCounts ,
11721190 {
11731191 maximumChecks : MAX_INTERSECTION_PROPAGATION_CHECKS ,
1174- maximumComparisons : MAX_INTERSECTION_PROPAGATION_COMPARISONS
1192+ maximumComparisons : MAX_INTERSECTION_PROPAGATION_COMPARISONS ,
1193+ maximumExpansions : MAX_INTERSECTION_PROPAGATION_EXPANSIONS
11751194 }
11761195 ) ;
11771196 logger . debug (
1178- "Prepared %d additional split chunk intersections from %d pairs and %d comparisons%s; propagated with %d checks and %d comparisons %s" ,
1197+ "Prepared %d additional split chunk intersections from %d pairs and %d comparisons%s; propagated with %d checks, %d comparisons, and %d downstream visits %s" ,
11791198 result . sets . length ,
11801199 result . pairs ,
11811200 result . comparisons ,
11821201 result . limited ? " (limited)" : "" ,
11831202 propagation . checks ,
11841203 propagation . comparisons ,
1204+ propagation . expansions ,
11851205 propagation . limited ? " (limited)" : ""
11861206 ) ;
11871207 return propagation . intersectionsByOriginalKey ;
11881208 } ;
1189- const getIntersectionsByChunkSetKey = memoize ( ( ) =>
1190- getIntersectionsByChunkSet ( getChunkSetsInGraph ( ) . chunkSetsInGraph )
1191- ) ;
1192- const getExportsIntersectionsByChunkSetKey = memoize ( ( ) =>
1193- getIntersectionsByChunkSet (
1194- getExportsChunkSetsInGraph ( ) . chunkSetsInGraph
1195- )
1196- ) ;
1209+ const getIntersectionsByChunkSetKey = memoize ( ( ) => {
1210+ const { chunkSetsInGraph, chunkSetModuleCounts } =
1211+ getChunkSetsInGraph ( ) ;
1212+ return getIntersectionsByChunkSet (
1213+ chunkSetsInGraph ,
1214+ chunkSetModuleCounts
1215+ ) ;
1216+ } ) ;
1217+ const getExportsIntersectionsByChunkSetKey = memoize ( ( ) => {
1218+ const { chunkSetsInGraph, chunkSetModuleCounts } =
1219+ getExportsChunkSetsInGraph ( ) ;
1220+ return getIntersectionsByChunkSet (
1221+ chunkSetsInGraph ,
1222+ chunkSetModuleCounts
1223+ ) ;
1224+ } ) ;
11971225
11981226 /** @typedef {(ChunkSet | Chunk)[] } Combinations */
11991227
0 commit comments