Skip to content

Commit c494697

Browse files
fix: keep namedChunks in sync after merging or removing chunks (#22954)
* fix: keep namedChunks in sync after merging or removing chunks * fix: drop every name of a removed empty chunk --------- Co-authored-by: alexander-akait <[email protected]>
1 parent 70dea9e commit c494697

19 files changed

Lines changed: 177 additions & 6 deletions
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"webpack": patch
3+
---
4+
5+
Keep `compilation.namedChunks` pointing to existing chunks after chunks are merged or removed.

‎lib/graph/ChunkGraph.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1188,9 +1188,10 @@ class ChunkGraph {
11881188
* Processes the provided chunk a.
11891189
* @param {Chunk} chunkA the target chunk
11901190
* @param {Chunk} chunkB the chunk to integrate
1191+
* @param {Map<string, Chunk>=} namedChunks named chunks whose entries for chunk b are moved to chunk a
11911192
* @returns {void}
11921193
*/
1193-
integrateChunks(chunkA, chunkB) {
1194+
integrateChunks(chunkA, chunkB, namedChunks) {
11941195
// Decide for one name (deterministic)
11951196
if (chunkA.name && chunkB.name) {
11961197
if (
@@ -1245,6 +1246,12 @@ class ChunkGraph {
12451246
chunkA.addGroup(chunkGroup);
12461247
chunkB.removeGroup(chunkGroup);
12471248
}
1249+
1250+
if (namedChunks) {
1251+
for (const [name, chunk] of namedChunks) {
1252+
if (chunk === chunkB) namedChunks.set(name, chunkA);
1253+
}
1254+
}
12481255
ChunkGraph.clearChunkGraphForChunk(chunkB);
12491256
}
12501257

‎lib/graph/buildChunkGraph.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,6 +1507,9 @@ const cleanupUnconnectedGroups = (compilation, allCreatedChunkGroups) => {
15071507
for (const chunk of chunkGroup.chunks) {
15081508
compilation.chunks.delete(chunk);
15091509
chunkGraph.disconnectChunk(chunk);
1510+
if (chunk.name && compilation.namedChunks.get(chunk.name) === chunk) {
1511+
compilation.namedChunks.delete(chunk.name);
1512+
}
15101513
}
15111514
chunkGraph.disconnectChunkGroup(chunkGroup);
15121515
chunkGroup.remove();

‎lib/optimize/AggressiveMergingPlugin.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ class AggressiveMergingPlugin {
9090
if (bestA === undefined) return;
9191
if (bestImprovement < minSizeReduce) return;
9292

93-
chunkGraph.integrateChunks(/** @type {Chunk} */ (bestB), bestA);
93+
chunkGraph.integrateChunks(
94+
/** @type {Chunk} */ (bestB),
95+
bestA,
96+
compilation.namedChunks
97+
);
9498
compilation.chunks.delete(bestA);
9599
return true;
96100
}

‎lib/optimize/LimitChunkCountPlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class LimitChunkCountPlugin {
239239

240240
// merge the chunks
241241
if (chunkGraph.canChunksBeIntegrated(a, b)) {
242-
chunkGraph.integrateChunks(a, b);
242+
chunkGraph.integrateChunks(a, b, compilation.namedChunks);
243243
compilation.chunks.delete(b);
244244

245245
// flag chunk a as modified as further optimization are possible for all children here

‎lib/optimize/MergeDuplicateChunksPlugin.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,11 @@ class MergeDuplicateChunksPlugin {
130130
}
131131
// merge them
132132
if (chunkGraph.canChunksBeIntegrated(chunk, otherChunk)) {
133-
chunkGraph.integrateChunks(chunk, otherChunk);
133+
chunkGraph.integrateChunks(
134+
chunk,
135+
otherChunk,
136+
compilation.namedChunks
137+
);
134138
compilation.chunks.delete(otherChunk);
135139
}
136140
}

‎lib/optimize/MinChunkSizePlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class MinChunkSizePlugin {
121121

122122
const pair = sortedSizeFilteredExtendedPairCombinations[0];
123123

124-
chunkGraph.integrateChunks(pair[2], pair[3]);
124+
chunkGraph.integrateChunks(pair[2], pair[3], compilation.namedChunks);
125125
compilation.chunks.delete(pair[3]);
126126
return true;
127127
}

‎lib/optimize/RemoveEmptyChunksPlugin.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ class RemoveEmptyChunksPlugin {
3535
) {
3636
compilation.chunkGraph.disconnectChunk(chunk);
3737
compilation.chunks.delete(chunk);
38+
// A merged chunk can carry several names; names reassigned to another chunk stay
39+
for (const [name, namedChunk] of compilation.namedChunks) {
40+
if (namedChunk === chunk) compilation.namedChunks.delete(name);
41+
}
3842
}
3943
}
4044
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default "a";
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export default "b";

0 commit comments

Comments
 (0)