webpack 5.105.4 → 5.106.0

package/lib/DllPlugin.js

@@ -8,22 +8,12 @@
 const DllEntryPlugin = require("./DllEntryPlugin");
 const FlagAllModulesAsUsedPlugin = require("./FlagAllModulesAsUsedPlugin");
 const LibManifestPlugin = require("./LibManifestPlugin");
-const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/DllPlugin").DllPluginOptions} DllPluginOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./DllEntryPlugin").Entries} Entries */
 /** @typedef {import("./DllEntryPlugin").Options} Options */
 
-const validate = createSchemaValidation(
-	require("../schemas/plugins/DllPlugin.check"),
-	() => require("../schemas/plugins/DllPlugin.json"),
-	{
-		name: "Dll Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const PLUGIN_NAME = "DllPlugin";
 
 class DllPlugin {
@@ -31,11 +21,8 @@ class DllPlugin {
 	 * @param {DllPluginOptions} options options object
 	 */
 	constructor(options) {
-		validate(options);
-		this.options = {
-			...options,
-			entryOnly: options.entryOnly !== false
-		};
+		/** @type {DllPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -44,6 +31,19 @@ class DllPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../schemas/plugins/DllPlugin.json"),
+				this.options,
+				{
+					name: "Dll Plugin",
+					baseDataPath: "options"
+				},
+				(options) => require("../schemas/plugins/DllPlugin.check")(options)
+			);
+		});
+
+		const entryOnly = this.options.entryOnly !== false;
 		compiler.hooks.entryOption.tap(PLUGIN_NAME, (context, entry) => {
 			if (typeof entry !== "function") {
 				for (const name of Object.keys(entry)) {
@@ -63,8 +63,8 @@ class DllPlugin {
 			}
 			return true;
 		});
-		new LibManifestPlugin(this.options).apply(compiler);
-		if (!this.options.entryOnly) {
+		new LibManifestPlugin({ ...this.options, entryOnly }).apply(compiler);
+		if (!entryOnly) {
 			new FlagAllModulesAsUsedPlugin(PLUGIN_NAME).apply(compiler);
 		}
 	}

package/lib/DllReferencePlugin.js

@@ -10,7 +10,6 @@ const DelegatedModuleFactoryPlugin = require("./DelegatedModuleFactoryPlugin");
 const ExternalModuleFactoryPlugin = require("./ExternalModuleFactoryPlugin");
 const WebpackError = require("./WebpackError");
 const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
-const createSchemaValidation = require("./util/create-schema-validation");
 const makePathsRelative = require("./util/identifier").makePathsRelative;
 
 /** @typedef {import("../declarations/WebpackOptions").Externals} Externals */
@@ -21,15 +20,6 @@ const makePathsRelative = require("./util/identifier").makePathsRelative;
 /** @typedef {import("./Compiler").CompilationParams} CompilationParams */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
-const validate = createSchemaValidation(
-	require("../schemas/plugins/DllReferencePlugin.check"),
-	() => require("../schemas/plugins/DllReferencePlugin.json"),
-	{
-		name: "Dll Reference Plugin",
-		baseDataPath: "options"
-	}
-);
-
 /** @typedef {{ path: string, data: DllReferencePluginOptionsManifest | undefined, error: Error | undefined }} CompilationDataItem */
 
 const PLUGIN_NAME = "DllReferencePlugin";
@@ -39,10 +29,7 @@ class DllReferencePlugin {
 	 * @param {DllReferencePluginOptions} options options object
 	 */
 	constructor(options) {
-		validate(options);
 		this.options = options;
-		/** @type {WeakMap<CompilationParams, CompilationDataItem>} */
-		this._compilationData = new WeakMap();
 	}
 
 	/**
@@ -51,6 +38,18 @@ class DllReferencePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../schemas/plugins/DllReferencePlugin.json"),
+				this.options,
+				{
+					name: "Dll Reference Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../schemas/plugins/DllReferencePlugin.check")(options)
+			);
+		});
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
@@ -61,6 +60,9 @@ class DllReferencePlugin {
 			}
 		);
 
+		/** @type {WeakMap<CompilationParams, CompilationDataItem>} */
+		const compilationData = new WeakMap();
+
 		compiler.hooks.beforeCompile.tapAsync(PLUGIN_NAME, (params, callback) => {
 			if ("manifest" in this.options) {
 				const manifest = this.options.manifest;
@@ -93,7 +95,7 @@ class DllReferencePlugin {
 								/** @type {Error} */ (parseErr).message
 							);
 						}
-						this._compilationData.set(params, data);
+						compilationData.set(params, data);
 						return callback();
 					});
 					return;
@@ -114,7 +116,7 @@ class DllReferencePlugin {
 				if (typeof manifestParameter === "string") {
 					const data =
 						/** @type {CompilationDataItem} */
-						(this._compilationData.get(params));
+						(compilationData.get(params));
 					// If there was an error parsing the manifest
 					// file, exit now because the error will be added
 					// as a compilation error in the "compilation" hook.
@@ -156,9 +158,9 @@ class DllReferencePlugin {
 			if ("manifest" in this.options) {
 				const manifest = this.options.manifest;
 				if (typeof manifest === "string") {
-					const data = /** @type {CompilationDataItem} */ (
-						this._compilationData.get(params)
-					);
+					const data =
+						/** @type {CompilationDataItem} */
+						(compilationData.get(params));
 					// If there was an error parsing the manifest file, add the
 					// error as a compilation error to make the compilation fail.
 					if (data.error) {

package/lib/DotenvPlugin.js

@@ -6,7 +6,6 @@
 "use strict";
 
 const FileSystemInfo = require("./FileSystemInfo");
-const createSchemaValidation = require("./util/create-schema-validation");
 const { join } = require("./util/fs");
 
 /** @typedef {import("../declarations/WebpackOptions").DotenvPluginOptions} DotenvPluginOptions */
@@ -18,11 +17,12 @@ const { join } = require("./util/fs");
 /** @typedef {Exclude<DotenvPluginOptions["prefix"], string | undefined>} Prefix */
 /** @typedef {Record<string, string>} Env */
 
-/** @type {DotenvPluginOptions} */
-const DEFAULT_OPTIONS = {
-	prefix: "WEBPACK_",
-	template: [".env", ".env.local", ".env.[mode]", ".env.[mode].local"]
-};
+const DEFAULT_TEMPLATE = [
+	".env",
+	".env.local",
+	".env.[mode]",
+	".env.[mode].local"
+];
 
 // Regex for parsing .env files
 // ported from https://github.com/motdotla/dotenv/blob/master/lib/main.js#L49
@@ -31,22 +31,6 @@ const LINE =
 
 const PLUGIN_NAME = "DotenvPlugin";
 
-const validate = createSchemaValidation(
-	undefined,
-	() => {
-		const { definitions } = require("../schemas/WebpackOptions.json");
-
-		return {
-			definitions,
-			oneOf: [{ $ref: "#/definitions/DotenvPluginOptions" }]
-		};
-	},
-	{
-		name: "Dotenv Plugin",
-		baseDataPath: "options"
-	}
-);
-
 /**
  * Parse .env file content
  * ported from https://github.com/motdotla/dotenv/blob/master/lib/main.js#L49
@@ -233,8 +217,8 @@ class DotenvPlugin {
 	 * @param {DotenvPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
-		validate(options);
-		this.options = { ...DEFAULT_OPTIONS, ...options };
+		/** @type {DotenvPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -242,6 +226,23 @@ class DotenvPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => {
+					const { definitions } = require("../schemas/WebpackOptions.json");
+
+					return {
+						definitions,
+						oneOf: [{ $ref: "#/definitions/DotenvPluginOptions" }]
+					};
+				},
+				this.options,
+				{
+					name: "Dotenv Plugin",
+					baseDataPath: "options"
+				}
+			);
+		});
 		const definePlugin = new compiler.webpack.DefinePlugin({});
 		const prefixes = Array.isArray(this.options.prefix)
 			? this.options.prefix
@@ -258,7 +259,9 @@ class DotenvPlugin {
 		let snapshot;
 
 		const cache = compiler.getCache(PLUGIN_NAME);
-		const identifier = JSON.stringify(this.options.template);
+		const identifier = JSON.stringify(
+			this.options.template || DEFAULT_TEMPLATE
+		);
 		const itemCache = cache.getItemCache(identifier, null);
 
 		compiler.hooks.beforeCompile.tapPromise(PLUGIN_NAME, async () => {
@@ -295,8 +298,7 @@ class DotenvPlugin {
 			return [];
 		}
 
-		const { template } = /** @type {DotenvPluginOptions} */ (this.options);
-		const templates = template || [];
+		const templates = this.options.template || DEFAULT_TEMPLATE;
 
 		return templates
 			.map((pattern) => pattern.replace(/\[mode\]/g, mode || "development"))

package/lib/ExternalModule.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const { SyncBailHook } = require("tapable");
 const { OriginalSource, RawSource } = require("webpack-sources");
 const ConcatenationScope = require("./ConcatenationScope");
 const EnvironmentNotSupportAsyncWarning = require("./EnvironmentNotSupportAsyncWarning");
@@ -25,7 +26,7 @@ const StaticExportsDependency = require("./dependencies/StaticExportsDependency"
 const createHash = require("./util/createHash");
 const extractUrlAndGlobal = require("./util/extractUrlAndGlobal");
 const makeSerializable = require("./util/makeSerializable");
-const propertyAccess = require("./util/propertyAccess");
+const { propertyAccess } = require("./util/property");
 const { register } = require("./util/serialization");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -629,6 +630,14 @@ const getSourceForDefaultCase = (optional, request, runtimeTemplate) => {
 /** @typedef {Record<string, string | string[]>} RequestRecord */
 /** @typedef {string | string[] | RequestRecord} ExternalModuleRequest */
 
+/**
+ * @typedef {object} ExternalModuleHooks
+ * @property {SyncBailHook<[Chunk, Compilation], boolean>} chunkCondition
+ */
+
+/** @type {WeakMap<Compilation, ExternalModuleHooks>} */
+const compilationHooksMap = new WeakMap();
+
 class ExternalModule extends Module {
 	/**
 	 * @param {ExternalModuleRequest} request request
@@ -650,6 +659,21 @@ class ExternalModule extends Module {
 		this.dependencyMeta = dependencyMeta;
 	}
 
+	/**
+	 * @param {Compilation} compilation the compilation
+	 * @returns {ExternalModuleHooks} the attached hooks
+	 */
+	static getCompilationHooks(compilation) {
+		let hooks = compilationHooksMap.get(compilation);
+		if (hooks === undefined) {
+			hooks = {
+				chunkCondition: new SyncBailHook(["chunk", "compilation"])
+			};
+			compilationHooksMap.set(compilation, hooks);
+		}
+		return hooks;
+	}
+
 	/**
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
@@ -679,12 +703,21 @@ class ExternalModule extends Module {
 	/**
 	 * @param {Chunk} chunk the chunk which condition should be checked
 	 * @param {Compilation} compilation the compilation
-	 * @returns {boolean} true, if the chunk is ok for the module
+	 * @returns {boolean} true if the module can be placed in the chunk
 	 */
-	chunkCondition(chunk, { chunkGraph }) {
-		return this.externalType === "css-import"
-			? true
-			: chunkGraph.getNumberOfEntryModules(chunk) > 0;
+	chunkCondition(chunk, compilation) {
+		const { chunkCondition } = ExternalModule.getCompilationHooks(compilation);
+		const condition = chunkCondition.call(chunk, compilation);
+		if (condition !== undefined) return condition;
+
+		const type = this._resolveExternalType(this.externalType);
+
+		// For `import()` externals, keep them in the initial chunk to avoid loading
+		// them asynchronously twice and to improve runtime performance.
+		if (["css-import", "module"].includes(type)) {
+			return true;
+		}
+		return compilation.chunkGraph.getNumberOfEntryModules(chunk) > 0;
 	}
 
 	/**

package/lib/FileSystemInfo.js

@@ -1805,7 +1805,9 @@ class FileSystemInfo {
 						break;
 					}
 					case RBDT_RESOLVE_DIRECTORY: {
-						resolveDirectory(RBDT_RESOLVE_INITIAL ? path.slice(0, -1) : path);
+						resolveDirectory(
+							type === RBDT_RESOLVE_INITIAL ? path.slice(0, -1) : path
+						);
 						break;
 					}
 					case RBDT_RESOLVE_CJS_FILE: {

package/lib/IgnorePlugin.js

@@ -7,22 +7,12 @@
 
 const RawModule = require("./RawModule");
 const EntryDependency = require("./dependencies/EntryDependency");
-const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/IgnorePlugin").IgnorePluginOptions} IgnorePluginOptions */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */
 /** @typedef {import("./ContextModuleFactory").BeforeContextResolveData} BeforeContextResolveData */
 
-const validate = createSchemaValidation(
-	require("../schemas/plugins/IgnorePlugin.check"),
-	() => require("../schemas/plugins/IgnorePlugin.json"),
-	{
-		name: "Ignore Plugin",
-		baseDataPath: "options"
-	}
-);
-
 /** @typedef {(resource: string, context: string) => boolean} CheckResourceFn */
 
 const PLUGIN_NAME = "IgnorePlugin";
@@ -32,7 +22,6 @@ class IgnorePlugin {
 	 * @param {IgnorePluginOptions} options IgnorePlugin options
 	 */
 	constructor(options) {
-		validate(options);
 		this.options = options;
 		this.checkIgnore = this.checkIgnore.bind(this);
 	}
@@ -74,6 +63,18 @@ class IgnorePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				require("../schemas/plugins/IgnorePlugin.json"),
+				this.options,
+				{
+					name: "Ignore Plugin",
+					baseDataPath: "options"
+				},
+				(options) => require("../schemas/plugins/IgnorePlugin.check")(options)
+			);
+		});
+
 		compiler.hooks.normalModuleFactory.tap(PLUGIN_NAME, (nmf) => {
 			nmf.hooks.beforeResolve.tap(PLUGIN_NAME, (resolveData) => {
 				const result = this.checkIgnore(resolveData);

package/lib/LoaderOptionsPlugin.js

@@ -7,7 +7,6 @@
 
 const ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 const NormalModule = require("./NormalModule");
-const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("../declarations/plugins/LoaderOptionsPlugin").LoaderOptionsPluginOptions} LoaderOptionsPluginOptions */
 /** @typedef {import("./Compiler")} Compiler */
@@ -18,15 +17,6 @@ const createSchemaValidation = require("./util/create-schema-validation");
  * @typedef {import("../declarations/LoaderContext").LoaderContext<T>} LoaderContext
  */
 
-const validate = createSchemaValidation(
-	require("../schemas/plugins/LoaderOptionsPlugin.check"),
-	() => require("../schemas/plugins/LoaderOptionsPlugin.json"),
-	{
-		name: "Loader Options Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const PLUGIN_NAME = "LoaderOptionsPlugin";
 
 class LoaderOptionsPlugin {
@@ -34,12 +24,12 @@ class LoaderOptionsPlugin {
 	 * @param {LoaderOptionsPluginOptions & MatchObject} options options object
 	 */
 	constructor(options = {}) {
-		validate(options);
 		// If no options are set then generate empty options object
 		if (typeof options !== "object") options = {};
 		if (!options.test) {
 			options.test = () => true;
 		}
+		/** @type {LoaderOptionsPluginOptions & MatchObject} */
 		this.options = options;
 	}
 
@@ -49,7 +39,19 @@ class LoaderOptionsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const options = this.options;
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../schemas/plugins/LoaderOptionsPlugin.json"),
+				this.options,
+				{
+					name: "Loader Options Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../schemas/plugins/LoaderOptionsPlugin.check")(options)
+			);
+		});
+
 		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			NormalModule.getCompilationHooks(compilation).loader.tap(
 				PLUGIN_NAME,
@@ -59,17 +61,17 @@ class LoaderOptionsPlugin {
 					const i = resource.indexOf("?");
 					if (
 						ModuleFilenameHelpers.matchObject(
-							options,
+							this.options,
 							i < 0 ? resource : resource.slice(0, i)
 						)
 					) {
-						for (const key of Object.keys(options)) {
+						for (const key of Object.keys(this.options)) {
 							if (key === "include" || key === "exclude" || key === "test") {
 								continue;
 							}
 
 							/** @type {LoaderContext<EXPECTED_ANY> & Record<string, EXPECTED_ANY>} */
-							(context)[key] = options[key];
+							(context)[key] = this.options[key];
 						}
 					}
 				}

package/lib/ManifestPlugin.js

@@ -8,7 +8,6 @@
 const { RawSource } = require("webpack-sources");
 const Compilation = require("./Compilation");
 const HotUpdateChunk = require("./HotUpdateChunk");
-const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Chunk")} Chunk */
@@ -28,15 +27,6 @@ const createSchemaValidation = require("./util/create-schema-validation");
 
 const PLUGIN_NAME = "ManifestPlugin";
 
-const validate = createSchemaValidation(
-	require("../schemas/plugins/ManifestPlugin.check"),
-	() => require("../schemas/plugins/ManifestPlugin.json"),
-	{
-		name: "ManifestPlugin",
-		baseDataPath: "options"
-	}
-);
-
 /**
  * @param {string} filename filename
  * @returns {string} extname
@@ -51,21 +41,16 @@ const extname = (filename) => {
 		: last;
 };
 
+const DEFAULT_PREFIX = "[publicpath]";
+const DEFAULT_FILENAME = "manifest.json";
+
 class ManifestPlugin {
 	/**
 	 * @param {ManifestPluginOptions} options options
 	 */
-	constructor(options) {
-		validate(options);
-
-		/** @type {ManifestPluginOptions & Required<Omit<ManifestPluginOptions, "filter" | "generate">>} */
-		this.options = {
-			filename: "manifest.json",
-			prefix: "[publicpath]",
-			entrypoints: true,
-			serialize: (manifest) => JSON.stringify(manifest, null, 2),
-			...options
-		};
+	constructor(options = {}) {
+		/** @type {ManifestPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -74,6 +59,23 @@ class ManifestPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../schemas/plugins/ManifestPlugin.json"),
+				this.options,
+				{
+					name: "ManifestPlugin",
+					baseDataPath: "options"
+				},
+				(options) => require("../schemas/plugins/ManifestPlugin.check")(options)
+			);
+		});
+
+		const entrypoints = this.options.entrypoints || true;
+		const serialize =
+			this.options.serialize ||
+			((manifest) => JSON.stringify(manifest, null, 2));
+
 		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.processAssets.tap(
 				{
@@ -122,7 +124,7 @@ class ManifestPlugin {
 					/** @type {ManifestObject} */
 					let manifest = {};
 
-					if (this.options.entrypoints) {
+					if (entrypoints) {
 						/** @type {ManifestObject["entrypoints"]} */
 						const entrypoints = {};
 
@@ -178,7 +180,7 @@ class ManifestPlugin {
 							// Fallback for unofficial plugins, just remove hash from filename
 							removeHash(file, asset.info);
 
-						const prefix = this.options.prefix.replace(
+						const prefix = (this.options.prefix || DEFAULT_PREFIX).replace(
 							/\[publicpath\]/gi,
 							() => (publicPath === "auto" ? "/" : publicPath)
 						);
@@ -229,8 +231,8 @@ class ManifestPlugin {
 					}
 
 					compilation.emitAsset(
-						this.options.filename,
-						new RawSource(this.options.serialize(manifest)),
+						this.options.filename || DEFAULT_FILENAME,
+						new RawSource(serialize(manifest)),
 						{ manifest: true }
 					);
 				}