webpack 5.83.1 → 5.85.0

package/lib/RuntimeTemplate.js

@@ -429,7 +429,7 @@ class RuntimeTemplate {
 			);
 		}
 		runtimeRequirements.add(RuntimeGlobals.require);
-		return `__webpack_require__(${this.moduleId({
+		return `${RuntimeGlobals.require}(${this.moduleId({
 			module,
 			chunkGraph,
 			request,
@@ -625,7 +625,7 @@ class RuntimeTemplate {
 					)})`;
 				} else {
 					runtimeRequirements.add(RuntimeGlobals.require);
-					appending = `.then(__webpack_require__.bind(__webpack_require__, ${comment}${idExpr}))`;
+					appending = `.then(${RuntimeGlobals.require}.bind(${RuntimeGlobals.require}, ${comment}${idExpr}))`;
 				}
 				break;
 			case "dynamic":
@@ -651,7 +651,7 @@ class RuntimeTemplate {
 						)})`;
 					} else {
 						runtimeRequirements.add(RuntimeGlobals.require);
-						appending = `.then(__webpack_require__.bind(__webpack_require__, ${comment}${idExpr}))`;
+						appending = `.then(${RuntimeGlobals.require}.bind(${RuntimeGlobals.require}, ${comment}${idExpr}))`;
 					}
 					appending += `.then(${this.returningFunction(
 						`${RuntimeGlobals.createFakeNamespaceObject}(m, ${fakeType})`,
@@ -666,7 +666,7 @@ class RuntimeTemplate {
 							`${header}return ${returnExpression};`
 						)})`;
 					} else {
-						appending = `.then(${RuntimeGlobals.createFakeNamespaceObject}.bind(__webpack_require__, ${comment}${idExpr}, ${fakeType}))`;
+						appending = `.then(${RuntimeGlobals.createFakeNamespaceObject}.bind(${RuntimeGlobals.require}, ${comment}${idExpr}, ${fakeType}))`;
 					}
 				}
 				break;
@@ -773,7 +773,7 @@ class RuntimeTemplate {
 			originModule.buildMeta.strictHarmonyModule
 		);
 		runtimeRequirements.add(RuntimeGlobals.require);
-		const importContent = `/* harmony import */ ${optDeclaration}${importVar} = __webpack_require__(${moduleId});\n`;
+		const importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`;
 
 		if (exportsType === "dynamic") {
 			runtimeRequirements.add(RuntimeGlobals.compatGetDefaultExport);
@@ -794,10 +794,10 @@ class RuntimeTemplate {
 	 * @param {Module} options.originModule the origin module
 	 * @param {boolean|undefined} options.asiSafe true, if location is safe for ASI, a bracket can be emitted
 	 * @param {boolean} options.isCall true, if expression will be called
-	 * @param {boolean} options.callContext when false, call context will not be preserved
+	 * @param {boolean | null} options.callContext when false, call context will not be preserved
 	 * @param {boolean} options.defaultInterop when true and accessing the default exports, interop code will be generated
 	 * @param {string} options.importVar the identifier name of the import variable
-	 * @param {InitFragment[]} options.initFragments init fragments will be added here
+	 * @param {InitFragment<TODO>[]} options.initFragments init fragments will be added here
 	 * @param {RuntimeSpec} options.runtime runtime for which this code will be generated
 	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} expression

package/lib/SelfModuleFactory.js

@@ -5,11 +5,23 @@
 
 "use strict";
 
+/** @typedef {import("./ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
+/** @typedef {import("./ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
+/** @typedef {import("./ModuleGraph")} ModuleGraph */
+
 class SelfModuleFactory {
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 */
 	constructor(moduleGraph) {
 		this.moduleGraph = moduleGraph;
 	}
 
+	/**
+	 * @param {ModuleFactoryCreateData} data data object
+	 * @param {function((Error | null)=, ModuleFactoryResult=): void} callback callback
+	 * @returns {void}
+	 */
 	create(data, callback) {
 		const module = this.moduleGraph.getParentModule(data.dependencies[0]);
 		callback(null, {

package/lib/SourceMapDevToolPlugin.js

@@ -23,6 +23,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./Compilation").AssetInfo} AssetInfo */
+/** @typedef {import("./Compilation").PathData} PathData */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./NormalModule").SourceMap} SourceMap */
@@ -139,7 +140,7 @@ class SourceMapDevToolPlugin {
 
 		/** @type {string | false} */
 		this.sourceMapFilename = options.filename;
-		/** @type {string | false} */
+		/** @type {string | false | (function(PathData, AssetInfo=): string)}} */
 		this.sourceMappingURLComment =
 			options.append === false
 				? false
@@ -447,13 +448,14 @@ class SourceMapDevToolPlugin {
 										);
 									}
 
-									/** @type {string | false} */
+									/** @type {string | false | (function(PathData, AssetInfo=): string)} */
 									let currentSourceMappingURLComment = sourceMappingURLComment;
 									let cssExtensionDetected =
 										CSS_EXTENSION_DETECT_REGEXP.test(file);
 									resetRegexpState(CSS_EXTENSION_DETECT_REGEXP);
 									if (
 										currentSourceMappingURLComment !== false &&
+										typeof currentSourceMappingURLComment !== "function" &&
 										cssExtensionDetected
 									) {
 										currentSourceMappingURLComment =
@@ -534,6 +536,11 @@ class SourceMapDevToolPlugin {
 												"SourceMapDevToolPlugin: append can't be false when no filename is provided"
 											);
 										}
+										if (typeof currentSourceMappingURLComment === "function") {
+											throw new Error(
+												"SourceMapDevToolPlugin: append can't be a function when no filename is provided"
+											);
+										}
 										/**
 										 * Add source map as data url to asset
 										 */

package/lib/Template.js

@@ -7,6 +7,7 @@
 
 const { ConcatSource, PrefixSource } = require("webpack-sources");
 const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
+const RuntimeGlobals = require("./RuntimeGlobals");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").Output} OutputOptions */
@@ -289,7 +290,7 @@ class Template {
 	 * @param {Module[]} modules modules to render (should be ordered by identifier)
 	 * @param {function(Module): Source} renderModule function to render a module
 	 * @param {string=} prefix applying prefix strings
-	 * @returns {Source} rendered chunk modules in a Source object
+	 * @returns {Source | null} rendered chunk modules in a Source object or null if no modules
 	 */
 	static renderChunkModules(renderContext, modules, renderModule, prefix = "") {
 		const { chunkGraph } = renderContext;
@@ -405,7 +406,7 @@ class Template {
 		return new PrefixSource(
 			"/******/ ",
 			new ConcatSource(
-				"function(__webpack_require__) { // webpackRuntimeModules\n",
+				`function(${RuntimeGlobals.require}) { // webpackRuntimeModules\n`,
 				this.renderRuntimeModules(runtimeModules, renderContext),
 				"}\n"
 			)

