webpack 5.105.4 → 5.106.0

package/lib/WatchIgnorePlugin.js

@@ -6,7 +6,6 @@
 "use strict";
 
 const { groupBy } = require("./util/ArrayHelpers");
-const createSchemaValidation = require("./util/create-schema-validation");
 
 /** @typedef {import("watchpack").TimeInfoEntries} TimeInfoEntries */
 /** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
@@ -15,15 +14,6 @@ const createSchemaValidation = require("./util/create-schema-validation");
 /** @typedef {import("./util/fs").WatchMethod} WatchMethod */
 /** @typedef {import("./util/fs").Watcher} Watcher */
 
-const validate = createSchemaValidation(
-	require("../schemas/plugins/WatchIgnorePlugin.check"),
-	() => require("../schemas/plugins/WatchIgnorePlugin.json"),
-	{
-		name: "Watch Ignore Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const IGNORE_TIME_ENTRY = "ignore";
 
 class IgnoringWatchFileSystem {
@@ -132,8 +122,8 @@ class WatchIgnorePlugin {
 	 * @param {WatchIgnorePluginOptions} options options
 	 */
 	constructor(options) {
-		validate(options);
-		this.paths = options.paths;
+		/** @type {WatchIgnorePluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -142,11 +132,23 @@ class WatchIgnorePlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../schemas/plugins/WatchIgnorePlugin.json"),
+				this.options,
+				{
+					name: "Watch Ignore Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../schemas/plugins/WatchIgnorePlugin.check")(options)
+			);
+		});
 		compiler.hooks.afterEnvironment.tap(PLUGIN_NAME, () => {
 			compiler.watchFileSystem = new IgnoringWatchFileSystem(
 				/** @type {WatchFileSystem} */
 				(compiler.watchFileSystem),
-				this.paths
+				this.options.paths
 			);
 		});
 	}

package/lib/WebpackOptionsApply.js

@@ -442,7 +442,7 @@ class WebpackOptionsApply extends OptionsApply {
 				const NormalModuleReplacementPlugin = require("./NormalModuleReplacementPlugin");
 
 				// Override emitter that using `EventEmitter` to `EventTarget`
-				// TODO webpack6 - migrate to `EventTarget` by default
+				// TODO webpack 6 - migrate to `EventTarget` by default
 				new NormalModuleReplacementPlugin(/emitter(\.js)?$/, (result) => {
 					if (
 						/webpack[/\\]hot|webpack-dev-server[/\\]client|webpack-hot-middleware[/\\]client/.test(
@@ -487,15 +487,15 @@ class WebpackOptionsApply extends OptionsApply {
 		}
 
 		if (
-			options.experiments.deferImport &&
 			!(
 				/** @type {typeof JavascriptParser & { __importPhasesExtended?: true }} */
 				(JavascriptParser).__importPhasesExtended
-			)
+			) &&
+			(options.experiments.deferImport || options.experiments.sourceImport)
 		) {
 			const importPhases = require("acorn-import-phases");
 
-			JavascriptParser.extend(importPhases({ source: false }));
+			JavascriptParser.extend(importPhases({ source: true, defer: true }));
 			/** @type {typeof JavascriptParser & { __importPhasesExtended?: true }} */
 			(JavascriptParser).__importPhasesExtended = true;
 		}

package/lib/asset/AssetModulesPlugin.js

@@ -13,7 +13,6 @@ const {
 	ASSET_MODULE_TYPE_SOURCE
 } = require("../ModuleTypeConstants");
 const { compareModulesByFullName } = require("../util/comparators");
-const createSchemaValidation = require("../util/create-schema-validation");
 const memoize = require("../util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
@@ -46,32 +45,6 @@ const generatorValidationOptions = {
 	name: "Asset Modules Plugin",
 	baseDataPath: "generator"
 };
-const validateGeneratorOptions = {
-	asset: createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetGeneratorOptions.check"),
-		() => getSchema("AssetGeneratorOptions"),
-		generatorValidationOptions
-	),
-	"asset/resource": createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetResourceGeneratorOptions.check"),
-		() => getSchema("AssetResourceGeneratorOptions"),
-		generatorValidationOptions
-	),
-	"asset/inline": createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetInlineGeneratorOptions.check"),
-		() => getSchema("AssetInlineGeneratorOptions"),
-		generatorValidationOptions
-	)
-};
-
-const validateParserOptions = createSchemaValidation(
-	require("../../schemas/plugins/asset/AssetParserOptions.check"),
-	() => getSchema("AssetParserOptions"),
-	{
-		name: "Asset Modules Plugin",
-		baseDataPath: "parser"
-	}
-);
 
 const getAssetGenerator = memoize(() => require("./AssetGenerator"));
 const getAssetParser = memoize(() => require("./AssetParser"));
@@ -135,7 +108,18 @@ class AssetModulesPlugin {
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE)
 					.tap(PLUGIN_NAME, (parserOptions) => {
-						validateParserOptions(parserOptions);
+						compiler.validate(
+							() => getSchema("AssetParserOptions"),
+							parserOptions,
+							{
+								name: "Asset Modules Plugin",
+								baseDataPath: "parser"
+							},
+							(options) =>
+								require("../../schemas/plugins/asset/AssetParserOptions.check")(
+									options
+								)
+						);
 
 						let dataUrlCondition = parserOptions.dataUrlCondition;
 						if (!dataUrlCondition || typeof dataUrlCondition === "object") {
@@ -186,7 +170,44 @@ class AssetModulesPlugin {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
 						.tap(PLUGIN_NAME, (generatorOptions) => {
-							validateGeneratorOptions[type](generatorOptions);
+							switch (type) {
+								case ASSET_MODULE_TYPE: {
+									compiler.validate(
+										() => getSchema("AssetGeneratorOptions"),
+										generatorOptions,
+										generatorValidationOptions,
+										(options) =>
+											require("../../schemas/plugins/asset/AssetGeneratorOptions.check")(
+												options
+											)
+									);
+									break;
+								}
+								case ASSET_MODULE_TYPE_RESOURCE: {
+									compiler.validate(
+										() => getSchema("AssetResourceGeneratorOptions"),
+										generatorOptions,
+										generatorValidationOptions,
+										(options) =>
+											require("../../schemas/plugins/asset/AssetResourceGeneratorOptions.check")(
+												options
+											)
+									);
+									break;
+								}
+								case ASSET_MODULE_TYPE_INLINE: {
+									compiler.validate(
+										() => getSchema("AssetInlineGeneratorOptions"),
+										generatorOptions,
+										generatorValidationOptions,
+										(options) =>
+											require("../../schemas/plugins/asset/AssetInlineGeneratorOptions.check")(
+												options
+											)
+									);
+									break;
+								}
+							}
 
 							/** @type {undefined | AssetGeneratorDataUrl} */
 							let dataUrl;

package/lib/cli.js

@@ -603,6 +603,8 @@ const getExpectedValue = (argConfig) => {
 
 /** @typedef {null | string | number | boolean | RegExp | EnumValue | []} ParsedValue */
 
+const DECIMAL_NUMBER_REGEXP = /^[+-]?(?:\d+\.?\d*|\.\d+)(?:e[+-]?\d+)?$/i;
+
 /**
  * @param {ArgumentConfig} argConfig processing instructions
  * @param {Value} value the value
@@ -622,7 +624,7 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 			break;
 		case "number":
 			if (typeof value === "number") return value;
-			if (typeof value === "string" && /^[+-]?\d*(\.\d*)e\d+$/i) {
+			if (typeof value === "string" && DECIMAL_NUMBER_REGEXP.test(value)) {
 				const n = Number(value);
 				if (!Number.isNaN(n)) return n;
 			}

package/lib/config/defaults.js

@@ -58,8 +58,9 @@ const {
 /** @typedef {import("../../declarations/WebpackOptions").LibraryType} LibraryType */
 /** @typedef {import("../../declarations/WebpackOptions").Loader} Loader */
 /** @typedef {import("../../declarations/WebpackOptions").Mode} Mode */
+/** @typedef {import("../../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("../../declarations/WebpackOptions").HashSalt} HashSalt */
-/** @typedef {import("../../declarations/WebpackOptions").HashSalt} HashDigest */
+/** @typedef {import("../../declarations/WebpackOptions").HashDigest} HashDigest */
 /** @typedef {import("../../declarations/WebpackOptions").HashDigestLength} HashDigestLength */
 /** @typedef {import("../../declarations/WebpackOptions").ModuleOptionsNormalized} ModuleOptions */
 /** @typedef {import("../../declarations/WebpackOptions").Node} WebpackNode */
@@ -363,6 +364,8 @@ const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 		/** @type {NonNullable<ExperimentsNormalized["futureDefaults"]>} */
 		(options.experiments.futureDefaults);
 
+	F(options, "validate", () => !(futureDefaults === true && production));
+
 	F(options, "cache", () =>
 		development ? { type: /** @type {"memory"} */ ("memory") } : false
 	);
@@ -405,11 +408,8 @@ const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 		hashSalt: /** @type {NonNullable<Output["hashSalt"]>} */ (
 			options.output.hashSalt
 		),
-		hashDigest: /** @type {NonNullable<Output["hashDigest"]>} */ (
-			options.output.hashDigest
-		),
-		hashDigestLength: /** @type {NonNullable<Output["hashDigestLength"]>} */ (
-			options.output.hashDigestLength
+		hashFunction: /** @type {NonNullable<Output["hashFunction"]>} */ (
+			options.output.hashFunction
 		),
 		syncWebAssembly:
 			/** @type {NonNullable<ExperimentsNormalized["syncWebAssembly"]>} */
@@ -423,6 +423,9 @@ const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 		deferImport:
 			/** @type {NonNullable<ExperimentsNormalized["deferImport"]>} */
 			(options.experiments.deferImport),
+		sourceImport:
+			/** @type {NonNullable<ExperimentsNormalized["sourceImport"]>} */
+			(options.experiments.sourceImport),
 		futureDefaults,
 		isNode: targetProperties && targetProperties.node === true,
 		uniqueName: /** @type {string} */ (options.output.uniqueName),
@@ -549,6 +552,7 @@ const applyExperimentsDefaults = (
 	D(experiments, "buildHttp", undefined);
 	D(experiments, "cacheUnaffected", experiments.futureDefaults);
 	D(experiments, "deferImport", false);
+	D(experiments, "sourceImport", false);
 	F(experiments, "css", () => (experiments.futureDefaults ? true : undefined));
 
 	if (typeof experiments.buildHttp === "object") {
@@ -721,13 +725,14 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
  * @param {object} options options
  * @param {boolean} options.futureDefaults is future defaults enabled
  * @param {boolean} options.deferImport is defer import enabled
+ * @param {boolean} options.sourceImport is import source enabled
  * @param {boolean} options.isNode is node target platform
  * @param {boolean} options.outputModule is output.module enabled
  * @returns {void}
  */
 const applyJavascriptParserOptionsDefaults = (
 	parserOptions,
-	{ futureDefaults, deferImport, isNode, outputModule }
+	{ futureDefaults, deferImport, sourceImport, isNode, outputModule }
 ) => {
 	D(parserOptions, "unknownContextRequest", ".");
 	D(parserOptions, "unknownContextRegExp", false);
@@ -749,6 +754,7 @@ const applyJavascriptParserOptionsDefaults = (
 	D(parserOptions, "createRequire", isNode);
 	D(parserOptions, "dynamicUrl", true);
 	D(parserOptions, "deferImport", deferImport);
+	D(parserOptions, "sourceImport", sourceImport);
 	if (futureDefaults) D(parserOptions, "exportsPresence", "error");
 };
 
@@ -789,11 +795,11 @@ const applyCssGeneratorOptionsDefaults = (
  * @param {string} options.uniqueName the unique name
  * @param {boolean} options.isNode is node target platform
  * @param {boolean} options.deferImport is defer import enabled
+ * @param {boolean} options.sourceImport is import source enabled
  * @param {TargetProperties | false} options.targetProperties target properties
  * @param {Mode | undefined} options.mode mode
  * @param {HashSalt} options.hashSalt hash salt
- * @param {HashDigest} options.hashDigest hash digest
- * @param {HashDigestLength} options.hashDigestLength hash digest length
+ * @param {HashFunction} options.hashFunction hash function
  * @param {boolean} options.outputModule is output.module enabled
  * @returns {void}
  */
@@ -801,8 +807,7 @@ const applyModuleDefaults = (
 	module,
 	{
 		hashSalt,
-		hashDigest,
-		hashDigestLength,
+		hashFunction,
 		cache,
 		syncWebAssembly,
 		asyncWebAssembly,
@@ -813,6 +818,7 @@ const applyModuleDefaults = (
 		targetProperties,
 		mode,
 		deferImport,
+		sourceImport,
 		outputModule
 	}
 ) => {
@@ -872,6 +878,7 @@ const applyModuleDefaults = (
 		{
 			futureDefaults,
 			deferImport,
+			sourceImport,
 			isNode,
 			outputModule
 		}
@@ -990,6 +997,13 @@ const applyModuleDefaults = (
 				localIdentHashSalt
 			);
 
+			D(
+				/** @type {NonNullable<GeneratorOptionsByModuleTypeKnown[CSS_MODULE_TYPE_AUTO]> | NonNullable<GeneratorOptionsByModuleTypeKnown[CSS_MODULE_TYPE_MODULE]> | NonNullable<GeneratorOptionsByModuleTypeKnown[CSS_MODULE_TYPE_MODULE]>} */
+				(module.generator[type]),
+				"localIdentHashFunction",
+				hashFunction
+			);
+
 			D(
 				/** @type {NonNullable<GeneratorOptionsByModuleTypeKnown[CSS_MODULE_TYPE_AUTO]> | NonNullable<GeneratorOptionsByModuleTypeKnown[CSS_MODULE_TYPE_MODULE]> | NonNullable<GeneratorOptionsByModuleTypeKnown[CSS_MODULE_TYPE_MODULE]>} */
 				(module.generator[type]),
@@ -1501,7 +1515,7 @@ const applyOutputDefaults = (
 				output.module &&
 				environment.dynamicImport
 			) {
-				return "universal";
+				return "import";
 			}
 		}
 		return false;
@@ -1527,7 +1541,7 @@ const applyOutputDefaults = (
 				output.module &&
 				environment.dynamicImportInWorker
 			) {
-				return "universal";
+				return "import";
 			}
 		}
 		return false;

package/lib/config/normalization.js

@@ -364,7 +364,7 @@ const getNormalizedWebpackOptions = (config) => ({
 			importFunctionName: output.importFunctionName,
 			importMetaName: output.importMetaName,
 			scriptType: output.scriptType,
-			// TODO webpack6 remove `libraryTarget`/`auxiliaryComment`/`amdContainer`/etc in favor of the `library` option
+			// TODO webpack 6 remove `libraryTarget`/`auxiliaryComment`/`amdContainer`/etc in favor of the `library` option
 			library: libraryBase && {
 				type:
 					output.libraryTarget !== undefined
@@ -416,6 +416,7 @@ const getNormalizedWebpackOptions = (config) => ({
 		return result;
 	}),
 	parallelism: config.parallelism,
+	validate: config.validate,
 	performance: optionalNestedConfig(config.performance, (performance) => {
 		if (performance === false) return false;
 		return {
@@ -599,7 +600,7 @@ const applyWebpackOptionsInterception = (options) => {
 		};
 	}
 
-	// TODO webpack6 - remove compatibility logic and move `devtools` fully into `devtool` with multi-type support
+	// TODO webpack 6 - remove compatibility logic and move `devtools` fully into `devtool` with multi-type support
 	let _devtool = options.devtool;
 	/** @type {WebpackOptionsNormalized["devtool"]} */
 	let cached;

package/lib/container/ContainerPlugin.js

@@ -5,7 +5,6 @@
 
 "use strict";
 
-const createSchemaValidation = require("../util/create-schema-validation");
 const memoize = require("../util/memoize");
 const ContainerEntryDependency = require("./ContainerEntryDependency");
 const ContainerEntryModuleFactory = require("./ContainerEntryModuleFactory");
@@ -20,15 +19,6 @@ const getModuleFederationPlugin = memoize(() =>
 	require("./ModuleFederationPlugin")
 );
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/container/ContainerPlugin.check"),
-	() => require("../../schemas/plugins/container/ContainerPlugin.json"),
-	{
-		name: "Container Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const PLUGIN_NAME = "ContainerPlugin";
 
 class ContainerPlugin {
@@ -36,31 +26,8 @@ class ContainerPlugin {
 	 * @param {ContainerPluginOptions} options options
 	 */
 	constructor(options) {
-		validate(options);
-
-		this._options = {
-			name: options.name,
-			shareScope: options.shareScope || "default",
-			library: options.library || {
-				type: "var",
-				name: options.name
-			},
-			runtime: options.runtime,
-			filename: options.filename || undefined,
-			exposes: /** @type {ExposesList} */ (
-				parseOptions(
-					options.exposes,
-					(item) => ({
-						import: Array.isArray(item) ? item : [item],
-						name: undefined
-					}),
-					(item) => ({
-						import: Array.isArray(item.import) ? item.import : [item.import],
-						name: item.name || undefined
-					})
-				)
-			)
-		};
+		/** @type {ContainerPluginOptions} */
+		this.options = options;
 	}
 
 	/**
@@ -69,25 +36,62 @@ class ContainerPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const { name, exposes, shareScope, filename, library, runtime } =
-			this._options;
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() => require("../../schemas/plugins/container/ContainerPlugin.json"),
+				this.options,
+				{
+					name: "Container Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/container/ContainerPlugin.check")(
+						options
+					)
+			);
+		});
+
+		const library = this.options.library || {
+			type: "var",
+			name: this.options.name
+		};
 
 		if (!compiler.options.output.enabledLibraryTypes.includes(library.type)) {
 			compiler.options.output.enabledLibraryTypes.push(library.type);
 		}
 
+		const exposes = /** @type {ExposesList} */ (
+			parseOptions(
+				this.options.exposes,
+				(item) => ({
+					import: Array.isArray(item) ? item : [item],
+					name: undefined
+				}),
+				(item) => ({
+					import: Array.isArray(item.import) ? item.import : [item.import],
+					name: item.name || undefined
+				})
+			)
+		);
+
+		const shareScope = this.options.shareScope || "default";
+
 		compiler.hooks.make.tapAsync(PLUGIN_NAME, (compilation, callback) => {
 			const hooks =
 				getModuleFederationPlugin().getCompilationHooks(compilation);
-			const dep = new ContainerEntryDependency(name, exposes, shareScope);
-			dep.loc = { name };
+			const dep = new ContainerEntryDependency(
+				this.options.name,
+				exposes,
+				shareScope
+			);
+			dep.loc = { name: this.options.name };
 			compilation.addEntry(
 				compilation.options.context,
 				dep,
 				{
-					name,
-					filename,
-					runtime,
+					name: this.options.name,
+					filename: this.options.filename,
+					runtime: this.options.runtime,
 					library
 				},
 				(error) => {

package/lib/container/ContainerReferencePlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
+const ExternalModule = require("../ExternalModule");
 const ExternalsPlugin = require("../ExternalsPlugin");
 const RuntimeGlobals = require("../RuntimeGlobals");
-const createSchemaValidation = require("../util/create-schema-validation");
 const FallbackDependency = require("./FallbackDependency");
 const FallbackItemDependency = require("./FallbackItemDependency");
 const FallbackModuleFactory = require("./FallbackModuleFactory");
@@ -19,16 +19,6 @@ const { parseOptions } = require("./options");
 /** @typedef {import("../../declarations/plugins/container/ContainerReferencePlugin").ContainerReferencePluginOptions} ContainerReferencePluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/container/ContainerReferencePlugin.check"),
-	() =>
-		require("../../schemas/plugins/container/ContainerReferencePlugin.json"),
-	{
-		name: "Container Reference Plugin",
-		baseDataPath: "options"
-	}
-);
-
 const slashCode = "/".charCodeAt(0);
 const PLUGIN_NAME = "ContainerReferencePlugin";
 
@@ -37,31 +27,46 @@ class ContainerReferencePlugin {
 	 * @param {ContainerReferencePluginOptions} options options
 	 */
 	constructor(options) {
-		validate(options);
+		/** @typedef {ContainerReferencePluginOptions} */
+		this.options = options;
+	}
 
-		this._remoteType = options.remoteType;
-		this._remotes = parseOptions(
-			options.remotes,
+	/**
+	 * Apply the plugin
+	 * @param {Compiler} compiler the compiler instance
+	 * @returns {void}
+	 */
+	apply(compiler) {
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() =>
+					require("../../schemas/plugins/container/ContainerReferencePlugin.json"),
+				this.options,
+				{
+					name: "Container Reference Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/container/ContainerReferencePlugin.check")(
+						options
+					)
+			);
+		});
+
+		const { remoteType } = this.options;
+		const remotes = parseOptions(
+			this.options.remotes,
 			(item) => ({
 				external: Array.isArray(item) ? item : [item],
-				shareScope: options.shareScope || "default"
+				shareScope: this.options.shareScope || "default"
 			}),
 			(item) => ({
 				external: Array.isArray(item.external)
 					? item.external
 					: [item.external],
-				shareScope: item.shareScope || options.shareScope || "default"
+				shareScope: item.shareScope || this.options.shareScope || "default"
 			})
 		);
-	}
-
-	/**
-	 * Apply the plugin
-	 * @param {Compiler} compiler the compiler instance
-	 * @returns {void}
-	 */
-	apply(compiler) {
-		const { _remotes: remotes, _remoteType: remoteType } = this;
 
 		/** @type {Record<string, string>} */
 		const remoteExternals = {};
@@ -131,6 +136,17 @@ class ContainerReferencePlugin {
 						set.add(RuntimeGlobals.shareScopeMap);
 						compilation.addRuntimeModule(chunk, new RemoteRuntimeModule());
 					});
+
+				const { chunkCondition } =
+					ExternalModule.getCompilationHooks(compilation);
+
+				// External modules issued by remote modules should be placed in entry chunks
+				// to ensure they are loaded and initialize first
+				chunkCondition.tap(
+					PLUGIN_NAME,
+					(chunk, compilation) =>
+						compilation.chunkGraph.getNumberOfEntryModules(chunk) > 0
+				);
 			}
 		);
 	}

package/lib/container/FallbackModule.js

@@ -79,7 +79,7 @@ class FallbackModule 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 chunkGraph.getNumberOfEntryModules(chunk) > 0;

package/lib/container/ModuleFederationPlugin.js

@@ -9,7 +9,6 @@ const { SyncHook } = require("tapable");
 const isValidExternalsType = require("../../schemas/plugins/container/ExternalsType.check");
 const Compilation = require("../Compilation");
 const SharePlugin = require("../sharing/SharePlugin");
-const createSchemaValidation = require("../util/create-schema-validation");
 const ContainerPlugin = require("./ContainerPlugin");
 const ContainerReferencePlugin = require("./ContainerReferencePlugin");
 const HoistContainerReferences = require("./HoistContainerReferencesPlugin");
@@ -25,15 +24,6 @@ const HoistContainerReferences = require("./HoistContainerReferencesPlugin");
  * @property {SyncHook<Dependency>} addFederationRuntimeDependency
  */
 
-const validate = createSchemaValidation(
-	require("../../schemas/plugins/container/ModuleFederationPlugin.check"),
-	() => require("../../schemas/plugins/container/ModuleFederationPlugin.json"),
-	{
-		name: "Module Federation Plugin",
-		baseDataPath: "options"
-	}
-);
-
 /** @type {WeakMap<Compilation, CompilationHooks>} */
 const compilationHooksMap = new WeakMap();
 const PLUGIN_NAME = "ModuleFederationPlugin";
@@ -43,9 +33,8 @@ class ModuleFederationPlugin {
 	 * @param {ModuleFederationPluginOptions} options options
 	 */
 	constructor(options) {
-		validate(options);
 		/** @type {ModuleFederationPluginOptions} */
-		this._options = options;
+		this.options = options;
 	}
 
 	/**
@@ -76,7 +65,22 @@ class ModuleFederationPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const { _options: options } = this;
+		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
+			compiler.validate(
+				() =>
+					require("../../schemas/plugins/container/ModuleFederationPlugin.json"),
+				this.options,
+				{
+					name: "Module Federation Plugin",
+					baseDataPath: "options"
+				},
+				(options) =>
+					require("../../schemas/plugins/container/ModuleFederationPlugin.check")(
+						options
+					)
+			);
+		});
+		const { options } = this;
 		const library = options.library || { type: "var", name: options.name };
 		const remoteType =
 			options.remoteType ||