webpack 5.12.3 → 5.16.0

package/lib/AutomaticPrefetchPlugin.js

@@ -45,7 +45,7 @@ class AutomaticPrefetchPlugin {
 					(m, callback) => {
 						compilation.addModuleChain(
 							m.context || compiler.context,
-							new PrefetchDependency(m.request),
+							new PrefetchDependency(`!!${m.request}`),
 							callback
 						);
 					},

package/lib/ChunkGraph.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const util = require("util");
+const ModuleGraphConnection = require("./ModuleGraphConnection");
 const SortableSet = require("./util/SortableSet");
 const {
 	compareModulesById,
@@ -272,10 +273,19 @@ class ChunkGraph {
 			findGraphRoots(set, module => {
 				/** @type {Set<Module>} */
 				const set = new Set();
-				for (const connection of moduleGraph.getOutgoingConnections(module)) {
-					if (!connection.module) continue;
-					set.add(connection.module);
-				}
+				const addDependencies = module => {
+					for (const connection of moduleGraph.getOutgoingConnections(module)) {
+						if (!connection.module) continue;
+						const activeState = connection.getActiveState(undefined);
+						if (activeState === false) continue;
+						if (activeState === ModuleGraphConnection.TRANSITIVE_ONLY) {
+							addDependencies(connection.module);
+							continue;
+						}
+						set.add(connection.module);
+					}
+				};
+				addDependencies(module);
 				return set;
 			})
 		).sort(compareModulesByIdentifier);

package/lib/Compilation.js

@@ -2683,18 +2683,6 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	 * @returns {void}
 	 */
 	removeReasonsOfDependencyBlock(module, block) {
-		const chunkGraph = this.chunkGraph;
-		const iteratorDependency = d => {
-			if (!d.module) {
-				return;
-			}
-			if (d.module.removeReason(module, d)) {
-				for (const chunk of chunkGraph.getModuleChunksIterable(d.module)) {
-					this.patchChunksAfterReasonRemoval(d.module, chunk);
-				}
-			}
-		};
-
 		if (block.blocks) {
 			for (const b of block.blocks) {
 				this.removeReasonsOfDependencyBlock(module, b);
@@ -2702,7 +2690,20 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 		}
 
 		if (block.dependencies) {
-			for (const dep of block.dependencies) iteratorDependency(dep);
+			for (const dep of block.dependencies) {
+				const originalModule = this.moduleGraph.getModule(dep);
+				if (originalModule) {
+					this.moduleGraph.removeConnection(dep);
+
+					if (this.chunkGraph) {
+						for (const chunk of this.chunkGraph.getModuleChunks(
+							originalModule
+						)) {
+							this.patchChunksAfterReasonRemoval(originalModule, chunk);
+						}
+					}
+				}
+			}
 		}
 	}
 
@@ -2730,11 +2731,15 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 	 * @returns {void}
 	 */
 	removeChunkFromDependencies(block, chunk) {
+		/**
+		 * @param {Dependency} d dependency to (maybe) patch up
+		 */
 		const iteratorDependency = d => {
-			if (!d.module) {
+			const depModule = this.moduleGraph.getModule(d);
+			if (!depModule) {
 				return;
 			}
-			this.patchChunksAfterReasonRemoval(d.module, chunk);
+			this.patchChunksAfterReasonRemoval(depModule, chunk);
 		};
 
 		const blocks = block.blocks;

package/lib/Compiler.js

@@ -222,9 +222,9 @@ class Compiler {
 		this.modifiedFiles = undefined;
 		/** @type {Set<string>} */
 		this.removedFiles = undefined;
-		/** @type {Map<string, FileSystemInfoEntry | null>} */
+		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.fileTimestamps = undefined;
-		/** @type {Map<string, FileSystemInfoEntry | null>} */
+		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.contextTimestamps = undefined;
 
 		/** @type {ResolverFactory} */
@@ -724,7 +724,10 @@ ${other}`);
 								return this.outputFileSystem.readFile(
 									targetPath,
 									(err, existingContent) => {
-										if (err || !content.equals(existingContent)) {
+										if (
+											err ||
+											!content.equals(/** @type {Buffer} */ (existingContent))
+										) {
 											return doWrite(content);
 										} else {
 											return alreadyWritten();

package/lib/ContextModule.js

@@ -16,9 +16,9 @@ const {
 	compareLocations,
 	concatComparators,
 	compareSelect,
-	keepOriginalOrder
+	keepOriginalOrder,
+	compareModulesById
 } = require("./util/comparators");
-const { compareModulesById } = require("./util/comparators");
 const { contextify, parseResource } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 

package/lib/ContextModuleFactory.js

@@ -298,11 +298,13 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 		const addDirectory = (directory, addSubDirectory, callback) => {
 			fs.readdir(directory, (err, files) => {
 				if (err) return callback(err);
-				files = files.map(file => file.normalize("NFC"));
-				files = cmf.hooks.contextModuleFiles.call(files);
-				if (!files || files.length === 0) return callback(null, []);
+				const processedFiles = cmf.hooks.contextModuleFiles.call(
+					/** @type {string[]} */ (files).map(file => file.normalize("NFC"))
+				);
+				if (!processedFiles || processedFiles.length === 0)
+					return callback(null, []);
 				asyncLib.map(
-					files.filter(p => p.indexOf(".") !== 0),
+					processedFiles.filter(p => p.indexOf(".") !== 0),
 					(segment, callback) => {
 						const subResource = join(fs, directory, segment);
 

package/lib/ExportsInfo.js

@@ -457,7 +457,6 @@ class ExportsInfo {
 				case UsageState.NoInfo:
 					return null;
 				case UsageState.Unknown:
-					return true;
 				case UsageState.OnlyPropertiesUsed:
 				case UsageState.Used:
 					return true;

package/lib/ExternalModuleFactoryPlugin.js

@@ -7,12 +7,13 @@
 
 const util = require("util");
 const ExternalModule = require("./ExternalModule");
-const { resolveByProperty } = require("./util/cleverMerge");
+const { resolveByProperty, cachedSetProperty } = require("./util/cleverMerge");
 
 /** @typedef {import("../declarations/WebpackOptions").Externals} Externals */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 
 const UNSPECIFIED_EXTERNAL_TYPE_REGEXP = /^[a-z0-9]+ /;
+const EMPTY_RESOLVE_OPTIONS = {};
 
 // TODO webpack 6 remove this
 const callDeprecatedExternals = util.deprecate(
@@ -171,14 +172,56 @@ class ExternalModuleFactoryPlugin {
 								cb
 							);
 						} else {
-							externals(
+							const promise = externals(
 								{
 									context,
 									request: dependency.request,
-									contextInfo
+									contextInfo,
+									getResolve: options => (context, request, callback) => {
+										const dependencyType = dependency.category || "";
+										const resolveContext = {
+											fileDependencies: data.fileDependencies,
+											missingDependencies: data.missingDependencies,
+											contextDependencies: data.contextDependencies
+										};
+										let resolver = normalModuleFactory.getResolver(
+											"normal",
+											dependencyType
+												? cachedSetProperty(
+														data.resolveOptions || EMPTY_RESOLVE_OPTIONS,
+														"dependencyType",
+														dependencyType
+												  )
+												: data.resolveOptions
+										);
+										if (options) resolver = resolver.withOptions(options);
+										if (callback) {
+											resolver.resolve(
+												{},
+												context,
+												request,
+												resolveContext,
+												callback
+											);
+										} else {
+											return new Promise((resolve, reject) => {
+												resolver.resolve(
+													{},
+													context,
+													request,
+													resolveContext,
+													(err, result) => {
+														if (err) reject(err);
+														else resolve(result);
+													}
+												);
+											});
+										}
+									}
 								},
 								cb
 							);
+							if (promise && promise.then) promise.then(r => cb(null, r), cb);
 						}
 						return;
 					} else if (typeof externals === "object") {