webpack 5.105.3 → 5.106.0

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 ||

package/lib/container/RemoteModule.js

@@ -7,7 +7,10 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
-const { REMOTE_AND_SHARE_INIT_TYPES } = require("../ModuleSourceTypeConstants");
+const {
+	JAVASCRIPT_TYPES,
+	REMOTE_AND_SHARE_INIT_TYPES
+} = require("../ModuleSourceTypeConstants");
 const { WEBPACK_MODULE_TYPE_REMOTE } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
@@ -34,6 +37,7 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
+/** @typedef {import("../Module").BasicSourceTypes} BasicSourceTypes */
 
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
 
@@ -137,6 +141,19 @@ class RemoteModule extends Module {
 		return REMOTE_AND_SHARE_INIT_TYPES;
 	}
 
+	/**
+	 * Basic source types are high-level categories like javascript, css, webassembly, etc.
+	 * We only have built-in knowledge about the javascript basic type here; other basic types may be
+	 * added or changed over time by generators and do not need to be handled or detected here.
+	 *
+	 * Some modules, e.g. RemoteModule, may return non-basic source types like "remote" and "share-init"
+	 * from getSourceTypes(), but their generated output is still JavaScript, i.e. their basic type is JS.
+	 * @returns {BasicSourceTypes} types available (do not mutate)
+	 */
+	getSourceBasicTypes() {
+		return JAVASCRIPT_TYPES;
+	}
+
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {boolean | undefined} strict the importing module is strict