webpack 5.111.1 → 5.112.1

package/lib/{NormalModuleFactory.js → module/NormalModuleFactory.js}

@@ -13,37 +13,37 @@ const {
 	SyncHook,
 	SyncWaterfallHook
 } = require("tapable");
-const ChunkGraph = require("./ChunkGraph");
+const { ImportPhaseUtils } = require("../dependencies/core/ImportPhase");
+const { dirname, join, relative } = require("../fs/fs");
+const ChunkGraph = require("../graph/ChunkGraph");
+const ModuleGraph = require("../graph/ModuleGraph");
+const { getContext } = require("../loaders/LoaderRunner");
+const BasicEffectRulePlugin = require("../rules/BasicEffectRulePlugin");
+const BasicMatcherRulePlugin = require("../rules/BasicMatcherRulePlugin");
+const GlobMatcherRulePlugin = require("../rules/GlobMatcherRulePlugin");
+const ObjectMatcherRulePlugin = require("../rules/ObjectMatcherRulePlugin");
+const RuleSetCompiler = require("../rules/RuleSetCompiler");
+const UseEffectRulePlugin = require("../rules/UseEffectRulePlugin");
+const LazySet = require("../util/LazySet");
+const { getScheme } = require("../util/URLAbsoluteSpecifier");
+const asyncLib = require("../util/async");
+const { cachedCleverMerge, cachedSetProperty } = require("../util/cleverMerge");
+const {
+	ABSOLUTE_PATH_REGEXP,
+	WINDOWS_PATH_SEPARATOR_REGEXP,
+	escapeHashInPathRequest,
+	parseResource,
+	parseResourceWithoutFragment
+} = require("../util/identifier");
+const matchAlias = require("../util/matchAlias");
 const Module = require("./Module");
 const ModuleFactory = require("./ModuleFactory");
-const ModuleGraph = require("./ModuleGraph");
 const { JAVASCRIPT_MODULE_TYPE_AUTO } = require("./ModuleTypeConstants");
 const NormalModule = require("./NormalModule");
-const { ImportPhaseUtils } = require("./dependencies/ImportPhase");
-const { getContext } = require("./loaders/LoaderRunner");
-const BasicEffectRulePlugin = require("./rules/BasicEffectRulePlugin");
-const BasicMatcherRulePlugin = require("./rules/BasicMatcherRulePlugin");
-const GlobMatcherRulePlugin = require("./rules/GlobMatcherRulePlugin");
-const ObjectMatcherRulePlugin = require("./rules/ObjectMatcherRulePlugin");
-const RuleSetCompiler = require("./rules/RuleSetCompiler");
-const UseEffectRulePlugin = require("./rules/UseEffectRulePlugin");
-const LazySet = require("./util/LazySet");
-const { getScheme } = require("./util/URLAbsoluteSpecifier");
-const asyncLib = require("./util/async");
-const { cachedCleverMerge, cachedSetProperty } = require("./util/cleverMerge");
 const {
 	applyCaseCorrections,
 	findCaseMismatch
-} = require("./util/findCaseMismatch");
-const { dirname, join, relative } = require("./util/fs");
-const {
-	ABSOLUTE_PATH_REGEXP,
-	WINDOWS_PATH_SEPARATOR_REGEXP,
-	escapeHashInPathRequest,
-	parseResource,
-	parseResourceWithoutFragment
-} = require("./util/identifier");
-const matchAlias = require("./util/matchAlias");
+} = require("./findCaseMismatch");
 
 /** @typedef {import("enhanced-resolve").Resolver["options"]["alias"]} AliasOptions */
 /** @import { ResolveContext, ResolveRequest } from "enhanced-resolve" */
@@ -64,9 +64,9 @@ const matchAlias = require("./util/matchAlias");
  * 	CssModuleGeneratorOptions,
  * 	EmptyParserOptions as HtmlParserOptions,
  * 	HtmlGeneratorOptions
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions"
  */
-/** @import { FileSystemDependencies } from "./Compilation" */
+/** @import { FileSystemDependencies } from "../Compilation" */
 /** @import Generator from "./Generator" */
 /**
  * @import {
@@ -85,27 +85,27 @@ const matchAlias = require("./util/matchAlias");
  * } from "./NormalModule"
  */
 /** @import Parser from "./Parser" */
