webpack 5.101.3 → 5.102.1

package/lib/RuntimePlugin.js

@@ -6,7 +6,6 @@
 "use strict";
 
 const RuntimeGlobals = require("./RuntimeGlobals");
-const { getChunkFilenameTemplate } = require("./css/CssModulesPlugin");
 const RuntimeRequirementsDependency = require("./dependencies/RuntimeRequirementsDependency");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 const AsyncModuleRuntimeModule = require("./runtime/AsyncModuleRuntimeModule");
@@ -33,16 +32,14 @@ const PublicPathRuntimeModule = require("./runtime/PublicPathRuntimeModule");
 const RelativeUrlRuntimeModule = require("./runtime/RelativeUrlRuntimeModule");
 const RuntimeIdRuntimeModule = require("./runtime/RuntimeIdRuntimeModule");
 const SystemContextRuntimeModule = require("./runtime/SystemContextRuntimeModule");
+const ToBinaryRuntimeModule = require("./runtime/ToBinaryRuntimeModule");
 const ShareRuntimeModule = require("./sharing/ShareRuntimeModule");
 const StringXor = require("./util/StringXor");
 const memoize = require("./util/memoize");
 
 /** @typedef {import("../declarations/WebpackOptions").LibraryOptions} LibraryOptions */
-/** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputNormalized */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
 
 const getJavascriptModulesPlugin = memoize(() =>
 	require("./javascript/JavascriptModulesPlugin")
@@ -310,12 +307,10 @@ class RuntimePlugin {
 							RuntimeGlobals.getChunkScriptFilename,
 							(chunk) =>
 								getJavascriptModulesPlugin().chunkHasJs(chunk, chunkGraph) &&
-								/** @type {TemplatePath} */ (
-									chunk.filenameTemplate ||
-										(chunk.canBeInitial()
-											? compilation.outputOptions.filename
-											: compilation.outputOptions.chunkFilename)
-								),
+								(chunk.filenameTemplate ||
+									(chunk.canBeInitial()
+										? compilation.outputOptions.filename
+										: compilation.outputOptions.chunkFilename)),
 							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
 						)
 					);
@@ -338,9 +333,17 @@ class RuntimePlugin {
 							"css",
 							"css",
 							RuntimeGlobals.getChunkCssFilename,
-							(chunk) =>
-								getCssModulesPlugin().chunkHasCss(chunk, chunkGraph) &&
-								getChunkFilenameTemplate(chunk, compilation.outputOptions),
+							(chunk) => {
+								const cssModulePlugin = getCssModulesPlugin();
+
+								return (
+									cssModulePlugin.chunkHasCss(chunk, chunkGraph) &&
+									cssModulePlugin.getChunkFilenameTemplate(
+										chunk,
+										compilation.outputOptions
+									)
+								);
+							},
 							set.has(RuntimeGlobals.hmrDownloadUpdateHandlers)
 						)
 					);
