webpack 5.106.2 → 5.107.1

package/lib/WebpackError.js

@@ -5,80 +5,6 @@
 
 "use strict";
 
-const inspect = require("util").inspect.custom;
-const makeSerializable = require("./util/makeSerializable");
-
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-
-class WebpackError extends Error {
-	/**
-	 * Creates an instance of WebpackError.
-	 * @param {string=} message error message
-	 * @param {{ cause?: unknown }} options error options
-	 */
-	constructor(message, options = {}) {
-		super(message, options);
-
-		/** @type {string=} */
-		this.details = undefined;
-		/** @type {(Module | null)=} */
-		this.module = undefined;
-		/** @type {DependencyLocation=} */
-		this.loc = undefined;
-		/** @type {boolean=} */
-		this.hideStack = undefined;
-		/** @type {Chunk=} */
-		this.chunk = undefined;
-		/** @type {string=} */
-		this.file = undefined;
-	}
-
-	/**
-	 * Returns inspect message.
-	 * @returns {string} inspect message
-	 */
-	[inspect]() {
-		return (
-			this.stack +
-			(this.details ? `\n${this.details}` : "") +
-			(this.cause ? `\n${this.cause}` : "")
-		);
-	}
-
-	/**
-	 * Serializes this instance into the provided serializer context.
-	 * @param {ObjectSerializerContext} context context
-	 */
-	serialize({ write }) {
-		write(this.name);
-		write(this.message);
-		write(this.stack);
-		write(this.cause);
-		write(this.details);
-		write(this.loc);
-		write(this.hideStack);
-	}
-
-	/**
-	 * Restores this instance from the provided deserializer context.
-	 * @param {ObjectDeserializerContext} context context
-	 */
-	deserialize({ read }) {
-		this.name = read();
-		this.message = read();
-		this.stack = read();
-		this.cause = read();
-		this.details = read();
-		this.loc = read();
-		this.hideStack = read();
-	}
-}
-
-makeSerializable(WebpackError, "webpack/lib/WebpackError");
-
-/** @type {typeof WebpackError} */
-module.exports = WebpackError;
+// TODO remove in webpack 6
+// Some old plugins use `require("webpack/lib/WebpackError")`, in webpack@6 developer should migrate to `compiler.webpack.WebpackError`
+module.exports = require("./errors/WebpackError");

package/lib/WebpackIsIncludedPlugin.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const IgnoreErrorModuleFactory = require("./IgnoreErrorModuleFactory");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("./ModuleTypeConstants");
 const WebpackIsIncludedDependency = require("./dependencies/WebpackIsIncludedDependency");
+const IgnoreErrorModuleFactory = require("./errors/IgnoreErrorModuleFactory");
 const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");

package/lib/WebpackOptionsApply.js

@@ -425,6 +425,18 @@ class WebpackOptionsApply extends OptionsApply {
 			new CssModulesPlugin().apply(compiler);
 		}
 
+		if (options.experiments.html) {
+			const HtmlModulesPlugin = require("./html/HtmlModulesPlugin");
+
+			new HtmlModulesPlugin().apply(compiler);
+		}
+
+		if (options.experiments.typescript) {
+			const TypeScriptPlugin = require("./typescript/TypeScriptPlugin");
+
+			new TypeScriptPlugin().apply(compiler);
+		}
+
 		if (options.experiments.lazyCompilation) {
 			const LazyCompilationPlugin = require("./hmr/LazyCompilationPlugin");
 
@@ -517,7 +529,7 @@ class WebpackOptionsApply extends OptionsApply {
 		}).apply(compiler);
 		if (options.amd !== false) {
 			const AMDPlugin = require("./dependencies/AMDPlugin");
-			const RequireJsStuffPlugin = require("./RequireJsStuffPlugin");
+			const RequireJsStuffPlugin = require("./dependencies/RequireJsStuffPlugin");
 
 			new AMDPlugin(options.amd || {}).apply(compiler);
 			new RequireJsStuffPlugin().apply(compiler);

package/lib/asset/AssetBytesGenerator.js

@@ -9,10 +9,11 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
+	ASSET_URL_TYPE,
+	ASSET_URL_TYPES,
 	CSS_TYPE,
-	CSS_URL_TYPE,
-	CSS_URL_TYPES,
-	JAVASCRIPT_AND_CSS_URL_TYPES,
+	HTML_TYPE,
+	JAVASCRIPT_AND_ASSET_URL_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
@@ -79,7 +80,7 @@ class AssetSourceGenerator extends Generator {
 				}
 				return new RawSource(sourceContent);
 			}
