webpack 5.99.9 → 5.100.1

package/lib/javascript/JavascriptModulesPlugin.js

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const eslintScope = require("eslint-scope");
-const { SyncWaterfallHook, SyncHook, SyncBailHook } = require("tapable");
 const vm = require("vm");
+const eslintScope = require("eslint-scope");
+const { SyncBailHook, SyncHook, SyncWaterfallHook } = require("tapable");
 const {
+	CachedSource,
 	ConcatSource,
 	OriginalSource,
 	PrefixSource,
 	RawSource,
-	CachedSource,
 	ReplaceSource
 } = require("webpack-sources");
 const Compilation = require("../Compilation");
@@ -33,11 +33,11 @@ const { last, someInIterable } = require("../util/IterableHelpers");
 const StringXor = require("../util/StringXor");
 const { compareModulesByIdOrIdentifier } = require("../util/comparators");
 const {
-	getPathInAst,
-	getAllReferences,
 	RESERVED_NAMES,
-	findNewName,
 	addScopeSymbols,
+	findNewName,
+	getAllReferences,
+	getPathInAst,
 	getUsedNamesInScopeInfo
 } = require("../util/concatenate");
 const createHash = require("../util/createHash");
@@ -95,8 +95,9 @@ const chunkHasRuntimeOrJs = (chunk, chunkGraph) => {
 			chunk,
 			WEBPACK_MODULE_TYPE_RUNTIME
 		)
