webpack 5.106.2 → 5.107.1

package/lib/runtime/MakeDeferredNamespaceObjectRuntime.js

@@ -121,15 +121,40 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 			? "init?.();"
 			: "if (init) init();";
 		return `${fn} = ${runtimeTemplate.basicFunction("moduleId, mode", [
+			// Per the TC39 import-defer spec, deferred namespaces are
+			// distinct from their eager counterparts and the same module
+			// referenced from multiple defer-import sites must yield the
+			// same object. Cache the Proxy / fake namespace per-moduleId so
+			// repeated calls (including across files) share identity.
+			//
+			// Bit 16 (`createFakeNamespaceObject`'s "return value when
+			// it's Promise-like" flag added by
+			// `RuntimeTemplate.moduleNamespacePromise` for dynamic
+			// imports) is irrelevant for deferred namespaces — the value
+			// passed into `createFakeNamespaceObject` here is always the
+			// resolved module exports (after unwrapping the async-module
+			// export symbol when present), never a Promise. Strip it
+			// once so all downstream behavior, the cache key, and the
+			// `createFakeNamespaceObject` call below see the same shape
+			// mode. This keeps static defer (mode 8) and dynamic
+			// `await import.defer` (mode 8 | 16) sharing the same
+			// Deferred Module Namespace object, while still keying by
+			// `(moduleId, mode)` so distinct exports-type shapes
+			// (e.g. one importer treats a CJS module as
+			// "default-with-named", another as "namespace") get
+			// distinct cache entries.
+			"mode &= ~16;",
+			"var byMode = __webpack_module_deferred_namespace_cache__[moduleId];",
+			"if (byMode && byMode[mode] !== undefined) return byMode[mode];",
+			"if (!byMode) byMode = __webpack_module_deferred_namespace_cache__[moduleId] = {};",
 			"var cachedModule = __webpack_module_cache__[moduleId];",
-			"if (cachedModule && cachedModule.error === undefined) {",
+			"if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {",
 			Template.indent([
 				"var exports = cachedModule.exports;",
 				hasAsync
 					? `if (${RuntimeGlobals.asyncModuleExportSymbol} in exports) exports = exports[${RuntimeGlobals.asyncModuleExportSymbol}];`
 					: "",
-				"if (mode & 8) return exports;",
-				`return ${RuntimeGlobals.createFakeNamespaceObject}(exports, mode);`
+				`return byMode[mode] = ${RuntimeGlobals.createFakeNamespaceObject}(exports, mode);`
 			]),
 			"}",
 			"",
@@ -141,9 +166,23 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				"init = null;",
 				"if (mode & 8 || mode & 4 && ns.__esModule && typeof ns === 'object') {",
 				Template.indent([
-					"delete handler.defineProperty;",
-					"delete handler.deleteProperty;",
-					"delete handler.set;",
+					// Drop only the read-side traps after init: with the
+					// resolved namespace's own keys mirrored onto
+					// `ns_target` below, the default `Reflect` behavior
+					// returns the right values via the live-binding
+					// getters, so we no longer need to intercept `get` /
+					// `has` / `ownKeys` / `getOwnPropertyDescriptor`.
+					//
+					// The mutation traps (`set`, `deleteProperty`,
+					// `defineProperty`) are kept because per the TC39
+					// import-defer spec, `[[Set]]` / `[[Delete]]` /
+					// `[[DefineOwnProperty]]` on a Deferred Module
+					// Namespace Exotic Object never succeed — and the
+					// proxy target itself remains extensible
+					// (architecturally we cannot freeze it up-front),
+					// so without these traps `ns.notExported = "x"`
+					// after evaluation would silently create a property
+					// on the target instead of returning false.
 					"delete handler.get;",
 					"delete handler.has;",
 					"delete handler.ownKeys;",
@@ -153,13 +192,58 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				Template.indent([
 					`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns, mode);`
 				]),
+				"}",
+				// Mirror own properties from the resolved namespace onto the proxy
+				// target so that proxy invariants hold for callers that structurally
+				// introspect via `Object.keys` / `Object.getOwnPropertyNames` /
+				// `Object.getOwnPropertyDescriptor`: when our trap reports a
+				// non-configurable descriptor for a key, the target must also have
+				// that key with a matching descriptor.
+				//
+				// `__esModule` and `Symbol.toStringTag` are intentionally skipped:
+				// the proxy synthesizes "Deferred Module" / true regardless of what
+				// the underlying namespace exposes (per the TC39 import-defer
+				// proposal, the [[StringTag]] of a Deferred Module Namespace
+				// Exotic Object is "Deferred Module"), and the target was already
+				// pre-populated with those values below.
+				"var keys = Reflect.ownKeys(ns);",
+				"for (var i = 0; i < keys.length; i++) {",
+				Template.indent([
+					"var k = keys[i];",
+					'if (k === "__esModule" || k === Symbol.toStringTag) continue;',
+					"if (!Object.prototype.hasOwnProperty.call(ns_target, k)) {",
+					Template.indent([
+						"try { Object.defineProperty(ns_target, k, Reflect.getOwnPropertyDescriptor(ns, k)); } catch (_) {}"
+					]),
+					"}"
+				]),
 				"}"
 			])};`,
 			"",