-			case CSS_URL_TYPE: {
+			case ASSET_URL_TYPE: {
 				if (!originalSource) {
 					return null;
 				}
@@ -146,10 +147,13 @@ class AssetSourceGenerator extends Generator {
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
-				return JAVASCRIPT_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has(CSS_TYPE)) {
-				return CSS_URL_TYPES;
+			if (
+				sourceTypes.has(JAVASCRIPT_TYPE) &&
+				(sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE))
+			) {
+				return JAVASCRIPT_AND_ASSET_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE)) {
+				return ASSET_URL_TYPES;
 			}
 			return JAVASCRIPT_TYPES;
 		}

package/lib/asset/AssetGenerator.js

@@ -10,14 +10,15 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
-	ASSET_AND_CSS_URL_TYPES,
-	ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES,
+	ASSET_AND_ASSET_URL_TYPES,
+	ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES,
 	ASSET_AND_JAVASCRIPT_TYPES,
 	ASSET_TYPES,
+	ASSET_URL_TYPE,
+	ASSET_URL_TYPES,
 	CSS_TYPE,
-	CSS_URL_TYPE,
-	CSS_URL_TYPES,
-	JAVASCRIPT_AND_CSS_URL_TYPES,
+	HTML_TYPE,
+	JAVASCRIPT_AND_ASSET_URL_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
@@ -29,6 +30,7 @@ const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const memoize = require("../util/memoize");
 const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
+const { updateHashFromSource } = require("../util/source");
 
 const getMimeTypes = memoize(() => require("../util/mimeTypes"));
 
