fix: clear compiled modules from active modules (#10914)

* fix: clear compiled modules from active modules

* fix: fix persistentCache test

Author: JSerFeng

crates/rspack_plugin_lazy_compilation/src/module.rs

@@ -209,7 +209,7 @@ impl Module for LazyCompilationProxyModule {
     );
 
     let keep_active = format!(
-      "var dispose = client.keepAlive({{ data: data, active: {}, module: module, onError: onError }})",
+      "var dispose = client.activate({{ data: data, active: {}, module: module, onError: onError }})",
       block.is_some()
     );
 
@@ -242,12 +242,10 @@ impl Module for LazyCompilationProxyModule {
         if (module.hot) {{
           module.hot.accept();
           module.hot.accept({}, function() {{ module.hot.invalidate(); }});
-          module.hot.dispose(function(data) {{ delete data.resolveSelf; dispose(data); }});
+          module.hot.dispose(function(data) {{ delete data.resolveSelf; }});
           if (module.hot.data && module.hot.data.resolveSelf)
             module.hot.data.resolveSelf(module.exports);
         }}
-        function onError() {{ /* ignore */ }}
-        {}
         ",
         module_namespace_promise(
           &mut template_ctx,
@@ -261,7 +259,6 @@ impl Module for LazyCompilationProxyModule {
           ChunkGraph::get_module_id(&compilation.module_ids_artifact, *module)
             .expect("should have module id")
         ),
-        keep_active,
       ))
     } else {
       RawStringSource::from(format!(

packages/rspack-test-tools/tests/hotCases/lazy-compilation/context/__snapshots__/web/1.snap.txt

@@ -10,7 +10,7 @@
 - Bundle: modules_module_js_lazy-compilation-proxy.chunk.CURRENT_HASH.js
 - Manifest: main.LAST_HASH.hot-update.json, size: 69
 - Update: main.LAST_HASH.hot-update.js, size: 582
-- Update: modules_demo_js_lazy-compilation-proxy.LAST_HASH.hot-update.js, size: 1430
+- Update: modules_demo_js_lazy-compilation-proxy.LAST_HASH.hot-update.js, size: 1268
 
 ## Manifest
 
@@ -84,12 +84,10 @@ var data = __LAZY_ID__
         if (module.hot) {
           module.hot.accept();
           module.hot.accept("./modules/demo.js", function() { module.hot.invalidate(); });
-          module.hot.dispose(function(data) { delete data.resolveSelf; dispose(data); });
+          module.hot.dispose(function(data) { delete data.resolveSelf; });
           if (module.hot.data && module.hot.data.resolveSelf)
             module.hot.data.resolveSelf(module.exports);
         }
-        function onError() { /* ignore */ }
-        var dispose = client.keepAlive({ data: data, active: true, module: module, onError: onError })
 
 
 }),

packages/rspack-test-tools/tests/hotCases/lazy-compilation/context/__snapshots__/web/2.snap.txt

@@ -11,7 +11,7 @@
 - Bundle: modules_module_js_lazy-compilation-proxy.chunk.CURRENT_HASH.js
 - Manifest: main.LAST_HASH.hot-update.json, size: 71
 - Update: main.LAST_HASH.hot-update.js, size: 582
-- Update: modules_module_js_lazy-compilation-proxy.LAST_HASH.hot-update.js, size: 1448
+- Update: modules_module_js_lazy-compilation-proxy.LAST_HASH.hot-update.js, size: 1286
 
 ## Manifest
 
@@ -85,12 +85,10 @@ var data = __LAZY_ID__
         if (module.hot) {
           module.hot.accept();
           module.hot.accept("./modules/module.js", function() { module.hot.invalidate(); });
-          module.hot.dispose(function(data) { delete data.resolveSelf; dispose(data); });
+          module.hot.dispose(function(data) { delete data.resolveSelf; });
           if (module.hot.data && module.hot.data.resolveSelf)
             module.hot.data.resolveSelf(module.exports);
         }
-        function onError() { /* ignore */ }
-        var dispose = client.keepAlive({ data: data, active: true, module: module, onError: onError })
 
 
 }),

packages/rspack-test-tools/tests/hotCases/lazy-compilation/module-test/__snapshots__/web/1.snap.txt

