webpack 5.59.0 → 5.94.0

package/lib/container/FallbackModule.js

@@ -7,6 +7,7 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
+const { WEBPACK_MODULE_TYPE_FALLBACK } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 const makeSerializable = require("../util/makeSerializable");
@@ -21,9 +22,12 @@ const FallbackItemDependency = require("./FallbackItemDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
@@ -35,7 +39,7 @@ class FallbackModule extends Module {
 	 * @param {string[]} requests list of requests to choose one
 	 */
 	constructor(requests) {
-		super("fallback-module");
+		super(WEBPACK_MODULE_TYPE_FALLBACK);
 		this.requests = requests;
 		this._identifier = `fallback ${this.requests.join(" ")}`;
 	}
@@ -60,9 +64,9 @@ class FallbackModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return `webpack/container/fallback/${this.requests[0]}/and ${
-			this.requests.length - 1
-		} more`;
+		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/fallback/${
+			this.requests[0]
+		}/and ${this.requests.length - 1} more`;
 	}
 
 	/**
@@ -76,7 +80,7 @@ class FallbackModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -113,7 +117,7 @@ class FallbackModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;
@@ -125,7 +129,7 @@ class FallbackModule extends Module {
 	 */
 	codeGeneration({ runtimeTemplate, moduleGraph, chunkGraph }) {
 		const ids = this.dependencies.map(dep =>
-			chunkGraph.getModuleId(moduleGraph.getModule(dep))
+			chunkGraph.getModuleId(/** @type {Module} */ (moduleGraph.getModule(dep)))
 		);
 		const code = Template.asString([
 			`var ids = ${JSON.stringify(ids)};`,
@@ -133,7 +137,7 @@ class FallbackModule extends Module {
 			`var loop = ${runtimeTemplate.basicFunction("next", [
 				"while(i < ids.length) {",
 				Template.indent([
-					"try { next = __webpack_require__(ids[i++]); } catch(e) { return handleError(e); }",
+					`try { next = ${RuntimeGlobals.require}(ids[i++]); } catch(e) { return handleError(e); }`,
 					"if(next) return next.then ? next.then(handleResult, handleError) : handleResult(next);"
 				]),
 				"}",
@@ -154,12 +158,19 @@ class FallbackModule extends Module {
 		return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS };
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.requests);
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 * @returns {FallbackModule} deserialized fallback module
+	 */
 	static deserialize(context) {
 		const { read } = context;
 		const obj = new FallbackModule(read());

package/lib/container/FallbackModuleFactory.js

@@ -15,7 +15,7 @@ const FallbackModule = require("./FallbackModule");
 module.exports = class FallbackModuleFactory extends ModuleFactory {
 	/**
 	 * @param {ModuleFactoryCreateData} data data object
-	 * @param {function(Error=, ModuleFactoryResult=): void} callback callback
+	 * @param {function((Error | null)=, ModuleFactoryResult=): void} callback callback
 	 * @returns {void}
 	 */
 	create({ dependencies: [dependency] }, callback) {

package/lib/container/ModuleFederationPlugin.js

@@ -65,6 +65,7 @@ class ModuleFederationPlugin {
 					library,
 					filename: options.filename,
 					runtime: options.runtime,
+					shareScope: options.shareScope,
 					exposes: options.exposes
 				}).apply(compiler);
 			}
@@ -76,6 +77,7 @@ class ModuleFederationPlugin {
 			) {
 				new ContainerReferencePlugin({
 					remoteType,
+					shareScope: options.shareScope,
 					remotes: options.remotes
 				}).apply(compiler);
 			}

package/lib/container/RemoteModule.js

@@ -7,6 +7,7 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("../Module");
+const { WEBPACK_MODULE_TYPE_REMOTE } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const FallbackDependency = require("./FallbackDependency");
@@ -20,9 +21,12 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../RequestShortener")} RequestShortener */
 /** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
 
@@ -37,7 +41,7 @@ class RemoteModule extends Module {
 	 * @param {string} shareScope the used share scope name
 	 */
 	constructor(request, externalRequests, internalRequest, shareScope) {
-		super("remote-module");
+		super(WEBPACK_MODULE_TYPE_REMOTE);
 		this.request = request;
 		this.externalRequests = externalRequests;
 		this.internalRequest = internalRequest;
@@ -67,12 +71,14 @@ class RemoteModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return `webpack/container/remote/${this.request}`;
+		return `${this.layer ? `(${this.layer})/` : ""}webpack/container/remote/${
+			this.request
+		}`;
 	}
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -114,7 +120,7 @@ class RemoteModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;
@@ -147,6 +153,9 @@ class RemoteModule extends Module {
 		return { sources, data, runtimeRequirements: RUNTIME_REQUIREMENTS };
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.request);
@@ -156,6 +165,10 @@ class RemoteModule extends Module {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 * @returns {RemoteModule} deserialized module
+	 */
 	static deserialize(context) {
 		const { read } = context;
 		const obj = new RemoteModule(read(), read(), read(), read());

package/lib/container/RemoteRuntimeModule.js

@@ -9,6 +9,11 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Chunk").ChunkId} ChunkId */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../ChunkGraph").ModuleId} ModuleId */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("./RemoteModule")} RemoteModule */
 
 class RemoteRuntimeModule extends RuntimeModule {
@@ -17,29 +22,37 @@ class RemoteRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @returns {string} runtime code
+	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		const { compilation, chunkGraph } = this;
+		const compilation = /** @type {Compilation} */ (this.compilation);
+		const chunkGraph = /** @type {ChunkGraph} */ (this.chunkGraph);
 		const { runtimeTemplate, moduleGraph } = compilation;
+		/** @type {Record<ChunkId, (string | number)[]>} */
 		const chunkToRemotesMapping = {};
+		/** @type {Record<ModuleId, [string, string, string | number | null]>} */
 		const idToExternalAndNameMapping = {};
-		for (const chunk of this.chunk.getAllAsyncChunks()) {
+		for (const chunk of /** @type {Chunk} */ (this.chunk).getAllAsyncChunks()) {
 			const modules = chunkGraph.getChunkModulesIterableBySourceType(
 				chunk,
 				"remote"
 			);
 			if (!modules) continue;
-			const remotes = (chunkToRemotesMapping[chunk.id] = []);
+			/** @type {ModuleId[]} */
+			const remotes = (chunkToRemotesMapping[
+				/** @type {ChunkId} */
+				(chunk.id)
+			] = []);
 			for (const m of modules) {
 				const module = /** @type {RemoteModule} */ (m);
 				const name = module.internalRequest;
-				const id = chunkGraph.getModuleId(module);
+				const id = /** @type {ModuleId} */ (chunkGraph.getModuleId(module));
 				const shareScope = module.shareScope;
 				const dep = module.dependencies[0];
 				const externalModule = moduleGraph.getModule(dep);
 				const externalModuleId =
-					externalModule && chunkGraph.getModuleId(externalModule);
+					/** @type {ModuleId} */
+					(externalModule && chunkGraph.getModuleId(externalModule));
 				remotes.push(id);
 				idToExternalAndNameMapping[id] = [shareScope, name, externalModuleId];
 			}
@@ -66,16 +79,16 @@ class RemoteRuntimeModule extends RuntimeModule {
 						"var data = idToExternalAndNameMapping[id];",
 						"if(getScope.indexOf(data) >= 0) return;",
 						"getScope.push(data);",
-						`if(data.p) return promises.push(data.p);`,
+						"if(data.p) return promises.push(data.p);",
 						`var onError = ${runtimeTemplate.basicFunction("error", [
 							'if(!error) error = new Error("Container missing");',
 							'if(typeof error.message === "string")',
 							Template.indent(
 								`error.message += '\\nwhile loading "' + data[1] + '" from ' + data[2];`
 							),
-							`__webpack_modules__[id] = ${runtimeTemplate.basicFunction("", [
-								"throw error;"
-							])}`,
+							`${
+								RuntimeGlobals.moduleFactories
+							}[id] = ${runtimeTemplate.basicFunction("", ["throw error;"])}`,
 							"data.p = 0;"
 						])};`,
 						`var handleFunction = ${runtimeTemplate.basicFunction(
@@ -90,7 +103,7 @@ class RemoteRuntimeModule extends RuntimeModule {
 											"next(result, d)",
 											"result"
 										)}, onError);`,
-										`if(first) promises.push(data.p = p); else return p;`
+										"if(first) promises.push(data.p = p); else return p;"
 									]),
 									"} else {",
 									Template.indent(["return next(promise, d, first);"]),
@@ -106,17 +119,18 @@ class RemoteRuntimeModule extends RuntimeModule {
 							"external, _, first"
 						)};`,
 						`var onInitialized = ${runtimeTemplate.returningFunction(
-							`handleFunction(external.get, data[1], getScope, 0, onFactory, first)`,
+							"handleFunction(external.get, data[1], getScope, 0, onFactory, first)",
 							"_, external, first"
 						)};`,
 						`var onFactory = ${runtimeTemplate.basicFunction("factory", [
 							"data.p = 1;",
-							`__webpack_modules__[id] = ${runtimeTemplate.basicFunction(
-								"module",
-								["module.exports = factory();"]
-							)}`
+							`${
+								RuntimeGlobals.moduleFactories
+							}[id] = ${runtimeTemplate.basicFunction("module", [
+								"module.exports = factory();"
+							])}`
 						])};`,
-						"handleFunction(__webpack_require__, data[2], 0, 0, onExternal, 1);"
+						`handleFunction(${RuntimeGlobals.require}, data[2], 0, 0, onExternal, 1);`
 					])});`
 				]),
 				"}"

package/lib/container/RemoteToExternalDependency.js

@@ -9,6 +9,9 @@ const ModuleDependency = require("../dependencies/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
 
 class RemoteToExternalDependency extends ModuleDependency {
+	/**
+	 * @param {string} request request
+	 */
 	constructor(request) {
 		super(request);
 	}

package/lib/container/options.js

@@ -5,7 +5,15 @@
 
 "use strict";
 
-/** @template T @typedef {(string | Record<string, string | string[] | T>)[] | Record<string, string | string[] | T>} ContainerOptionsFormat */
+/**
+ * @template T
+ * @typedef {Record<string, string | string[] | T>} Item
+ */
+
+/**
+ * @template T
+ * @typedef {(string | Item<T>)[] | Item<T>} ContainerOptionsFormat
+ */
 
 /**
  * @template T
@@ -17,6 +25,9 @@
  * @returns {void}
  */
 const process = (options, normalizeSimple, normalizeOptions, fn) => {
+	/**
+	 * @param {(string | Item<T>)[]} items items
+	 */
 	const array = items => {
 		for (const item of items) {
 			if (typeof item === "string") {
@@ -28,6 +39,9 @@ const process = (options, normalizeSimple, normalizeOptions, fn) => {
 			}
 		}
 	};
+	/**
+	 * @param {Item<T>} obj an object
+	 */
 	const object = obj => {
 		for (const [key, value] of Object.entries(obj)) {
 			if (typeof value === "string" || Array.isArray(value)) {
@@ -38,7 +52,7 @@ const process = (options, normalizeSimple, normalizeOptions, fn) => {
 		}
 	};
 	if (!options) {
-		return;
+		// Do nothing
 	} else if (Array.isArray(options)) {
 		array(options);
 	} else if (typeof options === "object") {
@@ -87,5 +101,5 @@ const scope = (scope, options) => {
 	return obj;
 };
 
-exports.parseOptions = parseOptions;
-exports.scope = scope;
+module.exports.parseOptions = parseOptions;
+module.exports.scope = scope;

package/lib/css/CssExportsGenerator.js

@@ -0,0 +1,203 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Sergey Melyukov @smelukov
+*/
+
+"use strict";
+
+const { ReplaceSource, RawSource, ConcatSource } = require("webpack-sources");
+const { UsageState } = require("../ExportsInfo");
+const Generator = require("../Generator");
+const RuntimeGlobals = require("../RuntimeGlobals");
+const Template = require("../Template");
+
+/** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
+/** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../DependencyTemplate").CssExportsData} CssExportsData */
+/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
+/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
+/** @typedef {import("../NormalModule")} NormalModule */
+/** @typedef {import("../util/Hash")} Hash */
+
+/**
+ * @template T
+ * @typedef {import("../InitFragment")<T>} InitFragment
+ */
+
+const TYPES = new Set(["javascript"]);
+
+class CssExportsGenerator extends Generator {
+	/**
+	 * @param {CssGeneratorExportsConvention | undefined} convention the convention of the exports name
+	 * @param {CssGeneratorLocalIdentName | undefined} localIdentName css export local ident name
+	 * @param {boolean} esModule whether to use ES modules syntax
+	 */
+	constructor(convention, localIdentName, esModule) {
+		super();
+		/** @type {CssGeneratorExportsConvention | undefined} */
+		this.convention = convention;
+		/** @type {CssGeneratorLocalIdentName | undefined} */
+		this.localIdentName = localIdentName;
+		/** @type {boolean} */
+		this.esModule = esModule;
+	}
+
+	/**
+	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {ConcatenationBailoutReasonContext} context context
+	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
+	 */
+	getConcatenationBailoutReason(module, context) {
+		if (!this.esModule) {
+			return "Module is not an ECMAScript module";
+		}
+		// TODO webpack 6: remove /\[moduleid\]/.test
+		if (
+			/\[id\]/.test(this.localIdentName) ||
+			/\[moduleid\]/.test(this.localIdentName)
+		) {
+			return "The localIdentName includes moduleId ([id] or [moduleid])";
+		}
+		return undefined;
+	}
+
+	/**
+	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {GenerateContext} generateContext context for generate
+	 * @returns {Source} generated code
+	 */
+	generate(module, generateContext) {
+		const source = new ReplaceSource(new RawSource(""));
+		/** @type {InitFragment<TODO>[]} */
+		const initFragments = [];
+		/** @type {CssExportsData} */
+		const cssExportsData = {
+			esModule: this.esModule,
+			exports: new Map()
+		};
+
+		generateContext.runtimeRequirements.add(RuntimeGlobals.module);
+
+		let chunkInitFragments;
+		const runtimeRequirements = new Set();
+
+		/** @type {DependencyTemplateContext} */
+		const templateContext = {
+			runtimeTemplate: generateContext.runtimeTemplate,
+			dependencyTemplates: generateContext.dependencyTemplates,
+			moduleGraph: generateContext.moduleGraph,
+			chunkGraph: generateContext.chunkGraph,
+			module,
+			runtime: generateContext.runtime,
+			runtimeRequirements,
+			concatenationScope: generateContext.concatenationScope,
+			codeGenerationResults: generateContext.codeGenerationResults,
+			initFragments,
+			cssExportsData,
+			get chunkInitFragments() {
+				if (!chunkInitFragments) {
+					const data = generateContext.getData();
+					chunkInitFragments = data.get("chunkInitFragments");
+					if (!chunkInitFragments) {
+						chunkInitFragments = [];
+						data.set("chunkInitFragments", chunkInitFragments);
+					}
+				}
+
+				return chunkInitFragments;
+			}
+		};
+
+		/**
+		 * @param {Dependency} dependency the dependency
+		 */
+		const handleDependency = dependency => {
+			const constructor = /** @type {new (...args: any[]) => Dependency} */ (
+				dependency.constructor
+			);
+			const template = generateContext.dependencyTemplates.get(constructor);
+			if (!template) {
+				throw new Error(
+					`No template for dependency: ${dependency.constructor.name}`
+				);
+			}
+
+			template.apply(dependency, source, templateContext);
+		};
+
+		for (const dependency of module.dependencies) {
+			handleDependency(dependency);
+		}
+
+		if (generateContext.concatenationScope) {
+			const source = new ConcatSource();
+			const usedIdentifiers = new Set();
+			for (const [name, v] of cssExportsData.exports) {
+				let identifier = Template.toIdentifier(name);
+				const i = 0;
+				while (usedIdentifiers.has(identifier)) {
+					identifier = Template.toIdentifier(name + i);
+				}
+				usedIdentifiers.add(identifier);
+				generateContext.concatenationScope.registerExport(name, identifier);
+				source.add(
+					`${
+						generateContext.runtimeTemplate.supportsConst() ? "const" : "var"
+					} ${identifier} = ${JSON.stringify(v)};\n`
+				);
+			}
+			return source;
+		}
+		const needNsObj =
+			this.esModule &&
+			generateContext.moduleGraph
+				.getExportsInfo(module)
+				.otherExportsInfo.getUsed(generateContext.runtime) !==
+				UsageState.Unused;
+		if (needNsObj) {
+			generateContext.runtimeRequirements.add(
+				RuntimeGlobals.makeNamespaceObject
+			);
+		}
+		const exports = [];
+		for (const [name, v] of cssExportsData.exports) {
+			exports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
+		}
+		return new RawSource(
+			`${needNsObj ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
+				module.moduleArgument
+			}.exports = {\n${exports.join(",\n")}\n}${needNsObj ? ")" : ""};`
+		);
+	}
+
+	/**
+	 * @param {NormalModule} module fresh module
+	 * @returns {Set<string>} available types (do not mutate)
+	 */
+	getTypes(module) {
+		return TYPES;
+	}
+
+	/**
+	 * @param {NormalModule} module the module
+	 * @param {string=} type source type
+	 * @returns {number} estimate size of the module
+	 */
+	getSize(module, type) {
+		return 42;
+	}
+
+	/**
+	 * @param {Hash} hash hash that will be modified
+	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 */
+	updateHash(hash, { module }) {
+		hash.update(this.esModule.toString());
+	}
+}
+
+module.exports = CssExportsGenerator;