webpack 5.31.2 → 5.33.2

package/lib/DefinePlugin.js

@@ -13,6 +13,7 @@ const {
 	evaluateToString,
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
+const { provide } = require("./util/MapHelpers");
 
 /** @typedef {import("estree").Expression} Expression */
 /** @typedef {import("./Compiler")} Compiler */
@@ -53,7 +54,7 @@ class RuntimeValue {
 
 	/**
 	 * @param {JavascriptParser} parser the parser
-	 * @param {Map<string, string>} valueCacheVersions valueCacheVersions
+	 * @param {Map<string, string | Set<string>>} valueCacheVersions valueCacheVersions
 	 * @param {string} key the defined key
 	 * @returns {CodeValuePrimitive} code
 	 */
@@ -88,7 +89,9 @@ class RuntimeValue {
 			module: parser.state.module,
 			key,
 			get version() {
-				return valueCacheVersions.get(VALUE_DEP_PREFIX + key);
+				return /** @type {string} */ (valueCacheVersions.get(
+					VALUE_DEP_PREFIX + key
+				));
 			}
 		});
 	}
@@ -105,7 +108,7 @@ class RuntimeValue {
 /**
  * @param {any[]|{[k: string]: any}} obj obj
  * @param {JavascriptParser} parser Parser
- * @param {Map<string, string>} valueCacheVersions valueCacheVersions
+ * @param {Map<string, string | Set<string>>} valueCacheVersions valueCacheVersions
  * @param {string} key the defined key
  * @param {RuntimeTemplate} runtimeTemplate the runtime template
  * @param {boolean|undefined|null=} asiSafe asi safe (undefined: unknown, null: unneeded)
@@ -156,7 +159,7 @@ const stringifyObj = (
  * Convert code to a string that evaluates
  * @param {CodeValue} code Code to evaluate
  * @param {JavascriptParser} parser Parser
- * @param {Map<string, string>} valueCacheVersions valueCacheVersions
+ * @param {Map<string, string | Set<string>>} valueCacheVersions valueCacheVersions
  * @param {string} key the defined key
  * @param {RuntimeTemplate} runtimeTemplate the runtime template
  * @param {boolean|undefined|null=} asiSafe asi safe (undefined: unknown, null: unneeded)
@@ -247,6 +250,7 @@ const toCacheVersion = code => {
 };
 
 const VALUE_DEP_PREFIX = "webpack/DefinePlugin ";
+const VALUE_DEP_MAIN = "webpack/DefinePlugin";
 
 class DefinePlugin {
 	/**
@@ -282,16 +286,27 @@ class DefinePlugin {
 				);
 				const { runtimeTemplate } = compilation;
 
+				const mainValue = /** @type {Set<string>} */ (provide(
+					compilation.valueCacheVersions,
+					VALUE_DEP_MAIN,
+					() => new Set()
+				));
+
 				/**
 				 * Handler
 				 * @param {JavascriptParser} parser Parser
 				 * @returns {void}
 				 */
 				const handler = parser => {
-					const addValueDependency = key => {
+					parser.hooks.program.tap("DefinePlugin", () => {
 						const { buildInfo } = parser.state.module;
 						if (!buildInfo.valueDependencies)
 							buildInfo.valueDependencies = new Map();
+						buildInfo.valueDependencies.set(VALUE_DEP_MAIN, mainValue);
+					});
+
+					const addValueDependency = key => {
+						const { buildInfo } = parser.state.module;
 						buildInfo.valueDependencies.set(
 							VALUE_DEP_PREFIX + key,
 							compilation.valueCacheVersions.get(VALUE_DEP_PREFIX + key)
@@ -546,6 +561,7 @@ class DefinePlugin {
 						const code = definitions[key];
 						const version = toCacheVersion(code);
 						const name = VALUE_DEP_PREFIX + prefix + key;
+						mainValue.add(name);
 						const oldVersion = compilation.valueCacheVersions.get(name);
 						if (oldVersion === undefined) {
 							compilation.valueCacheVersions.set(name, version);

package/lib/EntryOptionPlugin.js

@@ -62,6 +62,7 @@ class EntryOptionPlugin {
 			runtime: desc.runtime,
 			layer: desc.layer,
 			dependOn: desc.dependOn,
+			publicPath: desc.publicPath,
 			chunkLoading: desc.chunkLoading,
 			wasmLoading: desc.wasmLoading,
 			library: desc.library

package/lib/FlagDependencyExportsPlugin.js

@@ -12,6 +12,7 @@ const Queue = require("./util/Queue");
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").ExportSpec} ExportSpec */
+/** @typedef {import("./Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("./ExportsInfo")} ExportsInfo */
 /** @typedef {import("./Module")} Module */
 
@@ -93,6 +94,9 @@ class FlagDependencyExportsPlugin {
 								/** @type {ExportsInfo} */
 								let exportsInfo;
 
+								/** @type {Map<Dependency, ExportsSpec>} */
+								const exportsSpecsFromDependencies = new Map();
+
 								let cacheable = true;
 								let changed = false;
 
@@ -116,6 +120,15 @@ class FlagDependencyExportsPlugin {
 								const processDependency = dep => {
 									const exportDesc = dep.getExports(moduleGraph);
 									if (!exportDesc) return;
+									exportsSpecsFromDependencies.set(dep, exportDesc);
+								};
+
+								/**
+								 * @param {Dependency} dep dependency
+								 * @param {ExportsSpec} exportDesc info
+								 * @returns {void}
+								 */
+								const processExportsSpec = (dep, exportDesc) => {
 									const exports = exportDesc.exports;
 									const globalCanMangle = exportDesc.canMangle;
 									const globalFrom = exportDesc.from;
@@ -300,7 +313,16 @@ class FlagDependencyExportsPlugin {
 										cacheable = true;
 										changed = false;
 
+										exportsSpecsFromDependencies.clear();
+										moduleGraph.freeze();
 										processDependenciesBlock(module);
+										moduleGraph.unfreeze();
+										for (const [
+											dep,
+											exportsSpec
+										] of exportsSpecsFromDependencies) {
+											processExportsSpec(dep, exportsSpec);
+										}
 
 										if (cacheable) {
 											modulesToStore.add(module);

package/lib/Module.js

@@ -94,7 +94,7 @@ const makeSerializable = require("./util/makeSerializable");
 /**
  * @typedef {Object} NeedBuildContext
  * @property {FileSystemInfo} fileSystemInfo
- * @property {Map<string, string>} valueCacheVersions
+ * @property {Map<string, string | Set<string>>} valueCacheVersions
  */
 
 /** @typedef {KnownBuildMeta & Record<string, any>} BuildMeta */

package/lib/ModuleGraph.js

@@ -9,6 +9,7 @@ const util = require("util");
 const ExportsInfo = require("./ExportsInfo");
 const ModuleGraphConnection = require("./ModuleGraphConnection");
 const SortableSet = require("./util/SortableSet");
+const WeakTupleMap = require("./util/WeakTupleMap");
 
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("./Dependency")} Dependency */
@@ -110,6 +111,9 @@ class ModuleGraph {
 		this._cacheModuleGraphModuleValue2 = undefined;
 		this._cacheModuleGraphDependencyKey = undefined;
 		this._cacheModuleGraphDependencyValue = undefined;
+
+		/** @type {WeakTupleMap<any[], any>} */
+		this._cache = undefined;
 	}
 
 	/**
@@ -699,6 +703,26 @@ class ModuleGraph {
 		return this._metaMap.get(thing);
 	}
 
+	freeze() {
+		this._cache = new WeakTupleMap();
+	}
+
+	unfreeze() {
+		this._cache = undefined;
+	}
+
+	/**
+	 * @template {any[]} T
+	 * @template V
+	 * @param {(moduleGraph: ModuleGraph, ...args: T) => V} fn computer
+	 * @param {T} args arguments
+	 * @returns {V} computed value or cached
+	 */
+	cached(fn, ...args) {
+		if (this._cache === undefined) return fn(this, ...args);
+		return this._cache.provide(fn, ...args, () => fn(this, ...args));
+	}
+
 	// TODO remove in webpack 6
 	/**
 	 * @param {Module} module the module

package/lib/NormalModule.js

@@ -28,6 +28,7 @@ const UnhandledSchemeError = require("./UnhandledSchemeError");
 const WebpackError = require("./WebpackError");
 const formatLocation = require("./formatLocation");
 const LazySet = require("./util/LazySet");
+const { isSubset } = require("./util/SetHelpers");
 const { getScheme } = require("./util/URLAbsoluteSpecifier");
 const {
 	compareLocations,
@@ -1151,12 +1152,22 @@ class NormalModule extends Module {
 		if (!this.buildInfo.snapshot) return callback(null, true);
 
 		// build when valueDependencies have changed
-		if (this.buildInfo.valueDependencies) {
+		/** @type {Map<string, string | Set<string>>} */
+		const valueDependencies = this.buildInfo.valueDependencies;
+		if (valueDependencies) {
 			if (!valueCacheVersions) return callback(null, true);
-			for (const [key, value] of this.buildInfo.valueDependencies) {
+			for (const [key, value] of valueDependencies) {
 				if (value === undefined) return callback(null, true);
 				const current = valueCacheVersions.get(key);
-				if (value !== current) return callback(null, true);
+				if (
+					value !== current &&
+					(typeof value === "string" ||
+						typeof current === "string" ||
+						current === undefined ||
+						!isSubset(value, current))
+				) {
+					return callback(null, true);
+				}
 			}
 		}
 

package/lib/NormalModuleFactory.js

@@ -496,7 +496,21 @@ class NormalModuleFactory extends ModuleFactory {
 							for (const loader of loaders) allLoaders.push(loader);
 						}
 						for (const loader of preLoaders) allLoaders.push(loader);
-						const type = settings.type;
+						let type = settings.type;
+						if (!type) {
+							const resource =
+								(matchResourceData && matchResourceData.resource) ||
+								resourceData.resource;
+							let match;
+							if (
+								typeof resource === "string" &&
+								(match = /\.webpack\[([^\]]+)\]$/.exec(resource))
+							) {
+								type = match[1];
+							} else {
+								type = "javascript/auto";
+							}
+						}
 						const resolveOptions = settings.resolve;
 						const layer = settings.layer;
 						if (layer !== undefined && !layers) {

package/lib/RuntimeModule.js

@@ -41,6 +41,8 @@ class RuntimeModule extends Module {
 		this.compilation = undefined;
 		/** @type {Chunk} */
 		this.chunk = undefined;
+		/** @type {ChunkGraph} */
+		this.chunkGraph = undefined;
 		this.fullHash = false;
 		/** @type {string} */
 		this._cachedGeneratedCode = undefined;
@@ -49,11 +51,13 @@ class RuntimeModule extends Module {
 	/**
 	 * @param {Compilation} compilation the compilation
 	 * @param {Chunk} chunk the chunk
+	 * @param {ChunkGraph} chunkGraph the chunk graph
 	 * @returns {void}
 	 */
-	attach(compilation, chunk) {
+	attach(compilation, chunk, chunkGraph = compilation.chunkGraph) {
 		this.compilation = compilation;
 		this.chunk = chunk;
+		this.chunkGraph = chunkGraph;
 	}
 
 	/**

package/lib/RuntimePlugin.js

@@ -176,14 +176,19 @@ class RuntimePlugin {
 				.for(RuntimeGlobals.publicPath)
 				.tap("RuntimePlugin", (chunk, set) => {
 					const { outputOptions } = compilation;
-					const { publicPath, scriptType } = outputOptions;
+					const { publicPath: globalPublicPath, scriptType } = outputOptions;
+					const entryOptions = chunk.getEntryOptions();
+					const publicPath =
+						entryOptions && entryOptions.publicPath !== undefined
+							? entryOptions.publicPath
+							: globalPublicPath;
 
 					if (publicPath === "auto") {
 						const module = new AutoPublicPathRuntimeModule();
 						if (scriptType !== "module") set.add(RuntimeGlobals.global);
 						compilation.addRuntimeModule(chunk, module);
 					} else {
-						const module = new PublicPathRuntimeModule();
+						const module = new PublicPathRuntimeModule(publicPath);
 
 						if (
 							typeof publicPath !== "string" ||

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -8,6 +8,7 @@
 const CaseSensitiveModulesWarning = require("./CaseSensitiveModulesWarning");
 
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Module")} Module */
 
 class WarnCaseSensitiveModulesPlugin {
 	/**
@@ -20,21 +21,26 @@ class WarnCaseSensitiveModulesPlugin {
 			"WarnCaseSensitiveModulesPlugin",
 			compilation => {
 				compilation.hooks.seal.tap("WarnCaseSensitiveModulesPlugin", () => {
+					/** @type {Map<string, Map<string, Module>>} */
 					const moduleWithoutCase = new Map();
 					for (const module of compilation.modules) {
-						const identifier = module.identifier().toLowerCase();
-						const array = moduleWithoutCase.get(identifier);
-						if (array) {
-							array.push(module);
-						} else {
-							moduleWithoutCase.set(identifier, [module]);
+						const identifier = module.identifier();
+						const lowerIdentifier = identifier.toLowerCase();
+						let map = moduleWithoutCase.get(lowerIdentifier);
+						if (map === undefined) {
+							map = new Map();
+							moduleWithoutCase.set(lowerIdentifier, map);
 						}
+						map.set(identifier, module);
 					}
 					for (const pair of moduleWithoutCase) {
-						const array = pair[1];
-						if (array.length > 1) {
+						const map = pair[1];
+						if (map.size > 1) {
 							compilation.warnings.push(
-								new CaseSensitiveModulesWarning(array, compilation.moduleGraph)
+								new CaseSensitiveModulesWarning(
+									map.values(),
+									compilation.moduleGraph
+								)
 							);
 						}
 					}

package/lib/WebpackOptionsApply.js

@@ -296,7 +296,9 @@ class WebpackOptionsApply extends OptionsApply {
 			new RequireJsStuffPlugin().apply(compiler);
 		}
 		new CommonJsPlugin().apply(compiler);
-		new LoaderPlugin().apply(compiler);
+		new LoaderPlugin({
+			enableExecuteModule: options.experiments.executeModule
+		}).apply(compiler);
 		if (options.node !== false) {
 			const NodeStuffPlugin = require("./NodeStuffPlugin");
 			new NodeStuffPlugin(options.node).apply(compiler);

package/lib/asset/AssetModulesPlugin.js

@@ -176,6 +176,19 @@ class AssetModulesPlugin {
 
 					return result;
 				});
+
+				compilation.hooks.prepareModuleExecution.tap(
+					"AssetModulesPlugin",
+					(options, context) => {
+						const { codeGenerationResult } = options;
+						const source = codeGenerationResult.sources.get("asset");
+						if (source === undefined) return;
+						context.assets.set(codeGenerationResult.data.get("filename"), {
+							source,
+							info: codeGenerationResult.data.get("assetInfo")
+						});
+					}
+				);
 			}
 		);
 	}

package/lib/config/defaults.js

@@ -431,9 +431,6 @@ const applyModuleDefaults = (
 		};
 		/** @type {RuleSetRules} */
 		const rules = [
-			{
-				type: "javascript/auto"
-			},
 			{
 				mimetype: "application/node",
 				type: "javascript/auto"
@@ -1031,6 +1028,7 @@ const getResolveDefaults = ({ cache, context, targetProperties, mode }) => {
 		byDependency: {
 			wasm: esmDeps(),
 			esm: esmDeps(),
+			loaderImport: esmDeps(),
 			url: {
 				preferRelative: true
 			},

package/lib/config/normalization.js

@@ -458,6 +458,7 @@ const getNormalizedEntryStatic = entry => {
 				filename: value.filename,
 				layer: value.layer,
 				runtime: value.runtime,
+				publicPath: value.publicPath,
 				chunkLoading: value.chunkLoading,
 				wasmLoading: value.wasmLoading,
 				dependOn:

package/lib/container/RemoteRuntimeModule.js

@@ -20,7 +20,8 @@ class RemoteRuntimeModule extends RuntimeModule {
 	 * @returns {string} runtime code
 	 */
 	generate() {
-		const { runtimeTemplate, chunkGraph, moduleGraph } = this.compilation;
+		const { compilation, chunkGraph } = this;
+		const { runtimeTemplate, moduleGraph } = compilation;
 		const chunkToRemotesMapping = {};
 		const idToExternalAndNameMapping = {};
 		for (const chunk of this.chunk.getAllAsyncChunks()) {

package/lib/dependencies/HarmonyExportDependencyParserPlugin.js

@@ -16,6 +16,8 @@ const {
 } = require("./HarmonyImportDependencyParserPlugin");
 const HarmonyImportSideEffectDependency = require("./HarmonyImportSideEffectDependency");
 
+const { HarmonyStarExportsList } = HarmonyExportImportedSpecifierDependency;
+
 module.exports = class HarmonyExportDependencyParserPlugin {
 	constructor(options) {
 		this.strictExportPresence = options.strictExportPresence;
@@ -124,7 +126,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 						name,
 						harmonyNamedExports,
 						null,
-						this.strictExportPresence
+						this.strictExportPresence,
+						null
 					);
 				} else {
 					dep = new HarmonyExportSpecifierDependency(id, name);
@@ -145,7 +148,7 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					harmonyNamedExports.add(name);
 				} else {
 					harmonyStarExports = parser.state.harmonyStarExports =
-						parser.state.harmonyStarExports || [];
+						parser.state.harmonyStarExports || new HarmonyStarExportsList();
 				}
 				const dep = new HarmonyExportImportedSpecifierDependency(
 					source,
@@ -154,7 +157,8 @@ module.exports = class HarmonyExportDependencyParserPlugin {
 					name,
 					harmonyNamedExports,
 					harmonyStarExports && harmonyStarExports.slice(),
-					this.strictExportPresence
+					this.strictExportPresence,
+					harmonyStarExports
 				);
 				if (harmonyStarExports) {
 					harmonyStarExports.push(dep);