@@ -351,8 +354,7 @@ class RuntimePlugin {
 				.tap(PLUGIN_NAME, (chunk, set) => {
 					if (
 						/\[(full)?hash(:\d+)?\]/.test(
-							/** @type {NonNullable<OutputNormalized["hotUpdateChunkFilename"]>} */
-							(compilation.outputOptions.hotUpdateChunkFilename)
+							compilation.outputOptions.hotUpdateChunkFilename
 						)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
@@ -363,9 +365,7 @@ class RuntimePlugin {
 							"javascript",
 							"javascript update",
 							RuntimeGlobals.getChunkUpdateScriptFilename,
-							(_chunk) =>
-								/** @type {NonNullable<OutputNormalized["hotUpdateChunkFilename"]>} */
-								(compilation.outputOptions.hotUpdateChunkFilename),
+							(_chunk) => compilation.outputOptions.hotUpdateChunkFilename,
 							true
 						)
 					);
@@ -376,8 +376,7 @@ class RuntimePlugin {
 				.tap(PLUGIN_NAME, (chunk, set) => {
 					if (
 						/\[(full)?hash(:\d+)?\]/.test(
-							/** @type {NonNullable<OutputNormalized["hotUpdateMainFilename"]>} */
-							(compilation.outputOptions.hotUpdateMainFilename)
+							compilation.outputOptions.hotUpdateMainFilename
 						)
 					) {
 						set.add(RuntimeGlobals.getFullHash);
@@ -387,8 +386,7 @@ class RuntimePlugin {
 						new GetMainFilenameRuntimeModule(
 							"update manifest",
 							RuntimeGlobals.getUpdateManifestFilename,
-							/** @type {NonNullable<OutputNormalized["hotUpdateMainFilename"]>} */
-							(compilation.outputOptions.hotUpdateMainFilename)
+							compilation.outputOptions.hotUpdateMainFilename
 						)
 					);
 					return true;
@@ -492,6 +490,12 @@ class RuntimePlugin {
 					compilation.addRuntimeModule(chunk, new NonceRuntimeModule());
 					return true;
 				});
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.toBinary)
+				.tap(PLUGIN_NAME, (chunk) => {
+					compilation.addRuntimeModule(chunk, new ToBinaryRuntimeModule());
+					return true;
+				});
 			// TODO webpack 6: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				PLUGIN_NAME,

package/lib/RuntimeTemplate.js

@@ -20,13 +20,10 @@ const compileBooleanMatcher = require("./util/compileBooleanMatcher");
 const propertyAccess = require("./util/propertyAccess");
 const { forEachRuntime, subtractRuntime } = require("./util/runtime");
 
-/** @typedef {import("../declarations/WebpackOptions").Environment} Environment */
-/** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputOptions */
+/** @typedef {import("./config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("./CodeGenerationResults").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Module")} Module */
@@ -97,10 +94,7 @@ class RuntimeTemplate {
 		this.globalObject =
 			/** @type {string} */
 			(getGlobalObject(outputOptions.globalObject));
-		this.contentHashReplacement = "X".repeat(
-			/** @type {NonNullable<OutputOptions["hashDigestLength"]>} */
-			(outputOptions.hashDigestLength)
-		);
+		this.contentHashReplacement = "X".repeat(outputOptions.hashDigestLength);
 	}
 
 	isIIFE() {
@@ -113,7 +107,7 @@ class RuntimeTemplate {
 
 	isNeutralPlatform() {
 		return (
-			!this.outputOptions.environment.document &&
+			!this.compilation.compiler.platform.web &&
 			!this.compilation.compiler.platform.node
 		);
 	}
@@ -172,6 +166,13 @@ class RuntimeTemplate {
 			: `"${mod}"`;
 	}
 
+	/**
+	 * @returns {"const" | "var"} return `const` when it is supported, otherwise `var`
+	 */
+	renderConst() {
+		return this.supportsConst() ? "const" : "var";
+	}
+
 	/**
 	 * @param {string} returnValue return value
 	 * @param {string} args arguments
@@ -195,7 +196,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Array<string|{expr: string}>} args args
+	 * @param {(string | { expr: string })[]} args args
 	 * @returns {string} result expression
 	 */
 	concatenation(...args) {
@@ -244,7 +245,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Array<string|{expr: string}>} args args (len >= 2)
+	 * @param {(string | { expr: string })[]} args args (len >= 2)
 	 * @returns {string} result expression
 	 * @private
 	 */
@@ -948,7 +949,16 @@ class RuntimeTemplate {
 			// when the defaultInterop is used (when a ESM imports a CJS module),
 			if (exportName.length > 0 && exportName[0] === "default") {
 				if (isDeferred && exportsType !== "namespace") {
-					const access = `${importVar}.a${propertyAccess(exportName, 1)}`;
+					const exportsInfo = moduleGraph.getExportsInfo(module);
+					const name = exportName.slice(1);
+					const used = exportsInfo.getUsedName(name, runtime);
+					if (!used) {
+						const comment = Template.toNormalComment(
+							`unused export ${propertyAccess(exportName)}`
+						);
+						return `${comment} undefined`;
+					}
+					const access = `${importVar}.a${propertyAccess(used)}`;
 					if (isCall || asiSafe === undefined) {
 						return access;
 					}

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -14,9 +14,9 @@ const PLUGIN_NAME = "SourceMapDevToolModuleOptionsPlugin";
 
 class SourceMapDevToolModuleOptionsPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions} options options
+	 * @param {SourceMapDevToolPluginOptions=} options options
 	 */
-	constructor(options) {
+	constructor(options = {}) {
 		this.options = options;
 	}
 

package/lib/SourceMapDevToolPlugin.js

@@ -19,9 +19,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").MapOptions} MapOptions */
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
-/** @typedef {import("./Cache").Etag} Etag */
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Compilation").Asset} Asset */
@@ -109,7 +107,7 @@ const getTaskForFile = (
 		source = asset.source();
 	}
 	if (!sourceMap || typeof source !== "string") return;
-	const context = /** @type {string} */ (compilation.options.context);
+	const context = compilation.options.context;
 	const root = compilation.compiler.root;
 	const cachedAbsolutify = makePathsAbsolute.bindContextCache(context, root);
 	const modules = sourceMap.sources.map((source) => {
@@ -162,9 +160,9 @@ class SourceMapDevToolPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const outputFs = /** @type {OutputFileSystem} */ (
-			compiler.outputFileSystem
-		);
+		const outputFs =
+			/** @type {OutputFileSystem} */
+			(compiler.outputFileSystem);
 		const sourceMapFilename = this.sourceMapFilename;
 		const sourceMappingURLComment = this.sourceMappingURLComment;
 		const moduleFilenameTemplate = this.moduleFilenameTemplate;
@@ -361,7 +359,7 @@ class SourceMapDevToolPlugin {
 
 							/**
 							 * all modules in defined order (longest identifier first)
-							 * @type {Array<string | Module>}
+							 * @type {(string | Module)[]}
 							 */
 							const allModules = [...moduleToSourceNameMapping.keys()].sort(
 								(a, b) => {
@@ -484,17 +482,12 @@ class SourceMapDevToolPlugin {
 									const sourceMapString = JSON.stringify(sourceMap);
 									if (sourceMapFilename) {
 										const filename = file;
-										const sourceMapContentHash =
-											/** @type {string} */
-											(
-												usesContentHash &&
-													createHash(
-														/** @type {HashFunction} */
-														(compilation.outputOptions.hashFunction)
-													)
-														.update(sourceMapString)
-														.digest("hex")
-											);
+										const sourceMapContentHash = usesContentHash
+											? createHash(compilation.outputOptions.hashFunction)
+													.update(sourceMapString)
+													.digest("hex")
+											: undefined;
+
 										const pathParams = {
 											chunk,
 											filename: options.fileContext

package/lib/Stats.js

@@ -7,7 +7,6 @@
 
 /** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 class Stats {

package/lib/Template.js

@@ -10,7 +10,7 @@ const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
+/** @typedef {import("./config/defaults").OutputNormalizedWithDefaults} OutputOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
@@ -49,7 +49,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @property {string} fullHash
  * @property {OutputOptions} outputOptions
  * @property {CodeGenerationResults} codeGenerationResults
- * @property {{javascript: ModuleTemplate}} moduleTemplates
+ * @property {{ javascript: ModuleTemplate }} moduleTemplates
  * @property {DependencyTemplates} dependencyTemplates
  * @property {RuntimeTemplate} runtimeTemplate
  * @property {ModuleGraph} moduleGraph
@@ -79,11 +79,6 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  * @property {boolean=} auxiliary
  */
 
-/**
- * @typedef {object} HasId
- * @property {number | string} id
- */
-
 /**
  * @typedef {(module: Module) => boolean} ModuleFilterPredicate
  */
@@ -226,7 +221,7 @@ class Template {
 	}
 
 	/**
-	 * @param {string|string[]} s string to create prefix for
+	 * @param {string | string[]} s string to create prefix for
 	 * @param {string} prefix prefix to compose
 	 * @returns {string} returns new prefix string
 	 */
@@ -238,7 +233,7 @@ class Template {
 	}
 
 	/**
-	 * @param {string|string[]} str string or string collection
+	 * @param {string | string[]} str string or string collection
 	 * @returns {string} returns a single string from array
 	 */
 	static asString(str) {
@@ -295,7 +290,7 @@ class Template {
 		if (modules.length === 0) {
 			return null;
 		}
-		/** @type {{id: string|number, source: Source|string}[]} */
+		/** @type {{ id: ModuleId, source: Source | "false" }[]} */
 		const allModules = modules.map((module) => ({
 			id: /** @type {ModuleId} */ (chunkGraph.getModuleId(module)),
 			source: renderModule(module) || "false"
@@ -309,7 +304,7 @@ class Template {
 				source.add(`Array(${minId}).concat(`);
 			}
 			source.add("[\n");
-			/** @type {Map<string|number, {id: string|number, source: Source|string}>} */
+			/** @type {Map<ModuleId, { id: ModuleId, source: Source | "false" }>} */
 			const modules = new Map();
 			for (const module of allModules) {
 				modules.set(module.id, module);

package/lib/TemplatedPathPlugin.js

@@ -133,7 +133,8 @@ const deprecated = (fn, message, code) => {
 	);
 };
 
-/** @typedef {string | ((pathData: PathData, assetInfo?: AssetInfo) => string)} TemplatePath */
+/** @typedef {(pathData: PathData, assetInfo?: AssetInfo) => string} TemplatePathFn */
+/** @typedef {string | TemplatePathFn} TemplatePath */
 
 /**
  * @param {TemplatePath} path the raw path

package/lib/WatchIgnorePlugin.js

@@ -9,7 +9,6 @@ const { groupBy } = require("./util/ArrayHelpers");
 const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
-/** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
@@ -51,12 +50,12 @@ class IgnoringWatchFileSystem {
 			);
 
 		const [ignoredFiles, notIgnoredFiles] = groupBy(
-			/** @type {Array<string>} */
+			/** @type {string[]} */
 			(files),
 			ignored
 		);
 		const [ignoredDirs, notIgnoredDirs] = groupBy(
-			/** @type {Array<string>} */
+			/** @type {string[]} */
 			(dirs),
 			ignored
 		);

package/lib/Watching.js

@@ -10,20 +10,20 @@ const Stats = require("./Stats");
 /** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
+/** @typedef {import("./Compiler").ErrorCallback} ErrorCallback */
 /** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
-/** @typedef {import("./util/fs").Watcher} Watcher */
 
 /**
  * @template T
- * @callback Callback
- * @param {Error | null} err
- * @param {T=} result
+ * @template [R=void]
+ * @typedef {import("./webpack").Callback<T, R>} Callback
  */
 
+/** @typedef {Set<string>} CollectedFiles */
+
 class Watching {
 	/**
 	 * @param {Compiler} compiler the compiler
@@ -34,9 +34,9 @@ class Watching {
 		this.startTime = null;
 		this.invalid = false;
 		this.handler = handler;
-		/** @type {Callback<void>[]} */
+		/** @type {ErrorCallback[]} */
 		this.callbacks = [];
-		/** @type {Callback<void>[] | undefined} */
+		/** @type {ErrorCallback[] | undefined} */
 		this._closeCallbacks = undefined;
 		this.closed = false;
 		this.suspended = false;
@@ -66,9 +66,9 @@ class Watching {
 		this._needRecords = true;
 		this.watcher = undefined;
 		this.pausedWatcher = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {CollectedFiles | undefined} */
 		this._collectedChangedFiles = undefined;
-		/** @type {Set<string> | undefined} */
+		/** @type {CollectedFiles | undefined} */
 		this._collectedRemovedFiles = undefined;
 		this._done = this._done.bind(this);
 		process.nextTick(() => {
@@ -88,12 +88,12 @@ class Watching {
 		} else {
 			for (const file of changedFiles) {
 				this._collectedChangedFiles.add(file);
-				/** @type {Set<string>} */
+				/** @type {CollectedFiles} */
 				(this._collectedRemovedFiles).delete(file);
 			}
 			for (const file of /** @type {ReadonlySet<string>} */ (removedFiles)) {
 				this._collectedChangedFiles.delete(file);
-				/** @type {Set<string>} */
+				/** @type {CollectedFiles} */
 				(this._collectedRemovedFiles).add(file);
 			}
 		}
@@ -262,7 +262,7 @@ class Watching {
 
 		/**
 		 * @param {Error} err error
-		 * @param {Callback<void>[]=} cbs callbacks
+		 * @param {ErrorCallback[]=} cbs callbacks
 		 */
 		const handleError = (err, cbs) => {
 			this.compiler.hooks.failed.call(err);
@@ -393,7 +393,7 @@ class Watching {
 	}
 
 	/**
-	 * @param {Callback<void>=} callback signals when the build has completed again
+	 * @param {ErrorCallback=} callback signals when the build has completed again
 	 * @returns {void}
 	 */
 	invalidate(callback) {
@@ -451,7 +451,7 @@ class Watching {
 	}
 
 	/**
-	 * @param {Callback<void>} callback signals when the watcher is closed
+	 * @param {ErrorCallback} callback signals when the watcher is closed
 	 * @returns {void}
 	 */
 	close(callback) {
@@ -481,7 +481,7 @@ class Watching {
 			const shutdown = (err) => {
 				this.compiler.hooks.watchClose.call();
 				const closeCallbacks =
-					/** @type {Callback<void>[]} */
+					/** @type {ErrorCallback[]} */
 					(this._closeCallbacks);
 				this._closeCallbacks = undefined;
 				for (const cb of closeCallbacks) cb(err);

package/lib/WebpackIsIncludedPlugin.js

@@ -16,10 +16,8 @@ const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 
-/** @typedef {import("enhanced-resolve").Resolver} Resolver */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./Module")} Module */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */