webpack 5.107.1 → 5.108.0

package/lib/debug/ProfilingPlugin.js

@@ -67,7 +67,9 @@ class Profiler {
 	constructor(inspector) {
 		/** @type {undefined | Session} */
 		this.session = undefined;
+		/** @type {Inspector} */
 		this.inspector = inspector;
+		/** @type {number} */
 		this._startTime = 0;
 	}
 

package/lib/deno/DenoTargetPlugin.js

@@ -0,0 +1,47 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const ExternalsPlugin = require("../ExternalsPlugin");
+const NodeTargetPlugin = require("../node/NodeTargetPlugin");
+
+/** @typedef {import("../Compiler")} Compiler */
+
+// Deno only resolves node.js core modules through the `node:` specifier, so the
+// prefix is baked into the external request for both `import` and `require`.
+// cspell:word pnpapi
+const coreModules = new Set(
+	NodeTargetPlugin.builtins.filter(
+		(builtin) => typeof builtin === "string" && builtin !== "pnpapi"
+	)
+);
+
+// Deno's own import protocols are resolved by the runtime, never bundled.
+const DENO_PROTOCOLS = /^(?:npm|jsr|https?):/;
+
+class DenoTargetPlugin {
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		new ExternalsPlugin(
+			(dependency) =>
+				dependency.category === "commonjs" ? "node-commonjs" : "module-import",
+			({ request }, callback) => {
+				if (!request) return callback();
+				if (request.startsWith("node:") || DENO_PROTOCOLS.test(request)) {
+					return callback(null, request);
+				}
+				if (coreModules.has(request)) return callback(null, `node:${request}`);
+				callback();
+			}
+		).apply(compiler);
+	}
+}
+
+module.exports = DenoTargetPlugin;

package/lib/dependencies/AMDDefineDependency.js

@@ -14,8 +14,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectSerializerContext */
 
 /** @type {Record<string, { definition: string, content: string, requests: string[] }>} */
 const DEFINITIONS = {
@@ -121,6 +121,7 @@ class AMDDefineDependency extends NullDependency {
 		this.arrayRange = arrayRange;
 		this.functionRange = functionRange;
 		this.objectRange = objectRange;
+		/** @type {string | null} */
 		this.namedModule = namedModule;
 		/** @type {LocalModule | null} */
 		this.localModule = null;
@@ -135,13 +136,13 @@ class AMDDefineDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
-		write(this.arrayRange);
-		write(this.functionRange);
-		write(this.objectRange);
-		write(this.namedModule);
-		write(this.localModule);
+		context
+			.write(this.range)
+			.write(this.arrayRange)
+			.write(this.functionRange)
+			.write(this.objectRange)
+			.write(this.namedModule)
+			.write(this.localModule);
 		super.serialize(context);
 	}
 
@@ -150,14 +151,18 @@ class AMDDefineDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.range = read();
-		this.arrayRange = read();
-		this.functionRange = read();
-		this.objectRange = read();
-		this.namedModule = read();
-		this.localModule = read();
-		super.deserialize(context);
+		this.range = context.read();
+		const c1 = context.rest;
+		this.arrayRange = c1.read();
+		const c2 = c1.rest;
+		this.functionRange = c2.read();
+		const c3 = c2.rest;
+		this.objectRange = c3.read();
+		const c4 = c3.rest;
+		this.namedModule = c4.read();
+		const c5 = c4.rest;
+		this.localModule = c5.read();
+		super.deserialize(c5.rest);
 	}
 }
 

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -83,6 +83,7 @@ class AMDDefineDependencyParserPlugin {
 	 * @param {JavascriptParserOptions} options parserOptions
 	 */
 	constructor(options) {
+		/** @type {JavascriptParserOptions} */
 		this.options = options;
 	}
 

package/lib/dependencies/AMDRequireArrayDependency.js

@@ -14,9 +14,9 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./AMDRequireItemDependency")} AMDRequireItemDependency */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectSerializerContext */
 
 class AMDRequireArrayDependency extends NullDependency {
 	/**
@@ -44,10 +44,7 @@ class AMDRequireArrayDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.depsArray);
-		write(this.range);
+		context.write(this.depsArray).write(this.range);
 
 		super.serialize(context);
 	}
@@ -57,12 +54,11 @@ class AMDRequireArrayDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.depsArray = read();
-		this.range = read();
+		this.depsArray = context.read();
+		const c1 = context.rest;
+		this.range = c1.read();
 
-		super.deserialize(context);
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/AMDRequireContextDependency.js

@@ -9,8 +9,8 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range]>} ObjectSerializerContext */
 /** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
 
 class AMDRequireContextDependency extends ContextDependency {
@@ -40,10 +40,7 @@ class AMDRequireContextDependency extends ContextDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
-		write(this.valueRange);
+		context.write(this.range).write(this.valueRange);
 
 		super.serialize(context);
 	}
@@ -53,12 +50,11 @@ class AMDRequireContextDependency extends ContextDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.range = read();
-		this.valueRange = read();
+		this.range = context.read();
+		const c1 = context.rest;
+		this.valueRange = c1.read();
 
-		super.deserialize(context);
+		super.deserialize(c1.rest);
 	}
 }
 

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -40,6 +40,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 	 * @param {JavascriptParserOptions} options parserOptions
 	 */
 	constructor(options) {
+		/** @type {JavascriptParserOptions} */
 		this.options = options;
 	}
 

package/lib/dependencies/AMDRequireDependency.js

@@ -14,8 +14,8 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range | null, Range | null, boolean, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range | null, Range | null, boolean, boolean]>} ObjectSerializerContext */
 
 class AMDRequireDependency extends NullDependency {
 	/**
@@ -32,7 +32,9 @@ class AMDRequireDependency extends NullDependency {
 		this.arrayRange = arrayRange;
 		this.functionRange = functionRange;
 		this.errorCallbackRange = errorCallbackRange;
+		/** @type {boolean} */
 		this.functionBindThis = false;
+		/** @type {boolean} */
 		this.errorCallbackBindThis = false;
 	}
 