-/** @import ResolverFactory, { ResolverWithOptions } from "./ResolverFactory" */
-/** @import ModuleDependency from "./dependencies/ModuleDependency" */
+/** @import ResolverFactory, { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import ModuleDependency from "../dependencies/core/ModuleDependency" */
 /**
  * @import {
  * 	ImportPhaseType,
  * 	ImportPhaseName
- * } from "./dependencies/ImportPhase"
+ * } from "../dependencies/core/ImportPhase"
  */
 /**
  * @import JavascriptParser, {
  * 	ImportAttributes
- * } from "./javascript/JavascriptParser"
+ * } from "../javascript/JavascriptParser"
  */
-/** @import { RuleSetRules, RuleSet } from "./rules/RuleSetCompiler" */
-/** @import { InputFileSystem } from "./util/fs" */
-/** @import { AssociatedObjectForCache } from "./util/identifier" */
+/** @import { RuleSetRules, RuleSet } from "../rules/RuleSetCompiler" */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { AssociatedObjectForCache } from "../util/identifier" */
 
 /**
  * Defines the callback type used by this module.
  * @template T
- * @typedef {import("./Compiler").Callback<T>} Callback
+ * @typedef {import("../Compiler").Callback<T>} Callback
  */
 
 /** @typedef {Pick<RuleSetRule, "type" | "sideEffects" | "parser" | "generator" | "resolve" | "layer" | "extractSourceMap">} ModuleSettings */
@@ -473,12 +473,11 @@ const mergeGlobalOptions = (globalOptions, type, localOptions) => {
 	return cachedCleverMerge(result, localOptions);
 };
 
