webpack 5.102.1 → 5.104.0

package/lib/json/JsonGenerator.js

@@ -9,7 +9,7 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const { UsageState } = require("../ExportsInfo");
 const Generator = require("../Generator");
-const { JS_TYPES } = require("../ModuleSourceTypesConstants");
+const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -17,6 +17,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../Module").SourceType} SourceType */
 /** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
@@ -26,7 +27,7 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 
 /**
  * @param {JsonValue} data Raw JSON data
- * @returns {undefined|string} stringified data
+ * @returns {undefined | string} stringified data
  */
 const stringifySafe = (data) => {
 	const stringified = JSON.stringify(data);
@@ -132,12 +133,12 @@ class JsonGenerator extends Generator {
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
-		return JS_TYPES;
+		return JAVASCRIPT_TYPES;
 	}
 
 	/**
 	 * @param {NormalModule} module the module
-	 * @param {string=} type source type
+	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
 	getSize(module, type) {

package/lib/json/JsonParser.js

@@ -54,7 +54,8 @@ class JsonParser extends Parser {
 					: parseFn(source[0] === "\uFEFF" ? source.slice(1) : source);
 		} catch (err) {
 			throw new Error(
-				`Cannot parse JSON: ${/** @type {Error} */ (err).message}`
+				`Cannot parse JSON: ${/** @type {Error} */ (err).message}`,
+				{ cause: err }
 			);
 		}
 		const jsonData = new JsonData(/** @type {Buffer | JsonValue} */ (data));
@@ -64,7 +65,13 @@ class JsonParser extends Parser {
 		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
 		buildMeta.exportsType = "default";
 		buildMeta.defaultObject =
-			typeof data === "object" ? "redirect-warn" : false;
+			typeof data === "object"
+				? this.options.namedExports === false
+					? false
+					: this.options.namedExports === true
+						? "redirect"
+						: "redirect-warn"
+				: false;
 		state.module.addDependency(
 			new JsonExportsDependency(
 				jsonData,

package/lib/library/AbstractLibraryPlugin.js

@@ -308,7 +308,7 @@ class AbstractLibraryPlugin {
 	 * @param {Source} source source
 	 * @param {Module} module module
 	 * @param {ModuleRenderContext} renderContext render context
-	 * @param {Omit<LibraryContext<T>, 'options'>} libraryContext context
+	 * @param {Omit<LibraryContext<T>, "options">} libraryContext context
 	 * @returns {Source} source with library export
 	 */
 	renderModuleContent(source, module, renderContext, libraryContext) {

package/lib/library/AmdLibraryPlugin.js

@@ -17,7 +17,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 /** @typedef {import("../util/Hash")} Hash */
-/** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
+/**
+ * @template T
+ * @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T>
+ */
 
 /**
  * @typedef {object} AmdLibraryPluginOptions

package/lib/library/ExportPropertyLibraryPlugin.js

@@ -20,7 +20,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").StartupRenderContext} StartupRenderContext */
-/** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
+/**
+ * @template T
+ * @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T>
+ */
 
 /**
  * @typedef {object} ExportPropertyLibraryPluginParsed

package/lib/library/ModuleLibraryPlugin.js

@@ -21,6 +21,7 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").StartupRenderContext} StartupRenderContext */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").ModuleRenderContext} ModuleRenderContext */
@@ -69,7 +70,28 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const { onDemandExportsGeneration } =
 				ConcatenatedModule.getCompilationHooks(compilation);
-			onDemandExportsGeneration.tap(PLUGIN_NAME, (_module) => true);
+			onDemandExportsGeneration.tap(
+				PLUGIN_NAME,
+				(module, runtimes, source, finalName) => {
+					/** @type {BuildMeta} */
+					const buildMeta = module.buildMeta || (module.buildMeta = {});
+
+					const exportsSourceByRuntime =
+						buildMeta.exportsSourceByRuntime ||
+						(buildMeta.exportsSourceByRuntime = new Map());
+
+					const exportsFinalNameByRuntime =
+						buildMeta.exportsFinalNameByRuntime ||
+						(buildMeta.exportsFinalNameByRuntime = new Map());
+
+					for (const runtime of runtimes) {
+						exportsSourceByRuntime.set(runtime, source);
+						exportsFinalNameByRuntime.set(runtime, finalName);
+					}
+
+					return true;
+				}
+			);
 		});
 	}
 
@@ -104,16 +126,6 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 		moduleGraph.addExtraReason(module, "used as library export");
 	}
 
-	/**
-	 * @param {Chunk} chunk the chunk
-	 * @param {RuntimeRequirements} set runtime requirements
-	 * @param {LibraryContext<T>} libraryContext context
-	 * @returns {void}
-	 */
-	runtimeRequirements(chunk, set, libraryContext) {
-		set.add(RuntimeGlobals.exports);
-	}
-
 	/**
 	 * @param {LibraryOptions} library normalized library option
 	 * @returns {T | false} preprocess as needed by overriding
@@ -162,10 +174,16 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 					)
 				]
 			: moduleGraph.getExportsInfo(module).orderedExports;
+
+		const exportsFinalNameByRuntime =
+			(module.buildMeta &&
+				module.buildMeta.exportsFinalNameByRuntime &&
+				module.buildMeta.exportsFinalNameByRuntime.get(chunk.runtime)) ||
+			{};
+
 		const definitions =
-			inlined && !inlinedInIIFE
-				? (module.buildMeta && module.buildMeta.exportsFinalName) || {}
-				: {};
+			inlined && !inlinedInIIFE ? exportsFinalNameByRuntime : {};
+
 		/** @type {string[]} */
 		const shortHandedExports = [];
 		/** @type {[string, string][]} */
@@ -278,23 +296,23 @@ class ModuleLibraryPlugin extends AbstractLibraryPlugin {
 	 * @param {Source} source source
 	 * @param {Module} module module
 	 * @param {ModuleRenderContext} renderContext render context
-	 * @param {Omit<LibraryContext<T>, 'options'>} libraryContext context
+	 * @param {Omit<LibraryContext<T>, "options">} libraryContext context
 	 * @returns {Source} source with library export
 	 */
 	renderModuleContent(
 		source,
 		module,
-		{ factory, inlinedInIIFE },
+		{ factory, inlinedInIIFE, chunk },
 		libraryContext
 	) {
-		// Re-add `factoryExportsBinding` to the source
-		// when the module is rendered as a factory or treated as an inlined (startup) module but wrapped in an IIFE
-		if (
-			(inlinedInIIFE || factory) &&
+		const exportsSource =
 			module.buildMeta &&
-			module.buildMeta.factoryExportsBinding
-		) {
-			return new ConcatSource(module.buildMeta.factoryExportsBinding, source);
+			module.buildMeta.exportsSourceByRuntime &&
+			module.buildMeta.exportsSourceByRuntime.get(chunk.runtime);
+
+		// Re-add the module's exports source when rendered in factory or as an inlined startup module wrapped in an IIFE
+		if ((inlinedInIIFE || factory) && exportsSource) {
+			return new ConcatSource(exportsSource, source);
 		}
 		return source;
 	}

package/lib/library/SystemLibraryPlugin.js

@@ -19,7 +19,10 @@ const AbstractLibraryPlugin = require("./AbstractLibraryPlugin");
 /** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
 /** @typedef {import("../javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
 /** @typedef {import("../util/Hash")} Hash */
-/** @template T @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T> */
+/**
+ * @template T
+ * @typedef {import("./AbstractLibraryPlugin").LibraryContext<T>} LibraryContext<T>
+ */
 
 /**
  * @typedef {object} SystemLibraryPluginOptions
@@ -164,6 +167,10 @@ class SystemLibraryPlugin extends AbstractLibraryPlugin {
 												`Object.defineProperty(${external}, "__esModule", { value: true });`
 											);
 										}
+										// See comment above
+										instructions.push(
+											`${external}["default"] = module["default"] || module;`
+										);
 										if (handledNames.length > 0) {
 											const name = `${external}handledNames`;
 											externalVarInitialization.push(

package/lib/library/UmdLibraryPlugin.js

@@ -34,7 +34,7 @@ const accessorToObjectAccess = (accessor) =>
 /** @typedef {string | string[]} Accessor */
 
 /**
- * @param {string|undefined} base the path prefix
+ * @param {string | undefined} base the path prefix
  * @param {Accessor} accessor the accessor
  * @param {string=} joinWith the element separator
  * @returns {string} the path
@@ -338,7 +338,7 @@ class UmdLibraryPlugin extends AbstractLibraryPlugin {
 										: "		var a = factory();\n"
 								}		for(var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];\n` +
 								"	}\n"