-			"var ns = __webpack_module_deferred_exports__[moduleId] || (__webpack_module_deferred_exports__[moduleId] = { __proto__: null });",
+			// The proxy target is a fresh placeholder, separate from
+			// `__webpack_module_deferred_exports__[moduleId]` (which is reused
+			// by `__webpack_require__` as `module.exports` for deferred-loaded
+			// modules and would conflict with our pre-populated synthetic
+			// `__esModule` / `Symbol.toStringTag` non-configurable properties).
+			// Using a dedicated target keeps the proxy invariant-compliant
+			// without interfering with the module's own exports object.
+			"var ns_target = { __proto__: null };",
+			// Pre-populate the synthetic deferred-namespace properties with
+			// fully non-configurable, non-writable, non-enumerable descriptors
+			// (matching the TC39 import-defer spec for Module Namespace
+			// Exotic Objects). The trap returns the same descriptors below.
+			'Object.defineProperty(ns_target, "__esModule", { value: true });',
+			'Object.defineProperty(ns_target, Symbol.toStringTag, { value: "Deferred Module" });',
+			"var ns = ns_target;",
 			"var handler = {",
 			Template.indent([
 				"__proto__: null,",
+				// Per the TC39 import-defer proposal, `IsSymbolLikeNamespaceKey`
+				// returns true for any Symbol-keyed access (and for "then"); such
+				// accesses go through `OrdinaryGetOwnProperty` and must not
+				// trigger evaluation of the deferred module. The Symbol checks
+				// below short-circuit to the pre-populated target without
+				// running `init()`.
 				`get: ${runtimeTemplate.basicFunction("_, name", [
 					"switch (name) {",
 					Template.indent([
@@ -168,6 +252,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 						'case "then": return undefined;'
 					]),
 					"}",
+					'if (typeof name === "symbol") return ns_target[name];',
 					init,
 					"return ns[name];"
 				])},`,
@@ -186,6 +271,7 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 						].filter(Boolean)
 					),
 					"}",
