webpack 5.94.0 → 5.95.0

package/lib/javascript/JavascriptModulesPlugin.js

@@ -839,18 +839,25 @@ class JavascriptModulesPlugin {
 				startupSource.add(`var ${RuntimeGlobals.exports} = {};\n`);
 			}
 
-			const renamedInlinedModule = this.renameInlineModule(
-				allModules,
-				renderContext,
-				inlinedModules,
-				chunkRenderContext,
-				hooks
-			);
+			const avoidEntryIife = compilation.options.optimization.avoidEntryIife;
+			/** @type {Map<Module, Source> | false} */
+			let renamedInlinedModule = false;
+			if (avoidEntryIife) {
+				renamedInlinedModule = this.getRenamedInlineModule(
+					allModules,
+					renderContext,
+					inlinedModules,
+					chunkRenderContext,
+					hooks,
+					allStrict,
+					Boolean(chunkModules)
+				);
+			}
 
 			for (const m of inlinedModules) {
-				const renderedModule =
-					renamedInlinedModule.get(m) ||
-					this.renderModule(m, chunkRenderContext, hooks, false);
+				const renderedModule = renamedInlinedModule
+					? renamedInlinedModule.get(m)
+					: this.renderModule(m, chunkRenderContext, hooks, false);
 
 				if (renderedModule) {
 					const innerStrict =
@@ -868,9 +875,11 @@ class JavascriptModulesPlugin {
 							? // TODO check globals and top-level declarations of other entries and chunk modules
 								// to make a better decision
 								"it need to be isolated against other entry modules."
-							: exports && !webpackExports
-								? `it uses a non-standard name for the exports (${m.exportsArgument}).`
-								: hooks.embedInRuntimeBailout.call(m, renderContext);
+							: chunkModules && !renamedInlinedModule
+								? "it need to be isolated against other modules in the chunk."
+								: exports && !webpackExports
+									? `it uses a non-standard name for the exports (${m.exportsArgument}).`
+									: hooks.embedInRuntimeBailout.call(m, renderContext);
 					let footer;
 					if (iife !== undefined) {
 						startupSource.add(
@@ -1420,25 +1429,41 @@ class JavascriptModulesPlugin {
 	 * @param {Set<Module>} inlinedModules inlinedModules
 	 * @param {ChunkRenderContext} chunkRenderContext chunkRenderContext
 	 * @param {CompilationHooks} hooks hooks
-	 * @returns {Map<Module, Source>} renamed inlined modules
+	 * @param {boolean} allStrict allStrict
+	 * @param {boolean} hasChunkModules hasChunkModules
+	 * @returns {Map<Module, Source> | false} renamed inlined modules
 	 */
-	renameInlineModule(
+	getRenamedInlineModule(
 		allModules,
 		renderContext,
 		inlinedModules,
 		chunkRenderContext,
-		hooks
+		hooks,
+		allStrict,
+		hasChunkModules
 	) {
+		const innerStrict = !allStrict && allModules.every(m => m.buildInfo.strict);
+		const isMultipleEntries = inlinedModules.size > 1;
+		const singleEntryWithModules = inlinedModules.size === 1 && hasChunkModules;
+
+		// TODO:
+		// This step is before the IIFE reason calculation. Ideally, it should only be executed when this function can optimize the
+		// IIFE reason. Otherwise, it should directly return false. There are four reasons now, we have skipped two already, the left
+		// one is 'it uses a non-standard name for the exports'.
+		if (isMultipleEntries || innerStrict || !singleEntryWithModules) {
+			return false;
+		}
+
+		/** @type {Map<Module, Source>} */
+		const renamedInlinedModules = new Map();
 		const { runtimeTemplate } = renderContext;
 
 		/** @typedef {{ source: Source, ast: any, variables: Set<Variable>, usedInNonInlined: Set<Variable>}} InlinedModulesInfo */
-
 		/** @type {Map<Module, InlinedModulesInfo>} */
 		const inlinedModulesToInfo = new Map();
 		/** @type {Set<string>} */
 		const nonInlinedModuleThroughIdentifiers = new Set();
 		/** @type {Map<Module, Source>} */
-		const renamedInlinedModules = new Map();
 
 		for (const m of allModules) {
 			const isInlinedModule = inlinedModules && inlinedModules.has(m);

package/lib/optimize/ConcatenatedModule.js

@@ -1660,9 +1660,7 @@ ${defineGetters}`
 			switch (info.type) {
 				case "concatenated": {
 					result.add(
-						`\n;// CONCATENATED MODULE: ${info.module.readableIdentifier(
-							requestShortener
-						)}\n`
+						`\n;// ${info.module.readableIdentifier(requestShortener)}\n`
 					);
 					result.add(info.source);
 					if (info.chunkInitFragments) {

package/lib/optimize/MergeDuplicateChunksPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { STAGE_BASIC } = require("../OptimizationStages");
+const { STAGE_ADVANCED } = require("../OptimizationStages");
 const { runtimeEqual } = require("../util/runtime");
 
 /** @typedef {import("../Compiler")} Compiler */
@@ -22,7 +22,7 @@ class MergeDuplicateChunksPlugin {
 				compilation.hooks.optimizeChunks.tap(
 					{
 						name: "MergeDuplicateChunksPlugin",
-						stage: STAGE_BASIC
+						stage: STAGE_ADVANCED
 					},
 					chunks => {
 						const { chunkGraph, moduleGraph } = compilation;

package/lib/util/LazySet.js

@@ -138,6 +138,9 @@ class LazySet {
 		return this._set.delete(value);
 	}
 
+	/**
+	 * @returns {IterableIterator<[T, T]>} entries
+	 */
 	entries() {
 		this._deopt = true;
 		if (this._needMerge) this._merge();
@@ -165,18 +168,27 @@ class LazySet {
 		return this._set.has(item);
 	}
 
+	/**
+	 * @returns {IterableIterator<T>} keys
+	 */
 	keys() {
 		this._deopt = true;
 		if (this._needMerge) this._merge();
 		return this._set.keys();
 	}
 
+	/**
+	 * @returns {IterableIterator<T>} values
+	 */
 	values() {
 		this._deopt = true;
 		if (this._needMerge) this._merge();
 		return this._set.values();
 	}
 
+	/**
+	 * @returns {IterableIterator<T>} iterable iterator
+	 */
 	[Symbol.iterator]() {
 		this._deopt = true;
 		if (this._needMerge) this._merge();

package/lib/util/fs.js

@@ -625,7 +625,7 @@ const lstatReadlinkAbsolute = (fs, p, callback) => {
 				// we retry 2 times to catch this case before throwing the error
 				return doStat();
 			}
-			if (err || !target) return doStat();
+			if (err) return callback(err);
 			const value = target.toString();
 			callback(null, join(fs, dirname(fs, p), value));
 		});

package/lib/util/runtime.js

@@ -618,6 +618,9 @@ class RuntimeSpecMap {
 		}
 	}
 
+	/**
+	 * @returns {IterableIterator<T>} values
+	 */
 	values() {
 		switch (this._mode) {
 			case 0:
@@ -666,6 +669,9 @@ class RuntimeSpecSet {
 		return this._map.has(getRuntimeKey(runtime));
 	}
 
+	/**
+	 * @returns {IterableIterator<RuntimeSpec>} iterable iterator
+	 */
 	[Symbol.iterator]() {
 		return this._map.values();
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.94.0",
+  "version": "5.95.0",
   "author": "Tobias Koppers @sokra",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -53,7 +53,7 @@
     "core-js": "^3.6.5",
     "cspell": "^8.8.4",
     "css-loader": "^7.1.2",
-    "date-fns": "^3.2.0",
+    "date-fns": "^4.0.0",
     "es5-ext": "^0.10.53",
     "es6-promise-polyfill": "^1.2.0",
     "eslint": "^9.5.0",
@@ -103,9 +103,9 @@
     "style-loader": "^4.0.0",
     "terser": "^5.31.1",
     "toml": "^3.0.0",
-    "tooling": "webpack/tooling#v1.23.3",
+    "tooling": "webpack/tooling#v1.23.4",
     "ts-loader": "^9.5.1",
-    "typescript": "^5.4.2",
+    "typescript": "^5.6.2",
     "url-loader": "^4.1.0",
     "wast-loader": "^1.12.1",
     "webassembly-feature": "1.3.0",