-// TODO webpack 6 remove
+// TODO in the next major release: remove
 /**
  * Deprecation changed hook message.
- * @template {import("tapable").Hook<EXPECTED_ANY, EXPECTED_ANY>} T
  * @param {string} name name
- * @param {T} hook hook
+ * @param {{ taps: import("tapable").FullTap[] }} hook hook
  * @returns {string} result
  */
 const deprecationChangedHookMessage = (name, hook) => {
@@ -534,26 +533,26 @@ const ruleSetCompiler = new RuleSetCompiler([
 	new UseEffectRulePlugin()
 ]);
 
-/** @import JavascriptGenerator from "./javascript/JavascriptGenerator" */
+/** @import JavascriptGenerator from "../javascript/JavascriptGenerator" */
 
-/** @import JsonParser from "./json/JsonParser" */
-/** @import JsonGenerator from "./json/JsonGenerator" */
+/** @import JsonParser from "../json/JsonParser" */
+/** @import JsonGenerator from "../json/JsonGenerator" */
 
-/** @import AssetParser from "./asset/AssetParser" */
-/** @import AssetSourceParser from "./asset/AssetSourceParser" */
-/** @import AssetBytesParser from "./asset/AssetBytesParser" */
-/** @import AssetGenerator from "./asset/AssetGenerator" */
-/** @import AssetSourceGenerator from "./asset/AssetSourceGenerator" */
-/** @import AssetBytesGenerator from "./asset/AssetBytesGenerator" */
+/** @import AssetParser from "../asset/AssetParser" */
+/** @import AssetSourceParser from "../asset/AssetSourceParser" */
+/** @import AssetBytesParser from "../asset/AssetBytesParser" */
+/** @import AssetGenerator from "../asset/AssetGenerator" */
+/** @import AssetSourceGenerator from "../asset/AssetSourceGenerator" */
+/** @import AssetBytesGenerator from "../asset/AssetBytesGenerator" */
 
-/** @import AsyncWebAssemblyParser from "./wasm-async/AsyncWebAssemblyParser" */
-/** @import WebAssemblyParser from "./wasm-sync/WebAssemblyParser" */
+/** @import AsyncWebAssemblyParser from "../wasm/AsyncWebAssemblyParser" */
+/** @import WebAssemblyParser from "../wasm-sync/WebAssemblyParser" */
 
-/** @import CssParser from "./css/CssParser" */
-/** @import CssGenerator from "./css/CssGenerator" */
+/** @import CssParser from "../css/CssParser" */
+/** @import CssGenerator from "../css/CssGenerator" */
 
-/** @import HtmlParser from "./html/HtmlParser" */
-/** @import HtmlGenerator from "./html/HtmlGenerator" */
+/** @import HtmlParser from "../html/HtmlParser" */
+/** @import HtmlGenerator from "../html/HtmlGenerator" */
 
 /* eslint-disable jsdoc/type-formatting */
 /**
@@ -580,26 +579,28 @@ const ruleSetCompiler = new RuleSetCompiler([
  */
 /* eslint-enable jsdoc/type-formatting */
 
+/** @typedef {[string, Parser<never>, ParserOptions, Generator<never>, GeneratorOptions]} ParserAndGeneratorTuple */
+
 /**
  * Defines the extract tuple elements type used by this module.
- * @template {unknown[]} T
+ * @template {ParserAndGeneratorTuple} T
  * @template {number[]} I
  * @typedef {{ [K in keyof I]: K extends keyof I ? I[K] extends keyof T ? T[I[K]] : never : never }} ExtractTupleElements
  */
 
 /**
  * Represents the normal module factory runtime component.
- * @template {unknown[]} T
+ * @template {ParserAndGeneratorTuple[]} T
  * @template {number[]} A
  * @template [R=void]
- * @typedef {T extends [infer Head extends [string, ...unknown[]], ...infer Tail extends [string, ...unknown[]][]] ? Record<Head[0], SyncBailHook<ExtractTupleElements<Head, A>, R extends number ? Head[R] : R>> & RecordFactoryFromTuple<Tail, A, R> : unknown } RecordFactoryFromTuple
+ * @typedef {T extends [infer Head extends ParserAndGeneratorTuple] ? Record<Head[0], SyncBailHook<ExtractTupleElements<Head, A>, R extends number ? Head[R] : R>> : T extends [infer Head extends ParserAndGeneratorTuple, ...infer Tail extends ParserAndGeneratorTuple[]] ? Record<Head[0], SyncBailHook<ExtractTupleElements<Head, A>, R extends number ? Head[R] : R>> & RecordFactoryFromTuple<Tail, A, R> : never } RecordFactoryFromTuple
  */
 
 /**
  * Maps each tuple in `T` to a record from its `[0]` key to its `[I]` value.
- * @template {unknown[]} T
+ * @template {ParserAndGeneratorTuple[]} T
  * @template {number} I
- * @typedef {T extends [infer Head extends [string, ...unknown[]], ...infer Tail extends [string, ...unknown[]][]] ? Record<Head[0], I extends keyof Head ? Head[I] : never> & TupleToTypeMap<Tail, I> : unknown } TupleToTypeMap
+ * @typedef {T extends [infer Head extends ParserAndGeneratorTuple] ? Record<Head[0], I extends keyof Head ? Head[I] : never> : T extends [infer Head extends ParserAndGeneratorTuple, ...infer Tail extends ParserAndGeneratorTuple[]] ? Record<Head[0], I extends keyof Head ? Head[I] : never> & TupleToTypeMap<Tail, I> : never } TupleToTypeMap
  */
 
 /** @typedef {TupleToTypeMap<ParsersAndGeneratorsByTypes, 1>} ParserByType */
@@ -704,7 +705,7 @@ class NormalModuleFactory extends ModuleFactory {
 		/** @type {Map<string, LoaderResolveCacheEntry>} */
 		this._loaderResolveCache = new Map();
 
-		/** @type {(resource: string) => import("./util/identifier").ParsedResource} */
+		/** @type {(resource: string) => import("../util/identifier").ParsedResource} */
 		const cacheParseResource = parseResource.bindCache(
 			associatedObjectForCache
 		);
@@ -764,7 +765,7 @@ class NormalModuleFactory extends ModuleFactory {
 										return callback(new Error("Empty dependency (no request)"));
 									}
 
-									// TODO webpack 6 make it required and move javascript/wasm/asset properties to own module
+									// TODO in the next major release: make it required and move javascript/wasm/asset properties to own module
 									createdModule = this.hooks.createModuleClass
 										.for(createData.settings.type)
 										.call(createData, resolveData);
@@ -1605,12 +1606,8 @@ ${difference}`);
 				);
 				this.fs.readdir(directory, (err, entries) => {
 					if (!err && entries) {
-						return suggest(
-							prefix,
-							requestedName,
-							/** @type {string[]} */ (entries),
-							false,
-							() => next(index + 1)
+						return suggest(prefix, requestedName, entries, false, () =>
+							next(index + 1)
 						);
 					}
 					// The directory is missing, so only a directory the request spells
@@ -1625,12 +1622,8 @@ ${difference}`);
 						if (fixedPrefix === undefined) return next(index + 1);
 						this.fs.readdir(mismatch.path, (realError, realEntries) => {
 							if (realError || !realEntries) return next(index + 1);
-							suggest(
-								fixedPrefix,
-								requestedName,
-								/** @type {string[]} */ (realEntries),
-								true,
-								() => next(index + 1)
+							suggest(fixedPrefix, requestedName, realEntries, true, () =>
+								next(index + 1)
 							);
 						});
 					});

package/lib/module/NullFactory.js

