webpack 5.59.1 → 5.60.0

package/hot/lazy-compilation-node.js

@@ -9,7 +9,9 @@ exports.keepAlive = function (options) {
 	var active = options.active;
 	var module = options.module;
 	var response;
-	var request = require("http").request(
+	var request = (
+		urlBase.startsWith("https") ? require("https") : require("http")
+	).request(
 		urlBase + data,
 		{
 			agent: false,

package/lib/NormalModule.js

@@ -793,16 +793,19 @@ class NormalModule extends Module {
 		this.buildInfo.fileDependencies = new LazySet();
 		this.buildInfo.contextDependencies = new LazySet();
 		this.buildInfo.missingDependencies = new LazySet();
-		if (this.loaders.length > 0) {
-			this.buildInfo.buildDependencies = new LazySet();
-		}
 		this.buildInfo.cacheable = true;
+
 		try {
 			hooks.beforeLoaders.call(this.loaders, this, loaderContext);
 		} catch (err) {
 			processResult(err);
 			return;
 		}
+
+		if (this.loaders.length > 0) {
+			this.buildInfo.buildDependencies = new LazySet();
+		}
+
 		runLoaders(
 			{
 				resource: this.resource,

package/lib/WebpackOptionsApply.js

@@ -261,15 +261,18 @@ class WebpackOptionsApply extends OptionsApply {
 					: null;
 			new LazyCompilationPlugin({
 				backend:
-					(lazyOptions && lazyOptions.backend) ||
-					require("./hmr/lazyCompilationBackend"),
-				client:
-					(lazyOptions && lazyOptions.client) ||
-					require.resolve(
-						`../hot/lazy-compilation-${
-							options.externalsPresets.node ? "node" : "web"
-						}.js`
-					),
+					typeof lazyOptions.backend === "function"
+						? lazyOptions.backend
+						: require("./hmr/lazyCompilationBackend")({
+								...lazyOptions.backend,
+								client:
+									(lazyOptions.backend && lazyOptions.backend.client) ||
+									require.resolve(
+										`../hot/lazy-compilation-${
+											options.externalsPresets.node ? "node" : "web"
+										}.js`
+									)
+						  }),
 				entries: !lazyOptions || lazyOptions.entries !== false,
 				imports: !lazyOptions || lazyOptions.imports !== false,
 				test: (lazyOptions && lazyOptions.test) || undefined

package/lib/cache/PackFileCacheStrategy.js

@@ -991,7 +991,10 @@ class PackFileCacheStrategy {
 		allowCollectingMemory,
 		compression
 	}) {
-		this.fileSerializer = createFileSerializer(fs);
+		this.fileSerializer = createFileSerializer(
+			fs,
+			compiler.options.output.hashFunction
+		);
 		this.fileSystemInfo = new FileSystemInfo(fs, {
 			managedPaths: snapshot.managedPaths,
 			immutablePaths: snapshot.immutablePaths,

package/lib/hmr/LazyCompilationPlugin.js

@@ -32,6 +32,12 @@ const { registerNotSerializable } = require("../util/serialization");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
+/**
+ * @typedef {Object} BackendApi
+ * @property {function(Error=): void} dispose
+ * @property {function(Module): { client: string, data: string, active: boolean }} module
+ */
+
 const IGNORED_DEPENDENCY_TYPES = new Set([
 	"import.meta.webpackHot.accept",
 	"import.meta.webpackHot.decline",
@@ -303,15 +309,13 @@ class LazyCompilationDependencyFactory extends ModuleFactory {
 class LazyCompilationPlugin {
 	/**
 	 * @param {Object} options options
-	 * @param {(function(Compiler, string, function(Error?, any?): void): void) | function(Compiler, string): Promise<any>} options.backend the backend
-	 * @param {string} options.client the client reference
+	 * @param {(function(Compiler, function(Error?, BackendApi?): void): void) | function(Compiler): Promise<BackendApi>} options.backend the backend
 	 * @param {boolean} options.entries true, when entries are lazy compiled
 	 * @param {boolean} options.imports true, when import() modules are lazy compiled
 	 * @param {RegExp | string | (function(Module): boolean)} options.test additional filter for lazy compiled entrypoint modules
 	 */
-	constructor({ backend, client, entries, imports, test }) {
+	constructor({ backend, entries, imports, test }) {
 		this.backend = backend;
-		this.client = client;
 		this.entries = entries;
 		this.imports = imports;
 		this.test = test;
@@ -327,7 +331,7 @@ class LazyCompilationPlugin {
 			"LazyCompilationPlugin",
 			(params, callback) => {
 				if (backend !== undefined) return callback();
-				const promise = this.backend(compiler, this.client, (err, result) => {
+				const promise = this.backend(compiler, (err, result) => {
 					if (err) return callback(err);
 					backend = result;
 					callback();

package/lib/hmr/lazyCompilationBackend.js

@@ -5,21 +5,46 @@
 
 "use strict";
 
-const http = require("http");
-
+/** @typedef {import("http").ServerOptions} HttpServerOptions */
+/** @typedef {import("https").ServerOptions} HttpsServerOptions */
+/** @typedef {import("../../declarations/WebpackOptions").LazyCompilationDefaultBackendOptions} LazyCompilationDefaultBackendOptions */
 /** @typedef {import("../Compiler")} Compiler */
 
 /**
+ * @callback BackendHandler
  * @param {Compiler} compiler compiler
- * @param {string} client client reference
  * @param {function(Error?, any?): void} callback callback
  * @returns {void}
  */
-module.exports = (compiler, client, callback) => {
+
+/**
+ * @param {Omit<LazyCompilationDefaultBackendOptions, "client"> & { client: NonNullable<LazyCompilationDefaultBackendOptions["client"]>}} options additional options for the backend
+ * @returns {BackendHandler} backend
+ */
+module.exports = options => (compiler, callback) => {
 	const logger = compiler.getInfrastructureLogger("LazyCompilationBackend");
 	const activeModules = new Map();
 	const prefix = "/lazy-compilation-using-";
 
+	const isHttps =
+		options.protocol === "https" ||
+		(typeof options.server === "object" &&
+			("key" in options.server || "pfx" in options.server));
+
+	const createServer =
+		typeof options.server === "function"
+			? options.server
+			: (() => {
+					const http = isHttps ? require("https") : require("http");
+					return http.createServer.bind(http, options.server);
+			  })();
+	const listen =
+		typeof options.listen === "function"
+			? options.listen
+			: server => server.listen(options.listen);
+
+	const protocol = options.protocol || (isHttps ? "https" : "http");
+
 	const requestListener = (req, res) => {
 		const keys = req.url.slice(prefix.length).split("@");
 		req.socket.on("close", () => {
@@ -52,7 +77,10 @@ module.exports = (compiler, client, callback) => {
 		}
 		if (moduleActivated && compiler.watching) compiler.watching.invalidate();
 	};
-	const server = http.createServer(requestListener);
+
+	const server = /** @type {import("net").Server} */ (createServer());
+	server.on("request", requestListener);
+
 	let isClosing = false;
 	/** @type {Set<import("net").Socket>} */
 	const sockets = new Set();
@@ -63,16 +91,19 @@ module.exports = (compiler, client, callback) => {
 		});
 		if (isClosing) socket.destroy();
 	});
-	server.listen(err => {
+	server.on("clientError", e => {
+		if (e.message !== "Server is disposing") logger.warn(e);
+	});
+	server.on("listening", err => {
 		if (err) return callback(err);
 		const addr = server.address();
 		if (typeof addr === "string") throw new Error("addr must not be a string");
 		const urlBase =
 			addr.address === "::" || addr.address === "0.0.0.0"
-				? `http://localhost:${addr.port}`
+				? `${protocol}://localhost:${addr.port}`
 				: addr.family === "IPv6"
-				? `http://[${addr.address}]:${addr.port}`
-				: `http://${addr.address}:${addr.port}`;
+				? `${protocol}://[${addr.address}]:${addr.port}`
+				: `${protocol}://${addr.address}:${addr.port}`;
 		logger.log(
 			`Server-Sent-Events server for lazy compilation open at ${urlBase}.`
 		);
@@ -94,11 +125,12 @@ module.exports = (compiler, client, callback) => {
 				).replace(/%(2F|3A|24|26|2B|2C|3B|3D|3A)/g, decodeURIComponent)}`;
 				const active = activeModules.get(key) > 0;
 				return {
-					client: `${client}?${encodeURIComponent(urlBase + prefix)}`,
+					client: `${options.client}?${encodeURIComponent(urlBase + prefix)}`,
 					data: key,
 					active
 				};
 			}
 		});
 	});
+	listen(server);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.59.1",
+  "version": "5.60.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",