package/lib/UseStrictPlugin.js

@@ -13,6 +13,7 @@ const {
 const ConstDependency = require("./dependencies/ConstDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 
 const PLUGIN_NAME = "UseStrictPlugin";
 
@@ -26,6 +27,9 @@ class UseStrictPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
+				/**
+				 * @param {JavascriptParser} parser the parser
+				 */
 				const handler = parser => {
 					parser.hooks.program.tap(PLUGIN_NAME, ast => {
 						const firstNode = ast.body[0];

package/lib/WarnDeprecatedOptionPlugin.js

@@ -40,6 +40,13 @@ class WarnDeprecatedOptionPlugin {
 }
 
 class DeprecatedOptionWarning extends WebpackError {
+	/**
+	 * Create an instance deprecated option warning
+	 *
+	 * @param {string} option the target option
+	 * @param {string | number} value the deprecated option value
+	 * @param {string} suggestion the suggestion replacement
+	 */
 	constructor(option, value, suggestion) {
 		super();
 

package/lib/WatchIgnorePlugin.js

@@ -36,6 +36,10 @@ class IgnoringWatchFileSystem {
 	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
 		files = Array.from(files);
 		dirs = Array.from(dirs);
+		/**
+		 * @param {string} path path to check
+		 * @returns {boolean} true, if path is ignored
+		 */
 		const ignored = path =>
 			this.paths.some(p =>
 				p instanceof RegExp ? p.test(path) : path.indexOf(p) === 0

package/lib/WebpackOptionsApply.js

@@ -657,7 +657,8 @@ class WebpackOptionsApply extends OptionsApply {
 									maxAge: cacheOptions.maxAge,
 									profile: cacheOptions.profile,
 									allowCollectingMemory: cacheOptions.allowCollectingMemory,
-									compression: cacheOptions.compression
+									compression: cacheOptions.compression,
+									readonly: cacheOptions.readonly
 								}),
 								cacheOptions.idleTimeout,
 								cacheOptions.idleTimeoutForInitialStore,

package/lib/asset/AssetGenerator.js

@@ -107,6 +107,11 @@ const encodeDataUri = (encoding, source) => {
 	return encodedContent;
 };
 
+/**
+ * @param {string} encoding encoding
+ * @param {string} content content
+ * @returns {Buffer} decoded content
+ */
 const decodeDataUriContent = (encoding, content) => {
 	const isBase64 = encoding === "base64";
 
@@ -230,10 +235,10 @@ class AssetGenerator extends Generator {
 	) {
 		switch (type) {
 			case ASSET_MODULE_TYPE:
-				return module.originalSource();
+				return /** @type {Source} */ (module.originalSource());
 			default: {
 				let content;
-				const originalSource = module.originalSource();
+				const originalSource = /** @type {Source} */ (module.originalSource());
 				if (module.buildInfo.dataUrl) {
 					let encodedSource;
 					if (typeof this.dataUrlOptions === "function") {

package/lib/asset/AssetModulesPlugin.js

@@ -21,6 +21,10 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
 
+/**
+ * @param {string} name name of definitions
+ * @returns {TODO} definition
+ */
 const getSchema = name => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
 	return {
@@ -204,7 +208,9 @@ class AssetModulesPlugin {
 										codeGenResult.data.get("fullContentHash")
 								});
 							} catch (e) {
-								e.message += `\nduring rendering of asset ${module.identifier()}`;
+								/** @type {Error} */ (
+									e
+								).message += `\nduring rendering of asset ${module.identifier()}`;
 								throw e;
 							}
 						}

package/lib/asset/AssetParser.js

@@ -7,6 +7,7 @@
 
 const Parser = require("../Parser");
 
+/** @typedef {import("../../declarations/WebpackOptions").AssetParserDataUrlOptions} AssetParserDataUrlOptions */
 /** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
 /** @typedef {import("../Parser").ParserState} ParserState */
 /** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
@@ -45,7 +46,9 @@ class AssetParser extends Parser {
 			typeof this.dataUrlCondition === "object"
 		) {
 			state.module.buildInfo.dataUrl =
-				Buffer.byteLength(source) <= this.dataUrlCondition.maxSize;
+				Buffer.byteLength(source) <=
+				/** @type {NonNullable<AssetParserDataUrlOptions["maxSize"]>} */
+				(this.dataUrlCondition.maxSize);
 		} else {
 			throw new Error("Unexpected dataUrlCondition type");
 		}

package/lib/asset/RawDataUrlModule.js

@@ -60,7 +60,8 @@ class RawDataUrlModule extends Module {
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
 	size(type) {
-		if (this.url === undefined) this.url = this.urlBuffer.toString();
+		if (this.url === undefined)
+			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
 		return Math.max(1, this.url.length);
 	}
 
@@ -102,7 +103,8 @@ class RawDataUrlModule extends Module {
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
-		if (this.url === undefined) this.url = this.urlBuffer.toString();
+		if (this.url === undefined)
+			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
 		const sources = new Map();
 		sources.set(
 			"javascript",
@@ -121,7 +123,7 @@ class RawDataUrlModule extends Module {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		hash.update(this.urlBuffer);
+		hash.update(/** @type {Buffer} */ (this.urlBuffer));
 		super.updateHash(hash, context);
 	}
 

package/lib/async-modules/InferAsyncModulesPlugin.js

@@ -42,7 +42,7 @@ class InferAsyncModulesPlugin {
 										c.isTargetActive(undefined)
 								)
 							) {
-								queue.add(originModule);
+								queue.add(/** @type {Module} */ (originModule));
 							}
 						}
 					}

package/lib/cache/PackFileCacheStrategy.js

@@ -981,6 +981,7 @@ class PackFileCacheStrategy {
 	 * @param {boolean} options.profile track and log detailed timing information for individual cache items
 	 * @param {boolean} options.allowCollectingMemory allow to collect unused memory created during deserialization
 	 * @param {false | "gzip" | "brotli"} options.compression compression used
+	 * @param {boolean} options.readonly disable storing cache into filesystem
 	 */
 	constructor({
 		compiler,
@@ -993,7 +994,8 @@ class PackFileCacheStrategy {
 		maxAge,
 		profile,
 		allowCollectingMemory,
-		compression
+		compression,
+		readonly
 	}) {
 		this.fileSerializer = createFileSerializer(
 			fs,
@@ -1012,6 +1014,7 @@ class PackFileCacheStrategy {
 		this.logger = logger;
 		this.maxAge = maxAge;
 		this.profile = profile;
+		this.readonly = readonly;
 		this.allowCollectingMemory = allowCollectingMemory;
 		this.compression = compression;
 		this._extension =
@@ -1213,6 +1216,8 @@ class PackFileCacheStrategy {
 	 * @returns {Promise<void>} promise
 	 */
 	store(identifier, etag, data) {
+		if (this.readonly) return Promise.resolve();
+
 		return this._getPack().then(pack => {
 			pack.set(identifier, etag === null ? null : etag.toString(), data);
 		});
@@ -1239,6 +1244,7 @@ class PackFileCacheStrategy {
 	}
 
 	storeBuildDependencies(dependencies) {
+		if (this.readonly) return;
 		this.newBuildDependencies.addAll(dependencies);
 	}
 

package/lib/config/browserslistTargetHandler.js

@@ -23,7 +23,7 @@ const inputRx = /^(?:((?:[A-Z]:)?[/\\].*?))?(?::(.+?))?$/i;
  */
 
 /**
- * @param {string} input input string
+ * @param {string | null | undefined} input input string
  * @param {string} context the context directory
  * @returns {BrowserslistHandlerConfig} config
  */
@@ -47,7 +47,7 @@ const parse = (input, context) => {
 };
 
 /**
- * @param {string} input input string
+ * @param {string | null | undefined} input input string
  * @param {string} context the context directory
  * @returns {string[] | undefined} selected browsers
  */
@@ -66,7 +66,7 @@ const load = (input, context) => {
 		  })
 		: browserslist.loadConfig({ path: context, env });
 
-	if (!config) return null;
+	if (!config) return;
 	return browserslist(config);
 };