webpack 5.82.0 → 5.82.1

package/lib/css/walkCssTokens.js

@@ -124,10 +124,14 @@ const _isWhiteSpace = cc => {
 };
 
 /**
+ * ident-start code point
+ *
+ * A letter, a non-ASCII code point, or U+005F LOW LINE (_).
+ *
  * @param {number} cc char code
  * @returns {boolean} true, if cc is a start code point of an identifier
  */
-const _isIdentStartCodePoint = cc => {
+const isIdentStartCodePoint = cc => {
 	return (
 		(cc >= CC_LOWER_A && cc <= CC_LOWER_Z) ||
 		(cc >= CC_UPPER_A && cc <= CC_UPPER_Z) ||
@@ -341,11 +345,7 @@ const consumeNumericToken = (input, pos, callbacks) => {
 const consumeOtherIdentifier = (input, pos, callbacks) => {
 	const start = pos;
 	pos = _consumeIdentifier(input, pos, callbacks);
-	if (
-		pos !== input.length &&
-		!callbacks.isSelector(input, pos) &&
-		input.charCodeAt(pos) === CC_LEFT_PARENTHESIS
-	) {
+	if (pos !== input.length && input.charCodeAt(pos) === CC_LEFT_PARENTHESIS) {
 		pos++;
 		if (callbacks.function !== undefined) {
 			return callbacks.function(input, start, pos);
@@ -683,7 +683,7 @@ const CHAR_MAP = Array.from({ length: 0x80 }, (_, cc) => {
 			// digit
 			if (_isDigit(cc)) return consumeNumericToken;
 			// ident-start code point
-			if (_isIdentStartCodePoint(cc)) {
+			if (isIdentStartCodePoint(cc)) {
 				return consumeOtherIdentifier;
 			}
 			// EOF, but we don't have it
@@ -715,6 +715,8 @@ module.exports = (input, callbacks) => {
 	}
 };
 
+module.exports.isIdentStartCodePoint = isIdentStartCodePoint;
+
 /**
  * @param {string} input input
  * @param {number} pos position
@@ -732,6 +734,19 @@ module.exports.eatComments = (input, pos) => {
 	return pos;
 };
 
+/**
+ * @param {string} input input
+ * @param {number} pos position
+ * @returns {number} position after whitespace
+ */
+module.exports.eatWhitespace = (input, pos) => {
+	while (_isWhiteSpace(input.charCodeAt(pos))) {
+		pos++;
+	}
+
+	return pos;
+};
+
 /**
  * @param {string} input input
  * @param {number} pos position

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -127,7 +127,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 			"",
 			"// object to store loaded and loading chunks",
 			"// undefined = chunk not loaded, null = chunk preloaded/prefetched",
-			"// [resolve, reject, Promise] = chunk loading, 0 = chunk loaded",
+			"// [resolve, Promise] = chunk loading, 0 = chunk loaded",
 			`var installedChunks = ${
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
@@ -210,7 +210,9 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 													)})])`,
 													`promises.push(installedChunkData[1] = promise);`
 												]),
-												"} else installedChunks[chunkId] = 0;"
+												hasJsMatcher === true
+													? "}"
+													: "} else installedChunks[chunkId] = 0;"
 											]),
 											"}"
 										]),

package/lib/hmr/LazyCompilationPlugin.js

@@ -10,6 +10,9 @@ const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Dependency = require("../Dependency");
 const Module = require("../Module");
 const ModuleFactory = require("../ModuleFactory");
+const {
+	WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY
+} = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const CommonJsRequireDependency = require("../dependencies/CommonJsRequireDependency");
@@ -95,7 +98,11 @@ registerNotSerializable(LazyCompilationDependency);
 
 class LazyCompilationProxyModule extends Module {
 	constructor(context, originalModule, request, client, data, active) {
-		super("lazy-compilation-proxy", context, originalModule.layer);
+		super(
+			WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY,
+			context,
+			originalModule.layer
+		);
 		this.originalModule = originalModule;
 		this.request = request;
 		this.client = client;
@@ -107,7 +114,7 @@ class LazyCompilationProxyModule extends Module {
 	 * @returns {string} a unique identifier of the module
 	 */
 	identifier() {
-		return `lazy-compilation-proxy|${this.originalModule.identifier()}`;
+		return `${WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY}|${this.originalModule.identifier()}`;
 	}
 
 	/**
@@ -115,7 +122,7 @@ class LazyCompilationProxyModule extends Module {
 	 * @returns {string} a user readable identifier of the module
 	 */
 	readableIdentifier(requestShortener) {
-		return `lazy-compilation-proxy ${this.originalModule.readableIdentifier(
+		return `${WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY} ${this.originalModule.readableIdentifier(
 			requestShortener
 		)}`;
 	}
@@ -142,7 +149,9 @@ class LazyCompilationProxyModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return `${this.originalModule.libIdent(options)}!lazy-compilation-proxy`;
+		return `${this.originalModule.libIdent(
+			options
+		)}!${WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY}`;
 	}
 
 	/**

package/lib/javascript/JavascriptModulesPlugin.js

@@ -21,7 +21,8 @@ const InitFragment = require("../InitFragment");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
-	JAVASCRIPT_MODULE_TYPE_ESM
+	JAVASCRIPT_MODULE_TYPE_ESM,
+	WEBPACK_MODULE_TYPE_RUNTIME
 } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
@@ -394,7 +395,7 @@ class JavascriptModulesPlugin {
 					}
 					const runtimeModules = chunkGraph.getChunkModulesIterableBySourceType(
 						chunk,
-						"runtime"
+						WEBPACK_MODULE_TYPE_RUNTIME
 					);
 					if (runtimeModules) {
 						const xor = new StringXor();

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -178,7 +178,9 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 												"});",
 												"promises.push(installedChunkData[2] = promise);"
 											]),
-											"} else installedChunks[chunkId] = 0;"
+											hasJsMatcher === true
+												? "}"
+												: "} else installedChunks[chunkId] = 0;"
 										]),
 										"}"
 									]),

package/lib/sharing/ConsumeSharedModule.js

@@ -8,6 +8,9 @@
 const { RawSource } = require("webpack-sources");
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Module = require("../Module");
+const {
+	WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE
+} = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const { rangeToString, stringifyHoley } = require("../util/semver");
@@ -52,7 +55,7 @@ class ConsumeSharedModule extends Module {
 	 * @param {ConsumeOptions} options consume options
 	 */
 	constructor(context, options) {
-		super("consume-shared-module", context);
+		super(WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE, context);
 		this.options = options;
 	}
 
@@ -69,7 +72,7 @@ class ConsumeSharedModule extends Module {
 			singleton,
 			eager
 		} = this.options;
-		return `consume-shared-module|${shareScope}|${shareKey}|${
+		return `${WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE}|${shareScope}|${shareKey}|${
 			requiredVersion && rangeToString(requiredVersion)
 		}|${strictVersion}|${importResolved}|${singleton}|${eager}`;
 	}

package/lib/sharing/ProvideSharedModule.js

@@ -7,6 +7,7 @@
 
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Module = require("../Module");
+const { WEBPACK_MODULE_TYPE_PROVIDE } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const ProvideForSharedDependency = require("./ProvideForSharedDependency");
@@ -39,7 +40,7 @@ class ProvideSharedModule extends Module {
 	 * @param {boolean} eager include the module in sync way
 	 */
 	constructor(shareScope, name, version, request, eager) {
-		super("provide-module");
+		super(WEBPACK_MODULE_TYPE_PROVIDE);
 		this._shareScope = shareScope;
 		this._name = name;
 		this._version = version;

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const util = require("util");
+const { WEBPACK_MODULE_TYPE_RUNTIME } = require("../ModuleTypeConstants");
 const ModuleDependency = require("../dependencies/ModuleDependency");
 const formatLocation = require("../formatLocation");
 const { LogType } = require("../logging/Logger");
@@ -2093,19 +2094,21 @@ const MODULES_GROUPERS = type => ({
 					if (!module.moduleType) return;
 					if (groupModulesByType) {
 						return [module.moduleType.split("/", 1)[0]];
-					} else if (module.moduleType === "runtime") {
-						return ["runtime"];
+					} else if (module.moduleType === WEBPACK_MODULE_TYPE_RUNTIME) {
+						return [WEBPACK_MODULE_TYPE_RUNTIME];
 					}
 				},
 				getOptions: key => {
-					const exclude = key === "runtime" && !options.runtimeModules;
+					const exclude =
+						key === WEBPACK_MODULE_TYPE_RUNTIME && !options.runtimeModules;
 					return {
 						groupChildren: !exclude,
 						force: exclude
 					};
 				},
 				createGroup: (key, children, modules) => {
-					const exclude = key === "runtime" && !options.runtimeModules;
+					const exclude =
+						key === WEBPACK_MODULE_TYPE_RUNTIME && !options.runtimeModules;
 					return {
 						type: `${key} modules`,
 						moduleType: key,

package/lib/util/createHash.js

@@ -107,8 +107,9 @@ class DebugHash extends Hash {
 	 */
 	update(data, inputEncoding) {
 		if (typeof data !== "string") data = data.toString("utf-8");
-		if (data.startsWith("debug-digest-")) {
-			data = Buffer.from(data.slice("debug-digest-".length), "hex").toString();
+		const prefix = Buffer.from("@webpack-debug-digest@").toString("hex");
+		if (data.startsWith(prefix)) {
+			data = Buffer.from(data.slice(prefix.length), "hex").toString();
 		}
 		this.string += `[${data}](${new Error().stack.split("\n", 3)[2]})\n`;
 		return this;
@@ -120,7 +121,7 @@ class DebugHash extends Hash {
 	 * @returns {string|Buffer} digest
 	 */
 	digest(encoding) {
-		return "debug-digest-" + Buffer.from(this.string).toString("hex");
+		return Buffer.from("@webpack-debug-digest@" + this.string).toString("hex");
 	}
 }
 

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -189,7 +189,9 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 													)};`,
 													`${RuntimeGlobals.loadScript}(url, loadingEnded, "chunk-" + chunkId, chunkId);`
 												]),
-												"} else installedChunks[chunkId] = 0;"
+												hasJsMatcher === true
+													? "}"
+													: "} else installedChunks[chunkId] = 0;"
 											]),
 											"}"
 										]),
@@ -250,7 +252,7 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 							linkPreload.call(
 								Template.asString([
 									"var link = document.createElement('link');",
-									scriptType
+									scriptType && scriptType !== "module"
 										? `link.type = ${JSON.stringify(scriptType)};`
 										: "",
 									"link.charset = 'utf-8';",
@@ -259,8 +261,10 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 										`link.setAttribute("nonce", ${RuntimeGlobals.scriptNonce});`
 									),
 									"}",
-									'link.rel = "preload";',
-									'link.as = "script";',
+									scriptType === "module"
+										? 'link.rel = "modulepreload";'
+										: 'link.rel = "preload";',
+									scriptType === "module" ? "" : 'link.as = "script";',
 									`link.href = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId);`,
 									crossOriginLoading
 										? crossOriginLoading === "use-credentials"

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "webpack",
-  "version": "5.82.0",
+  "version": "5.82.1",
   "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.",
+  "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
   "dependencies": {
     "@types/eslint-scope": "^3.7.3",
@@ -14,7 +14,7 @@
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.13.0",
+    "enhanced-resolve": "^5.14.0",
     "es-module-lexer": "^1.2.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",

package/types.d.ts

@@ -3506,6 +3506,7 @@ declare class EnvironmentPlugin {
 	 */
 	apply(compiler: Compiler): void;
 }
+type ErrorWithDetail = Error & { details?: string };
 declare interface Etag {
 	toString: () => string;
 }
@@ -6871,8 +6872,54 @@ declare interface MinChunkSizePluginOptions {
 	minChunkSize: number;
 }
 declare class Module extends DependenciesBlock {
-	constructor(type: string, context?: string, layer?: string);
-	type: string;
+	constructor(
+		type:
+			| ""
+			| "runtime"
+			| "javascript/auto"
+			| "javascript/dynamic"
+			| "javascript/esm"
+			| "json"
+			| "webassembly/async"
+			| "webassembly/sync"
+			| "css"
+			| "css/global"
+			| "css/module"
+			| "asset"
+			| "asset/inline"
+			| "asset/resource"
+			| "asset/source"
+			| "asset/raw-data-url"
+			| "fallback-module"
+			| "remote-module"
+			| "provide-module"
+			| "consume-shared-module"
+			| "lazy-compilation-proxy",
+		context?: string,
+		layer?: string
+	);
+	type:
+		| ""
+		| "runtime"
+		| "javascript/auto"
+		| "javascript/dynamic"
+		| "javascript/esm"
+		| "json"
+		| "webassembly/async"
+		| "webassembly/sync"
+		| "css"
+		| "css/global"
+		| "css/module"
+		| "asset"
+		| "asset/inline"
+		| "asset/resource"
+		| "asset/source"
+		| "asset/raw-data-url"
+		| "fallback-module"
+		| "remote-module"
+		| "provide-module"
+		| "consume-shared-module"
+		| "lazy-compilation-proxy";
 	context: null | string;
 	layer: null | string;
 	needId: boolean;
@@ -7831,9 +7878,9 @@ declare interface NormalModuleCreateData {
 	layer?: string;
 
 	/**
-	 * module type
+	 * module type. When deserializing, this is set to an empty string "".
 	 */
-	type: string;
+	type: "" | "javascript/auto" | "javascript/dynamic" | "javascript/esm";
 
 	/**
 	 * request string
@@ -7977,9 +8024,9 @@ declare interface NormalModuleLoaderContext<OptionsType> {
 		context: string,
 		request: string,
 		callback: (
-			arg0: null | Error,
-			arg1?: string | false,
-			arg2?: ResolveRequest
+			err: null | ErrorWithDetail,
+			res?: string | false,
+			req?: ResolveRequest
 		) => void
 	): any;
 	getResolve(options?: ResolveOptionsWithDependencyType): {
@@ -7987,9 +8034,9 @@ declare interface NormalModuleLoaderContext<OptionsType> {
 			context: string,
 			request: string,
 			callback: (
-				arg0: null | Error,
-				arg1?: string | false,
-				arg2?: ResolveRequest
+				err: null | ErrorWithDetail,
+				res?: string | false,
+				req?: ResolveRequest
 			) => void
 		): void;
 		(context: string, request: string): Promise<string>;
@@ -10088,9 +10135,9 @@ declare abstract class Resolver {
 		request: string,
 		resolveContext: ResolveContext,
 		callback: (
-			arg0: null | Error,
-			arg1?: string | false,
-			arg2?: ResolveRequest
+			err: null | ErrorWithDetail,
+			res?: string | false,
+			req?: ResolveRequest
 		) => void
 	): void;
 	doResolve(