webpack 5.90.3 → 5.91.0

package/lib/cache/ResolverCachePlugin.js

@@ -8,7 +8,7 @@
 const LazySet = require("../util/LazySet");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("enhanced-resolve/lib/Resolver")} Resolver */
+/** @typedef {import("enhanced-resolve").Resolver} Resolver */
 /** @typedef {import("../CacheFacade").ItemCacheFacade} ItemCacheFacade */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../FileSystemInfo")} FileSystemInfo */
@@ -213,7 +213,10 @@ class ResolverCachePlugin {
 								stage: -100
 							},
 							(request, resolveContext, callback) => {
-								if (request._ResolverCachePluginCacheMiss || !fileSystemInfo) {
+								if (
+									/** @type {TODO} */ (request)._ResolverCachePluginCacheMiss ||
+									!fileSystemInfo
+								) {
 									return callback();
 								}
 								const withYield = typeof resolveContext.yield === "function";
@@ -225,7 +228,9 @@ class ResolverCachePlugin {
 									const activeRequest = activeRequestsWithYield.get(identifier);
 									if (activeRequest) {
 										activeRequest[0].push(callback);
-										activeRequest[1].push(resolveContext.yield);
+										activeRequest[1].push(
+											/** @type {TODO} */ (resolveContext.yield)
+										);
 										return;
 									}
 								} else {
@@ -303,19 +308,22 @@ class ResolverCachePlugin {
 												cachedResolves++;
 												if (resolveContext.missingDependencies) {
 													addAllToSet(
-														resolveContext.missingDependencies,
+														/** @type {LazySet<string>} */
+														(resolveContext.missingDependencies),
 														snapshot.getMissingIterable()
 													);
 												}
 												if (resolveContext.fileDependencies) {
 													addAllToSet(
-														resolveContext.fileDependencies,
+														/** @type {LazySet<string>} */
+														(resolveContext.fileDependencies),
 														snapshot.getFileIterable()
 													);
 												}
 												if (resolveContext.contextDependencies) {
 													addAllToSet(
-														resolveContext.contextDependencies,
+														/** @type {LazySet<string>} */
+														(resolveContext.contextDependencies),
 														snapshot.getContextIterable()
 													);
 												}

package/lib/cache/getLazyHashedEtag.js

@@ -47,7 +47,7 @@ const mapObjects = new WeakMap();
 
 /**
  * @param {HashableObject} obj object with updateHash method
- * @param {string | HashConstructor} hashFunction the hash function to use
+ * @param {(string | HashConstructor)=} hashFunction the hash function to use
  * @returns {LazyHashedEtag} etag
  */
 const getter = (obj, hashFunction = "md4") => {

package/lib/config/defaults.js

@@ -472,7 +472,6 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 			}
 			return [];
 		});
-		F(snapshot, "unmanagedPaths", () => []);
 		A(snapshot, "immutablePaths", () => {
 			if (process.versions.pnp === "1") {
 				const match =
@@ -494,6 +493,7 @@ const applySnapshotDefaults = (snapshot, { production, futureDefaults }) => {
 			return [];
 		});
 	}
+	F(snapshot, "unmanagedPaths", () => []);
 	F(snapshot, "resolveBuildDependencies", () => ({
 		timestamp: true,
 		hash: true
@@ -554,6 +554,7 @@ const applyCssGeneratorOptionsDefaults = (
 		"exportsOnly",
 		!targetProperties || !targetProperties.document
 	);
+	D(generatorOptions, "exportsConvention", "as-is");
 };
 
 /**
@@ -641,6 +642,27 @@ const applyModuleDefaults = (
 			(module.generator.css),
 			{ targetProperties }
 		);
+
+		F(module.generator, "css/auto", () => ({}));
+		D(
+			module.generator["css/auto"],
+			"localIdentName",
+			"[uniqueName]-[id]-[local]"
+		);
+
+		F(module.generator, "css/module", () => ({}));
+		D(
+			module.generator["css/module"],
+			"localIdentName",
+			"[uniqueName]-[id]-[local]"
+		);
+
+		F(module.generator, "css/global", () => ({}));
+		D(
+			module.generator["css/global"],
+			"localIdentName",
+			"[uniqueName]-[id]-[local]"
+		);
 	}
 
 	A(module, "defaultRules", () => {
@@ -901,6 +923,7 @@ const applyOutputDefaults = (
 		}
 		return "[id].css";
 	});
+	D(output, "cssHeadDataCompression", !development);
 	D(output, "assetModuleFilename", "[hash][ext][query]");
 	D(output, "webassemblyModuleFilename", "[hash].module.wasm");
 	D(output, "compareBeforeEmit", true);

package/lib/config/normalization.js

@@ -320,6 +320,7 @@ const getNormalizedWebpackOptions = config => {
 				chunkLoadTimeout: output.chunkLoadTimeout,
 				cssFilename: output.cssFilename,
 				cssChunkFilename: output.cssChunkFilename,
+				cssHeadDataCompression: output.cssHeadDataCompression,
 				clean: output.clean,
 				compareBeforeEmit: output.compareBeforeEmit,
 				crossOriginLoading: output.crossOriginLoading,
@@ -446,7 +447,8 @@ const getNormalizedWebpackOptions = config => {
 				hash: module.hash
 			})),
 			immutablePaths: optionalNestedArray(snapshot.immutablePaths, p => [...p]),
-			managedPaths: optionalNestedArray(snapshot.managedPaths, p => [...p])
+			managedPaths: optionalNestedArray(snapshot.managedPaths, p => [...p]),
+			unmanagedPaths: optionalNestedArray(snapshot.unmanagedPaths, p => [...p])
 		})),
 		stats: nestedConfig(config.stats, stats => {
 			if (stats === false) {

package/lib/container/ContainerEntryDependency.js

@@ -9,11 +9,12 @@ const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {import("./ContainerEntryModule").ExposeOptions} ExposeOptions */
+/** @typedef {import("./ContainerEntryModule").ExposesList} ExposesList */
 
 class ContainerEntryDependency extends Dependency {
 	/**
 	 * @param {string} name entry name
-	 * @param {[string, ExposeOptions][]} exposes list of exposed modules
+	 * @param {ExposesList} exposes list of exposed modules
 	 * @param {string} shareScope name of the share scope
 	 */
 	constructor(name, exposes, shareScope) {

package/lib/container/ContainerEntryModule.js

@@ -39,12 +39,14 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
  * @property {string} name custom chunk name for the exposed module
  */
 
+/** @typedef {[string, ExposeOptions][]} ExposesList */
+
 const SOURCE_TYPES = new Set(["javascript"]);
 
 class ContainerEntryModule extends Module {
 	/**
 	 * @param {string} name container entry name
-	 * @param {[string, ExposeOptions][]} exposes list of exposed modules
+	 * @param {ExposesList} exposes list of exposed modules
 	 * @param {string} shareScope name of the share scope
 	 */
 	constructor(name, exposes, shareScope) {

package/lib/container/ContainerPlugin.js

@@ -13,6 +13,8 @@ const { parseOptions } = require("./options");
 
 /** @typedef {import("../../declarations/plugins/container/ContainerPlugin").ContainerPluginOptions} ContainerPluginOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("./ContainerEntryModule").ExposeOptions} ExposeOptions */
+/** @typedef {import("./ContainerEntryModule").ExposesList} ExposesList */
 
 const validate = createSchemaValidation(
 	require("../../schemas/plugins/container/ContainerPlugin.check.js"),
@@ -41,16 +43,18 @@ class ContainerPlugin {
 			},
 			runtime: options.runtime,
 			filename: options.filename || undefined,
-			exposes: 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
-				})
+			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
+					})
+				)
 			)
 		};
 	}

package/lib/container/FallbackModule.js

@@ -129,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)};`,

package/lib/container/RemoteRuntimeModule.js

@@ -10,6 +10,9 @@ const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../Chunk").ChunkId} ChunkId */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("./RemoteModule")} RemoteModule */
 
 class RemoteRuntimeModule extends RuntimeModule {
@@ -21,17 +24,23 @@ class RemoteRuntimeModule extends RuntimeModule {
 	 * @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<string | number, [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 {(string | number)[]} */
+			const remotes = (chunkToRemotesMapping[
+				/** @type {ChunkId} */ (chunk.id)
+			] = []);
 			for (const m of modules) {
 				const module = /** @type {RemoteModule} */ (m);
 				const name = module.internalRequest;

package/lib/css/CssExportsGenerator.js

@@ -10,8 +10,11 @@ const { UsageState } = require("../ExportsInfo");
 const Generator = require("../Generator");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const { cssExportConvention } = require("../util/conventions");
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
@@ -27,8 +30,16 @@ const Template = require("../Template");
 const TYPES = new Set(["javascript"]);
 
 class CssExportsGenerator extends Generator {
-	constructor() {
+	/**
+	 * @param {CssGeneratorExportsConvention} convention the convention of the exports name
+	 * @param {CssGeneratorLocalIdentName | undefined} localIdentName css export local ident name
+	 */
+	constructor(convention, localIdentName) {
 		super();
+		/** @type {CssGeneratorExportsConvention} */
+		this.convention = convention;
+		/** @type {CssGeneratorLocalIdentName | undefined} */
+		this.localIdentName = localIdentName;
 	}
 
 	// TODO add getConcatenationBailoutReason to allow concatenation
@@ -43,6 +54,7 @@ class CssExportsGenerator extends Generator {
 		const source = new ReplaceSource(new RawSource(""));
 		/** @type {InitFragment<TODO>[]} */
 		const initFragments = [];
+		/** @type {Map<string, string>} */
 		const cssExports = new Map();
 
 		generateContext.runtimeRequirements.add(RuntimeGlobals.module);
@@ -97,19 +109,21 @@ class CssExportsGenerator extends Generator {
 		if (generateContext.concatenationScope) {
 			const source = new ConcatSource();
 			const usedIdentifiers = new Set();
-			for (const [k, v] of cssExports) {
-				let identifier = Template.toIdentifier(k);
-				let i = 0;
-				while (usedIdentifiers.has(identifier)) {
-					identifier = Template.toIdentifier(k + i);
+			for (const [name, v] of cssExports) {
+				for (let k of cssExportConvention(name, this.convention)) {
+					let identifier = Template.toIdentifier(k);
+					let i = 0;
+					while (usedIdentifiers.has(identifier)) {
+						identifier = Template.toIdentifier(k + i);
+					}
+					usedIdentifiers.add(identifier);
+					generateContext.concatenationScope.registerExport(k, identifier);
+					source.add(
+						`${
+							generateContext.runtimeTemplate.supportsConst() ? "const" : "var"
+						} ${identifier} = ${JSON.stringify(v)};\n`
+					);
 				}
-				usedIdentifiers.add(identifier);
-				generateContext.concatenationScope.registerExport(k, identifier);
-				source.add(
-					`${
-						generateContext.runtimeTemplate.supportsConst ? "const" : "var"
-					} ${identifier} = ${JSON.stringify(v)};\n`
-				);
 			}
 			return source;
 		} else {
@@ -123,13 +137,16 @@ class CssExportsGenerator extends Generator {
 					RuntimeGlobals.makeNamespaceObject
 				);
 			}
+			const newCssExports = [];
+			for (let [k, v] of cssExports) {
+				for (let name of cssExportConvention(k, this.convention)) {
+					newCssExports.push(`\t${JSON.stringify(name)}: ${JSON.stringify(v)}`);
+				}
+			}
 			return new RawSource(
 				`${otherUsed ? `${RuntimeGlobals.makeNamespaceObject}(` : ""}${
 					module.moduleArgument
-				}.exports = {\n${Array.from(
-					cssExports,
-					([k, v]) => `\t${JSON.stringify(k)}: ${JSON.stringify(v)}`
-				).join(",\n")}\n}${otherUsed ? ")" : ""};`
+				}.exports = {\n${newCssExports.join(",\n")}\n}${otherUsed ? ")" : ""};`
 			);
 		}
 	}

