npm - webpack - Versions diffs - 5.111.1 → 5.112.0 - Mend

webpack 5.111.1 → 5.112.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (774) hide show

package/lib/rules/RuleSetCompiler.js CHANGED Viewed

@@ -6,8 +6,11 @@
 "use strict";
 const { SyncHook } = require("tapable");
-const { createPathGlobMatcher } = require("../util/globUtils");
-const { fileUrlToPath } = require("../util/identifier");
+const { compileGlobList } = require("../util/globUtils");
+const {
+	RELATIVE_PATH_PREFIX_REGEXP,
+	fileUrlToPath
+} = require("../util/identifier");
 /** @import { ResolveRequest } from "enhanced-resolve" */
 /**
@@ -16,7 +19,9 @@ const { fileUrlToPath } = require("../util/identifier");
  * 	RuleSetUseItem,
  * 	RuleSetLoaderOptions,
  * 	RuleSetRule,
- * 	RuleSetConditionAbsolute
+ * 	RuleSetConditionAbsolute,
+ * 	RuleSetGlob,
+ * 	RuleSetGlobs
  * } from "../../declarations/WebpackOptions"
  */
@@ -110,34 +115,11 @@ const { fileUrlToPath } = require("../util/identifier");
 /** @typedef {Set<string>} UnhandledProperties */
-/** @typedef {(str: string) => boolean} GlobMatcher */
 /** @typedef {(data: EffectData) => (RuleSetUseItem | (Falsy | RuleSetUseItem)[])} RuleSetUseFn */
 /** @typedef {(value: string) => boolean} RuleSetConditionFn */
 /** @typedef {{ apply: (ruleSetCompiler: RuleSetCompiler) => void }} RuleSetPlugin */
-/**
- * @param {GlobMatcher[]} positive patterns that select
- * @param {GlobMatcher[]} negative patterns that subtract
- * @returns {GlobMatcher} matcher
- */
-const combineGlobMatchers = (positive, negative) => {
-	/** @type {GlobMatcher} */
-	const matchPositive =
-		positive.length === 0
-			? () => true
-			: positive.length === 1
-				? positive[0]
-				: (str) => positive.some((match) => match(str));
-	if (negative.length === 0) return matchPositive;
-	/** @type {GlobMatcher} */
-	const matchNegative =
-		negative.length === 1
-			? negative[0]
-			: (str) => negative.some((match) => match(str));
-	return (str) => matchPositive(str) && !matchNegative(str);
-};
 class RuleSetCompiler {
 	/**
 	 * Creates an instance of RuleSetCompiler.
@@ -475,31 +457,30 @@ class RuleSetCompiler {
 		if (globs.length === 0) {
 			throw this.error(path, glob, "Expected glob pattern, but got empty list");
 		}
-		/** @type {GlobMatcher[]} */
-		const positive = [];
-		/** @type {GlobMatcher[]} */
-		const negative = [];
+		/**
+		 * @param {number} i pattern index
+		 * @returns {string} path of the pattern
+		 */
+		const patternPath = (i) => (Array.isArray(glob) ? `${path}[${i}]` : path);
 		for (let i = 0; i < globs.length; i++) {
-			const pattern = globs[i];
-			const patternPath = Array.isArray(glob) ? `${path}[${i}]` : path;
-			if (typeof pattern !== "string") {
+			if (typeof globs[i] !== "string") {
 				throw this.error(
-					patternPath,
-					pattern,
-					`Unexpected ${typeof pattern} when glob pattern was expected`
+					patternPath(i),
+					globs[i],
+					`Unexpected ${typeof globs[i]} when glob pattern was expected`
 				);
 			}
-			const negated = pattern.startsWith("!");
-			const match = createPathGlobMatcher(negated ? pattern.slice(1) : pattern);
-			if (match === null) {
-				throw this.error(patternPath, pattern, "Invalid glob pattern");
-			}
-			(negated ? negative : positive).push(match);
 		}
-		const match = combineGlobMatchers(positive, negative);
+		const match = compileGlobList(globs, (pattern, i) => {
+			throw this.error(patternPath(i), pattern, "Invalid glob pattern");
+		});
 		return {
 			matchWhenEmpty: match(""),
-			fn: (v) => typeof v === "string" && match(v)
+			// a relative value starts where its `./` and `../` end, as a relative
+			// pattern matches at any depth
+			fn: (v) =>
+				typeof v === "string" &&
+				match(v.replace(RELATIVE_PATH_PREFIX_REGEXP, ""))
 		};
 	}
@@ -837,7 +818,7 @@ const someSpellingContains = (pattern, probe, expandFirst) => {
 };
 /**
- * @param {EXPECTED_ANY} glob glob pattern(s)
+ * @param {RuleSetGlob | RuleSetGlobs | undefined} glob glob pattern(s)
  * @param {string} extension extension including the dot (e.g. `".css"`)
  * @returns {boolean} whether a pattern targets the extension
  */
@@ -861,7 +842,7 @@ const globReferencesExtension = (glob, extension) => {
  * generic sample path doesn't match its (possibly filename-scoped) pattern.
  * The extension may be spelled by an alternation (`\.(css|scss)$`) or a
  * character class (`\.[jt]sx?$`), so those are expanded before probing.
- * @param {EXPECTED_ANY} condition condition
+ * @param {RuleSetConditionAbsolute | undefined} condition condition
  * @param {string} extProbe escaped extension probe (e.g. `"\\.css"`)
  * @returns {boolean} whether a regexp in the condition targets the extension
  */

package/lib/runtime/AsyncModuleGeneratorRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/AsyncModuleRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */
@@ -33,6 +33,9 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 		const fn = RuntimeGlobals.asyncModule;
 		const defer = this._deferInterop;
 		const strictErrors = this._strictModuleErrorHandling;
+		const moduleCache = this.receivesHotUpdates()
+			? RuntimeGlobals.moduleCache
+			: "__webpack_module_cache__";
 		const rejectCall = "reject(promise[webpackError] = err)";
 		const rejectExpression = strictErrors
 			? `(markCycle(err), ${rejectCall})`
@@ -65,7 +68,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 								Template.indent([
 									`${cst} hasUnresolvedAsyncSubgraph = asyncDeps.some((id) => {`,
 									Template.indent([
-										`${cst} cache = __webpack_module_cache__[id];`,
+										`${cst} cache = ${moduleCache}[id];`,
 										"if (!cache) return true;",
 										// A cached entry no longer means finished, and a rejected
 										// one is done but its error must still reach the importer.
@@ -223,7 +226,7 @@ class AsyncModuleRuntimeModule extends HelperRuntimeModule {
 									`group && group.forEach(${runtimeTemplate.basicFunction(
 										"id",
 										[
-											`${cst} peer = __webpack_module_cache__[id];`,
+											`${cst} peer = ${moduleCache}[id];`,
 											"if (peer && peer.error === undefined) peer.error = err;"
 										]
 									)})`,

package/lib/runtime/AutoPublicPathRuntimeModule.js CHANGED Viewed

@@ -4,12 +4,12 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 class AutoPublicPathRuntimeModule extends RuntimeModule {

package/lib/runtime/BaseUriRuntimeModule.js CHANGED Viewed

@@ -5,8 +5,8 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 const { renderBaseUri } = require("./baseUri");
 /**
@@ -14,7 +14,7 @@ const { renderBaseUri } = require("./baseUri");
  * 	EntryDescriptionNormalized as EntryDescription
  * } from "../../declarations/WebpackOptions"
  */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 class BaseUriRuntimeModule extends RuntimeModule {

package/lib/runtime/ChunkNameRuntimeModule.js CHANGED Viewed

@@ -4,8 +4,8 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 class ChunkNameRuntimeModule extends RuntimeModule {
 	/**

package/lib/runtime/CompatGetDefaultExportRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/CompatRuntimeModule.js CHANGED Viewed

@@ -4,11 +4,11 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 class CompatRuntimeModule extends RuntimeModule {

package/lib/runtime/ConcatenationWrapRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/ConstructRequireRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/CreateFakeNamespaceObjectRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/CreateScriptRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/CreateScriptUrlRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/DefinePropertyGettersRuntimeModule.js CHANGED Viewed

@@ -4,12 +4,12 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 class DefinePropertyGettersRuntimeModule extends HelperRuntimeModule {
 	/**
@@ -39,12 +39,12 @@ class DefinePropertyGettersRuntimeModule extends HelperRuntimeModule {
 		const compilation = /** @type {Compilation} */ (this.compilation);
 		const { runtimeTemplate } = compilation;
 		const fn = RuntimeGlobals.definePropertyGetters;
-		// Only webpack emits the array form, so a build emitting none cannot
-		// receive one; the object form stays either way (see the note below).
+		// Only webpack emits the array form, so a build whose emitters all stayed
+		// silent cannot receive one; the object form stays either way.
 		const withArray = this.runtimeRequirements.has(
 			RuntimeGlobals.definePropertyGettersFromArray
 		);
-		// TODO webpack 6: remove object format support. Internal code (e.g. ConcatenatedModule)
+		// TODO in the next major release: remove object format support. Internal code (e.g. ConcatenatedModule)
 		// and third-party libraries may still call __webpack_require__.d() with an object.
 		const fromObject = [
 			"for(var key in definition) {",

package/lib/runtime/EnsureChunkRuntimeModule.js CHANGED Viewed

@@ -4,14 +4,14 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const { getOnlyHandlerKey } = require("../util/handlerKeys");
 const { propertyAccess } = require("../util/property");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 /** @import Compilation from "../Compilation" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 class EnsureChunkRuntimeModule extends RuntimeModule {
 	/**

package/lib/runtime/GetChunkFilenameRuntimeModule.js CHANGED Viewed

@@ -4,14 +4,14 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
-const { reEncodeDigest } = require("../TemplatedPathPlugin");
+const Template = require("../template/Template");
+const { reEncodeDigest } = require("../template/TemplatedPathPlugin");
 const { first } = require("../util/SetHelpers");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
-/** @import Chunk, { ChunkId, ChunkFilenameTemplate } from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk, { ChunkId, ChunkFilenameTemplate } from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /**
  * @import Compilation, {
  * 	HashWithLengthFunction,

package/lib/runtime/GetFullHashRuntimeModule.js CHANGED Viewed

@@ -4,8 +4,8 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/GetMainFilenameRuntimeModule.js CHANGED Viewed

@@ -4,11 +4,11 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 class GetMainFilenameRuntimeModule extends RuntimeModule {

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js CHANGED Viewed

@@ -4,12 +4,12 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
 /** @import Compilation from "../Compilation" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 	/**

package/lib/runtime/GetWorkletBootstrapRuntimeModule.js CHANGED Viewed

@@ -5,9 +5,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/GlobalRuntimeModule.js CHANGED Viewed

@@ -4,9 +4,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 /** @typedef {import("../Compilation")} Compilation */

package/lib/runtime/HasOwnPropertyRuntimeModule.js CHANGED Viewed

@@ -5,9 +5,9 @@
 "use strict";
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const Template = require("../template/Template");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
 /** @import Compilation from "../Compilation" */

package/lib/runtime/HelperRuntimeModule.js CHANGED Viewed

@@ -4,7 +4,11 @@
 "use strict";
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
+const RuntimeModule = require("./RuntimeModule");
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /**
  * Base class for runtime modules that only emit helper functions and do not
@@ -28,6 +32,17 @@ class HelperRuntimeModule extends RuntimeModule {
 		// A helper defines a function on the require global and nothing else.
 		return RuntimeModule.NO_CHUNK_HANDLERS;
 	}
+	/**
+	 * Whether a hot update can deliver this helper, which then runs outside the
+	 * bootstrap scope and reaches its state only through `__webpack_require__`.
+	 * @returns {boolean} true, when the runtime accepts hot updates
+	 */
+	receivesHotUpdates() {
+		return /** @type {ChunkGraph} */ (this.chunkGraph)
+			.getTreeRuntimeRequirements(/** @type {Chunk} */ (this.chunk))
+			.has(RuntimeGlobals.hmrDownloadManifest);
+	}
 }
 module.exports = HelperRuntimeModule;

package/lib/runtime/LoadScriptRuntimeModule.js CHANGED Viewed

@@ -6,12 +6,12 @@
 const { SyncWaterfallHook } = require("tapable");
 /** @import Compilation from "../Compilation" */
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+const Template = require("../template/Template");
 const createHooksRegistry = require("../util/createHooksRegistry");
 const HelperRuntimeModule = require("./HelperRuntimeModule");
+const RuntimeGlobals = require("./RuntimeGlobals");
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /**
  * @typedef {object} LoadScriptCompilationHooks