webpack 5.79.0 → 5.80.0

package/lib/dependencies/CssUrlDependency.js

@@ -27,12 +27,12 @@ class CssUrlDependency extends ModuleDependency {
 	/**
 	 * @param {string} request request
 	 * @param {[number, number]} range range of the argument
-	 * @param {string} cssFunctionKind kind of css function, e. g. url(), image()
+	 * @param {"string" | "url"} urlType dependency type e.g. url() or string
 	 */
-	constructor(request, range, cssFunctionKind) {
+	constructor(request, range, urlType) {
 		super(request);
 		this.range = range;
-		this.cssFunctionKind = cssFunctionKind;
+		this.urlType = urlType;
 	}
 
 	get type() {
@@ -54,13 +54,13 @@ class CssUrlDependency extends ModuleDependency {
 
 	serialize(context) {
 		const { write } = context;
-		write(this.cssFunctionKind);
+		write(this.urlType);
 		super.serialize(context);
 	}
 
 	deserialize(context) {
 		const { read } = context;
-		this.cssFunctionKind = read();
+		this.urlType = read();
 		super.deserialize(context);
 	}
 }
@@ -108,22 +108,34 @@ CssUrlDependency.Template = class CssUrlDependencyTemplate extends (
 	apply(
 		dependency,
 		source,
-		{ runtime, moduleGraph, runtimeTemplate, codeGenerationResults }
+		{ moduleGraph, runtimeTemplate, codeGenerationResults }
 	) {
 		const dep = /** @type {CssUrlDependency} */ (dependency);
 
-		source.replace(
-			dep.range[0],
-			dep.range[1] - 1,
-			`${dep.cssFunctionKind}(${cssEscapeString(
-				runtimeTemplate.assetUrl({
-					publicPath: "",
-					runtime,
-					module: moduleGraph.getModule(dep),
-					codeGenerationResults
-				})
-			)})`
-		);
+		let newValue;
+
+		switch (dep.urlType) {
+			case "string":
+				newValue = cssEscapeString(
+					runtimeTemplate.assetUrl({
+						publicPath: "",
+						module: moduleGraph.getModule(dep),
+						codeGenerationResults
+					})
+				);
+				break;
+			case "url":
+				newValue = `url(${cssEscapeString(
+					runtimeTemplate.assetUrl({
+						publicPath: "",
+						module: moduleGraph.getModule(dep),
+						codeGenerationResults
+					})
+				)})`;
+				break;
+		}
+
+		source.replace(dep.range[0], dep.range[1] - 1, newValue);
 	}
 };
 

package/lib/dependencies/ImportMetaPlugin.js

@@ -75,6 +75,17 @@ class ImportMetaPlugin {
 					}
 
 					/// import.meta direct ///
+					const webpackVersion = parseInt(
+						require("../../package.json").version,
+						10
+					);
+					const importMetaUrl = () =>
+						JSON.stringify(getUrl(parser.state.module));
+					const importMetaWebpackVersion = () => JSON.stringify(webpackVersion);
+					const importMetaUnknownProperty = members =>
+						`${Template.toNormalComment(
+							"unsupported import.meta." + members.join(".")
+						)} undefined${propertyAccess(members, 1)}`;
 					parser.hooks.typeof
 						.for("import.meta")
 						.tap(
@@ -84,20 +95,48 @@ class ImportMetaPlugin {
 					parser.hooks.expression
 						.for("import.meta")
 						.tap(PLUGIN_NAME, metaProperty => {
-							const CriticalDependencyWarning = getCriticalDependencyWarning();
-							parser.state.module.addWarning(
-								new ModuleDependencyWarning(
-									parser.state.module,
-									new CriticalDependencyWarning(
-										"Accessing import.meta directly is unsupported (only property access is supported)"
-									),
-									metaProperty.loc
-								)
-							);
-							const dep = new ConstDependency(
-								`${parser.isAsiPosition(metaProperty.range[0]) ? ";" : ""}({})`,
-								metaProperty.range
-							);
+							const referencedPropertiesInDestructuring =
+								parser.destructuringAssignmentPropertiesFor(metaProperty);
+							if (!referencedPropertiesInDestructuring) {
+								const CriticalDependencyWarning =
+									getCriticalDependencyWarning();
+								parser.state.module.addWarning(
+									new ModuleDependencyWarning(
+										parser.state.module,
+										new CriticalDependencyWarning(
+											"Accessing import.meta directly is unsupported (only property access or destructuring is supported)"
+										),
+										metaProperty.loc
+									)
+								);
+								const dep = new ConstDependency(
+									`${
+										parser.isAsiPosition(metaProperty.range[0]) ? ";" : ""
+									}({})`,
+									metaProperty.range
+								);
+								dep.loc = metaProperty.loc;
+								parser.state.module.addPresentationalDependency(dep);
+								return true;
+							}
+
+							let str = "";
+							for (const prop of referencedPropertiesInDestructuring) {
+								switch (prop) {
+									case "url":
+										str += `url: ${importMetaUrl()},`;
+										break;
+									case "webpack":
+										str += `webpack: ${importMetaWebpackVersion()},`;
+										break;
+									default:
+										str += `[${JSON.stringify(
+											prop
+										)}]: ${importMetaUnknownProperty([prop])},`;
+										break;
+								}
+							}
+							const dep = new ConstDependency(`({${str}})`, metaProperty.range);
 							dep.loc = metaProperty.loc;
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
@@ -120,10 +159,7 @@ class ImportMetaPlugin {
 					parser.hooks.expression
 						.for("import.meta.url")
 						.tap(PLUGIN_NAME, expr => {
-							const dep = new ConstDependency(
-								JSON.stringify(getUrl(parser.state.module)),
-								expr.range
-							);
+							const dep = new ConstDependency(importMetaUrl(), expr.range);
 							dep.loc = expr.loc;
 							parser.state.module.addPresentationalDependency(dep);
 							return true;
@@ -140,10 +176,6 @@ class ImportMetaPlugin {
 						});
 
 					/// import.meta.webpack ///
-					const webpackVersion = parseInt(
-						require("../../package.json").version,
-						10
-					);
 					parser.hooks.typeof
 						.for("import.meta.webpack")
 						.tap(
@@ -154,7 +186,7 @@ class ImportMetaPlugin {
 						.for("import.meta.webpack")
 						.tap(
 							PLUGIN_NAME,
-							toConstantDependency(parser, JSON.stringify(webpackVersion))
+							toConstantDependency(parser, importMetaWebpackVersion())
 						);
 					parser.hooks.evaluateTypeof
 						.for("import.meta.webpack")
@@ -168,9 +200,7 @@ class ImportMetaPlugin {
 						.for("import.meta")
 						.tap(PLUGIN_NAME, (expr, members) => {
 							const dep = new ConstDependency(
-								`${Template.toNormalComment(
-									"unsupported import.meta." + members.join(".")
-								)} undefined${propertyAccess(members, 1)}`,
+								importMetaUnknownProperty(members),
 								expr.range
 							);
 							dep.loc = expr.loc;

package/lib/dependencies/ImportParserPlugin.js

@@ -27,6 +27,8 @@ class ImportParserPlugin {
 	}
 
 	apply(parser) {
+		const exportsFromEnumerable = enumerable =>
+			Array.from(enumerable, e => [e]);
 		parser.hooks.importCall.tap("ImportParserPlugin", expr => {
 			const param = parser.evaluateExpression(expr.source);
 
@@ -184,7 +186,7 @@ class ImportParserPlugin {
 						if (typeof importOptions.webpackExports === "string") {
 							exports = [[importOptions.webpackExports]];
 						} else {
-							exports = Array.from(importOptions.webpackExports, e => [e]);
+							exports = exportsFromEnumerable(importOptions.webpackExports);
 						}
 					}
 				}
@@ -205,6 +207,20 @@ class ImportParserPlugin {
 				mode = "lazy";
 			}
 
+			const referencedPropertiesInDestructuring =
+				parser.destructuringAssignmentPropertiesFor(expr);
+			if (referencedPropertiesInDestructuring) {
+				if (exports) {
+					parser.state.module.addWarning(
+						new UnsupportedFeatureWarning(
+							`\`webpackExports\` could not be used with destructuring assignment.`,
+							expr.loc
+						)
+					);
+				}
+				exports = exportsFromEnumerable(referencedPropertiesInDestructuring);
+			}
+
 			if (param.isString()) {
 				if (mode === "eager") {
 					const dep = new ImportEagerDependency(

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -81,7 +81,7 @@ class OccurrenceModuleIdsPlugin {
 					] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
 						if (!originModule) continue;
 						if (!connections.some(c => c.isTargetActive(undefined))) continue;
-						sum += initialChunkChunkMap.get(originModule);
+						sum += initialChunkChunkMap.get(originModule) || 0;
 					}
 					return sum;
 				};

package/lib/javascript/JavascriptParser.js

@@ -1743,7 +1743,7 @@ class JavascriptParser extends Parser {
 	preWalkTryStatement(statement) {
 		this.preWalkStatement(statement.block);
 		if (statement.handler) this.preWalkCatchClause(statement.handler);
-		if (statement.finializer) this.preWalkStatement(statement.finializer);
+		if (statement.finalizer) this.preWalkStatement(statement.finalizer);
 	}
 
 	walkTryStatement(statement) {
@@ -1927,7 +1927,12 @@ class JavascriptParser extends Parser {
 			for (const id of set) keys.add(id);
 		}
 
-		this.destructuringAssignmentProperties.set(expression.right, keys);
+		this.destructuringAssignmentProperties.set(
+			expression.right.type === "AwaitExpression"
+				? expression.right.argument
+				: expression.right,
+			keys
+		);
 
 		if (expression.right.type === "AssignmentExpression") {
 			this.preWalkAssignmentExpression(expression.right);
@@ -2183,7 +2188,12 @@ class JavascriptParser extends Parser {
 		const keys = this._preWalkObjectPattern(declarator.id);
 
 		if (!keys) return;
-		this.destructuringAssignmentProperties.set(declarator.init, keys);
+		this.destructuringAssignmentProperties.set(
+			declarator.init.type === "AwaitExpression"
+				? declarator.init.argument
+				: declarator.init,
+			keys
+		);
 
 		if (declarator.init.type === "AssignmentExpression") {
 			this.preWalkAssignmentExpression(declarator.init);

package/lib/schemes/DataUriPlugin.js

@@ -19,9 +19,18 @@ const decodeDataURI = uri => {
 
 	const isBase64 = match[3];
 	const body = match[4];
-	return isBase64
-		? Buffer.from(body, "base64")
-		: Buffer.from(decodeURIComponent(body), "ascii");
+
+	if (isBase64) {
+		return Buffer.from(body, "base64");
+	}
+
+	// CSS allows to use `data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"><rect width="100%" height="100%" style="stroke: rgb(223,224,225); stroke-width: 2px; fill: none; stroke-dasharray: 6px 3px" /></svg>`
+	// so we return original body if we can't `decodeURIComponent`
+	try {
+		return Buffer.from(decodeURIComponent(body), "ascii");
+	} catch (_) {
+		return Buffer.from(body, "ascii");
+	}
 };
 
 class DataUriPlugin {

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -811,11 +811,32 @@ const SIMPLE_EXTRACTORS = {
 		},
 		errors: (object, compilation, context, options, factory) => {
 			const { type, cachedGetErrors } = context;
-			object.errors = factory.create(
+			const rawErrors = cachedGetErrors(compilation);
+			const factorizedErrors = factory.create(
 				`${type}.errors`,
 				cachedGetErrors(compilation),
 				context
 			);
+			let filtered = 0;
+			if (options.errorDetails === "auto" && rawErrors.length >= 3) {
+				filtered = rawErrors
+					.map(e => typeof e !== "string" && e.details)
+					.filter(Boolean).length;
+			}
+			if (
+				options.errorDetails === true ||
+				!Number.isFinite(options.errorsSpace)
+			) {
+				object.errors = factorizedErrors;
+				if (filtered) object.filteredErrorDetailsCount = filtered;
+				return;
+			}
+			const [errors, filteredBySpace] = errorsSpaceLimit(
+				factorizedErrors,
+				options.errorsSpace
+			);
+			object.filteredErrorDetailsCount = filtered + filteredBySpace;
+			object.errors = errors;
 		},
 		errorsCount: (object, compilation, { cachedGetErrors }) => {
 			object.errorsCount = countWithChildren(compilation, c =>
@@ -824,11 +845,31 @@ const SIMPLE_EXTRACTORS = {
 		},
 		warnings: (object, compilation, context, options, factory) => {
 			const { type, cachedGetWarnings } = context;
-			object.warnings = factory.create(
+			const rawWarnings = factory.create(
 				`${type}.warnings`,
 				cachedGetWarnings(compilation),
 				context
 			);
+			let filtered = 0;
+			if (options.errorDetails === "auto") {
+				filtered = cachedGetWarnings(compilation)
+					.map(e => typeof e !== "string" && e.details)
+					.filter(Boolean).length;
+			}
+			if (
+				options.errorDetails === true ||
+				!Number.isFinite(options.warningsSpace)
+			) {
+				object.warnings = rawWarnings;
+				if (filtered) object.filteredWarningDetailsCount = filtered;
+				return;
+			}
+			const [warnings, filteredBySpace] = errorsSpaceLimit(
+				rawWarnings,
+				options.warningsSpace
+			);
+			object.filteredWarningDetailsCount = filtered + filteredBySpace;
+			object.warnings = warnings;
 		},
 		warningsCount: (
 			object,
@@ -853,29 +894,6 @@ const SIMPLE_EXTRACTORS = {
 					});
 			});
 		},
-		errorDetails: (
-			object,
-			compilation,
-			{ cachedGetErrors, cachedGetWarnings },
-			{ errorDetails, errors, warnings }
-		) => {
-			if (errorDetails === "auto") {
-				if (warnings) {
-					const warnings = cachedGetWarnings(compilation);
-					object.filteredWarningDetailsCount = warnings
-						.map(e => typeof e !== "string" && e.details)
-						.filter(Boolean).length;
-				}
-				if (errors) {
-					const errors = cachedGetErrors(compilation);
-					if (errors.length >= 3) {
-						object.filteredErrorDetailsCount = errors
-							.map(e => typeof e !== "string" && e.details)
-							.filter(Boolean).length;
-					}
-				}
-			}
-		},
 		children: (object, compilation, context, options, factory) => {
 			const { type } = context;
 			object.children = factory.create(
@@ -1779,6 +1797,61 @@ const spaceLimited = (
 	};
 };
 
+const errorsSpaceLimit = (errors, max) => {
+	let filtered = 0;
+	// Can not fit into limit
+	// print only messages
+	if (errors.length + 1 >= max)
+		return [
+			errors.map(error => {
+				if (typeof error === "string" || !error.details) return error;
+				filtered++;
+				return { ...error, details: "" };
+			}),
+			filtered
+		];
+	let fullLength = errors.length;
+	let result = errors;
+
+	let i = 0;
+	for (; i < errors.length; i++) {
+		const error = errors[i];
+		if (typeof error !== "string" && error.details) {
+			const splitted = error.details.split("\n");
+			const len = splitted.length;
+			fullLength += len;
+			if (fullLength > max) {
+				result = i > 0 ? errors.slice(0, i) : [];
+				const overLimit = fullLength - max + 1;
+				const error = errors[i++];
+				result.push({
+					...error,
+					details: error.details.split("\n").slice(0, -overLimit).join("\n"),
+					filteredDetails: overLimit
+				});
+				filtered = errors.length - i;
+				for (; i < errors.length; i++) {
+					const error = errors[i];
+					if (typeof error === "string" || !error.details) result.push(error);
+					result.push({ ...error, details: "" });
+				}
+				break;
+			} else if (fullLength === max) {
+				result = errors.slice(0, ++i);
+				filtered = errors.length - i;
+				for (; i < errors.length; i++) {
+					const error = errors[i];
+					if (typeof error === "string" || !error.details) result.push(error);
+					result.push({ ...error, details: "" });
+				}
+				break;
+			}
+		}
+	}
+
+	return [result, filtered];
+};
+
 const assetGroup = (children, assets) => {
 	let size = 0;
 	for (const asset of children) {

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -47,6 +47,8 @@ const NAMED_PRESETS = {
 		orphanModules: true,
 		runtimeModules: true,
 		exclude: false,
+		errorsSpace: Infinity,
+		warningsSpace: Infinity,
 		modulesSpace: Infinity,
 		chunkModulesSpace: Infinity,
 		assetsSpace: Infinity,
@@ -73,6 +75,8 @@ const NAMED_PRESETS = {
 		logging: true,
 		runtimeModules: true,
 		exclude: false,
+		errorsSpace: 1000,
+		warningsSpace: 1000,
 		modulesSpace: 1000,
 		assetsSpace: 1000,
 		reasonsSpace: 1000
@@ -82,6 +86,8 @@ const NAMED_PRESETS = {
 		version: true,
 		timings: true,
 		modules: true,
+		errorsSpace: 0,
+		warningsSpace: 0,
 		modulesSpace: 0,
 		assets: true,
 		assetsSpace: 0,
@@ -95,6 +101,7 @@ const NAMED_PRESETS = {
 		all: false,
 		errors: true,
 		errorsCount: true,
+		errorsSpace: Infinity,
 		moduleTrace: true,
 		logging: "error"
 	},
@@ -102,8 +109,10 @@ const NAMED_PRESETS = {
 		all: false,
 		errors: true,
 		errorsCount: true,
+		errorsSpace: Infinity,
 		warnings: true,
 		warningsCount: true,
+		warningsSpace: Infinity,
 		logging: "warn"
 	},
 	summary: {

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -603,6 +603,8 @@ const SIMPLE_PRINTERS = {
 	"error.message": (message, { bold, formatError }) =>
 		message.includes("\u001b[") ? message : bold(formatError(message)),
 	"error.details": (details, { formatError }) => formatError(details),
+	"error.filteredDetails": filteredDetails =>
+		filteredDetails ? `+ ${filteredDetails} hidden lines` : undefined,
 	"error.stack": stack => stack,
 	"error.moduleTrace": moduleTrace => undefined,
 	"error.separator!": () => "\n",
@@ -703,6 +705,8 @@ const ERROR_PREFERRED_ORDER = [
 	"separator!",
 	"details",
 	"separator!",
+	"filteredDetails",
+	"separator!",
 	"stack",
 	"separator!",
 	"missing",

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "webpack",
-  "version": "5.79.0",
+  "version": "5.80.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",
   "dependencies": {
     "@types/eslint-scope": "^3.7.3",
     "@types/estree": "^1.0.0",
-    "@webassemblyjs/ast": "1.11.1",
-    "@webassemblyjs/wasm-edit": "1.11.1",
-    "@webassemblyjs/wasm-parser": "1.11.1",
+    "@webassemblyjs/ast": "^1.11.5",
+    "@webassemblyjs/wasm-edit": "^1.11.5",
+    "@webassemblyjs/wasm-parser": "^1.11.5",
     "acorn": "^8.7.1",
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.10.0",
+    "enhanced-resolve": "^5.13.0",
     "es-module-lexer": "^1.2.1",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
@@ -24,7 +24,7 @@
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
-    "schema-utils": "^3.1.0",
+    "schema-utils": "^3.1.2",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.3.7",
     "watchpack": "^2.4.0",
@@ -38,10 +38,9 @@
   "devDependencies": {
     "@babel/core": "^7.21.4",
     "@babel/preset-react": "^7.18.6",
-    "@types/es-module-lexer": "^0.4.1",
     "@types/jest": "^29.5.0",
     "@types/node": "^18.15.11",
-    "assemblyscript": "^0.25.2",
+    "assemblyscript": "^0.27.2",
     "babel-loader": "^8.1.0",
     "benchmark": "^2.1.4",
     "bundle-loader": "^0.5.6",
@@ -71,7 +70,7 @@
     "jest-cli": "^29.5.0",
     "jest-diff": "^29.5.0",
     "jest-environment-node": "^29.5.0",
-    "jest-junit": "^15.0.0",
+    "jest-junit": "^16.0.0",
     "json-loader": "^0.5.7",
     "json5": "^2.1.3",
     "less": "^4.0.0",
@@ -103,7 +102,7 @@
     "ts-loader": "^9.4.2",
     "typescript": "^4.8.4",
     "url-loader": "^4.1.0",
-    "wast-loader": "^1.11.0",
+    "wast-loader": "^1.11.5",
     "webassembly-feature": "1.3.0",
     "webpack-cli": "^5.0.1",
     "xxhashjs": "^0.2.2",
@@ -150,7 +149,7 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn special-lint && yarn type-lint && yarn typings-test && yarn module-typings-test && yarn yarn-lint && yarn pretty-lint && yarn spellcheck",
-    "code-lint": "eslint . --ext '.js' --cache",
+    "code-lint": "eslint --cache .",
     "type-lint": "tsc",
     "typings-test": "tsc -p tsconfig.types.test.json",
     "module-typings-test": "tsc -p tsconfig.module.test.json",
@@ -159,9 +158,8 @@
     "special-lint-fix": "node node_modules/tooling/inherit-types --write && node node_modules/tooling/format-schemas --write && node tooling/generate-runtime-code.js --write && node tooling/generate-wasm-code.js --write && node node_modules/tooling/format-file-header --write && node node_modules/tooling/compile-to-definitions --write && node node_modules/tooling/precompile-schemas --write && node node_modules/tooling/generate-types --no-template-literals --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix && yarn pretty-lint-fix",
     "prepare": "husky install",
-    "pretty-lint-base": "prettier \"*.{ts,json,yml,yaml,md}\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.json\" \"examples/*.md\"",
-    "pretty-lint-base-all": "yarn pretty-lint-base \"*.js\" \"{setup,lib,bin,hot,benchmark,tooling,schemas}/**/*.js\" \"module.d.ts\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases,benchmarkCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
-    "pretty-lint-fix": "yarn pretty-lint-base-all --loglevel warn --write",
+    "pretty-lint-base": "prettier --cache .",
+    "pretty-lint-fix": "yarn pretty-lint-base --loglevel warn --write",
     "pretty-lint": "yarn pretty-lint-base --check",
     "yarn-lint": "yarn-deduplicate --fail --list -s highest yarn.lock",
     "yarn-lint-fix": "yarn-deduplicate -s highest yarn.lock",
@@ -179,11 +177,11 @@
     "cover:report": "nyc report -t coverage"
   },
   "lint-staged": {
-    "*.js|{lib,setup,bin,hot,tooling,schemas}/**/*.js|test/*.js|{test,examples}/**/webpack.config.js}": [
-      "eslint --cache"
+    "*.{js,cjs,mjs}": [
+      "eslint --cache --fix"
     ],
-    "*.{ts,json,yml,yaml,md}|examples/*.md": [
-      "prettier --check"
+    "*": [
+      "prettier --cache --ignore-unknown"
     ],
     "*.md|{.github,benchmark,bin,examples,hot,lib,schemas,setup,tooling}/**/*.{md,yml,yaml,js,json}": [
       "cspell"