+					'if (typeof name === "symbol") return name in ns_target;',
 					init,
 					"return name in ns;"
 				])},`,
@@ -197,11 +283,16 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 				`getOwnPropertyDescriptor: ${runtimeTemplate.basicFunction("_, name", [
 					"switch (name) {",
 					Template.indent([
-						'case "__esModule": return { value: true, configurable: !(mode & 8) };',
-						'case Symbol.toStringTag: return { value: "Deferred Module", configurable: !(mode & 8) };',
+						// Match the descriptors actually defined on `ns_target`
+						// (non-configurable, non-writable, non-enumerable) so the
+						// proxy invariant holds for both the trap result and any
+						// post-init forwarding via the deleted-handler path.
+						'case "__esModule": return { value: true, writable: false, enumerable: false, configurable: false };',
+						'case Symbol.toStringTag: return { value: "Deferred Module", writable: false, enumerable: false, configurable: false };',
 						'case "then": return undefined;'
 					]),
 					"}",
+					'if (typeof name === "symbol") return Reflect.getOwnPropertyDescriptor(ns_target, name);',
 					init,
 					"var desc = Reflect.getOwnPropertyDescriptor(ns, name);",
 					'if (mode & 2 && name == "default" && !desc) {',
@@ -209,18 +300,33 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
 					"}",
 					"return desc;"
 				])},`,
+				// `defineProperty` always rejects, but per the TC39 spec it
+				// must still trigger evaluation for string keys (the spec
+				// algorithm calls `[[GetOwnProperty]]` first, which forces
+				// evaluation on a deferred namespace). Symbol keys go through
+				// OrdinaryDefineOwnProperty and do not trigger eval.
 				`defineProperty: ${runtimeTemplate.basicFunction("_, name", [
+					'if (typeof name === "symbol" || name === "then") return false;',
+					init,
+					"return false;"
+				])},`,
+				// `deleteProperty` rejects, but per the TC39 spec it must
+				// still trigger evaluation for string keys (the spec
+				// algorithm calls `GetModuleExportsList` for non-symbol-like
+				// keys, forcing evaluation on a deferred namespace).
+				`deleteProperty: ${runtimeTemplate.basicFunction("_, name", [
+					'if (typeof name === "symbol" || name === "then") return false;',
 					init,
-					// Note: This behavior does not match the spec one, but since webpack does not do it either
-					// for a normal Module Namespace object (in MakeNamespaceObjectRuntimeModule), let's keep it simple.
 					"return false;"
 				])},`,
-				`deleteProperty: ${runtimeTemplate.returningFunction("false")},`,
+				// `set` always returns false without triggering evaluation —
+				// the spec [[Set]] algorithm for Module Namespaces is just
+				// "return false" (no [[GetOwnProperty]], no eval).
 				`set: ${runtimeTemplate.returningFunction("false")},`
 			]),
 			"}",
 			// we don't fully emulate ES Module semantics in this Proxy to align with normal webpack esm namespace object.
-			"return new Proxy(ns, handler);"
+			"return byMode[mode] = new Proxy(ns_target, handler);"
 		])};`;
 	}
 }

package/lib/runtime/SetAnonymousDefaultNameRuntimeModule.js

@@ -0,0 +1,35 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+const HelperRuntimeModule = require("./HelperRuntimeModule");
+
+/** @typedef {import("../Compilation")} Compilation */
+
+class SetAnonymousDefaultNameRuntimeModule extends HelperRuntimeModule {
+	constructor() {
+		super("set anonymous default export name");
+	}
+
+	/**
+	 * Generates runtime code for this runtime module.
+	 * @returns {string | null} runtime code
+	 */
+	generate() {
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const { runtimeTemplate } = compilation;
+		const fn = RuntimeGlobals.setAnonymousDefaultName;
+		return Template.asString([
+			"// set .name for anonymous default exports per ES spec",
+			`${fn} = ${runtimeTemplate.basicFunction("x", [
+				'(Object.getOwnPropertyDescriptor(x, "name") || {}).writable || Object.defineProperty(x, "name", { value: "default", configurable: true });'
+			])};`
+		]);
+	}
+}
+
+module.exports = SetAnonymousDefaultNameRuntimeModule;

package/lib/schemes/DataUriPlugin.js