@@ -45,14 +47,13 @@ class AMDRequireDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-
-		write(this.outerRange);
-		write(this.arrayRange);
-		write(this.functionRange);
-		write(this.errorCallbackRange);
-		write(this.functionBindThis);
-		write(this.errorCallbackBindThis);
+		context
+			.write(this.outerRange)
+			.write(this.arrayRange)
+			.write(this.functionRange)
+			.write(this.errorCallbackRange)
+			.write(this.functionBindThis)
+			.write(this.errorCallbackBindThis);
 
 		super.serialize(context);
 	}
@@ -62,16 +63,19 @@ class AMDRequireDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-
-		this.outerRange = read();
-		this.arrayRange = read();
-		this.functionRange = read();
-		this.errorCallbackRange = read();
-		this.functionBindThis = read();
-		this.errorCallbackBindThis = read();
-
-		super.deserialize(context);
+		this.outerRange = context.read();
+		const c1 = context.rest;
+		this.arrayRange = c1.read();
+		const c2 = c1.rest;
+		this.functionRange = c2.read();
+		const c3 = c2.rest;
+		this.errorCallbackRange = c3.read();
+		const c4 = c3.rest;
+		this.functionBindThis = c4.read();
+		const c5 = c4.rest;
+		this.errorCallbackBindThis = c5.read();
+
+		super.deserialize(c5.rest);
 	}
 }
 

package/lib/dependencies/CachedConstDependency.js