package/lib/css/CssGenerator.js

@@ -9,8 +9,11 @@ const { ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
+const { cssExportConvention } = require("../util/conventions");
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorExportsConvention} CssGeneratorExportsConvention */
+/** @typedef {import("../../declarations/WebpackOptions").CssGeneratorLocalIdentName} CssGeneratorLocalIdentName */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Generator").UpdateHashContext} UpdateHashContext */
@@ -20,8 +23,16 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const TYPES = new Set(["css"]);
 
 class CssGenerator extends Generator {
-	constructor() {
+	/**
+	 * @param {CssGeneratorExportsConvention} convention the convention of the exports name
+	 * @param {CssGeneratorLocalIdentName | undefined} localIdentName css export local ident name
+	 */
+	constructor(convention, localIdentName) {
 		super();
+		/** @type {CssGeneratorExportsConvention} */
+		this.convention = convention;
+		/** @type {CssGeneratorLocalIdentName | undefined} */
+		this.localIdentName = localIdentName;
 	}
 
 	/**
@@ -34,6 +45,7 @@ class CssGenerator extends Generator {
 		const source = new ReplaceSource(originalSource);
 		/** @type {InitFragment[]} */
 		const initFragments = [];
+		/** @type {Map<string, string>} */
 		const cssExports = new Map();
 
 		generateContext.runtimeRequirements.add(RuntimeGlobals.hasCssModules);
@@ -86,8 +98,14 @@ class CssGenerator extends Generator {
 			module.presentationalDependencies.forEach(handleDependency);
 
 		if (cssExports.size > 0) {
+			const newCssExports = new Map();
+			for (let [name, v] of cssExports) {
+				for (let newName of cssExportConvention(name, this.convention)) {
+					newCssExports.set(newName, v);
+				}
+			}
 			const data = generateContext.getData();
-			data.set("css-exports", cssExports);
+			data.set("css-exports", newCssExports);
 		}
 
 		return InitFragment.addToSource(source, initFragments, generateContext);