webpack 5.95.0 → 5.96.1

package/lib/config/defaults.js

@@ -9,15 +9,18 @@ const fs = require("fs");
 const path = require("path");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
-	JSON_MODULE_TYPE,
-	WEBASSEMBLY_MODULE_TYPE_ASYNC,
 	JAVASCRIPT_MODULE_TYPE_ESM,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
+	JSON_MODULE_TYPE,
+	WEBASSEMBLY_MODULE_TYPE_ASYNC,
 	WEBASSEMBLY_MODULE_TYPE_SYNC,
 	ASSET_MODULE_TYPE,
+	ASSET_MODULE_TYPE_INLINE,
+	ASSET_MODULE_TYPE_RESOURCE,
 	CSS_MODULE_TYPE_AUTO,
 	CSS_MODULE_TYPE,
-	CSS_MODULE_TYPE_MODULE
+	CSS_MODULE_TYPE_MODULE,
+	CSS_MODULE_TYPE_GLOBAL
 } = require("../ModuleTypeConstants");
 const Template = require("../Template");
 const { cleverMerge } = require("../util/cleverMerge");
@@ -123,7 +126,7 @@ const A = (obj, prop, factory) => {
 	if (value === undefined) {
 		obj[prop] = factory();
 	} else if (Array.isArray(value)) {
-		/** @type {any[] | undefined} */
+		/** @type {EXPECTED_ANY[] | undefined} */
 		let newArray;
 		for (let i = 0; i < value.length; i++) {
 			const item = value[i];
@@ -132,7 +135,9 @@ const A = (obj, prop, factory) => {
 					newArray = value.slice(0, i);
 					obj[prop] = /** @type {T[P]} */ (/** @type {unknown} */ (newArray));
 				}
-				const items = /** @type {any[]} */ (/** @type {unknown} */ (factory()));
+				const items = /** @type {EXPECTED_ANY[]} */ (
+					/** @type {unknown} */ (factory())
+				);
 				if (items !== undefined) {
 					for (const item of items) {
 						newArray.push(item);
@@ -283,7 +288,9 @@ const applyWebpackOptionsDefaults = (options, compilerIndex) => {
 		futureDefaults:
 			/** @type {NonNullable<WebpackOptionsNormalized["experiments"]["futureDefaults"]>} */
 			(options.experiments.futureDefaults),
-		outputModule: options.output.module,
+		outputModule:
+			/** @type {NonNullable<WebpackOptionsNormalized["output"]["module"]>} */
+			(options.output.module),
 		targetProperties
 	});
 
@@ -631,19 +638,19 @@ const applyModuleDefaults = (
 	F(module.parser, ASSET_MODULE_TYPE, () => ({}));
 	F(
 		/** @type {NonNullable<ParserOptionsByModuleTypeKnown["asset"]>} */
-		(module.parser.asset),
+		(module.parser[ASSET_MODULE_TYPE]),
 		"dataUrlCondition",
 		() => ({})
 	);
 	if (
 		typeof (
 			/** @type {NonNullable<ParserOptionsByModuleTypeKnown["asset"]>} */
-			(module.parser.asset).dataUrlCondition
+			(module.parser[ASSET_MODULE_TYPE]).dataUrlCondition
 		) === "object"
 	) {
 		D(
 			/** @type {NonNullable<ParserOptionsByModuleTypeKnown["asset"]>} */
-			(module.parser.asset).dataUrlCondition,
+			(module.parser[ASSET_MODULE_TYPE]).dataUrlCondition,
 			"maxSize",
 			8096
 		);
@@ -661,41 +668,41 @@ const applyModuleDefaults = (
 	);
 
 	if (css) {
-		F(module.parser, "css", () => ({}));
+		F(module.parser, CSS_MODULE_TYPE, () => ({}));
 
-		D(module.parser.css, "namedExports", true);
+		D(module.parser[CSS_MODULE_TYPE], "namedExports", true);
 
-		F(module.generator, "css", () => ({}));
+		F(module.generator, CSS_MODULE_TYPE, () => ({}));
 
 		applyCssGeneratorOptionsDefaults(
 			/** @type {NonNullable<GeneratorOptionsByModuleTypeKnown["css"]>} */
-			(module.generator.css),
+			(module.generator[CSS_MODULE_TYPE]),
 			{ targetProperties }
 		);
 
-		F(module.generator, "css/auto", () => ({}));
+		F(module.generator, CSS_MODULE_TYPE_AUTO, () => ({}));
 		D(
-			module.generator["css/auto"],
+			module.generator[CSS_MODULE_TYPE_AUTO],
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
-		D(module.generator["css/auto"], "exportsConvention", "as-is");
+		D(module.generator[CSS_MODULE_TYPE_AUTO], "exportsConvention", "as-is");
 
-		F(module.generator, "css/module", () => ({}));
+		F(module.generator, CSS_MODULE_TYPE_MODULE, () => ({}));
 		D(
-			module.generator["css/module"],
+			module.generator[CSS_MODULE_TYPE_MODULE],
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
-		D(module.generator["css/module"], "exportsConvention", "as-is");
+		D(module.generator[CSS_MODULE_TYPE_MODULE], "exportsConvention", "as-is");
 
-		F(module.generator, "css/global", () => ({}));
+		F(module.generator, CSS_MODULE_TYPE_GLOBAL, () => ({}));
 		D(
-			module.generator["css/global"],
+			module.generator[CSS_MODULE_TYPE_GLOBAL],
 			"localIdentName",
 			"[uniqueName]-[id]-[local]"
 		);
-		D(module.generator["css/global"], "exportsConvention", "as-is");
+		D(module.generator[CSS_MODULE_TYPE_GLOBAL], "exportsConvention", "as-is");
 	}
 
 	A(module, "defaultRules", () => {
@@ -827,19 +834,19 @@ const applyModuleDefaults = (
 				oneOf: [
 					{
 						scheme: /^data$/,
-						type: "asset/inline"
+						type: ASSET_MODULE_TYPE_INLINE
 					},
 					{
-						type: "asset/resource"
+						type: ASSET_MODULE_TYPE_RESOURCE
 					}
 				]
 			},
 			{
-				assert: { type: "json" },
+				assert: { type: JSON_MODULE_TYPE },
 				type: JSON_MODULE_TYPE
 			},
 			{
-				with: { type: "json" },
+				with: { type: JSON_MODULE_TYPE },
 				type: JSON_MODULE_TYPE
 			}
 		);
@@ -920,6 +927,104 @@ const applyOutputDefaults = (
 	});
 
 	F(output, "module", () => Boolean(outputModule));
+
+	const environment = /** @type {Environment} */ (output.environment);
+	/**
+	 * @param {boolean | undefined} v value
+	 * @returns {boolean} true, when v is truthy or undefined
+	 */
+	const optimistic = v => v || v === undefined;
+	/**
+	 * @param {boolean | undefined} v value
+	 * @param {boolean | undefined} c condition
+	 * @returns {boolean | undefined} true, when v is truthy or undefined, or c is truthy
+	 */
+	const conditionallyOptimistic = (v, c) => (v === undefined && c) || v;
+
+	F(
+		environment,
+		"globalThis",
+		() => /** @type {boolean | undefined} */ (tp && tp.globalThis)
+	);
+	F(
+		environment,
+		"bigIntLiteral",
+		() =>
+			tp && optimistic(/** @type {boolean | undefined} */ (tp.bigIntLiteral))
+	);
+	F(
+		environment,
+		"const",
+		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.const))
+	);
+	F(
+		environment,
+		"arrowFunction",
+		() =>
+			tp && optimistic(/** @type {boolean | undefined} */ (tp.arrowFunction))
+	);
+	F(
+		environment,
+		"asyncFunction",
+		() =>
+			tp && optimistic(/** @type {boolean | undefined} */ (tp.asyncFunction))
+	);
+	F(
+		environment,
+		"forOf",
+		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.forOf))
+	);
+	F(
+		environment,
+		"destructuring",
+		() =>
+			tp && optimistic(/** @type {boolean | undefined} */ (tp.destructuring))
+	);
+	F(
+		environment,
+		"optionalChaining",
+		() =>
+			tp && optimistic(/** @type {boolean | undefined} */ (tp.optionalChaining))
+	);
+	F(
+		environment,
+		"nodePrefixForCoreModules",
+		() =>
+			tp &&
+			optimistic(
+				/** @type {boolean | undefined} */ (tp.nodePrefixForCoreModules)
+			)
+	);
+	F(
+		environment,
+		"templateLiteral",
+		() =>
+			tp && optimistic(/** @type {boolean | undefined} */ (tp.templateLiteral))
+	);
+	F(environment, "dynamicImport", () =>
+		conditionallyOptimistic(
+			/** @type {boolean | undefined} */ (tp && tp.dynamicImport),
+			output.module
+		)
+	);
+	F(environment, "dynamicImportInWorker", () =>
+		conditionallyOptimistic(
+			/** @type {boolean | undefined} */ (tp && tp.dynamicImportInWorker),
+			output.module
+		)
+	);
+	F(environment, "module", () =>
+		conditionallyOptimistic(
+			/** @type {boolean | undefined} */ (tp && tp.module),
+			output.module
+		)
+	);
+	F(
+		environment,
+		"document",
+		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.document))
+	);
+
 	D(output, "filename", output.module ? "[name].mjs" : "[name].js");
 	F(output, "iife", () => !output.module);
 	D(output, "importFunctionName", "import");
@@ -981,7 +1086,7 @@ const applyOutputDefaults = (
 				? "Make sure that your 'browserslist' includes only platforms that support these features or select an appropriate 'target' to allow selecting a chunk format by default. Alternatively specify the 'output.chunkFormat' directly."
 				: "Select an appropriate 'target' to allow selecting one by default, or specify the 'output.chunkFormat' directly.";
 			if (output.module) {
-				if (tp.dynamicImport) return "module";
+				if (environment.dynamicImport) return "module";
 				if (tp.document) return "array-push";
 				throw new Error(
 					"For the selected environment is no default ESM chunk format available:\n" +
@@ -1021,7 +1126,7 @@ const applyOutputDefaults = (
 					if (tp.nodeBuiltins) return "async-node";
 					break;
 				case "module":
-					if (tp.dynamicImport || output.module) return "import";
+					if (environment.dynamicImport) return "import";
 					break;
 			}
 			if (
@@ -1046,7 +1151,7 @@ const applyOutputDefaults = (
 					if (tp.nodeBuiltins) return "async-node";
 					break;
 				case "module":
-					if (tp.dynamicImportInWorker || output.module) return "import";
+					if (environment.dynamicImportInWorker) return "import";
 					break;
 			}
 			if (
@@ -1101,103 +1206,6 @@ const applyOutputDefaults = (
 	D(output, "strictModuleErrorHandling", false);
 	D(output, "strictModuleExceptionHandling", false);
 
-	const environment = /** @type {Environment} */ (output.environment);
-	/**
-	 * @param {boolean | undefined} v value
-	 * @returns {boolean} true, when v is truthy or undefined
-	 */
-	const optimistic = v => v || v === undefined;
-	/**
-	 * @param {boolean | undefined} v value
-	 * @param {boolean | undefined} c condition
-	 * @returns {boolean | undefined} true, when v is truthy or undefined, or c is truthy
-	 */
-	const conditionallyOptimistic = (v, c) => (v === undefined && c) || v;
-
-	F(
-		environment,
-		"globalThis",
-		() => /** @type {boolean | undefined} */ (tp && tp.globalThis)
-	);
-	F(
-		environment,
-		"bigIntLiteral",
-		() =>
-			tp && optimistic(/** @type {boolean | undefined} */ (tp.bigIntLiteral))
-	);
-	F(
-		environment,
-		"const",
-		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.const))
-	);
-	F(
-		environment,
-		"arrowFunction",
-		() =>
-			tp && optimistic(/** @type {boolean | undefined} */ (tp.arrowFunction))
-	);
-	F(
-		environment,
-		"asyncFunction",
-		() =>
-			tp && optimistic(/** @type {boolean | undefined} */ (tp.asyncFunction))
-	);
-	F(
-		environment,
-		"forOf",
-		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.forOf))
-	);
-	F(
-		environment,
-		"destructuring",
-		() =>
-			tp && optimistic(/** @type {boolean | undefined} */ (tp.destructuring))
-	);
-	F(
-		environment,
-		"optionalChaining",
-		() =>
-			tp && optimistic(/** @type {boolean | undefined} */ (tp.optionalChaining))
-	);
-	F(
-		environment,
-		"nodePrefixForCoreModules",
-		() =>
-			tp &&
-			optimistic(
-				/** @type {boolean | undefined} */ (tp.nodePrefixForCoreModules)
-			)
-	);
-	F(
-		environment,
-		"templateLiteral",
-		() =>
-			tp && optimistic(/** @type {boolean | undefined} */ (tp.templateLiteral))
-	);
-	F(environment, "dynamicImport", () =>
-		conditionallyOptimistic(
-			/** @type {boolean | undefined} */ (tp && tp.dynamicImport),
-			output.module
-		)
-	);
-	F(environment, "dynamicImportInWorker", () =>
-		conditionallyOptimistic(
-			/** @type {boolean | undefined} */ (tp && tp.dynamicImportInWorker),
-			output.module
-		)
-	);
-	F(environment, "module", () =>
-		conditionallyOptimistic(
-			/** @type {boolean | undefined} */ (tp && tp.module),
-			output.module
-		)
-	);
-	F(
-		environment,
-		"document",
-		() => tp && optimistic(/** @type {boolean | undefined} */ (tp.document))
-	);
-
 	const { trustedTypes } = output;
 	if (trustedTypes) {
 		F(

package/lib/container/ContainerEntryModule.js

@@ -8,6 +8,7 @@
 const { OriginalSource, RawSource } = require("webpack-sources");
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const Module = require("../Module");
+const { JS_TYPES } = require("../ModuleSourceTypesConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
@@ -41,8 +42,6 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
 
 /** @typedef {[string, ExposeOptions][]} ExposesList */
 
-const SOURCE_TYPES = new Set(["javascript"]);
-
 class ContainerEntryModule extends Module {
 	/**
 	 * @param {string} name container entry name
@@ -60,7 +59,7 @@ class ContainerEntryModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return SOURCE_TYPES;
+		return JS_TYPES;
 	}
 
 	/**
@@ -230,7 +229,7 @@ class ContainerEntryModule extends Module {
 				`if (!${RuntimeGlobals.shareScopeMap}) return;`,
 				`var name = ${JSON.stringify(this._shareScope)}`,
 				`var oldScope = ${RuntimeGlobals.shareScopeMap}[name];`,
-				`if(oldScope && oldScope !== shareScope) throw new Error("Container initialization failed as it has already been initialized with a different share scope");`,
+				'if(oldScope && oldScope !== shareScope) throw new Error("Container initialization failed as it has already been initialized with a different share scope");',
 				`${RuntimeGlobals.shareScopeMap}[name] = shareScope;`,
 				`return ${RuntimeGlobals.initializeSharing}(name, initScope);`
 			])};`,

package/lib/container/ContainerPlugin.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const createSchemaValidation = require("../util/create-schema-validation");
+const memoize = require("../util/memoize");
 const ContainerEntryDependency = require("./ContainerEntryDependency");
 const ContainerEntryModuleFactory = require("./ContainerEntryModuleFactory");
 const ContainerExposedDependency = require("./ContainerExposedDependency");
@@ -16,6 +17,10 @@ const { parseOptions } = require("./options");
 /** @typedef {import("./ContainerEntryModule").ExposeOptions} ExposeOptions */
 /** @typedef {import("./ContainerEntryModule").ExposesList} ExposesList */
 
+const getModuleFederationPlugin = memoize(() =>
+	require("./ModuleFederationPlugin")
+);
+
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/container/ContainerPlugin.check.js"),
 	() => require("../../schemas/plugins/container/ContainerPlugin.json"),
@@ -73,6 +78,8 @@ class ContainerPlugin {
 		}
 
 		compiler.hooks.make.tapAsync(PLUGIN_NAME, (compilation, callback) => {
+			const hooks =
+				getModuleFederationPlugin().getCompilationHooks(compilation);
 			const dep = new ContainerEntryDependency(name, exposes, shareScope);
 			dep.loc = { name };
 			compilation.addEntry(
@@ -86,6 +93,7 @@ class ContainerPlugin {
 				},
 				error => {
 					if (error) return callback(error);
+					hooks.addContainerEntryDependency.call(dep);
 					callback();
 				}
 			);

package/lib/container/FallbackModule.js

@@ -7,6 +7,7 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
+const { JS_TYPES } = require("../ModuleSourceTypesConstants");
 const { WEBPACK_MODULE_TYPE_FALLBACK } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
@@ -31,7 +32,6 @@ const FallbackItemDependency = require("./FallbackItemDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
-const TYPES = new Set(["javascript"]);
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
 
 class FallbackModule extends Module {
@@ -120,7 +120,7 @@ class FallbackModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return TYPES;
+		return JS_TYPES;
 	}
 
 	/**