@@ -10,7 +10,7 @@
 - Bundle: moduleB_js.chunk.CURRENT_HASH.js
 - Manifest: main.LAST_HASH.hot-update.json, size: 64
 - Update: main.LAST_HASH.hot-update.js, size: 182
-- Update: moduleA_js_lazy-compilation-proxy.LAST_HASH.hot-update.js, size: 1392
+- Update: moduleA_js_lazy-compilation-proxy.LAST_HASH.hot-update.js, size: 1230
 
 ## Manifest
 
@@ -69,12 +69,10 @@ var data = "0"
         if (module.hot) {
           module.hot.accept();
           module.hot.accept("./moduleA.js", function() { module.hot.invalidate(); });
-          module.hot.dispose(function(data) { delete data.resolveSelf; dispose(data); });
+          module.hot.dispose(function(data) { delete data.resolveSelf; });
           if (module.hot.data && module.hot.data.resolveSelf)
             module.hot.data.resolveSelf(module.exports);
         }
-        function onError() { /* ignore */ }
-        var dispose = client.keepAlive({ data: data, active: true, module: module, onError: onError })
 
 
 }),

packages/rspack/hot/lazy-compilation-node.js

@@ -8,7 +8,7 @@ var urlBase = decodeURIComponent(__resourceQuery.slice(1));
  * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
  * @returns {() => void} function to destroy response
  */
-exports.keepAlive = function (options) {
+exports.activate = function (options) {
 	var data = options.data;
 	var onError = options.onError;
 	var active = options.active;

packages/rspack/hot/lazy-compilation-web.js

@@ -11,14 +11,14 @@ if (typeof EventSource !== "function") {
 var urlBase = decodeURIComponent(__resourceQuery.slice(1));
 /** @type {EventSource | undefined} */
 var activeEventSource;
-var activeKeys = new Map();
+var compiling = new Set();
 var errorHandlers = new Set();
 
 var updateEventSource = function updateEventSource() {
 	if (activeEventSource) activeEventSource.close();
-	if (activeKeys.size) {
+	if (compiling.size) {
 		activeEventSource = new EventSource(
-			urlBase + Array.from(activeKeys.keys()).join("@")
+			urlBase + Array.from(compiling).join("@")
 		);
 		/**
 		 * @this {EventSource}
@@ -47,17 +47,18 @@ var updateEventSource = function updateEventSource() {
  * @param {{ data: string, onError: (err: Error) => void, active: boolean, module: module }} options options
  * @returns {() => void} function to destroy response
  */
-exports.keepAlive = function (options) {
+exports.activate = function (options) {
 	var data = options.data;
 	var onError = options.onError;
 	var active = options.active;
 	var module = options.module;
 	errorHandlers.add(onError);
-	var value = activeKeys.get(data) || 0;
-	activeKeys.set(data, value + 1);
-	if (value === 0) {
+
+	if (!compiling.has(data)) {
+		compiling.add(data);
 		updateEventSource();
 	}
+
 	if (!active && !module.hot) {
 		console.log(
 			"Hot Module Replacement is not enabled. Waiting for process restart..."
@@ -66,14 +67,7 @@ exports.keepAlive = function (options) {
 
 	return function () {
 		errorHandlers.delete(onError);
-		setTimeout(function () {
-			var value = activeKeys.get(data);
-			if (value === 1) {
-				activeKeys.delete(data);
-				updateEventSource();
-			} else {
-				activeKeys.set(data, value - 1);
-			}
-		}, 1000);
+		compiling.delete(data);
+		updateEventSource();
 	};
 };

tests/e2e/cases/lazy-compilation/persistent-cache/index.test.ts

@@ -5,15 +5,8 @@ test("should load success", async ({ page, rspack }) => {
 	let component_count = await page.getByText("Component").count();
 	expect(component_count).toBe(1);
 
-	const responsePromise = page.waitForResponse(
-		response =>
-			response.url().includes("lazy-compilation-using") &&
-			response.request().method() === "GET",
-		{ timeout: 5000 }
-	);
 	await rspack.reboot();
 	await page.reload();
-	await responsePromise;
 
 	await page.getByText("Click me").click();
 	component_count = await page.getByText("Component").count();