webpack 5.83.1 → 5.84.0

package/README.md

@@ -32,8 +32,8 @@
 	<a href="https://github.com/webpack/webpack/graphs/contributors">
 		<img src="https://img.shields.io/github/contributors/webpack/webpack.svg">
 	</a>
-	<a href="https://gitter.im/webpack/webpack">
-		<img src="https://badges.gitter.im/webpack/webpack.svg">
+	<a href="https://github.com/webpack/webpack/discussions">
+		<img src="https://img.shields.io/github/discussions/webpack/webpack">
 	</a>
   <a href="https://twitter.com/Webpack">
 		<img src="https://img.shields.io/twitter/follow/Webpack?style=social">

package/lib/CompatibilityPlugin.js

@@ -10,6 +10,7 @@ const {
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("./ModuleTypeConstants");
+const RuntimeGlobals = require("./RuntimeGlobals");
 const ConstDependency = require("./dependencies/ConstDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
@@ -79,7 +80,7 @@ class CompatibilityPlugin {
 						if (
 							statement.type === "FunctionDeclaration" &&
 							statement.id &&
-							statement.id.name === "__webpack_require__"
+							statement.id.name === RuntimeGlobals.require
 						) {
 							const newName = `__nested_webpack_require_${statement.range[0]}__`;
 							parser.tagVariable(
@@ -98,7 +99,7 @@ class CompatibilityPlugin {
 						}
 					});
 					parser.hooks.pattern
-						.for("__webpack_require__")
+						.for(RuntimeGlobals.require)
 						.tap(PLUGIN_NAME, pattern => {
 							const newName = `__nested_webpack_require_${pattern.range[0]}__`;
 							parser.tagVariable(pattern.name, nestedWebpackIdentifierTag, {

package/lib/Compilation.js

@@ -5024,13 +5024,13 @@ This prevents using hashes of each other and should be avoided.`);
 									};
 									const interceptModuleExecution = (__webpack_require__[
 										RuntimeGlobals.interceptModuleExecution.replace(
-											"__webpack_require__.",
+											`${RuntimeGlobals.require}.`,
 											""
 										)
 									] = []);
 									const moduleCache = (__webpack_require__[
 										RuntimeGlobals.moduleCache.replace(
-											"__webpack_require__.",
+											`${RuntimeGlobals.require}.`,
 											""
 										)
 									] = {});

package/lib/ContextModule.js

@@ -640,7 +640,7 @@ class ContextModule extends Module {
 
 	getReturn(type, asyncModule) {
 		if (type === 9) {
-			return "__webpack_require__(id)";
+			return `${RuntimeGlobals.require}(id)`;
 		}
 		return `${RuntimeGlobals.createFakeNamespaceObject}(id, ${type}${
 			asyncModule ? " | 16" : ""
@@ -799,7 +799,7 @@ module.exports = webpackAsyncContext;`;
 				? `${arrow ? "id =>" : "function(id)"} {
 		${this.getReturnModuleObjectSource(fakeMap)}
 	}`
-				: "__webpack_require__";
+				: RuntimeGlobals.require;
 		return `var map = ${JSON.stringify(map, null, "\t")};
 ${this.getFakeMapInitStatement(fakeMap)}
 
@@ -850,7 +850,7 @@ module.exports = webpackAsyncContext;`;
 				? `${arrow ? "id =>" : "function(id)"} {
 		${this.getReturnModuleObjectSource(fakeMap, true)};
 	}`
-				: "__webpack_require__";
+				: RuntimeGlobals.require;
 
 		return `var map = ${JSON.stringify(map, null, "\t")};
 ${this.getFakeMapInitStatement(fakeMap)}

package/lib/DefinePlugin.js

@@ -463,7 +463,7 @@ class DefinePlugin {
 								});
 							parser.hooks.expression.for(key).tap(PLUGIN_NAME, expr => {
 								addValueDependency(originalKey);
-								const strCode = toCode(
+								let strCode = toCode(
 									code,
 									parser,
 									compilation.valueCacheVersions,
@@ -473,6 +473,11 @@ class DefinePlugin {
 									!parser.isAsiPosition(expr.range[0]),
 									parser.destructuringAssignmentPropertiesFor(expr)
 								);
+
+								if (parser.scope.inShorthand) {
+									strCode = parser.scope.inShorthand + ":" + strCode;
+								}
+
 								if (WEBPACK_REQUIRE_FUNCTION_REGEXP.test(strCode)) {
 									return toConstantDependency(parser, strCode, [
 										RuntimeGlobals.require
@@ -564,7 +569,7 @@ class DefinePlugin {
 							);
 						parser.hooks.expression.for(key).tap(PLUGIN_NAME, expr => {
 							addValueDependency(key);
-							const strCode = stringifyObj(
+							let strCode = stringifyObj(
 								obj,
 								parser,
 								compilation.valueCacheVersions,
@@ -575,6 +580,10 @@ class DefinePlugin {
 								parser.destructuringAssignmentPropertiesFor(expr)
 							);
 
+							if (parser.scope.inShorthand) {
+								strCode = parser.scope.inShorthand + ":" + strCode;
+							}
+
 							if (WEBPACK_REQUIRE_FUNCTION_REGEXP.test(strCode)) {
 								return toConstantDependency(parser, strCode, [
 									RuntimeGlobals.require

package/lib/DllEntryPlugin.js

@@ -10,6 +10,11 @@ const DllEntryDependency = require("./dependencies/DllEntryDependency");
 const EntryDependency = require("./dependencies/EntryDependency");
 
 class DllEntryPlugin {
+	/**
+	 * @param {string} context context
+	 * @param {string[]} entries entry names
+	 * @param {TODO} options options
+	 */
 	constructor(context, entries, options) {
 		this.context = context;
 		this.entries = entries;

package/lib/DllModule.js

@@ -89,7 +89,7 @@ class DllModule extends Module {
 		const sources = new Map();
 		sources.set(
 			"javascript",
-			new RawSource("module.exports = __webpack_require__;")
+			new RawSource(`module.exports = ${RuntimeGlobals.require};`)
 		);
 		return {
 			sources,

package/lib/EvalSourceMapDevToolPlugin.js

@@ -48,7 +48,9 @@ class EvalSourceMapDevToolPlugin {
 			options = inputOptions;
 		}
 		this.sourceMapComment =
-			options.append || "//# sourceURL=[module]\n//# sourceMappingURL=[url]";
+			options.append && typeof options.append !== "function"
+				? options.append
+				: "//# sourceURL=[module]\n//# sourceMappingURL=[url]";
 		this.moduleFilenameTemplate =
 			options.moduleFilenameTemplate ||
 			"webpack://[namespace]/[resource-path]?[hash]";

package/lib/MainTemplate.js

@@ -306,8 +306,8 @@ class MainTemplate {
 
 Object.defineProperty(MainTemplate.prototype, "requireFn", {
 	get: util.deprecate(
-		() => "__webpack_require__",
-		'MainTemplate.requireFn is deprecated (use "__webpack_require__")',
+		() => RuntimeGlobals.require,
+		`MainTemplate.requireFn is deprecated (use "${RuntimeGlobals.require}")`,
 		"DEP_WEBPACK_MAIN_TEMPLATE_REQUIRE_FN"
 	)
 });

package/lib/PrefetchPlugin.js

@@ -10,6 +10,10 @@ const PrefetchDependency = require("./dependencies/PrefetchDependency");
 /** @typedef {import("./Compiler")} Compiler */
 
 class PrefetchPlugin {
+	/**
+	 * @param {string} context context or request if context is not set
+	 * @param {string} [request] request
+	 */
 	constructor(context, request) {
 		if (request) {
 			this.context = context;

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);

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=, 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 */
@@ -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/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);
 };