@@ -35,9 +35,12 @@ class CachedConstDependency extends NullDependency {
 	) {
 		super();
 
+		/** @type {string} */
 		this.expression = expression;
 		this.range = range;
+		/** @type {string} */
 		this.identifier = identifier;
+		/** @type {number} */
 		this.place = place;
 		/** @type {undefined | string} */
 		this._hashUpdate = undefined;

package/lib/dependencies/CommonJsDependencyHelpers.js

@@ -63,6 +63,7 @@ const getRequireEsmModuleExportsAccess = (
 		return null;
 	}
 	const exportsInfo = moduleGraph.getExportsInfo(importedModule);
+	// CJS exports are never inlined
 	const usedName = exportsInfo.getUsedName([ESM_MODULE_EXPORTS_NAME], runtime);
 	if (usedName === false) return null;
 	return propertyAccess(/** @type {readonly string[]} */ (usedName));

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -32,10 +32,10 @@ const processExportInfo = require("./processExportInfo");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[undefined | boolean, Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[], ExportInfoName[], boolean, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[undefined | boolean, Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[], ExportInfoName[], boolean, boolean]>} ObjectSerializerContext */
 
 const idsSymbol = /** @type {symbol} */ (
 	Symbol("CommonJsExportRequireDependency.ids")
@@ -61,12 +61,20 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		super(request);
 		this.range = range;
 		this.valueRange = valueRange;
+		/** @type {CommonJSDependencyBaseKeywords} */
 		this.base = base;
+		/** @type {string[]} */
 		this.names = names;
+		/** @type {string[]} */
 		this.ids = ids;
+		/** @type {boolean} */
 		this.resultUsed = resultUsed;
 		/** @type {undefined | boolean} */
 		this.asiSafe = undefined;
+		// true when the reexport is a lazy `{ get: () => require(...) }` accessor
+		// (as produced by `Object.defineProperty`) rather than an eager value.
+		/** @type {boolean} */
+		this.getter = false;
 	}
 
 	get type() {
@@ -120,7 +128,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			// `require(esm)` unwraps the "module.exports" named export; any
 			// further property access lands on that value (which webpack does
 			// not model), so only the "module.exports" export is observable.
-			return [[ESM_MODULE_EXPORTS_NAME]];
+			return [{ name: [ESM_MODULE_EXPORTS_NAME], canInline: false }];
 		}
 		const getFullResult = () => {
 			if (ids.length === 0) {
@@ -129,7 +137,8 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			return [
 				{
 					name: ids,
-					canMangle: false
+					canMangle: false,
+					canInline: false
 				}
 			];
 		};
@@ -164,7 +173,8 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		}
 		return referencedExports.map((name) => ({
 			name,
-			canMangle: false
+			canMangle: false,
+			canInline: false
 		}));
 	}
 
@@ -248,7 +258,6 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 						canMangle: !(name in EMPTY_OBJECT) && false
 					})
 				),
-				// TODO handle deep reexports
 				dependencies: [from.module]
 			};
 		}
@@ -352,14 +361,15 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.asiSafe);
-		write(this.range);
-		write(this.valueRange);
-		write(this.base);
-		write(this.names);
-		write(this.ids);
-		write(this.resultUsed);
+		context
+			.write(this.asiSafe)
+			.write(this.range)
+			.write(this.valueRange)
+			.write(this.base)
+			.write(this.names)
+			.write(this.ids)
+			.write(this.resultUsed)
+			.write(this.getter);
 		super.serialize(context);
 	}
 
@@ -368,15 +378,22 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.asiSafe = read();
-		this.range = read();
-		this.valueRange = read();
-		this.base = read();
-		this.names = read();
-		this.ids = read();
-		this.resultUsed = read();
-		super.deserialize(context);
+		this.asiSafe = context.read();
+		const c1 = context.rest;
+		this.range = c1.read();
+		const c2 = c1.rest;
+		this.valueRange = c2.read();
+		const c3 = c2.rest;
+		this.base = c3.read();
+		const c4 = c3.rest;
+		this.names = c4.read();
+		const c5 = c4.rest;
+		this.ids = c5.read();
+		const c6 = c5.rest;
+		this.resultUsed = c6.read();
+		const c7 = c6.rest;
+		this.getter = c7.read();
+		super.deserialize(c7.rest);
 	}
 }
 
