fix: should recompile correctly when a shared entry specified in 'dependOn' is modified during watch mode (#11464)

Author: SyMind

crates/rspack_core/src/build_chunk_graph/incremental.rs

@@ -9,8 +9,8 @@ use tracing::instrument;
 
 use super::code_splitter::{CgiUkey, CodeSplitter, DependenciesBlockIdentifier};
 use crate::{
-  AsyncDependenciesBlockIdentifier, ChunkGroupUkey, ChunkUkey, Compilation, GroupOptions,
-  ModuleIdentifier, RuntimeSpec,
+  AsyncDependenciesBlockIdentifier, ChunkGroupKind, ChunkGroupUkey, ChunkUkey, Compilation,
+  GroupOptions, ModuleIdentifier, RuntimeSpec,
   incremental::{IncrementalPasses, Mutation},
   is_runtime_equal,
 };
@@ -249,7 +249,31 @@ impl CodeSplitter {
       && chunk_group.is_initial()
       && chunk_group.parents.is_empty()
     {
-      return Ok(Some(vec![ChunkReCreation::Entry(name)]));
+      edges = vec![ChunkReCreation::Entry(name)];
+    }
+
+    // If the invalidated chunk group is an entrypoint, we must also invalidate any
+    // other entrypoints that depend on it via the `dependOn` option.
+    if matches!(chunk_group.kind, ChunkGroupKind::Entrypoint { .. }) {
+      let dependent_entrypoints_to_invalidate: Vec<_> = compilation
+        .entrypoints
+        .values()
+        .filter_map(|entrypoint_ukey| {
+          compilation
+            .chunk_group_by_ukey
+            .get(entrypoint_ukey)
+            .filter(|entrypoint| entrypoint.parents.contains(&chunk_group_ukey))
+            .map(|_| *entrypoint_ukey)
+        })
+        .collect();
+
+      for entrypoint_ukey in dependent_entrypoints_to_invalidate {
+        if let Some(invalidation_result) =
+          self.invalidate_chunk_group(entrypoint_ukey, compilation)?
+        {
+          edges.extend(invalidation_result);
+        }
+      }
     }
 
     if edges.is_empty() {

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/0/bar.js

@@ -0,0 +1 @@
+import "./shared";

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/0/foo.js

@@ -0,0 +1 @@
+import("./bar");

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/0/index1.js

@@ -0,0 +1 @@
+import("./bar");

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/0/index2.js

@@ -0,0 +1,3 @@
+it("should recompile correctly when a shared entry specified in 'dependOn' is modified during watch mode", (done) => {
+    done();
+});

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/0/main.js

@@ -0,0 +1 @@
+import("./foo")

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/0/shared.js

@@ -0,0 +1 @@
+// import("./foo")

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/1/shared.js

@@ -0,0 +1,18 @@
+/** @type {import("@rspack/core").Configuration} */
+module.exports = {
+    entry: {
+        main: "./main.js",
+        shared: "./shared.js",
+        index1: {
+            import: "./index1.js",
+            dependOn: "shared"
+        },
+        index2: {
+            import: "./index2.js",
+            dependOn: "shared"
+        },
+    },
+    output: {
+        filename: "[name].js"
+    }
+}

packages/rspack-test-tools/tests/watchCases/chunks/depend-on/rspack.config.js

@@ -0,0 +1,5 @@
+module.exports = {
+    findBundle() {
+        return []
+    }
+};