@@ -0,0 +1,29 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const ModuleFactory = require("./ModuleFactory");
+
+/**
+ * @import {
+ * 	ModuleFactoryCallback,
+ * 	ModuleFactoryCreateData
+ * } from "./ModuleFactory"
+ */
+
+class NullFactory extends ModuleFactory {
+	/**
+	 * Processes the provided data.
+	 * @param {ModuleFactoryCreateData} data data object
+	 * @param {ModuleFactoryCallback} callback callback
+	 * @returns {void}
+	 */
+	create(data, callback) {
+		return callback();
+	}
+}
+
+module.exports = NullFactory;

package/lib/{Parser.js → module/Parser.js}

@@ -8,25 +8,32 @@
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Compilation from "./Compilation" */
+/** @import Compilation from "../Compilation" */
 /** @import NormalModule from "./NormalModule" */
 
 /** @typedef {Record<string, EXPECTED_ANY>} PreparsedAst */
 
 /**
  * Defines the parser state base type used by this module.
+ * @template {NormalModule} [TModule=NormalModule]
  * @typedef {object} ParserStateBase
  * @property {string | Buffer} source
  * @property {NormalModule} current
- * @property {NormalModule} module
+ * @property {TModule} module the module being parsed
  * @property {Compilation} compilation
  * @property {WebpackOptions} options
  */
 
-/** @typedef {ParserStateBase & Record<string, EXPECTED_ANY>} ParserState */
+/**
+ * @template {NormalModule} [TModule=NormalModule]
+ * @typedef {ParserStateBase<TModule> & Record<string, EXPECTED_ANY>} ParserState
+ */
 