@@ -24,7 +24,7 @@ class DataUriPlugin {
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.resolveForScheme
 					.for("data")
-					.tap(PLUGIN_NAME, (resourceData) => {
+					.tap(PLUGIN_NAME, (resourceData, resolveData) => {
 						const match = URIRegEx.exec(resourceData.resource);
 						if (match) {
 							resourceData.data.mimetype = match[1] || "";
@@ -34,6 +34,18 @@ class DataUriPlugin {
 							);
 							resourceData.data.encodedContent = match[4] || "";
 						}
+						// Inherit the issuer's resolution context so any nested
+						// dependencies discovered while parsing the data URI's body
+						// (e.g. `url(...)` / `@import` inside an inline CSS data
+						// URI) resolve relative to where the URI was referenced
+						// from, instead of against the synthetic `data:.../` path
+						// that `getContext("data:…")` would otherwise infer.
+						if (
+							resourceData.context === undefined &&
+							resolveData.context !== undefined
+						) {
+							resourceData.context = resolveData.context;
+						}
 					});
 
 				NormalModule.getCompilationHooks(compilation)

package/lib/schemes/VirtualUrlPlugin.js

@@ -7,8 +7,8 @@
 
 const { getContext } = require("loader-runner");
 
-const ModuleNotFoundError = require("../ModuleNotFoundError");
 const NormalModule = require("../NormalModule");
+const ModuleNotFoundError = require("../errors/ModuleNotFoundError");
 const { isAbsolute, join } = require("../util/fs");
 const { parseResourceWithoutFragment } = require("../util/identifier");
 

package/lib/serialization/SerializerMiddleware.js

@@ -37,7 +37,7 @@ class SerializerMiddleware {
 	 * @returns {SerializedType | Promise<SerializedType> | null} serialized data
 	 */
 	serialize(data, context) {
-		const AbstractMethodError = require("../AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}
@@ -51,7 +51,7 @@ class SerializerMiddleware {
 	 * @returns {DeserializedType | Promise<DeserializedType>} deserialized data
 	 */
 	deserialize(data, context) {
-		const AbstractMethodError = require("../AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}

package/lib/sharing/ConsumeSharedPlugin.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const ModuleNotFoundError = require("../ModuleNotFoundError");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const WebpackError = require("../WebpackError");
 const { parseOptions } = require("../container/options");
+const ModuleNotFoundError = require("../errors/ModuleNotFoundError");
+const WebpackError = require("../errors/WebpackError");
 const LazySet = require("../util/LazySet");
 const { parseRange } = require("../util/semver");
 const ConsumeSharedFallbackDependency = require("./ConsumeSharedFallbackDependency");
@@ -356,15 +356,9 @@ class ConsumeSharedPlugin {
 						) {
 							return Promise.resolve();
 						}
-						const options = resolvedConsumes.get(
-							/** @type {string} */ (resource)
-						);
+						const options = resolvedConsumes.get(resource);
 						if (options !== undefined) {
-							return createConsumeSharedModule(
-								context,
-								/** @type {string} */ (resource),
-								options
-							);
+							return createConsumeSharedModule(context, resource, options);
 						}
 						return Promise.resolve();
 					}

package/lib/sharing/ConsumeSharedRuntimeModule.js

@@ -8,6 +8,7 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const { compareModulesById } = require("../util/comparators");
 const {
 	parseVersionRuntimeCode,
 	rangeToStringRuntimeCode,
@@ -71,12 +72,14 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 				);
 			}
 		};
+		const byId = compareModulesById(chunkGraph);
 		for (const chunk of /** @type {Chunk} */ (
 			this.chunk
 		).getAllReferencedChunks()) {
-			const modules = chunkGraph.getChunkModulesIterableBySourceType(
+			const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
 				chunk,
-				"consume-shared"
+				"consume-shared",
+				byId
 			);
 			if (!modules) continue;
 			addModules(
@@ -88,9 +91,10 @@ class ConsumeSharedRuntimeModule extends RuntimeModule {
 		for (const chunk of /** @type {Chunk} */ (
 			this.chunk
 		).getAllInitialChunks()) {
-			const modules = chunkGraph.getChunkModulesIterableBySourceType(
+			const modules = chunkGraph.getOrderedChunkModulesIterableBySourceType(
 				chunk,
-				"consume-shared"
+				"consume-shared",
+				byId
 			);
 			if (!modules) continue;
 			addModules(modules, chunk, initialConsumes);

package/lib/sharing/ProvideSharedModule.js

@@ -54,7 +54,7 @@ class ProvideSharedModule extends Module {
 	 * @returns {string} a unique identifier of the module
 	 */
 	identifier() {
-		return `provide module (${this._shareScope}) ${this._name}@${this._version} = ${this._request}`;
+		return `provide module (${this._shareScope}) ${this._name}@${this._version}|${this._request}`;
 	}
 
 	/**

package/lib/sharing/ProvideSharedPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const WebpackError = require("../WebpackError");
 const { parseOptions } = require("../container/options");
+const WebpackError = require("../errors/WebpackError");
 const ProvideForSharedDependency = require("./ProvideForSharedDependency");
 const ProvideSharedDependency = require("./ProvideSharedDependency");
 const ProvideSharedModuleFactory = require("./ProvideSharedModuleFactory");
@@ -169,7 +169,7 @@ class ProvideSharedPlugin {
 				normalModuleFactory.hooks.module.tap(
 					PLUGIN_NAME,
 					(module, { resource, resourceResolveData }, resolveData) => {
-						if (resolvedProvideMap.has(/** @type {string} */ (resource))) {
+						if (resolvedProvideMap.has(resource)) {
 							return module;
 						}
 						const { request } = resolveData;
@@ -179,7 +179,7 @@ class ProvideSharedPlugin {
 								provideSharedModule(
 									request,
 									config,
-									/** @type {string} */ (resource),
+									resource,
 									resourceResolveData
 								);
 								resolveData.cacheable = false;
@@ -189,12 +189,12 @@ class ProvideSharedPlugin {
 							if (request.startsWith(prefix)) {
 								const remainder = request.slice(prefix.length);
 								provideSharedModule(
-									/** @type {string} */ (resource),
+									resource,
 									{
 										...config,
 										shareKey: config.shareKey + remainder
 									},
-									/** @type {string} */ (resource),
+									resource,
 									resourceResolveData
 								);
 								resolveData.cacheable = false;

package/lib/sharing/resolveMatchedConfigs.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const ModuleNotFoundError = require("../ModuleNotFoundError");
+const ModuleNotFoundError = require("../errors/ModuleNotFoundError");
 const LazySet = require("../util/LazySet");
 
 /** @typedef {import("enhanced-resolve").ResolveContext} ResolveContext */

package/lib/stats/DefaultStatsFactoryPlugin.js

@@ -8,7 +8,6 @@
 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");
 const AggressiveSplittingPlugin = require("../optimize/AggressiveSplittingPlugin");
 const SizeLimitsPlugin = require("../performance/SizeLimitsPlugin");
@@ -22,6 +21,7 @@ const {
 	compareSelect,
 	concatComparators
 } = require("../util/comparators");
+const formatLocation = require("../util/formatLocation");
 const { makePathsRelative, parseResource } = require("../util/identifier");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -48,7 +48,7 @@ const { makePathsRelative, parseResource } = require("../util/identifier");
 /** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleProfile")} ModuleProfile */
-/** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../serialization/AggregateErrorSerializer").AggregateError} AggregateError */
 /** @typedef {import("../serialization/ErrorObjectSerializer").ErrorWithCause} ErrorWithCause */
 /** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */

package/lib/stats/DefaultStatsPresetPlugin.js

@@ -31,7 +31,7 @@ const applyDefaults = (options, defaults) => {
 	}
 };
 
-/** @typedef {{ [Key in Exclude<StatsValue, boolean | EXPECTED_OBJECT | "normal">]: StatsOptions }} NamedPresets */
+/** @typedef {{ [Key in Exclude<StatsValue, boolean | StatsOptions | "normal">]: StatsOptions }} NamedPresets */
 
 /** @type {NamedPresets} */
 const NAMED_PRESETS = {

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -1510,7 +1510,7 @@ const AVAILABLE_FORMATS = {
 		(oversize ? yellow : green)(filename),
 	formatFlag: (flag) => `[${flag}]`,
 	formatLayer: (layer) => `(in ${layer})`,
-	formatSize: require("../SizeFormatHelpers").formatSize,
+	formatSize: require("../util/formatSize"),
 	formatDateTime: (dateTime, { bold }) => {
 		const d = new Date(dateTime);
 		const x = twoDigit;

package/lib/stats/StatsFactory.js

@@ -18,7 +18,7 @@ const smartGrouping = require("../util/smartGrouping");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph").ModuleProfile} ModuleProfile */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../util/comparators").Comparator<EXPECTED_ANY>} Comparator */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /**