webpack 5.111.0 → 5.111.1

package/lib/{ContextModuleFactory.js → context/ContextModuleFactory.js}

@@ -6,25 +6,25 @@
 "use strict";
 
 const { AsyncSeriesWaterfallHook, SyncWaterfallHook } = require("tapable");
-const ContextModule = require("./ContextModule");
-const ModuleFactory = require("./ModuleFactory");
-const ContextElementDependency = require("./dependencies/ContextElementDependency");
-const LazySet = require("./util/LazySet");
-const asyncLib = require("./util/async");
-const { cachedSetProperty } = require("./util/cleverMerge");
-const { createFakeHook } = require("./util/deprecation");
-const { join } = require("./util/fs");
+const ModuleFactory = require("../ModuleFactory");
+const ContextElementDependency = require("../dependencies/ContextElementDependency");
+const LazySet = require("../util/LazySet");
+const asyncLib = require("../util/async");
+const { cachedSetProperty } = require("../util/cleverMerge");
+const { createFakeHook } = require("../util/deprecation");
+const { join } = require("../util/fs");
 const {
 	globPatternBaseReachesDir,
 	globUserRequest,
 	isNonExhaustiveImportMetaGlobSkippedDir,
 	resolveContextModuleGlobPattern
-} = require("./util/globUtils");
+} = require("../util/globUtils");
+const ContextModule = require("./ContextModule");
 
-/** @import { ResolvedContextModuleGlobPattern } from "./util/globUtils" */
+/** @import { ResolvedContextModuleGlobPattern } from "../util/globUtils" */
 /** @typedef {(context: string, subResource: string, callback: () => void, resolvedGlobPatterns?: ResolvedContextModuleGlobPattern[]) => void} AddSubDirectoryFn */
 /** @import { ResolveRequest } from "enhanced-resolve" */
-/** @import { FileSystemDependencies } from "./Compilation" */
+/** @import { FileSystemDependencies } from "../Compilation" */
 /**
  * @import {
  * 	ContextModuleOptions,
@@ -36,17 +36,17 @@ const {
  * @import {
  * 	ModuleFactoryCreateData,
  * 	ModuleFactoryCallback
- * } from "./ModuleFactory"
+ * } from "../ModuleFactory"
  */
-/** @import ResolverFactory from "./ResolverFactory" */
-/** @import ContextDependency from "./dependencies/ContextDependency" */
+/** @import ResolverFactory from "../ResolverFactory" */
+/** @import ContextDependency from "../dependencies/ContextDependency" */
 
 /**
  * Defines the shared type used by this module.
  * @template T
- * @typedef {import("./util/deprecation").FakeHook<T>} FakeHook<T>
+ * @typedef {import("../util/deprecation").FakeHook<T>} FakeHook<T>
  */
-/** @import { IStats, InputFileSystem } from "./util/fs" */
+/** @import { IStats, InputFileSystem } from "../util/fs" */
 /** @typedef {{ context: string, request: string }} ContextAlternativeRequest */
 
 /**
@@ -531,11 +531,9 @@ class ContextModuleFactory extends ModuleFactory {
 										}
 										return callback();
 									}
-									// Collect for a single batched alternativeRequests call
-									// per directory below. Calling the hook once per file
-									// would pay per-call overhead (closure, resolverFactory
-									// lookup, array allocations) for every file in the
-									// context — which is the bulk of work on rebuilds.
+									// Collected for one batched `alternativeRequests` call per
+									// directory: calling the hook per file would pay its overhead
+									// across the whole context, the bulk of a rebuild.
 									fileObjs.push({
 										context: ctx,
 										request: `.${subResource.slice(ctx.length).replace(/\\/g, "/")}`

package/lib/{ContextReplacementPlugin.js → context/ContextReplacementPlugin.js}

@@ -5,10 +5,10 @@
 
 "use strict";
 
-const ContextElementDependency = require("./dependencies/ContextElementDependency");
-const { isAbsolute, join } = require("./util/fs");
+const ContextElementDependency = require("../dependencies/ContextElementDependency");
+const { isAbsolute, join } = require("../util/fs");
 
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 /** @import { ContextModuleOptions } from "./ContextModule" */
 /**
  * @import {
@@ -16,7 +16,7 @@ const { isAbsolute, join } = require("./util/fs");
  * 	AfterContextResolveData
  * } from "./ContextModuleFactory"
  */