+/**
+ * @template {NormalModule} [TModule=NormalModule] the module class this parser parses
+ */
 class Parser {
 	/* istanbul ignore next */
 	/**
@@ -37,7 +44,7 @@ class Parser {
 	 * @returns {ParserState} the parser state
 	 */
 	parse(source, state) {
-		const AbstractMethodError = require("./errors/AbstractMethodError");
+		const AbstractMethodError = require("../errors/AbstractMethodError");
 
 		throw new AbstractMethodError();
 	}

package/lib/module/RawModule.js

@@ -0,0 +1,208 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const { OriginalSource, RawSource } = require("webpack-sources");
+const makeSerializable = require("../util/makeSerializable");
+const Module = require("./Module");
+const {
+	JAVASCRIPT_TYPE,
+	JAVASCRIPT_TYPES
+} = require("./ModuleSourceTypeConstants");
+const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
+
+/**
+ * @import {
+ * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
+ * } from "../config/defaults"
+ */
+/** @import Compilation from "../Compilation" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
+/**
+ * @import {
+ * 	BuildCallback,
+ * 	CodeGenerationContext,
+ * 	CodeGenerationResult,
+ * 	NeedBuildCallback,
+ * 	NeedBuildContext,
+ * 	ReadOnlyRuntimeRequirements,
+ * 	Sources,
+ * 	SourceTypes
+ * } from "./Module"
+ */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../graph/ModuleGraphConnection" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, string, ReadOnlyRuntimeRequirements | null]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string, string, ReadOnlyRuntimeRequirements | null]>} ObjectSerializerContext */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../fs/fs" */
+
+class RawModule extends Module {
+	/**
+	 * Creates an instance of RawModule.
+	 * @param {string} source source code
+	 * @param {string} identifier unique identifier
+	 * @param {string=} readableIdentifier readable identifier
+	 * @param {ReadOnlyRuntimeRequirements=} runtimeRequirements runtime requirements needed for the source code
+	 */
+	constructor(source, identifier, readableIdentifier, runtimeRequirements) {
+		super(JAVASCRIPT_MODULE_TYPE_DYNAMIC, null);
+		/** @type {string} */
+		this.sourceStr = source;
+		/** @type {string} */
+		this.identifierStr = identifier || this.sourceStr;
+		/** @type {string} */
+		this.readableIdentifierStr = readableIdentifier || this.identifierStr;
+		/** @type {ReadOnlyRuntimeRequirements | null} */
+		this.runtimeRequirements = runtimeRequirements || null;
+	}
+
+	/**
+	 * Returns the source types this module can generate.
+	 * @returns {SourceTypes} types available (do not mutate)
+	 */
+	getSourceTypes() {
+		return JAVASCRIPT_TYPES;
+	}
+
+	/**
+	 * Returns the unique identifier used to reference this module.
+	 * @returns {string} a unique identifier of the module
+	 */
+	identifier() {
+		return this.identifierStr;
+	}
+
+	/**
+	 * Returns the estimated size for the requested source type.
+	 * @param {string=} type the source type for which the size should be estimated
+	 * @returns {number} the estimated size of the module (must be non-zero)
+	 */
+	size(type) {
+		return Math.max(1, this.sourceStr.length);
+	}
+
+	/**
+	 * Returns a human-readable identifier for this module.
+	 * @param {RequestShortener} requestShortener the request shortener
+	 * @returns {string} a user readable identifier of the module
+	 */
+	readableIdentifier(requestShortener) {
+		return /** @type {string} */ (
+			requestShortener.shorten(this.readableIdentifierStr)
+		);
+	}
+
+	/**
+	 * Checks whether the module needs to be rebuilt for the current build state.
+	 * @param {NeedBuildContext} context context info
+	 * @param {NeedBuildCallback} callback callback function, returns true, if the module needs a rebuild
+	 * @returns {void}
+	 */
+	needBuild(context, callback) {
+		return callback(null, !this.buildMeta);
+	}
+
+	/**
+	 * Builds the module using the provided compilation context.
+	 * @param {WebpackOptions} options webpack options
+	 * @param {Compilation} compilation the compilation
+	 * @param {ResolverWithOptions} resolver the resolver
+	 * @param {InputFileSystem} fs the file system
+	 * @param {BuildCallback} callback callback function
+	 * @returns {void}
+	 */
+	build(options, compilation, resolver, fs, callback) {
+		this.buildMeta = {};
+		this.buildInfo = {
+			cacheable: true
+		};
+		callback();
+	}
+
+	/**
+	 * Gets side effects connection state.
+	 * @param {ModuleGraph} moduleGraph the module graph
+	 * @returns {ConnectionState} how this module should be connected to referencing modules when consumed for side-effects only
+	 */
+	getSideEffectsConnectionState(moduleGraph) {
+		if (this.factoryMeta !== undefined) {
+			if (this.factoryMeta.sideEffectFree) return false;
+			if (this.factoryMeta.sideEffectFree === false) return true;
+		}
+		return true;
+	}
+
+	/**
+	 * Generates code and runtime requirements for this module.
+	 * @param {CodeGenerationContext} context context for code generation
+	 * @returns {CodeGenerationResult} result
+	 */
+	codeGeneration(context) {
+		/** @type {Sources} */
+		const sources = new Map();
+		if (this.useSourceMap || this.useSimpleSourceMap) {
+			sources.set(
+				JAVASCRIPT_TYPE,
+				new OriginalSource(this.sourceStr, this.identifier())
+			);
+		} else {
+			sources.set(JAVASCRIPT_TYPE, new RawSource(this.sourceStr));
+		}
+		return { sources, runtimeRequirements: this.runtimeRequirements };
+	}
+
+	/**
+	 * Updates the hash with the data contributed by this instance.
+	 * @param {Hash} hash the hash used to track dependencies
+	 * @param {UpdateHashContext} context context
+	 * @returns {void}
+	 */
+	updateHash(hash, context) {
+		hash.update(this.sourceStr);
+		super.updateHash(hash, context);
+	}
+
+	/**
+	 * Serializes this instance into the provided serializer context.
+	 * @param {ObjectSerializerContext} context context
+	 */
+	serialize(context) {
+		context
+			.write(this.sourceStr)
+			.write(this.identifierStr)
+			.write(this.readableIdentifierStr)
+			.write(this.runtimeRequirements);
+
+		super.serialize(context);
+	}
+
+	/**
+	 * Restores this instance from the provided deserializer context.
+	 * @param {ObjectDeserializerContext} context context
+	 */
+	deserialize(context) {
+		this.sourceStr = context.read();
+		const c1 = context.rest;
+		this.identifierStr = c1.read();
+		const c2 = c1.rest;
+		this.readableIdentifierStr = c2.read();
+		const c3 = c2.rest;
+		this.runtimeRequirements = c3.read();
+
+		super.deserialize(c3.rest);
+	}
+}
+
+makeSerializable(RawModule, [
+	"webpack/lib/module/RawModule",
+	// TODO in the next major release: remove, they restore pre-move cache packs
+	"webpack/lib/RawModule"
+]);
+
+module.exports = RawModule;

package/lib/{SelfModuleFactory.js → module/SelfModuleFactory.js}

@@ -11,7 +11,7 @@
  * 	ModuleFactoryCreateData
  * } from "./ModuleFactory"
  */
-/** @import ModuleGraph from "./ModuleGraph" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 class SelfModuleFactory {
 	/**