webpack 5.99.9 → 5.100.0

package/lib/ContextModuleFactory.js

@@ -344,14 +344,15 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 				const processedFiles = cmf.hooks.contextModuleFiles.call(
 					/** @type {string[]} */ (files).map(file => file.normalize("NFC"))
 				);
-				if (!processedFiles || processedFiles.length === 0)
+				if (!processedFiles || processedFiles.length === 0) {
 					return callback(null, []);
+				}
 				asyncLib.map(
 					processedFiles.filter(p => p.indexOf(".") !== 0),
 					(segment, callback) => {
 						const subResource = join(fs, directory, segment);
 
-						if (!exclude || !subResource.match(exclude)) {
+						if (!exclude || !exclude.test(subResource)) {
 							fs.stat(subResource, (err, _stat) => {
 								if (err) {
 									if (err.code === "ENOENT") {
@@ -369,7 +370,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 									addSubDirectory(ctx, subResource, callback);
 								} else if (
 									stat.isFile() &&
-									(!include || subResource.match(include))
+									(!include || include.test(subResource))
 								) {
 									/** @type {{ context: string, request: string }} */
 									const obj = {

package/lib/ContextReplacementPlugin.js

@@ -131,7 +131,8 @@ class ContextReplacementPlugin {
 							result.resource = newContentResource;
 						} else {
 							result.resource = join(
-								/** @type {InputFileSystem} */ (compiler.inputFileSystem),
+								/** @type {InputFileSystem} */
+								(compiler.inputFileSystem),
 								result.resource,
 								newContentResource
 							);
@@ -159,7 +160,8 @@ class ContextReplacementPlugin {
 						) {
 							// When the function changed it to an relative path
 							result.resource = join(
-								/** @type {InputFileSystem} */ (compiler.inputFileSystem),
+								/** @type {InputFileSystem} */
+								(compiler.inputFileSystem),
 								origResource,
 								result.resource
 							);

package/lib/CssModule.js

@@ -18,9 +18,9 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {string | undefined} Supports */
 /** @typedef {string | undefined} Media */
 /** @typedef {[CssLayer, Supports, Media]} InheritanceItem */
-/** @typedef {Array<InheritanceItem>} Inheritance */
+/** @typedef {InheritanceItem[]} Inheritance */
 
-/** @typedef {NormalModuleCreateData & { cssLayer: CssLayer, supports: Supports, media: Media, inheritance: Inheritance }} CSSModuleCreateData */
+/** @typedef {NormalModuleCreateData & { cssLayer: CssLayer, supports: Supports, media: Media, inheritance?: Inheritance }} CSSModuleCreateData */
 
 class CssModule extends NormalModule {
 	/**

package/lib/DefinePlugin.js

@@ -7,8 +7,8 @@
 
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JAVASCRIPT_MODULE_TYPE_ESM,
-	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JAVASCRIPT_MODULE_TYPE_ESM
 } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const WebpackError = require("./WebpackError");
@@ -356,6 +356,16 @@ class DefinePlugin {
 	 */
 	apply(compiler) {
 		const definitions = this.definitions;
+
+		/**
+		 * @type {Map<string, Set<string>>}
+		 */
+		const finalByNestedKey = new Map();
+		/**
+		 * @type {Map<string, Set<string>>}
+		 */
+		const nestedByFinalKey = new Map();
+
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
@@ -381,6 +391,7 @@ class DefinePlugin {
 				 * @returns {void}
 				 */
 				const handler = parser => {
+					const hooked = new Set();
 					const mainValue =
 						/** @type {ValueCacheVersion} */
 						(compilation.valueCacheVersions.get(VALUE_DEP_MAIN));
@@ -388,8 +399,9 @@ class DefinePlugin {
 						const buildInfo = /** @type {BuildInfo} */ (
 							parser.state.module.buildInfo
 						);
-						if (!buildInfo.valueDependencies)
+						if (!buildInfo.valueDependencies) {
 							buildInfo.valueDependencies = new Map();
+						}
 						buildInfo.valueDependencies.set(VALUE_DEP_MAIN, mainValue);
 					});
 
@@ -469,6 +481,61 @@ class DefinePlugin {
 								return true;
 							});
 						}
+						if (prefix === "") {
+							const final = splittedKey[splittedKey.length - 1];
+							const nestedSet = nestedByFinalKey.get(final);
+							if (!nestedSet || nestedSet.size <= 0) return;
+							for (const nested of /** @type {Set<string>} */ (nestedSet)) {
+								if (nested && !hooked.has(nested)) {
+									// only detect the same nested key once
+									hooked.add(nested);
+									parser.hooks.expression.for(nested).tap(
+										{
+											name: PLUGIN_NAME,
+											// why 100? Ensures it runs after object define
+											stage: 100
+										},
+										expr => {
+											const destructed =
+												parser.destructuringAssignmentPropertiesFor(expr);
+											if (destructed === undefined) {
+												return;
+											}
+											/** @type {Record<string, CodeValue>} */
+											const obj = {};
+											const finalSet = finalByNestedKey.get(nested);
+											for (const { id } of destructed) {
+												const fullKey = `${nested}.${id}`;
+												if (
+													!finalSet ||
+													!finalSet.has(id) ||
+													!definitions[fullKey]
+												) {
+													return;
+												}
+												obj[id] = definitions[fullKey];
+											}
+											let strCode = stringifyObj(
+												obj,
+												parser,
+												compilation.valueCacheVersions,
+												key,
+												runtimeTemplate,
+												logger,
+												!parser.isAsiPosition(
+													/** @type {Range} */ (expr.range)[0]
+												),
+												getObjKeys(destructed)
+											);
+											if (parser.scope.inShorthand) {
+												strCode = `${parser.scope.inShorthand}:${strCode}`;
+											}
+											return toConstantDependency(parser, strCode)(expr);
+										}
+									);
+								}
+							}
+						}
 					};
 
 					/**
@@ -707,6 +774,46 @@ class DefinePlugin {
 					}
 				};
 
+				/**
+				 * @param {Record<string, CodeValue>} definitions Definitions map
+				 * @returns {void}
+				 */
+				const walkDefinitionsForKeys = definitions => {
+					/**
+					 * @param {Map<string, Set<string>>} map Map
+					 * @param {string} key key
+					 * @param {string} value v
+					 * @returns {void}
+					 */
+					const addToMap = (map, key, value) => {
+						if (map.has(key)) {
+							/** @type {Set<string>} */
+							(map.get(key)).add(value);
+						} else {
+							map.set(key, new Set([value]));
+						}
+					};
+					for (const key of Object.keys(definitions)) {
+						const code = definitions[key];
+						if (
+							!code ||
+							typeof code === "object" ||
+							TYPEOF_OPERATOR_REGEXP.test(key)
+						) {
+							continue;
+						}
+						const idx = key.lastIndexOf(".");
+						if (idx <= 0 || idx >= key.length - 1) {
+							continue;
+						}
+						const nested = key.slice(0, idx);
+						const final = key.slice(idx + 1);
+						addToMap(finalByNestedKey, nested, final);
+						addToMap(nestedByFinalKey, final, nested);
+					}
+				};
+
+				walkDefinitionsForKeys(definitions);
 				walkDefinitionsForValues(definitions, "");
 
 				compilation.valueCacheVersions.set(
@@ -717,4 +824,5 @@ class DefinePlugin {
 		);
 	}
 }
+
 module.exports = DefinePlugin;

package/lib/DelegatedModuleFactoryPlugin.js

@@ -25,6 +25,8 @@ const DelegatedModule = require("./DelegatedModule");
  * @property {AssociatedObjectForCache=} associatedObjectForCache object for caching
  */
 
+const PLUGIN_NAME = "DelegatedModuleFactoryPlugin";
+
 class DelegatedModuleFactoryPlugin {
 	/**
 	 * @param {Options} options options
@@ -43,7 +45,7 @@ class DelegatedModuleFactoryPlugin {
 		const scope = this.options.scope;
 		if (scope) {
 			normalModuleFactory.hooks.factorize.tapAsync(
-				"DelegatedModuleFactoryPlugin",
+				PLUGIN_NAME,
 				(data, callback) => {
 					const [dependency] = data.dependencies;
 					const { request } = dependency;
@@ -90,25 +92,23 @@ class DelegatedModuleFactoryPlugin {
 				}
 			);
 		} else {
-			normalModuleFactory.hooks.module.tap(
-				"DelegatedModuleFactoryPlugin",
-				module => {
-					const request = module.libIdent(this.options);
-					if (request && request in this.options.content) {
-						const resolved = this.options.content[request];
-						return new DelegatedModule(
-							this.options.source,
-							resolved,
-							/** @type {DelegatedModuleType} */
-							(this.options.type),
-							request,
-							module
-						);
-					}
-					return module;
+			normalModuleFactory.hooks.module.tap(PLUGIN_NAME, module => {
+				const request = module.libIdent(this.options);
+				if (request && request in this.options.content) {
+					const resolved = this.options.content[request];
+					return new DelegatedModule(
+						this.options.source,
+						resolved,
+						/** @type {DelegatedModuleType} */
+						(this.options.type),
+						request,
+						module
+					);
 				}
-			);
+				return module;
+			});
 		}
 	}
 }
+
 module.exports = DelegatedModuleFactoryPlugin;

package/lib/Dependency.js

@@ -101,7 +101,10 @@ class Dependency {
 		/** @type {boolean} */
 		this.weak = false;
 		// TODO check if this can be moved into ModuleDependency
-		/** @type {boolean} */
+		/** @type {boolean | undefined} */
+		this.defer = false;
+		// TODO check if this can be moved into ModuleDependency
+		/** @type {boolean | undefined} */
 		this.optional = false;
 		this._locSL = 0;
 		this._locSC = 0;
@@ -309,6 +312,7 @@ class Dependency {
 		write(this._locEC);
 		write(this._locI);
 		write(this._locN);
+		write(this.defer);
 	}
 
 	/**
@@ -323,6 +327,7 @@ class Dependency {
 		this._locEC = read();
 		this._locI = read();
 		this._locN = read();
+		this.defer = read();
 	}
 }
 

package/lib/DependencyTemplate.js

@@ -62,6 +62,7 @@ class DependencyTemplate {
 	 */
 	apply(dependency, source, templateContext) {
 		const AbstractMethodError = require("./AbstractMethodError");
+
 		throw new AbstractMethodError();
 	}
 }

package/lib/DllEntryPlugin.js

@@ -10,8 +10,10 @@ const DllEntryDependency = require("./dependencies/DllEntryDependency");
 const EntryDependency = require("./dependencies/EntryDependency");
 
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./Entrypoint").EntryOptions} EntryOptions */
+
 /** @typedef {string[]} Entries */
-/** @typedef {{ name: string, filename: TODO }} Options */
+/** @typedef {EntryOptions & { name: string }} Options */
 
 const PLUGIN_NAME = "DllEntryPlugin";
 

package/lib/DllPlugin.js

@@ -16,7 +16,7 @@ const createSchemaValidation = require("./util/create-schema-validation");
 /** @typedef {import("./DllEntryPlugin").Options} Options */
 
 const validate = createSchemaValidation(
-	require("../schemas/plugins/DllPlugin.check.js"),
+	require("../schemas/plugins/DllPlugin.check"),
 	() => require("../schemas/plugins/DllPlugin.json"),
 	{
 		name: "Dll Plugin",
@@ -48,10 +48,11 @@ class DllPlugin {
 			if (typeof entry !== "function") {
 				for (const name of Object.keys(entry)) {
 					/** @type {Options} */
-					const options = { name, filename: entry.filename };
+					const options = { name };
 					new DllEntryPlugin(
 						context,
-						/** @type {Entries} */ (entry[name].import),
+						/** @type {Entries} */
+						(entry[name].import),
 						options
 					).apply(compiler);
 				}

package/lib/DllReferencePlugin.js

@@ -22,7 +22,7 @@ const makePathsRelative = require("./util/identifier").makePathsRelative;
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
 const validate = createSchemaValidation(
-	require("../schemas/plugins/DllReferencePlugin.check.js"),
+	require("../schemas/plugins/DllReferencePlugin.check"),
 	() => require("../schemas/plugins/DllReferencePlugin.json"),
 	{
 		name: "Dll Reference Plugin",
@@ -78,7 +78,7 @@ class DllReferencePlugin {
 						// or malformed manifest files don't kill the process.
 						try {
 							data.data = parseJson(
-								/** @type {Buffer} */ (result).toString("utf-8")
+								/** @type {Buffer} */ (result).toString("utf8")
 							);
 						} catch (parseErr) {
 							// Store the error in the params so that it can

package/lib/DynamicEntryPlugin.js

@@ -80,7 +80,7 @@ class DynamicEntryPlugin {
 					}
 					return Promise.all(promises);
 				})
-				.then(x => {})
+				.then(() => {})
 		);
 	}
 }

package/lib/EntryOptionPlugin.js

@@ -33,9 +33,11 @@ class EntryOptionPlugin {
 	static applyEntryOption(compiler, context, entry) {
 		if (typeof entry === "function") {
 			const DynamicEntryPlugin = require("./DynamicEntryPlugin");
+
 			new DynamicEntryPlugin(context, entry).apply(compiler);
 		} else {
 			const EntryPlugin = require("./EntryPlugin");
+
 			for (const name of Object.keys(entry)) {
 				const desc = entry[name];
 				const options = EntryOptionPlugin.entryDescriptionToOptions(
@@ -81,14 +83,17 @@ class EntryOptionPlugin {
 		}
 		if (desc.chunkLoading) {
 			const EnableChunkLoadingPlugin = require("./javascript/EnableChunkLoadingPlugin");
+
 			EnableChunkLoadingPlugin.checkEnabled(compiler, desc.chunkLoading);
 		}
 		if (desc.wasmLoading) {
 			const EnableWasmLoadingPlugin = require("./wasm/EnableWasmLoadingPlugin");
+
 			EnableWasmLoadingPlugin.checkEnabled(compiler, desc.wasmLoading);
 		}
 		if (desc.library) {
 			const EnableLibraryPlugin = require("./library/EnableLibraryPlugin");
+
 			EnableLibraryPlugin.checkEnabled(compiler, desc.library.type);
 		}
 		return options;

package/lib/ErrorHelpers.js

@@ -91,10 +91,10 @@ const cleanUpWebpackOptions = (stack, message) => {
 	return stack;
 };
 
+module.exports.cleanUp = cleanUp;
+module.exports.cleanUpWebpackOptions = cleanUpWebpackOptions;
 module.exports.cutOffByFlag = cutOffByFlag;
 module.exports.cutOffLoaderExecution = cutOffLoaderExecution;
-module.exports.cutOffWebpackOptions = cutOffWebpackOptions;
-module.exports.cutOffMultilineMessage = cutOffMultilineMessage;
 module.exports.cutOffMessage = cutOffMessage;
-module.exports.cleanUp = cleanUp;
-module.exports.cleanUpWebpackOptions = cleanUpWebpackOptions;
+module.exports.cutOffMultilineMessage = cutOffMultilineMessage;
+module.exports.cutOffWebpackOptions = cutOffWebpackOptions;

package/lib/EvalDevToolModulePlugin.js

@@ -95,9 +95,9 @@ class EvalDevToolModulePlugin {
 						`eval(${
 							compilation.outputOptions.trustedTypes
 								? `${RuntimeGlobals.createScript}(${JSON.stringify(
-										content + footer
+										`{${content + footer}\n}`
 									)})`
-								: JSON.stringify(content + footer)
+								: JSON.stringify(`{${content + footer}\n}`)
 						});`
 					);
 					cache.set(source, result);
@@ -119,7 +119,7 @@ class EvalDevToolModulePlugin {
 			if (compilation.outputOptions.trustedTypes) {
 				compilation.hooks.additionalModuleRuntimeRequirements.tap(
 					PLUGIN_NAME,
-					(module, set, context) => {
+					(module, set, _context) => {
 						set.add(RuntimeGlobals.createScript);
 					}
 				);

package/lib/EvalSourceMapDevToolPlugin.js

@@ -15,12 +15,12 @@ const ConcatenatedModule = require("./optimize/ConcatenatedModule");
 const generateDebugId = require("./util/generateDebugId");
 const { makePathsAbsolute } = require("./util/identifier");
 
+/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../declarations/WebpackOptions").DevTool} DevToolOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./NormalModule").SourceMap} SourceMap */
 
 /** @type {WeakMap<Source, Source>} */
 const cache = new WeakMap();
@@ -117,15 +117,15 @@ class EvalSourceMapDevToolPlugin {
 					const namespace = compilation.getPath(this.namespace, {
 						chunk
 					});
-					/** @type {SourceMap} */
+					/** @type {RawSourceMap} */
 					let sourceMap;
 					let content;
 					if (source.sourceAndMap) {
 						const sourceAndMap = source.sourceAndMap(options);
-						sourceMap = /** @type {SourceMap} */ (sourceAndMap.map);
+						sourceMap = /** @type {RawSourceMap} */ (sourceAndMap.map);
 						content = sourceAndMap.source;
 					} else {
-						sourceMap = /** @type {SourceMap} */ (source.map(options));
+						sourceMap = /** @type {RawSourceMap} */ (source.map(options));
 						content = source.source();
 					}
 					if (!sourceMap) {
@@ -191,16 +191,16 @@ class EvalSourceMapDevToolPlugin {
 							`eval(${
 								compilation.outputOptions.trustedTypes
 									? `${RuntimeGlobals.createScript}(${JSON.stringify(
-											content + footer
+											`{${content + footer}\n}`
 										)})`
-									: JSON.stringify(content + footer)
+									: JSON.stringify(`{${content + footer}\n}`)
 							});`
 						)
 					);
 				}
 			);
 			hooks.inlineInRuntimeBailout.tap(
-				"EvalDevToolModulePlugin",
+				PLUGIN_NAME,
 				() => "the eval-source-map devtool is used."
 			);
 			hooks.render.tap(