@@ -259,7 +261,7 @@ class AssetGenerator extends Generator {
 		const source = module.originalSource();
 
 		if (source) {
-			hash.update(source.buffer());
+			updateHashFromSource(hash, source);
 		}
 
 		if (module.error) {
@@ -371,7 +373,7 @@ class AssetGenerator extends Generator {
 			assetPath = JSON.stringify(path + filename);
 		} else if (
 			generatorOptions.publicPath !== undefined &&
-			type === CSS_URL_TYPE
+			type === ASSET_URL_TYPE
 		) {
 			const { path, info } = runtimeTemplate.compilation.getAssetPathWithInfo(
 				generatorOptions.publicPath,
@@ -392,13 +394,19 @@ class AssetGenerator extends Generator {
 				{ expr: RuntimeGlobals.publicPath },
 				filename
 			);
-		} else if (type === CSS_URL_TYPE) {
+		} else if (type === ASSET_URL_TYPE) {
 			const compilation = runtimeTemplate.compilation;
 			const path =
 				compilation.outputOptions.publicPath === "auto"
 					? CssUrlDependency.PUBLIC_PATH_AUTO
 					: compilation.getAssetPath(compilation.outputOptions.publicPath, {
-							hash: compilation.hash
+							hash:
+								compilation.hash ||
+								`${CssUrlDependency.PUBLIC_PATH_FULL_HASH}0__`,
+							hashWithLength: (length) =>
+								compilation.hash
+									? compilation.hash.slice(0, length)
+									: `${CssUrlDependency.PUBLIC_PATH_FULL_HASH}${length}__`
 						});
 
 			assetPath = path + filename;
@@ -552,7 +560,7 @@ class AssetGenerator extends Generator {
 		/** @type {string} */
 		let content;
 
-		const needContent = type === JAVASCRIPT_TYPE || type === CSS_URL_TYPE;
+		const needContent = type === JAVASCRIPT_TYPE || type === ASSET_URL_TYPE;
 		const data = getData ? getData() : undefined;
 
 		if (
@@ -567,7 +575,7 @@ class AssetGenerator extends Generator {
 					: encodedSource;
 
 			if (data) {
-				data.set("url", { [type]: content, ...data.get("url") });
+				data.set("url", { ...data.get("url"), [type]: content });
 			}
 		} else {
 			const [fullContentHash, contentHash] = AssetGenerator.getFullContentHash(
@@ -605,8 +613,8 @@ class AssetGenerator extends Generator {
 					contentHash
 				);
 
-			if (data && (type === JAVASCRIPT_TYPE || type === CSS_URL_TYPE)) {
-				data.set("url", { [type]: assetPath, ...data.get("url") });
+			if (data && (type === JAVASCRIPT_TYPE || type === ASSET_URL_TYPE)) {
+				data.set("url", { ...data.get("url"), [type]: assetPath });
 			}
 
 			if (data) {
@@ -649,7 +657,7 @@ class AssetGenerator extends Generator {
 			runtimeRequirements.add(RuntimeGlobals.module);
 
 			return new RawSource(`${module.moduleArgument}.exports = ${content};`);
-		} else if (type === CSS_URL_TYPE) {
+		} else if (type === ASSET_URL_TYPE) {
 			return null;
 		}
 
@@ -698,10 +706,13 @@ class AssetGenerator extends Generator {
 
 		if ((module.buildInfo && module.buildInfo.dataUrl) || this.emit === false) {
 			if (sourceTypes.size > 0) {
-				if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
-					return JAVASCRIPT_AND_CSS_URL_TYPES;
-				} else if (sourceTypes.has(CSS_TYPE)) {
-					return CSS_URL_TYPES;
+				if (
+					sourceTypes.has(JAVASCRIPT_TYPE) &&
+					(sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE))
+				) {
+					return JAVASCRIPT_AND_ASSET_URL_TYPES;
+				} else if (sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE)) {
+					return ASSET_URL_TYPES;
 				}
 				return JAVASCRIPT_TYPES;
 			}
@@ -710,10 +721,13 @@ class AssetGenerator extends Generator {
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
-				return ASSET_AND_JAVASCRIPT_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has(CSS_TYPE)) {
-				return ASSET_AND_CSS_URL_TYPES;
+			if (
+				sourceTypes.has(JAVASCRIPT_TYPE) &&
+				(sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE))
+			) {
+				return ASSET_AND_JAVASCRIPT_AND_ASSET_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE)) {
+				return ASSET_AND_ASSET_URL_TYPES;
 			}
 			return ASSET_AND_JAVASCRIPT_TYPES;
 		}

package/lib/asset/AssetModulesPlugin.js

@@ -20,13 +20,12 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorDataUrl} AssetGeneratorDataUrl */
 /** @typedef {import("../../declarations/WebpackOptions").AssetModuleOutputPath} AssetModuleOutputPath */
 /** @typedef {import("../../declarations/WebpackOptions").RawPublicPath} RawPublicPath */
-/** @typedef {import("../../declarations/WebpackOptions").FilenameTemplate} FilenameTemplate */
+/** @typedef {import("../../declarations/WebpackOptions").AssetModuleFilename} AssetModuleFilename */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../NormalModule")} NormalModule */
-/** @typedef {import("../NormalModule").NormalModuleCreateData} NormalModuleCreateData */
 
 /**
  * Returns definition.
@@ -34,7 +33,9 @@ const memoize = require("../util/memoize");
  * @returns {Schema} definition
  */
 const getSchema = (name) => {
-	const { definitions } = require("../../schemas/WebpackOptions.json");
+	const { definitions } =
+		/** @type {EXPECTED_ANY} */
+		(require("../../schemas/WebpackOptions.json"));
 
 	return {
 		definitions,
@@ -96,10 +97,7 @@ class AssetModulesPlugin {
 						.for(type)
 						.tap(PLUGIN_NAME, (createData, _resolveData) => {
 							// TODO create the module via new AssetModule with its own properties
-							const module = new NormalModule(
-								/** @type {NormalModuleCreateData} */
-								(createData)
-							);
+							const module = new NormalModule(createData);
 							if (this.options.sideEffectFree) {
 								module.factoryMeta = { sideEffectFree: true };
 							}
@@ -225,7 +223,7 @@ class AssetModulesPlugin {
 								}
 							}
 
-							/** @type {undefined | FilenameTemplate} */
+							/** @type {undefined | AssetModuleFilename} */
 							let filename;
 							/** @type {undefined | RawPublicPath} */
 							let publicPath;

package/lib/asset/AssetSourceGenerator.js

@@ -9,10 +9,11 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
+	ASSET_URL_TYPE,
+	ASSET_URL_TYPES,
 	CSS_TYPE,
-	CSS_URL_TYPE,
-	CSS_URL_TYPES,
-	JAVASCRIPT_AND_CSS_URL_TYPES,
+	HTML_TYPE,
+	JAVASCRIPT_AND_ASSET_URL_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES,
 	NO_TYPES
@@ -78,7 +79,7 @@ class AssetSourceGenerator extends Generator {
 				}
 				return new RawSource(sourceContent);
 			}
-			case CSS_URL_TYPE: {
+			case ASSET_URL_TYPE: {
 				if (!originalSource) {
 					return null;
 				}
@@ -145,10 +146,13 @@ class AssetSourceGenerator extends Generator {
 		}
 
 		if (sourceTypes.size > 0) {
-			if (sourceTypes.has(JAVASCRIPT_TYPE) && sourceTypes.has(CSS_TYPE)) {
-				return JAVASCRIPT_AND_CSS_URL_TYPES;
-			} else if (sourceTypes.has(CSS_TYPE)) {
-				return CSS_URL_TYPES;
+			if (
+				sourceTypes.has(JAVASCRIPT_TYPE) &&
+				(sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE))
+			) {
+				return JAVASCRIPT_AND_ASSET_URL_TYPES;
+			} else if (sourceTypes.has(CSS_TYPE) || sourceTypes.has(HTML_TYPE)) {
+				return ASSET_URL_TYPES;
 			}
 			return JAVASCRIPT_TYPES;
 		}

package/lib/buildChunkGraph.js

@@ -5,9 +5,8 @@
 
 "use strict";
 
-const AsyncDependencyToInitialChunkError = require("./AsyncDependencyToInitialChunkError");
-const { connectChunkGroupParentAndChild } = require("./GraphHelpers");
 const ModuleGraphConnection = require("./ModuleGraphConnection");
+const AsyncDependencyToInitialChunkError = require("./errors/AsyncDependencyToInitialChunkError");
 const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
 
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
@@ -1311,10 +1310,9 @@ const connectChunkGroups = (
 			chunkGraph.connectBlockAndChunkGroup(block, chunkGroup);
 
 			// 4. Connect chunk with parent
-			connectChunkGroupParentAndChild(
-				originChunkGroupInfo.chunkGroup,
-				chunkGroup
-			);
+			if (originChunkGroupInfo.chunkGroup.addChild(chunkGroup)) {
+				chunkGroup.addParent(originChunkGroupInfo.chunkGroup);
+			}
 		}
 	}
 };

package/lib/cache/PackFileCacheStrategy.js

@@ -7,9 +7,9 @@
 
 const FileSystemInfo = require("../FileSystemInfo");
 const ProgressPlugin = require("../ProgressPlugin");
-const { formatSize } = require("../SizeFormatHelpers");
 const SerializerMiddleware = require("../serialization/SerializerMiddleware");
 const LazySet = require("../util/LazySet");
+const formatSize = require("../util/formatSize");
 const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 const {
@@ -105,7 +105,7 @@ const MIN_CONTENT_SIZE = 1024 * 1024; // 1 MB
 const CONTENT_COUNT_TO_MERGE = 10;
 const MIN_ITEMS_IN_FRESH_PACK = 100;
 const MAX_ITEMS_IN_FRESH_PACK = 50000;
-const MAX_TIME_IN_FRESH_PACK = 1 * 60 * 1000; // 1 min
+const MAX_TIME_IN_FRESH_PACK = 60 * 1000; // 1 min
 
 class PackItemInfo {
 	/**
@@ -799,7 +799,7 @@ class PackContentItems {
 		if (read()) {
 			this.map = read();
 		} else if (profile) {
-			/** @type {Map<EXPECTED_ANY, EXPECTED_ANY>} */
+			/** @type {Content} */
 			const map = new Map();
 			let key = read();
 			while (key !== null) {
@@ -825,7 +825,7 @@ class PackContentItems {
 			}
 			this.map = map;
 		} else {
-			/** @type {Map<EXPECTED_ANY, EXPECTED_ANY>} */
+			/** @type {Content} */
 			const map = new Map();
 			let key = read();
 			while (key !== null) {

package/lib/cli.js

@@ -7,7 +7,9 @@
 
 const path = require("path");
 const tty = require("tty");
-const webpackSchema = require("../schemas/WebpackOptions.json");
+const webpackSchema =
+	/** @type {EXPECTED_ANY} */
+	(require("../schemas/WebpackOptions.json"));
 
 /** @typedef {import("json-schema").JSONSchema4} JSONSchema4 */
 /** @typedef {import("json-schema").JSONSchema6} JSONSchema6 */