@@ -408,9 +425,10 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 		}
 	) {
 		const dep = /** @type {CommonJsExportRequireDependency} */ (dependency);
-		const used = moduleGraph
-			.getExportsInfo(module)
-			.getUsedName(dep.names, runtime);
+		// CJS exports are never inlined
+		const used = /** @type {string | string[] | false} */ (
+			moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime)
+		);
 
 		const [type, base] = handleDependencyBase(
 			dep.base,
@@ -436,9 +454,10 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 			if (esmRequireAccess !== null) {
 				requireExpr += `${esmRequireAccess}${propertyAccess(ids)}`;
 			} else {
-				const usedImported = moduleGraph
-					.getExportsInfo(importedModule)
-					.getUsedName(ids, runtime);
+				// CJS exports are never inlined
+				const usedImported = /** @type {string | string[] | false} */ (
+					moduleGraph.getExportsInfo(importedModule).getUsedName(ids, runtime)
+				);
 				if (usedImported) {
 					const comment = equals(usedImported, ids)
 						? ""
@@ -458,8 +477,37 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 						: `/* unused reexport */ ${requireExpr}`
 				);
 				return;
-			case "Object.defineProperty":
-				throw new Error("TODO");
+			case "Object.defineProperty": {
+				// `Object.defineProperty(exports, "name", { value: require("...") })`
+				// or the lazy getter form `{ get: () => require("...") }` used by
+				// barrel files (e.g. webpack's own `lib/index.js`).
+				const valueRange = /** @type {Range} */ (dep.valueRange);
+				if (!used) {
+					// A lazy getter never runs `require` until accessed, so an unused
+					// one can be dropped entirely; an eager value must keep side effects.
+					source.replace(
+						dep.range[0],
+						dep.range[1] - 1,
+						dep.getter
+							? "/* unused reexport */ 0"
+							: `/* unused reexport */ ${requireExpr}`
+					);
+					return;
+				}
+				const descriptor = dep.getter
+					? "enumerable: true, get: () => ("
+					: "value: (";
+				source.replace(
+					dep.range[0],
+					valueRange[0] - 1,
+					`Object.defineProperty(${base}${propertyAccess(
+						used.slice(0, -1)
+					)}, ${JSON.stringify(used[used.length - 1])}, { ${descriptor}`
+				);
+				source.replace(valueRange[0], valueRange[1] - 1, requireExpr);
+				source.replace(valueRange[1], dep.range[1] - 1, ") })");
+				return;
+			}
 			default:
 				throw new Error("Unexpected type");
 		}

package/lib/dependencies/CommonJsExportsDependency.js

@@ -18,9 +18,9 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./CommonJsDependencyHelpers").CommonJSDependencyBaseKeywords} CommonJSDependencyBaseKeywords */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[]]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, CommonJSDependencyBaseKeywords, ExportInfoName[]]>} ObjectSerializerContext */
 
 const EMPTY_OBJECT = {};
 
@@ -36,7 +36,9 @@ class CommonJsExportsDependency extends NullDependency {
 		super();
 		this.range = range;
 		this.valueRange = valueRange;
+		/** @type {CommonJSDependencyBaseKeywords} */
 		this.base = base;
+		/** @type {string[]} */
 		this.names = names;
 	}
 
@@ -70,11 +72,11 @@ class CommonJsExportsDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		const { write } = context;
-		write(this.range);
-		write(this.valueRange);
-		write(this.base);
-		write(this.names);
+		context
+			.write(this.range)
+			.write(this.valueRange)
+			.write(this.base)
+			.write(this.names);
 		super.serialize(context);
 	}
 
@@ -83,12 +85,14 @@ class CommonJsExportsDependency extends NullDependency {
 	 * @param {ObjectDeserializerContext} context context
 	 */
 	deserialize(context) {
-		const { read } = context;
-		this.range = read();
-		this.valueRange = read();
-		this.base = read();
-		this.names = read();
-		super.deserialize(context);
+		this.range = context.read();
+		const c1 = context.rest;
+		this.valueRange = c1.read();
+		const c2 = c1.rest;
+		this.base = c2.read();
+		const c3 = c2.rest;
+		this.names = c3.read();
+		super.deserialize(c3.rest);
 	}
 }
 
@@ -113,9 +117,10 @@ CommonJsExportsDependency.Template = class CommonJsExportsDependencyTemplate ext
 		{ module, moduleGraph, initFragments, runtimeRequirements, runtime }
 	) {
 		const dep = /** @type {CommonJsExportsDependency} */ (dependency);
-		const used = moduleGraph
-			.getExportsInfo(module)
-			.getUsedName(dep.names, runtime);
+		// CJS exports are never inlined
+		const used = /** @type {string | string[] | false} */ (
+			moduleGraph.getExportsInfo(module).getUsedName(dep.names, runtime)
+		);
 
 		const [type, base] = handleDependencyBase(
 			dep.base,