webpack 5.72.0 → 5.74.0

package/lib/javascript/JavascriptParser.js

@@ -165,6 +165,14 @@ class JavascriptParser extends Parser {
 			evaluateDefinedIdentifier: new HookMap(
 				() => new SyncBailHook(["expression"])
 			),
+			/** @type {HookMap<SyncBailHook<[NewExpressionNode], BasicEvaluatedExpression | undefined | null>>} */
+			evaluateNewExpression: new HookMap(
+				() => new SyncBailHook(["expression"])
+			),
+			/** @type {HookMap<SyncBailHook<[CallExpressionNode], BasicEvaluatedExpression | undefined | null>>} */
+			evaluateCallExpression: new HookMap(
+				() => new SyncBailHook(["expression"])
+			),
 			/** @type {HookMap<SyncBailHook<[CallExpressionNode, BasicEvaluatedExpression | undefined], BasicEvaluatedExpression | undefined | null>>} */
 			evaluateCallExpressionMember: new HookMap(
 				() => new SyncBailHook(["expression", "param"])
@@ -361,9 +369,14 @@ class JavascriptParser extends Parser {
 		this.hooks.evaluate.for("NewExpression").tap("JavascriptParser", _expr => {
 			const expr = /** @type {NewExpressionNode} */ (_expr);
 			const callee = expr.callee;
-			if (
-				callee.type !== "Identifier" ||
-				callee.name !== "RegExp" ||
+			if (callee.type !== "Identifier") return;
+			if (callee.name !== "RegExp") {
+				return this.callHooksForName(
+					this.hooks.evaluateNewExpression,
+					callee.name,
+					expr
+				);
+			} else if (
 				expr.arguments.length > 2 ||
 				this.getVariableInfo("RegExp") !== "RegExp"
 			)
@@ -1036,24 +1049,28 @@ class JavascriptParser extends Parser {
 		this.hooks.evaluate.for("CallExpression").tap("JavascriptParser", _expr => {
 			const expr = /** @type {CallExpressionNode} */ (_expr);
 			if (
-				expr.callee.type !== "MemberExpression" ||
-				expr.callee.property.type !==
+				expr.callee.type === "MemberExpression" &&
+				expr.callee.property.type ===
 					(expr.callee.computed ? "Literal" : "Identifier")
 			) {
-				return;
-			}
-
-			// type Super also possible here
-			const param = this.evaluateExpression(
-				/** @type {ExpressionNode} */ (expr.callee.object)
-			);
-			const property =
-				expr.callee.property.type === "Literal"
-					? `${expr.callee.property.value}`
-					: expr.callee.property.name;
-			const hook = this.hooks.evaluateCallExpressionMember.get(property);
-			if (hook !== undefined) {
-				return hook.call(expr, param);
+				// type Super also possible here
+				const param = this.evaluateExpression(
+					/** @type {ExpressionNode} */ (expr.callee.object)
+				);
+				const property =
+					expr.callee.property.type === "Literal"
+						? `${expr.callee.property.value}`
+						: expr.callee.property.name;
+				const hook = this.hooks.evaluateCallExpressionMember.get(property);
+				if (hook !== undefined) {
+					return hook.call(expr, param);
+				}
+			} else if (expr.callee.type === "Identifier") {
+				return this.callHooksForName(
+					this.hooks.evaluateCallExpression,
+					expr.callee.name,
+					expr
+				);
 			}
 		});
 		this.hooks.evaluateCallExpressionMember
@@ -1430,6 +1447,11 @@ class JavascriptParser extends Parser {
 							this.walkExpression(classElement.value);
 							this.scope.topLevelScope = wasTopLevel;
 						}
+					} else if (classElement.type === "StaticBlock") {
+						const wasTopLevel = this.scope.topLevelScope;
+						this.scope.topLevelScope = false;
+						this.walkBlockStatement(classElement);
+						this.scope.topLevelScope = wasTopLevel;
 					}
 				}
 			}
@@ -1886,7 +1908,7 @@ class JavascriptParser extends Parser {
 						!this.hooks.importSpecifier.call(
 							statement,
 							source,
-							specifier.imported.name,
+							specifier.imported.name || specifier.imported.value,
 							name
 						)
 					) {
@@ -1956,7 +1978,7 @@ class JavascriptParser extends Parser {
 				const specifier = statement.specifiers[specifierIndex];
 				switch (specifier.type) {
 					case "ExportSpecifier": {
-						const name = specifier.exported.name;
+						const name = specifier.exported.name || specifier.exported.value;
 						if (source) {
 							this.hooks.exportImportSpecifier.call(
 								statement,
@@ -3603,6 +3625,10 @@ class JavascriptParser extends Parser {
 		}
 	}
 
+	evaluatedVariable(tagInfo) {
+		return new VariableInfo(this.scope, undefined, tagInfo);
+	}
+
 	parseCommentOptions(range) {
 		const comments = this.getComments(range);
 		if (comments.length === 0) {

package/lib/json/JsonData.js

@@ -24,6 +24,14 @@ class JsonData {
 		}
 		return this._data;
 	}
+
+	updateHash(hash) {
+		if (this._buffer === undefined && this._data !== undefined) {
+			this._buffer = Buffer.from(JSON.stringify(this._data));
+		}
+
+		if (this._buffer) return hash.update(this._buffer);
+	}
 }
 
 register(JsonData, "webpack/lib/json/JsonData", null, {

package/lib/json/JsonParser.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const parseJson = require("json-parse-better-errors");
+const parseJson = require("json-parse-even-better-errors");
 const Parser = require("../Parser");
 const JsonExportsDependency = require("../dependencies/JsonExportsDependency");
 const JsonData = require("./JsonData");
@@ -41,15 +41,13 @@ class JsonParser extends Parser {
 			typeof source === "object"
 				? source
 				: parseFn(source[0] === "\ufeff" ? source.slice(1) : source);
-
-		state.module.buildInfo.jsonData = new JsonData(data);
+		const jsonData = new JsonData(data);
+		state.module.buildInfo.jsonData = jsonData;
 		state.module.buildInfo.strict = true;
 		state.module.buildMeta.exportsType = "default";
 		state.module.buildMeta.defaultObject =
 			typeof data === "object" ? "redirect-warn" : false;
-		state.module.addDependency(
-			new JsonExportsDependency(JsonExportsDependency.getExportsFromData(data))
-		);
+		state.module.addDependency(new JsonExportsDependency(jsonData));
 		return state;
 	}
 }

package/lib/optimize/ConcatenatedModule.js

@@ -21,7 +21,7 @@ const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency
 const JavascriptParser = require("../javascript/JavascriptParser");
 const { equals } = require("../util/ArrayHelpers");
 const LazySet = require("../util/LazySet");
-const { concatComparators, keepOriginalOrder } = require("../util/comparators");
+const { concatComparators } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
@@ -185,23 +185,25 @@ const RESERVED_NAMES = new Set(
 		.split(",")
 );
 
-const bySourceOrder = (a, b) => {
-	const aOrder = a.sourceOrder;
-	const bOrder = b.sourceOrder;
-	if (isNaN(aOrder)) {
-		if (!isNaN(bOrder)) {
+const createComparator = (property, comparator) => (a, b) =>
+	comparator(a[property], b[property]);
+const compareNumbers = (a, b) => {
+	if (isNaN(a)) {
+		if (!isNaN(b)) {
 			return 1;
 		}
 	} else {
-		if (isNaN(bOrder)) {
+		if (isNaN(b)) {
 			return -1;
 		}
-		if (aOrder !== bOrder) {
-			return aOrder < bOrder ? -1 : 1;
+		if (a !== b) {
+			return a < b ? -1 : 1;
 		}
 	}
 	return 0;
 };
+const bySourceOrder = createComparator("sourceOrder", compareNumbers);
+const byRangeStart = createComparator("rangeStart", compareNumbers);
 
 const joinIterableWithComma = iterable => {
 	// This is more performant than Array.from().join(", ")
@@ -885,6 +887,9 @@ class ConcatenatedModule extends Module {
 				for (const c of moduleGraph.getOutgoingConnections(this))
 					connections.push(c);
 			}
+			/**
+			 * @type {Array<{ connection: ModuleGraphConnection, sourceOrder: number, rangeStart: number }>}
+			 */
 			const references = connections
 				.filter(connection => {
 					if (!(connection.dependency instanceof HarmonyImportDependency))
@@ -896,15 +901,33 @@ class ConcatenatedModule extends Module {
 						connection.isTargetActive(runtime)
 					);
 				})
-				.map(connection => ({
-					connection,
-					sourceOrder: /** @type {HarmonyImportDependency} */ (
+				.map(connection => {
+					const dep = /** @type {HarmonyImportDependency} */ (
 						connection.dependency
-					).sourceOrder
-				}));
-			references.sort(
-				concatComparators(bySourceOrder, keepOriginalOrder(references))
-			);
+					);
+					return {
+						connection,
+						sourceOrder: dep.sourceOrder,
+						rangeStart: dep.range && dep.range[0]
+					};
+				});
+			/**
+			 * bySourceOrder
+			 * @example
+			 * import a from "a"; // sourceOrder=1
+			 * import b from "b"; // sourceOrder=2
+			 *
+			 * byRangeStart
+			 * @example
+			 * import {a, b} from "a"; // sourceOrder=1
+			 * a.a(); // first range
+			 * b.b(); // second range
+			 *
+			 * If there is no reexport, we have the same source.
+			 * If there is reexport, but module has side effects, this will lead to reexport module only.
+			 * If there is side-effects-free reexport, we can get simple deterministic result with range start comparison.
+			 */
+			references.sort(concatComparators(bySourceOrder, byRangeStart));
 			/** @type {Map<Module, { connection: ModuleGraphConnection, runtimeCondition: RuntimeSpec | true }>} */
 			const referencesMap = new Map();
 			for (const { connection } of references) {

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -606,7 +606,7 @@ class ModuleConcatenationPlugin {
 				incomingConnectionsFromNonModules.filter(connection => {
 					// We are not interested in inactive connections
 					// or connections without dependency
-					return connection.isActive(runtime) || connection.dependency;
+					return connection.isActive(runtime);
 				});
 			if (activeNonModulesConnections.length > 0) {
 				const problem = requestShortener => {

package/lib/runtime/AsyncModuleRuntimeModule.js

@@ -20,12 +20,13 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 		const { runtimeTemplate } = this.compilation;
 		const fn = RuntimeGlobals.asyncModule;
 		return Template.asString([
-			'var webpackThen = typeof Symbol === "function" ? Symbol("webpack then") : "__webpack_then__";',
+			'var webpackQueues = typeof Symbol === "function" ? Symbol("webpack queues") : "__webpack_queues__";',
 			'var webpackExports = typeof Symbol === "function" ? Symbol("webpack exports") : "__webpack_exports__";',
 			'var webpackError = typeof Symbol === "function" ? Symbol("webpack error") : "__webpack_error__";',
-			`var completeQueue = ${runtimeTemplate.basicFunction("queue", [
-				"if(queue) {",
+			`var resolveQueue = ${runtimeTemplate.basicFunction("queue", [
+				"if(queue && !queue.d) {",
 				Template.indent([
+					"queue.d = 1;",
 					`queue.forEach(${runtimeTemplate.expressionFunction(
 						"fn.r--",
 						"fn"
@@ -37,35 +38,26 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 				]),
 				"}"
 			])}`,
-			`var completeFunction = ${runtimeTemplate.expressionFunction(
-				"!--fn.r && fn()",
-				"fn"
-			)};`,
-			`var queueFunction = ${runtimeTemplate.expressionFunction(
-				"queue ? queue.push(fn) : completeFunction(fn)",
-				"queue, fn"
-			)};`,
 			`var wrapDeps = ${runtimeTemplate.returningFunction(
 				`deps.map(${runtimeTemplate.basicFunction("dep", [
 					'if(dep !== null && typeof dep === "object") {',
 					Template.indent([
-						"if(dep[webpackThen]) return dep;",
+						"if(dep[webpackQueues]) return dep;",
 						"if(dep.then) {",
 						Template.indent([
 							"var queue = [];",
+							"queue.d = 0;",
 							`dep.then(${runtimeTemplate.basicFunction("r", [
 								"obj[webpackExports] = r;",
-								"completeQueue(queue);",
-								"queue = 0;"
+								"resolveQueue(queue);"
 							])}, ${runtimeTemplate.basicFunction("e", [
 								"obj[webpackError] = e;",
-								"completeQueue(queue);",
-								"queue = 0;"
+								"resolveQueue(queue);"
 							])});`,
 							"var obj = {};",
-							`obj[webpackThen] = ${runtimeTemplate.expressionFunction(
-								"queueFunction(queue, fn), dep['catch'](reject)",
-								"fn, reject"
+							`obj[webpackQueues] = ${runtimeTemplate.expressionFunction(
+								`fn(queue)`,
+								"fn"
 							)};`,
 							"return obj;"
 						]),
@@ -73,54 +65,28 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 					]),
 					"}",
 					"var ret = {};",
-					`ret[webpackThen] = ${runtimeTemplate.expressionFunction(
-						"completeFunction(fn)",
-						"fn"
-					)};`,
+					`ret[webpackQueues] = ${runtimeTemplate.emptyFunction()};`,
 					"ret[webpackExports] = dep;",
 					"return ret;"
 				])})`,
 				"deps"
 			)};`,
 			`${fn} = ${runtimeTemplate.basicFunction("module, body, hasAwait", [
-				"var queue = hasAwait && [];",
+				"var queue;",
+				"hasAwait && ((queue = []).d = 1);",
+				"var depQueues = new Set();",
 				"var exports = module.exports;",
 				"var currentDeps;",
 				"var outerResolve;",
 				"var reject;",
-				"var isEvaluating = true;",
-				"var nested = false;",
-				`var whenAll = ${runtimeTemplate.basicFunction(
-					"deps, onResolve, onReject",
-					[
-						"if (nested) return;",
-						"nested = true;",
-						"onResolve.r += deps.length;",
-						`deps.map(${runtimeTemplate.expressionFunction(
-							"dep[webpackThen](onResolve, onReject)",
-							"dep, i"
-						)});`,
-						"nested = false;"
-					]
-				)};`,
 				`var promise = new Promise(${runtimeTemplate.basicFunction(
 					"resolve, rej",
-					[
-						"reject = rej;",
-						`outerResolve = ${runtimeTemplate.expressionFunction(
-							"resolve(exports), completeQueue(queue), queue = 0"
-						)};`
-					]
+					["reject = rej;", "outerResolve = resolve;"]
 				)});`,
 				"promise[webpackExports] = exports;",
-				`promise[webpackThen] = ${runtimeTemplate.basicFunction(
-					"fn, rejectFn",
-					[
-						"if (isEvaluating) { return completeFunction(fn); }",
-						"if (currentDeps) whenAll(currentDeps, fn, rejectFn);",
-						"queueFunction(queue, fn);",
-						"promise['catch'](rejectFn);"
-					]
+				`promise[webpackQueues] = ${runtimeTemplate.expressionFunction(
+					`queue && fn(queue), depQueues.forEach(fn), promise["catch"](${runtimeTemplate.emptyFunction()})`,
+					"fn"
 				)};`,
 				"module.exports = promise;",
 				`body(${runtimeTemplate.basicFunction("deps", [
@@ -133,21 +99,29 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 						])})`
 					)}`,
 					`var promise = new Promise(${runtimeTemplate.basicFunction(
-						"resolve, reject",
+						"resolve",
 						[
 							`fn = ${runtimeTemplate.expressionFunction(
-								"resolve(getResult)"
+								"resolve(getResult)",
+								""
 							)};`,
 							"fn.r = 0;",
-							"whenAll(currentDeps, fn, reject);"
+							`var fnQueue = ${runtimeTemplate.expressionFunction(
+								"q !== queue && !depQueues.has(q) && (depQueues.add(q), q && !q.d && (fn.r++, q.push(fn)))",
+								"q"
+							)};`,
+							`currentDeps.map(${runtimeTemplate.expressionFunction(
+								"dep[webpackQueues](fnQueue)",
+								"dep"
+							)});`
 						]
 					)});`,
 					"return fn.r ? promise : getResult();"
 				])}, ${runtimeTemplate.expressionFunction(
-					"err && reject(promise[webpackError] = err), outerResolve()",
+					"(err ? reject(promise[webpackError] = err) : outerResolve(exports)), resolveQueue(queue)",
 					"err"
 				)});`,
-				"isEvaluating = false;"
+				"queue && (queue.d = 0);"
 			])};`
 		]);
 	}

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -87,13 +87,15 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 					: "url"
 			};`,
 			crossOriginLoading
-				? Template.asString([
-						"if (script.src.indexOf(window.location.origin + '/') !== 0) {",
-						Template.indent(
-							`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
-						),
-						"}"
-				  ])
+				? crossOriginLoading === "use-credentials"
+					? 'script.crossOrigin = "use-credentials";'
+					: Template.asString([
+							"if (script.src.indexOf(window.location.origin + '/') !== 0) {",
+							Template.indent(
+								`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
+							),
+							"}"
+					  ])
 				: ""
 		]);
 

package/lib/runtime/NonceRuntimeModule.js

@@ -0,0 +1,24 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Ivan Kopeykin @vankop
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeModule = require("../RuntimeModule");
+
+class NonceRuntimeModule extends RuntimeModule {
+	constructor() {
+		super("nonce", RuntimeModule.STAGE_ATTACH);
+	}
+
+	/**
+	 * @returns {string} runtime code
+	 */
+	generate() {
+		return `${RuntimeGlobals.scriptNonce} = undefined;`;
+	}
+}
+
+module.exports = NonceRuntimeModule;

package/lib/sharing/ProvideSharedPlugin.js

@@ -129,8 +129,7 @@ class ProvideSharedPlugin {
 								details =
 									"No description file (usually package.json) found. Add description file with name and version, or manually specify version in shared config.";
 							} else if (!descriptionFileData.version) {
-								details =
-									"No version in description file (usually package.json). Add version to description file, or manually specify version in shared config.";
+								details = `No version in description file (usually package.json). Add version to description file ${resourceResolveData.descriptionFilePath}, or manually specify version in shared config.`;
 							} else {
 								version = descriptionFileData.version;
 							}

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -263,15 +263,17 @@ class JsonpChunkLoadingRuntimeModule extends RuntimeModule {
 									'link.as = "script";',
 									`link.href = ${RuntimeGlobals.publicPath} + ${RuntimeGlobals.getChunkScriptFilename}(chunkId);`,
 									crossOriginLoading
-										? Template.asString([
-												"if (link.href.indexOf(window.location.origin + '/') !== 0) {",
-												Template.indent(
-													`link.crossOrigin = ${JSON.stringify(
-														crossOriginLoading
-													)};`
-												),
-												"}"
-										  ])
+										? crossOriginLoading === "use-credentials"
+											? 'link.crossOrigin = "use-credentials";'
+											: Template.asString([
+													"if (link.href.indexOf(window.location.origin + '/') !== 0) {",
+													Template.indent(
+														`link.crossOrigin = ${JSON.stringify(
+															crossOriginLoading
+														)};`
+													),
+													"}"
+											  ])
 										: ""
 								]),
 								chunk

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.72.0",
+  "version": "5.74.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",
@@ -10,24 +10,24 @@
     "@webassemblyjs/ast": "1.11.1",
     "@webassemblyjs/wasm-edit": "1.11.1",
     "@webassemblyjs/wasm-parser": "1.11.1",
-    "acorn": "^8.4.1",
+    "acorn": "^8.7.1",
     "acorn-import-assertions": "^1.7.6",
     "browserslist": "^4.14.5",
     "chrome-trace-event": "^1.0.2",
-    "enhanced-resolve": "^5.9.2",
+    "enhanced-resolve": "^5.10.0",
     "es-module-lexer": "^0.9.0",
     "eslint-scope": "5.1.1",
     "events": "^3.2.0",
     "glob-to-regexp": "^0.4.1",
     "graceful-fs": "^4.2.9",
-    "json-parse-better-errors": "^1.0.2",
+    "json-parse-even-better-errors": "^2.3.1",
     "loader-runner": "^4.2.0",
     "mime-types": "^2.1.27",
     "neo-async": "^2.6.2",
     "schema-utils": "^3.1.0",
     "tapable": "^2.1.1",
     "terser-webpack-plugin": "^5.1.3",
-    "watchpack": "^2.3.1",
+    "watchpack": "^2.4.0",
     "webpack-sources": "^3.2.3"
   },
   "peerDependenciesMeta": {
@@ -121,6 +121,7 @@
     "url": "https://opencollective.com/webpack"
   },
   "homepage": "https://github.com/webpack/webpack",
+  "bugs": "https://github.com/webpack/webpack/issues",
   "main": "lib/index.js",
   "bin": {
     "webpack": "bin/webpack.js"