fix: should disconnect children correctly when remove available modules (#10503)

JSerFeng · web-flow · commit d42e8d13f1b7 · 2025-05-29T10:18:52.000+08:00
diff --git a/crates/rspack_core/src/build_chunk_graph/available_modules.rs b/crates/rspack_core/src/build_chunk_graph/available_modules.rs
@@ -220,6 +220,11 @@ pub fn remove_available_modules(
       continue;
     }
 
+    let outgoings = chunk.outgoings_mut();
+    for remove_id in &removed {
+      outgoings.swap_remove(remove_id);
+    }
+
     let chunk = &chunks[chunk_index].1.chunk_desc;
     let outgoings = chunk.outgoings();
 
@@ -229,7 +234,7 @@ pub fn remove_available_modules(
       // if all incomings from current chunk are removed, we can remove this child
       if child_chunk.incomings().iter().all(|incoming| {
         // if all incomings are not from current chunk, we disconnect them
-        !removed.contains(incoming) && !outgoings.contains(incoming)
+        !outgoings.contains(incoming)
       }) {
         disconnect_children.insert(*child);
       }
diff --git a/crates/rspack_core/src/build_chunk_graph/new_code_splitter.rs b/crates/rspack_core/src/build_chunk_graph/new_code_splitter.rs
@@ -97,6 +97,15 @@ impl ChunkDesc {
     }
   }
 
+  pub(crate) fn outgoings_mut(
+    &mut self,
+  ) -> &mut IndexSet<AsyncDependenciesBlockIdentifier, BuildHasherDefault<IdentifierHasher>> {
+    match self {
+      ChunkDesc::Entry(entry) => &mut entry.outgoing_blocks,
+      ChunkDesc::Chunk(chunk) => &mut chunk.outgoing_blocks,
+    }
+  }
+
   pub(crate) fn incomings(&self) -> &HashSet<AsyncDependenciesBlockIdentifier> {
     match self {
       ChunkDesc::Entry(entry) => &entry.incoming_blocks,
diff --git a/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/foo.js b/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/foo.js
@@ -0,0 +1 @@
+export const value = 1
diff --git a/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/index.js b/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/index.js
@@ -0,0 +1,12 @@
+import './routes.js'
+
+it('should load routes', async () => {
+	const {value} = await import(/*webpackChunkName: "routes"*/ './module.js')
+
+	expect(await value).toBe(1)
+
+	// foo should contain no children at all
+	const chunkId = __STATS__.namedChunkGroups.routes.chunks[0];
+	const chunk = __STATS__.chunks.find(c => c.id === chunkId);
+	expect(chunk.children.length).toBe(0);
+})
diff --git a/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/module.js b/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/module.js
@@ -0,0 +1 @@
+export * from './routes'
diff --git a/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/routes.js b/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/routes.js
@@ -0,0 +1 @@
+export const value = import(/*webpackChunkName: "foo"*/ './foo.js').then(({ value }) => value)
diff --git a/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/webpack.config.js b/packages/rspack-test-tools/tests/configCases/chunk-graph/disconnect-unneeded-chunks/webpack.config.js
@@ -0,0 +1,8 @@
+module.exports = {
+	output: {
+		chunkFilename: "[name].js"
+	},
+	stats: {
+		chunkGroups: true
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+export const value = import(/webpackChunkName: "foo"/ './foo.js').then(({ value }) => value)`