-	)
+	) {
 		return true;
+	}
 
 	return Boolean(
 		chunkGraph.getChunkModulesIterableBySourceType(chunk, "javascript")
@@ -116,10 +117,10 @@ const printGeneratedCodeForStack = (module, code) => {
 			/**
 			 * @param {string} line the line
 			 * @param {number} i the index
-			 * @param {string[]} lines the lines
+			 * @param {string[]} _lines the lines
 			 * @returns {string} the line with line number
 			 */
-			(line, i, lines) => {
+			(line, i, _lines) => {
 				const iStr = `${i + 1}`;
 				return `${" ".repeat(n - iStr.length)}${iStr} | ${line}`;
 			}
@@ -594,8 +595,9 @@ class JavascriptModulesPlugin {
 			if (codeGenResult.data !== undefined) {
 				const chunkInitFragments = codeGenResult.data.get("chunkInitFragments");
 				if (chunkInitFragments) {
-					for (const i of chunkInitFragments)
+					for (const i of chunkInitFragments) {
 						renderContext.chunkInitFragments.push(i);
+					}
 				}
 			}
 			const moduleSourcePostContent = tryRunOrWebpackError(
@@ -636,18 +638,20 @@ class JavascriptModulesPlugin {
 				} else {
 					const factorySource = new ConcatSource();
 					const args = [];
-					if (needExports || needRequire || needModule)
+					if (needExports || needRequire || needModule) {
 						args.push(
 							needModule
 								? module.moduleArgument
 								: `__unused_webpack_${module.moduleArgument}`
 						);
-					if (needExports || needRequire)
+					}
+					if (needExports || needRequire) {
 						args.push(
 							needExports
 								? module.exportsArgument
 								: `__unused_webpack_${module.exportsArgument}`
 						);
+					}
 					if (needRequire) args.push(RuntimeGlobals.require);
 					if (!needThisAsExports && runtimeTemplate.supportsArrowFunction()) {
 						factorySource.add(`/***/ ((${args.join(", ")}) => {\n\n`);
@@ -704,7 +708,7 @@ class JavascriptModulesPlugin {
 			"javascript",
 			compareModulesByIdOrIdentifier(chunkGraph)
 		);
-		const allModules = modules ? Array.from(modules) : [];
+		const allModules = modules ? [...modules] : [];
 		let strictHeader;
 		let allStrict = renderContext.strictMode;
 		if (
@@ -777,13 +781,14 @@ class JavascriptModulesPlugin {
 		const bootstrap = this.renderBootstrap(renderContext, hooks);
 		const useSourceMap = hooks.useSourceMap.call(chunk, renderContext);
 
-		const allModules = Array.from(
-			chunkGraph.getOrderedChunkModulesIterableBySourceType(
+		/** @type {Module[]} */
+		const allModules = [
+			...(chunkGraph.getOrderedChunkModulesIterableBySourceType(
 				chunk,
 				"javascript",
 				compareModulesByIdOrIdentifier(chunkGraph)
-			) || []
-		);
+			) || [])
+		];
 
 		const hasEntryModules = chunkGraph.getNumberOfEntryModules(chunk) > 0;
 		/** @type {Set<Module> | undefined} */
@@ -964,12 +969,13 @@ class JavascriptModulesPlugin {
 						footer = "\n";
 					}
 					if (exports) {
-						if (m !== lastInlinedModule)
+						if (m !== lastInlinedModule) {
 							startupSource.add(`var ${m.exportsArgument} = {};\n`);
-						else if (m.exportsArgument !== RuntimeGlobals.exports)
+						} else if (m.exportsArgument !== RuntimeGlobals.exports) {
 							startupSource.add(
 								`var ${m.exportsArgument} = ${RuntimeGlobals.exports};\n`
 							);
+						}
 					}
 					startupSource.add(renderedModule);
 					startupSource.add(footer);
@@ -1013,7 +1019,7 @@ class JavascriptModulesPlugin {
 						toSource(bootstrap.beforeStartup, "webpack/before-startup"),
 						"\n",
 						hooks.renderStartup.call(
-							toSource(bootstrap.startup.concat(""), "webpack/startup"),
+							toSource([...bootstrap.startup, ""], "webpack/startup"),
 							lastEntryModule,
 							{
 								...renderContext,
@@ -1162,6 +1168,16 @@ class JavascriptModulesPlugin {
 			buf.push("");
 		}
 
+		if (runtimeRequirements.has(RuntimeGlobals.makeDeferredNamespaceObject)) {
+			// in order to optimize of DeferredNamespaceObject, we remove all proxy handlers after the module initialize
+			// (see MakeDeferredNamespaceObjectRuntimeModule)
+			// This requires all deferred imports to a module can get the module export object before the module
+			// is evaluated.
+			buf.push("// The deferred module cache");
+			buf.push("var __webpack_module_deferred_exports__ = {};");
+			buf.push("");
+		}
+
 		if (useRequire) {
 			buf.push("// The require function");
 			buf.push(`function ${RuntimeGlobals.require}(moduleId) {`);
@@ -1431,6 +1447,9 @@ class JavascriptModulesPlugin {
 		const needModuleLoaded = runtimeRequirements.has(
 			RuntimeGlobals.moduleLoaded
 		);
+		const needModuleDefer = runtimeRequirements.has(
+			RuntimeGlobals.makeDeferredNamespaceObject
+		);
 		const content = Template.asString([
 			"// Check if module is in cache",
 			"var cachedModule = __webpack_module_cache__[moduleId];",
@@ -1447,7 +1466,9 @@ class JavascriptModulesPlugin {
 			Template.indent([
 				needModuleId ? "id: moduleId," : "// no module.id needed",
 				needModuleLoaded ? "loaded: false," : "// no module.loaded needed",
-				"exports: {}"
+				needModuleDefer
+					? "exports: __webpack_module_deferred_exports__[moduleId] || {}"
+					: "exports: {}"
 			]),
 			"};",
 			"",
@@ -1456,7 +1477,13 @@ class JavascriptModulesPlugin {
 						"// Execute the module function",
 						"var threw = true;",
 						"try {",
-						Template.indent([moduleExecution, "threw = false;"]),
+						Template.indent([
+							moduleExecution,
+							"threw = false;",
+							...(needModuleDefer
+								? ["delete __webpack_module_deferred_exports__[moduleId];"]
+								: [])
+						]),
 						"} finally {",
 						Template.indent([
 							"if(threw) delete __webpack_module_cache__[moduleId];"
@@ -1467,14 +1494,27 @@ class JavascriptModulesPlugin {
 					? Template.asString([
 							"// Execute the module function",
 							"try {",
-							Template.indent(moduleExecution),
+							Template.indent(
+								needModuleDefer
+									? [
+											moduleExecution,
+											"delete __webpack_module_deferred_exports__[moduleId];"
+										]
+									: moduleExecution
+							),
 							"} catch(e) {",
 							Template.indent(["module.error = e;", "throw e;"]),
 							"}"
 						])
 					: Template.asString([
 							"// Execute the module function",
-							moduleExecution
+							moduleExecution,
+							...(needModuleDefer
+								? [
+										"// delete __webpack_module_deferred_exports__[module];",
+										"// skipped because strictModuleErrorHandling is not enabled."
+									]
+								: [])
 						]),
 			needModuleLoaded
 				? Template.asString([
@@ -1619,9 +1659,10 @@ class JavascriptModulesPlugin {
 
 				if (allUsedNames.has(name) || usedNames.has(name)) {
 					const references = getAllReferences(variable);
-					const allIdentifiers = new Set(
-						references.map(r => r.identifier).concat(variable.identifiers)
-					);
+					const allIdentifiers = new Set([
+						...references.map(r => r.identifier),
+						...variable.identifiers
+					]);
 					for (const ref of references) {
 						addScopeSymbols(
 							ref.from,