-/** @import { InputFileSystem } from "./util/fs" */
+/** @import { InputFileSystem } from "../util/fs" */
 
 /** @typedef {Record<string, string>} NewContentCreateContextMap */
 

package/lib/css/CssGenerator.js

@@ -618,10 +618,21 @@ class CssGenerator extends Generator {
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
 			case JAVASCRIPT_TYPE: {
-				return new RawSource(Generator.throwBuildErrorCode(error));
+				return new RawSource(
+					Generator.throwBuildErrorCode(
+						error,
+						undefined,
+						generateContext.runtimeTemplate.requestShortener
+					)
+				);
 			}
 			case CSS_TYPE: {
-				return new RawSource(`/**\n ${error.message} \n**/`);
+				const message = Generator.buildErrorMessage(
+					error,
+					generateContext.runtimeTemplate.requestShortener
+				);
+
+				return new RawSource(`/**\n ${message} \n**/`);
 			}
 			default:
 				return null;
@@ -1018,10 +1029,9 @@ class CssGenerator extends Generator {
 	_cssToJsLiteral(cssSource, devtool, generateContext) {
 		const { source, map } = cssSource.sourceAndMap();
 		let content = /** @type {string} */ (source);
-		// A `renderEmbeddedSource` tap may hand back a mapped source whatever
-		// `devtool` says, so asking for no map at all is checked here too — this
-		// data URI would ship the sources inside the bundle. `hidden` is the same
-		// answer for the same reason.
+		// A `renderEmbeddedSource` tap may return a mapped source whatever `devtool`
+		// says, so wanting no map is checked here too: this data URI would ship the
+		// sources inside the bundle. `hidden` answers the same.
 		const wanted = typeof devtool === "string" && !devtool.includes("hidden");
 		if (map && wanted) {
 			const namedMap = this._nameMapSources(map, generateContext);
@@ -1082,11 +1092,9 @@ class CssGenerator extends Generator {
 			result = cssSource;
 		}
 
-		// Only text bound for a JS literal. `CSS_TEXT_TYPE` is an HTML inline
-		// `<style>` / `style=""`, and whether that is CSS at all depends on the
-		// element's `type` — a call the HTML layer makes and `htmlMinify` honors,
-		// which is not visible here. After the `@charset` prefix, so a tap sees a
-		// whole stylesheet.
+		// Only text bound for a JS literal. Whether a `CSS_TEXT_TYPE` inline
+		// `<style>` is CSS at all turns on the element's `type`, a call the HTML
+		// layer makes. After the `@charset` prefix, so a tap sees a whole sheet.
 		if (result && asJsLiteral) {
 			result = this._renderEmbeddedSource(result, module, generateContext);
 		}

package/lib/css/CssParser.js

@@ -164,13 +164,14 @@ const fontMimeType = (request) => {
 	return getMimeTypes().lookup(resourcePath);
 };
 
-// Skip options for a non-CSS-Modules parse: drop the selector prelude (never
-// walked without modules) plus value / function-arg leaves nothing reads (the
-// `Ident` visitor no-ops, the `Declaration` visitor returns early, no ICSS).
-// `url` / functions / strings / blocks / commas are kept — they carry url()
-// rewrites and image-set fences. At-rule preludes are kept (`@media` / `@import`
-// are read). CSS-Modules parses skip nothing: selectors are walked and ICSS
-// `:export { k: v }` captures each value's byte range from its first / last node.
+// WHY: skip options for a non-CSS-Modules parse. The selector prelude is never
+// walked without modules, and the value and function-arg leaves reach nothing —
+// the `Ident` visitor no-ops, the `Declaration` visitor returns early, and there
+// is no ICSS. `url`, functions, strings, blocks and commas are kept, carrying
+// the `url()` rewrites and image-set fences, and at-rule preludes too, since
+// `@media` and `@import` are read. A CSS-Modules parse skips nothing: selectors
+// are walked, and ICSS `:export { k: v }` captures each value's byte range from
+// its first and last node.
 const SKIP_NON_MODULES = {
 	types: buildSkipSet([
 		NodeType.Number,
@@ -4814,13 +4815,13 @@ class CssParser extends Parser {
 			},
 			[NodeType.Ident](path) {
 				const node = path.node;
-				// Fast exit before slicing the ident value: outside dashed-ident scoping
-				// and ICSS context (any non-CSS-Modules stylesheet) a bare ident carries
-				// no work, and idents are the most common node, so skipping the per-ident
-				// `value` slice matters. With no `@value`/`:import` definitions the ICSS
-				// probe can never hit, so it doesn't warrant the slice either. The dashed
-				// probe reads two char codes instead of slicing (escaped dashes don't
-				// match, same as the string form — cf. `processDashedIdentInVarFunction`).
+				// WHY: a fast exit before slicing the ident value. Outside dashed-ident
+				// scoping and ICSS context — any non-CSS-Modules stylesheet — a bare
+				// ident carries no work, and idents are the most common node, so skipping
+				// the per-ident `value` slice matters. With no `@value` or `:import`
+				// definitions the ICSS probe can never hit, so it does not warrant the
+				// slice either. The dashed probe reads two char codes instead of slicing,
+				// and an escaped dash does not match, as in the string form.
 				const dashedActive = dashed.active;
 				const icss = icssActive() && icssDefinitions.size !== 0;
 				if (!dashedActive && !icss) return;
@@ -4915,12 +4916,9 @@ class CssParser extends Parser {
 				emitICSSSymbol(identValue, identStart, identEnd);
 			}
 		};
-		// `as` selects the top-level production (§5.3): a `style` attribute is a
-		// block's contents, everything else a full stylesheet (the default). `as`
-		// and `skip` are per-parse config on the processor; only `locConverter`
-		// (per-source) is passed to `process`. One skip set: selector prelude +
-		// unread value leaves (non-modules only; CSS Modules needs its selectors
-		// and ICSS-captured values).
+		// `as` selects the top-level production of §5.3: a `style` attribute is a
+		// block's contents, anything else a full stylesheet. `as` and `skip` are
+		// per-parse, so only the per-source `locConverter` reaches `process`.
 		new SourceProcessor()
 			.use(/** @type {VisitorMap} */ (visitors))
 			.process(source, {

package/lib/css/cssMinify.js

@@ -44,36 +44,40 @@ const cssMinify = async (input, sourceMap, minimizerOptions = {}) => {
 
 	// TODO expose the remaining declined transforms on `optimization.minimize.css`
 	// like `convertLengthUnits` — the switches below turn off what webpack does
-	// make, not what it declines. Each is on in other minifiers; what each costs:
-	// - dropping a declaration a later one overrides, which loses a fallback pair
-	//   an engine that cannot read the newer spelling depends on;
-	// - merging rules a third stands between, and merging non-adjacent `@media`,
-	//   both of which reorder the cascade (csso loses ~12,900 Tailwind classes to
-	//   it). Adjacent rules sharing a block do join, nothing being between them to
-	//   step over — only where every selector is a shape each engine parses, since
-	//   one it cannot invalidates the whole list and loses the rest with it;
-	// - the color conversions webpack declines rather than guesses. Every polar and
-	//   Lab function converts to hex, except two cases the other minifiers convert
-	//   regardless: a channel landing near a `.5` boundary, where implementations
-	//   round opposite ways (it is why esbuild and lightningcss emit different
-	//   bytes for `hwb(194 0% 0%)`), and a Lab-family color outside the sRGB gamut,
-	//   which hex would clip to a different color rather than respell.
-	// Which longhand families merge into their shorthand is decided in
-	// `tooling/generate-css-data.js`, and three kinds are excluded there for good
-	// rather than pending an option:
-	// - a shorthand gathering a whole family (`border`, `font`, `background`,
+	// make, not what it declines.
+
+	// WHY: each transform webpack declines is on in other minifiers, and each costs
+	// something measured.
+	// - Dropping a declaration a later one overrides loses a fallback pair an
+	//   engine that cannot read the newer spelling depends on.
+	// - Merging rules a third stands between, and merging non-adjacent `@media`,
+	//   both reorder the cascade (csso loses ~12,900 Tailwind classes to it).
+	//   Adjacent rules sharing a block do join, nothing being between them to step
+	//   over — only where every selector is a shape each engine parses, since one
+	//   it cannot invalidates the whole list and loses the rest with it.
+	// - Two color conversions are declined rather than guessed. Every polar and Lab
+	//   function converts to hex, except a channel landing near a `.5` boundary,
+	//   where implementations round opposite ways (which is why esbuild and
+	//   lightningcss emit different bytes for `hwb(194 0% 0%)`), and a Lab-family
+	//   color outside the sRGB gamut, which hex would clip rather than respell.
+
+	// WHY: which longhand families merge into their shorthand is decided in
+	// `tooling/generate-css-data.js`, where three kinds are excluded for good
+	// rather than pending an option.
+	// - A shorthand gathering a whole family (`border`, `font`, `background`,
 	//   `transition`, `flex`, `columns`) resets longhands `computed` does not
 	//   name — `border` clears `border-image`, `font` clears `font-size-adjust` —
-	//   so the merge would drop a declaration nothing in the family wrote. The
-	//   ones checked against a browser and found to reset nothing else do merge
-	//   (`FAMILY_LONGHANDS`), where each value parses back into its own slot;
-	// - a shorthand materially newer than its longhands (`place-items`/`-content`
+	//   so the merge would drop a declaration nothing in the family wrote. The ones
+	//   checked against a browser and found to reset nothing else do merge
+	//   (`FAMILY_LONGHANDS`), where each value parses back into its own slot.
+	// - A shorthand materially newer than its longhands (`place-items`/`-content`
 	//   /`-self`) would lose both declarations, not one, on a target reading only
-	//   the longhands. `output.environment` states this for `inset` alone.
-	//   `overflow` is newer only two values wide, so it merges when it collapses;
-	// - a pair two shorthands both claim, which cannot be right for both. None
+	//   the longhands. `output.environment` states this for `inset` alone, and
+	//   `overflow` is newer only two values wide, so it merges when it collapses.
+	// - A pair two shorthands both claim, which cannot be right for both. None
 	//   today: `mdn-data` gave `corner-inline-start-shape` the block-start edge's
 	//   corners, corrected in the generator to the pair Chromium computes.
+
 	const {
 		SourceProcessor,
 		askEmbeddedRenderer,
@@ -84,10 +88,9 @@ const cssMinify = async (input, sourceMap, minimizerOptions = {}) => {
 	const [[file, given]] = Object.entries(input);
 	// The plugin hands a text minifier a string; the type admits an image's bytes.
 	const code = typeof given === "string" ? given : given.toString("utf8");
-	// `process` parses once, and with `mode: "minify"` the same walk also prints
-	// the safely minified serialization — no second parse. Naming the input with
-	// `source` / `content` is what asks for the map, which the plugin composes
-	// back to the original source.
+	// `process` parses once, and under `mode: "minify"` the same walk prints the
+	// minified serialization too. Naming the input with `source` or `content` is
+	// what asks for the map the plugin composes back to the original.
 	const {
 		as,
 		environment,