Merge pull request #13647 from webpack/perf/memory-improvements

improve disposing of lazy compilation backend server
webpack · Jun 28, 2021 · 18e93eb · 18e93eb
2 parents 3bcd719 + 291321c
commit 18e93eb
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 8 deletions.
diff --git a/lib/hmr/lazyCompilationBackend.js b/lib/hmr/lazyCompilationBackend.js
@@ -52,6 +52,16 @@ module.exports = (compiler, client, callback) => {
 		}
 		if (moduleActivated && compiler.watching) compiler.watching.invalidate();
 	});
+	let isClosing = false;
+	/** @type {Set<import("net").Socket>} */
+	const sockets = new Set();
+	server.on("connection", socket => {
+		sockets.add(socket);
+		socket.on("close", () => {
+			sockets.delete(socket);
+		});
+		if (isClosing) socket.destroy();
+	});
 	server.listen(err => {
 		if (err) return callback(err);
 		const addr = server.address();
@@ -67,7 +77,13 @@ module.exports = (compiler, client, callback) => {
 		);
 		callback(null, {
 			dispose(callback) {
-				server.close(callback);
+				isClosing = true;
+				server.close(err => {
+					callback(err);
+				});
+				for (const socket of sockets) {
+					socket.destroy(new Error("Server is disposing"));
+				}
 			},
 			module(originalModule) {
 				const key = `${encodeURIComponent(

diff --git a/lib/optimize/ModuleConcatenationPlugin.js b/lib/optimize/ModuleConcatenationPlugin.js
@@ -450,7 +450,7 @@ class ModuleConcatenationPlugin {
 						},
 						err => {
 							logger.timeEnd("create concatenated modules");
-							process.nextTick(() => callback(err));
+							process.nextTick(callback.bind(null, err));
 						}
 					);
 				}

diff --git a/test/ConfigTestCases.template.js b/test/ConfigTestCases.template.js
@@ -492,9 +492,21 @@ const describeCases = config => {
 											}
 										};
 
-										results.push(
-											_require(outputDirectory, optionsArr[i], bundlePath)
-										);
+										if (Array.isArray(bundlePath)) {
+											for (const bundlePathItem of bundlePath) {
+												results.push(
+													_require(
+														outputDirectory,
+														optionsArr[i],
+														"./" + bundlePathItem
+													)
+												);
+											}
+										} else {
+											results.push(
+												_require(outputDirectory, optionsArr[i], bundlePath)
+											);
+										}
 									}
 								}
 								// give a free pass to compilation that generated an error

diff --git a/test/HotTestCases.template.js b/test/HotTestCases.template.js
@@ -39,6 +39,7 @@ const describeCases = config => {
 						let compiler;
 						afterAll(callback => {
 							compiler.close(callback);
+							compiler = undefined;
 						});
 
 						it(

diff --git a/test/helpers/createLazyTestEnv.js b/test/helpers/createLazyTestEnv.js
@@ -4,7 +4,13 @@ const createOnceFn = fn => {
 	if (!fn) return null;
 	if (fn.length >= 1) {
 		return done => {
-			fn(done);
+			try {
+				fn(done);
+			} catch (e) {
+				// avoid leaking memory
+				e.stack;
+				throw e;
+			}
 			fn = null;
 		};
 	}
@@ -22,11 +28,23 @@ const createDisposableFn = fn => {
 	let rfn;
 	if (fn.length >= 1) {
 		rfn = done => {
-			fn(done);
+			try {
+				fn(done);
+			} catch (e) {
+				// avoid leaking memory
+				e.stack;
+				throw e;
+			}
 		};
 	} else {
 		rfn = () => {
-			return fn();
+			try {
+				return fn();
+			} catch (e) {
+				// avoid leaking memory
+				e.stack;
+				throw e;
+			}
 		};
 	}
 	rfn.dispose = () => {