-					}})(${runtimeTemplate.outputOptions.globalObject}, ${
+					}})(${runtimeTemplate.globalObject}, ${
 						runtimeTemplate.supportsArrowFunction()
 							? `(${externalsArguments(externals)}) =>`
 							: `function(${externalsArguments(externals)})`

package/lib/logging/Logger.js

@@ -30,6 +30,7 @@ const LogType = Object.freeze({
 module.exports.LogType = LogType;
 
 /** @typedef {typeof LogType[keyof typeof LogType]} LogTypeEnum */
+/** @typedef {Map<string | undefined, [number, number]>} TimersMap */
 
 const LOG_SYMBOL = Symbol("webpack logger raw log method");
 const TIMERS_SYMBOL = Symbol("webpack logger times");
@@ -143,7 +144,7 @@ class WebpackLogger {
 	 * @param {string} label label
 	 */
 	time(label) {
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		this[TIMERS_SYMBOL] = this[TIMERS_SYMBOL] || new Map();
 		this[TIMERS_SYMBOL].set(label, process.hrtime());
 	}
@@ -169,7 +170,7 @@ class WebpackLogger {
 			throw new Error(`No such label '${label}' for WebpackLogger.timeEnd()`);
 		}
 		const time = process.hrtime(prev);
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		(this[TIMERS_SYMBOL]).delete(label);
 		this[LOG_SYMBOL](LogType.time, [label, ...time]);
 	}
@@ -185,9 +186,9 @@ class WebpackLogger {
 			);
 		}
 		const time = process.hrtime(prev);
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		(this[TIMERS_SYMBOL]).delete(label);
-		/** @type {Map<string | undefined, [number, number]>} */
+		/** @type {TimersMap} */
 		this[TIMERS_AGGREGATES_SYMBOL] =
 			this[TIMERS_AGGREGATES_SYMBOL] || new Map();
 		const current = this[TIMERS_AGGREGATES_SYMBOL].get(label);

package/lib/logging/createConsoleLogger.js

@@ -35,8 +35,8 @@ const { LogType } = require("./Logger");
 
 /**
  * @typedef {object} LoggerOptions
- * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} level loglevel
- * @property {FilterTypes|boolean} debug filter for debug logging
+ * @property {false | true | "none" | "error" | "warn" | "info" | "log" | "verbose"} level loglevel
+ * @property {FilterTypes | boolean} debug filter for debug logging
  * @property {LoggerConsole} console the console to log to
  */
 

package/lib/node/NodeTargetPlugin.js

@@ -7,6 +7,7 @@
 
 const ExternalsPlugin = require("../ExternalsPlugin");
 
+/** @typedef {import("../../declarations/WebpackOptions").ExternalsType} ExternalsType */
 /** @typedef {import("../Compiler")} Compiler */
 
 const builtins = [
@@ -72,13 +73,20 @@ const builtins = [
 ];
 
 class NodeTargetPlugin {
+	/**
+	 * @param {ExternalsType} type default external type
+	 */
+	constructor(type = "node-commonjs") {
+		this.type = type;
+	}
+
 	/**
 	 * Apply the plugin
 	 * @param {Compiler} compiler the compiler instance
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		new ExternalsPlugin("node-commonjs", builtins).apply(compiler);
+		new ExternalsPlugin(this.type, builtins).apply(compiler);
 	}
 }
 

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -19,8 +19,6 @@ const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRunt
  * @property {boolean=} import use import?
  */
 
-// TODO webpack 6 remove
-
 const PLUGIN_NAME = "ReadFileCompileWasmPlugin";
 
 class ReadFileCompileWasmPlugin {