@depup/webpack 5.109.0-depup.0 → 5.110.1-depup.0

package/lib/SelfModuleFactory.js

@@ -5,9 +5,13 @@
 
 "use strict";
 
-/** @typedef {import("./ModuleFactory").ModuleFactoryCallback} ModuleFactoryCallback */
-/** @typedef {import("./ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
+/**
+ * @import {
+ * 	ModuleFactoryCallback,
+ * 	ModuleFactoryCreateData
+ * } from "./ModuleFactory"
+ */
+/** @import ModuleGraph from "./ModuleGraph" */
 
 class SelfModuleFactory {
 	/**

package/lib/SourceMapDevToolModuleOptionsPlugin.js

@@ -7,8 +7,12 @@
 
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
-/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
-/** @typedef {import("./Compilation")} Compilation */
+/**
+ * @import {
+ * 	SourceMapDevToolPluginOptions
+ * } from "../declarations/plugins/SourceMapDevToolPlugin"
+ */
+/** @import Compilation from "./Compilation" */
 
 const PLUGIN_NAME = "SourceMapDevToolModuleOptionsPlugin";
 

package/lib/SourceMapDevToolPlugin.js

@@ -17,22 +17,31 @@ const { dirname, relative } = require("./util/fs");
 const generateDebugId = require("./util/generateDebugId");
 const { makePathsAbsolute } = require("./util/identifier");
 
-/** @typedef {import("webpack-sources").MapOptions} MapOptions */
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").DevtoolNamespace} DevtoolNamespace */
-/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
-/** @typedef {import("../declarations/WebpackOptions").DevtoolFallbackModuleFilenameTemplate} DevtoolFallbackModuleFilenameTemplate */
-/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
-/** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").Rules} Rules */
-/** @typedef {import("./CacheFacade").ItemCacheFacade} ItemCacheFacade */
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./Compilation").Asset} Asset */
-/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./NormalModule").RawSourceMap} RawSourceMap */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} SourceMappingURLComment */
-/** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
+/** @import { MapOptions, Source, RawSourceMap } from "webpack-sources" */
+/**
+ * @import {
+ * 	DevtoolNamespace,
+ * 	DevtoolModuleFilenameTemplate,
+ * 	DevtoolFallbackModuleFilenameTemplate
+ * } from "../declarations/WebpackOptions"
+ */
+/**
+ * @import {
+ * 	SourceMapDevToolPluginOptions,
+ * 	Rules
+ * } from "../declarations/plugins/SourceMapDevToolPlugin"
+ */
+/** @import { ItemCacheFacade } from "./CacheFacade" */
+/** @import Chunk from "./Chunk" */
+/** @import { Asset, AssetInfo } from "./Compilation" */
+/** @import Compiler from "./Compiler" */
+/** @import Module from "./Module" */
+/**
+ * @import {
+ * 	TemplatePath as SourceMappingURLComment
+ * } from "./TemplatedPathPlugin"
+ */
+/** @import { OutputFileSystem } from "./util/fs" */
 
 /**
  * Defines the source map task type used by this module.
@@ -43,7 +52,7 @@ const { makePathsAbsolute } = require("./util/identifier");
  * @property {string} file
  * @property {RawSourceMap} sourceMap
  * @property {Source} mapSource the Source instance whose `sourceAndMap` we called (the current asset or, when its map was already stripped, the pinned original from `originalSources`) — what `clearCache` should target
- * @property {ItemCacheFacade} cacheItem cache item
+ * @property {InstanceType<ItemCacheFacade>} cacheItem cache item
  */
 
 const METACHARACTERS_REGEXP = /[-[\]\\/{}()*+?.^$|]/g;
@@ -164,7 +173,7 @@ const extractSourceAndMap = (file, asset, options, registry) => {
  * @param {AssetInfo} assetInfo the asset info
  * @param {MapOptions} options source map options
  * @param {Compilation} compilation compilation instance
- * @param {ItemCacheFacade} cacheItem cache item
+ * @param {InstanceType<ItemCacheFacade>} cacheItem cache item
  * @param {Map<string, Source>} registry compilation-scoped original-source registry
  * @returns {SourceMapTask | undefined} created task instance or `undefined`
  */
@@ -243,11 +252,12 @@ class SourceMapDevToolPlugin {
 					options.append || "\n//# source" + "MappingURL=[url]";
 		/** @type {DevtoolModuleFilenameTemplate} */
 		this.moduleFilenameTemplate =
-			options.moduleFilenameTemplate || "webpack://[namespace]/[resourcePath]";
+			options.moduleFilenameTemplate ||
+			ModuleFilenameHelpers.DEFAULT_MODULE_FILENAME_TEMPLATE;
 		/** @type {DevtoolFallbackModuleFilenameTemplate} */
 		this.fallbackModuleFilenameTemplate =
 			options.fallbackModuleFilenameTemplate ||
-			"webpack://[namespace]/[resourcePath]?[hash]";
+			ModuleFilenameHelpers.DEFAULT_FALLBACK_MODULE_FILENAME_TEMPLATE;
 		/** @type {DevtoolNamespace} */
 		this.namespace = options.namespace || "";
 		/** @type {SourceMapDevToolPluginOptions} */

package/lib/Stats.js

@@ -5,10 +5,9 @@
 
 "use strict";
 
-/** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
-/** @typedef {import("../declarations/WebpackOptions").StatsValue} StatsValue */
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
+/** @import { StatsValue } from "../declarations/WebpackOptions" */
+/** @import Compilation from "./Compilation" */
+/** @import { StatsCompilation } from "./stats/DefaultStatsFactoryPlugin" */
 
 class Stats {
 	/**

package/lib/Template.js

@@ -9,23 +9,28 @@ const { ConcatSource, PrefixSource } = require("webpack-sources");
 const { WEBPACK_MODULE_TYPE_RUNTIME } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("./config/defaults").OutputNormalizedWithDefaults} OutputOptions */
-/** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
-/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
-/** @typedef {import("./Compilation").PathData} PathData */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
-/** @typedef {import("./ModuleTemplate")} ModuleTemplate */
-/** @typedef {import("./RuntimeModule")} RuntimeModule */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("./TemplatedPathPlugin").TemplatePath} TemplatePath */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
-/** @typedef {import("./javascript/JavascriptModulesPlugin").RenderContext} RenderContext */
+/** @import { Source } from "webpack-sources" */
+/**
+ * @import {
+ * 	OutputNormalizedWithDefaults as OutputOptions
+ * } from "./config/defaults"
+ */
+/** @import Chunk from "./Chunk" */
+/** @import ChunkGraph, { ModuleId } from "./ChunkGraph" */
+/** @import CodeGenerationResults from "./CodeGenerationResults" */
+/** @import { AssetInfo, PathData } from "./Compilation" */
+/** @import DependencyTemplates from "./DependencyTemplates" */
+/** @import Module from "./Module" */
+/** @import ModuleGraph from "./ModuleGraph" */
+/** @import ModuleTemplate from "./ModuleTemplate" */
+/** @import RuntimeModule from "./RuntimeModule" */
+/** @import RuntimeTemplate from "./RuntimeTemplate" */
+/**
+ * @import {
+ * 	ChunkRenderContext,
+ * 	RenderContext
+ * } from "./javascript/JavascriptModulesPlugin"
+ */
 
 const START_LOWERCASE_ALPHABET_CODE = "a".charCodeAt(0);
 const START_UPPERCASE_ALPHABET_CODE = "A".charCodeAt(0);
@@ -39,6 +44,9 @@ const FUNCTION_CONTENT_REGEX = /^function\s?\(\)\s?\{\r?\n?|\r?\n?\}$/g;
 const JSDOC_LINE_REGEX = /^[ \t]*\/\*\*(?:[^*]|\*(?!\/))*\*\/[ \t]*\r?\n/gm;
 const JSDOC_INLINE_REGEX = /\/\*\*(?:[^*]|\*(?!\/))*\*\/[ \t]*/g;
 const INDENT_MULTILINE_REGEX = /^\t/gm;
+// Start of every non-blank line after the first. A lookahead keeps the next
+// character out of the match, so the replacement neither captures nor re-emits it.
+const LINE_START_REGEX = /\n(?=[^\n])/g;
 const LINE_SEPARATOR_REGEX = /\r?\n/g;
 const IDENTIFIER_NAME_REPLACE_REGEX = /^([^a-z$_])/i;
 const IDENTIFIER_ALPHA_NUMERIC_NAME_REPLACE_REGEX = /[^a-z0-9$]+/gi;
@@ -46,6 +54,22 @@ const COMMENT_END_REGEX = /\*\//g;
 const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-z0-9_!§$()=\-^°]+/gi;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
+/**
+ * Decimal digit count of a non-negative integer, without allocating a string.
+ * @param {number} n non-negative integer
+ * @returns {number} number of decimal digits
+ */
+const numberLength = (n) => {
+	if (n < 10) return 1;
+	if (n < 100) return 2;
+	if (n < 1000) return 3;
+	if (n < 10000) return 4;
+	if (n < 100000) return 5;
+	if (n < 1000000) return 6;
+	if (n < 10000000) return 7;
+	return String(n).length;
+};
+
 /**
  * Defines the render manifest options type used by this module.
  * @typedef {object} RenderManifestOptions
@@ -240,7 +264,7 @@ class Template {
 		const str = s.trimEnd();
 		if (!str) return "";
 		const ind = str[0] === "\n" ? "" : "\t";
-		return ind + str.replace(/\n([^\n])/g, "\n\t$1");
+		return ind + str.replace(LINE_START_REGEX, "\n\t");
 	}
 
 	/**
@@ -253,6 +277,8 @@ class Template {
 		const str = Template.asString(s).trim();
 		if (!str) return "";
 		const ind = str[0] === "\n" ? "" : prefix;
+		// Keeps the capture group: `prefix` is caller-supplied and may itself hold
+		// `$&`/`$1`, which expand differently against a zero-width lookahead.
 		return ind + str.replace(/\n([^\n])/g, `\n${prefix}$1`);
 	}
 
@@ -296,11 +322,15 @@ class Template {
 		// start with -1 because the first module needs no comma
 		let objectOverhead = -1;
 		for (const module of modules) {
-			// module id + colon + comma
-			objectOverhead += `${module.id}`.length + 2;
+			// module id digits + colon + comma; ids are non-negative integers here
+			// (non-number ids already returned false above), so count digits
+			// arithmetically instead of allocating a string per module.
+			const id = /** @type {number} */ (module.id);
+			objectOverhead += numberLength(id) + 2;
 		}
 		// number of commas, or when starting non-zero the length of Array(minId).concat()
-		const arrayOverhead = minId === 0 ? maxId : 16 + `${minId}`.length + maxId;
+		const arrayOverhead =
+			minId === 0 ? maxId : 16 + numberLength(minId) + maxId;
 		return arrayOverhead < objectOverhead ? [minId, maxId] : false;
 	}
 
@@ -446,8 +476,8 @@ class Template {
 	}
 }
 
-module.exports = Template;
-module.exports.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS =
+Template.NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS =
 	NUMBER_OF_IDENTIFIER_CONTINUATION_CHARS;
-module.exports.NUMBER_OF_IDENTIFIER_START_CHARS =
-	NUMBER_OF_IDENTIFIER_START_CHARS;
+Template.NUMBER_OF_IDENTIFIER_START_CHARS = NUMBER_OF_IDENTIFIER_START_CHARS;
+
+module.exports = Template;

package/lib/TemplatedPathPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { basename, extname } = require("path");
+const { basename, extname, posix } = require("path");
 const util = require("util");
 const Chunk = require("./Chunk");
 const Module = require("./Module");
@@ -13,19 +13,27 @@ const {
 	decode: decodeBase,
 	encode: encodeBase
 } = require("./util/hash/hash-digest");
-const { parseResource } = require("./util/identifier");
+const {
+	ABSOLUTE_PATH_REGEXP,
+	WINDOWS_ABS_PATH_REGEXP,
+	WINDOWS_PATH_SEPARATOR_REGEXP,
+	parseResource
+} = require("./util/identifier");
 const memoize = require("./util/memoize");
 
 const getMimeTypes = memoize(() => require("./util/mimeTypes"));
 
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
-/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
-/** @typedef {import("./Compilation").HashWithDigestFunction} HashWithDigestFunction */
-/** @typedef {import("./Compilation").PathData} PathData */
-/** @typedef {import("./Compilation").PathDataChunk} PathDataChunk */
-/** @typedef {import("./Compilation").PathDataModule} PathDataModule */
-/** @typedef {import("./Compiler")} Compiler */
+/** @import ChunkGraph, { ModuleId } from "./ChunkGraph" */
+/**
+ * @import Compilation, {
+ * 	AssetInfo,
+ * 	HashWithDigestFunction,
+ * 	PathData,
+ * 	PathDataChunk,
+ * 	PathDataModule
+ * } from "./Compilation"
+ */
+/** @import Compiler from "./Compiler" */
 
 const REGEXP = /\[\\*([\w:]+)\\*\]/g;
 
@@ -69,6 +77,56 @@ const getPresentKinds = (path) => {
 	return kinds;
 };
 
+// `[fullhash:<digest>]`/`[hash:<digest>]` — a non-numeric first argument is a digest
+// (a numeric one is just a length). A digest re-encodes the hash rather than reading
+// it, so no stand-in or runtime expression can take its place: the settled value has
+// to be inlined instead.
+const FULL_HASH_DIGEST_REGEXP = /\[(?:fullhash|hash):(?!\d+\])\w/;
+
+/**
+ * @param {string} template path template
+ * @returns {boolean} true when it references `[fullhash:<digest>]`/`[hash:<digest>]`
+ */
+const usesFullHashDigest = (template) => FULL_HASH_DIGEST_REGEXP.test(template);
+
+const PARENT_SEGMENTS_REGEXP = /^(?:\.\.\/)+/;
+
+/**
+ * Maps a `[path]`/`[file]` value into the output directory: an absolute root or
+ * a leading `..` becomes `_` (as `file-loader` did), so a module resolved
+ * outside of `context` can't emit its asset outside of `output.path`.
+ * @param {string} path relative path of the source file
+ * @returns {string} path that stays inside the output directory
+ */
+const toContainedPath = (path) => {
+	if (!path) return path;
+	// A resource on another Windows drive stays absolute and win32-separated
+	// when made relative to the context.
+	const normalized = posix.normalize(
+		WINDOWS_ABS_PATH_REGEXP.test(path)
+			? path.replace(WINDOWS_PATH_SEPARATOR_REGEXP, "/")
+			: path
+	);
+	return normalized
+		.replace(ABSOLUTE_PATH_REGEXP, "_/")
+		.replace(PARENT_SEGMENTS_REGEXP, (match) => "_/".repeat(match.length / 3));
+};
+
+/**
+ * Source file name a filename template sees. `[path]`/`[file]` of a module
+ * resolved outside of `context` start with `..` and would emit the asset
+ * outside of `output.path`, so they are contained like
+ * `[containedpath]`/`[containedfile]` with `experiments.futureDefaults`.
+ * @param {string} sourceFilename context-relative path of the source file
+ * @param {Compilation} compilation compilation
+ * @returns {string} source file name for the filename template
+ */
+const toTemplateSourceFileName = (sourceFilename, compilation) =>
+	// TODO webpack 6: remove the check, always contain
+	compilation.options.experiments.futureDefaults
+		? toContainedPath(sourceFilename)
+		: sourceFilename;
+
 /** @type {PathData["prepareId"]} */
 const prepareId = (id) => {
 	if (typeof id !== "string") return id;
@@ -376,6 +434,9 @@ const interpolate = (path, data, assetInfo) => {
 	// [path] - /some/path/
 	// [name] - file
 	// [ext] - .js
+	//
+	// [containedfile] and [containedpath] are [file] and [path] kept inside
+	// `output.path`
 	if (
 		typeof data.filename === "string" &&
 		(presentKinds.has("file") ||
@@ -385,7 +446,9 @@ const interpolate = (path, data, assetInfo) => {
 			presentKinds.has("base") ||
 			presentKinds.has("name") ||
 			presentKinds.has("ext") ||
-			presentKinds.has("filebase"))
+			presentKinds.has("filebase") ||
+			presentKinds.has("containedfile") ||
+			presentKinds.has("containedpath"))
 	) {
 		// check that filename is data uri
 		const match = data.filename.match(/^data:([^;,]+)/);
@@ -405,6 +468,12 @@ const interpolate = (path, data, assetInfo) => {
 				replacements.set("fragment", emptyReplacer);
 			}
 			if (presentKinds.has("path")) replacements.set("path", emptyReplacer);
+			if (presentKinds.has("containedfile")) {
+				replacements.set("containedfile", emptyReplacer);
+			}
+			if (presentKinds.has("containedpath")) {
+				replacements.set("containedpath", emptyReplacer);
+			}
 			if (presentKinds.has("base")) replacements.set("base", baseReplacer);
 			if (presentKinds.has("name")) replacements.set("name", baseReplacer);
 			if (presentKinds.has("ext")) {
@@ -439,6 +508,15 @@ const interpolate = (path, data, assetInfo) => {
 			if (presentKinds.has("path")) {
 				replacements.set("path", replacer(path, true));
 			}
+			if (presentKinds.has("containedfile")) {
+				replacements.set("containedfile", replacer(toContainedPath(file)));
+			}
+			if (presentKinds.has("containedpath")) {
+				replacements.set(
+					"containedpath",
+					replacer(toContainedPath(path), true)
+				);
+			}
 			if (presentKinds.has("base")) replacements.set("base", replacer(base));
 			if (presentKinds.has("name")) replacements.set("name", replacer(name));
 			if (presentKinds.has("ext")) replacements.set("ext", replacer(ext, true));
@@ -762,7 +840,11 @@ class TemplatedPathPlugin {
 	}
 }
 
+TemplatedPathPlugin.getPresentKinds = getPresentKinds;
+TemplatedPathPlugin.interpolate = interpolate;
+TemplatedPathPlugin.reEncodeDigest = reEncodeDigest;
+TemplatedPathPlugin.toContainedPath = toContainedPath;
+TemplatedPathPlugin.toTemplateSourceFileName = toTemplateSourceFileName;
+TemplatedPathPlugin.usesFullHashDigest = usesFullHashDigest;
+
 module.exports = TemplatedPathPlugin;
-module.exports.getPresentKinds = getPresentKinds;
-module.exports.interpolate = interpolate;
-module.exports.reEncodeDigest = reEncodeDigest;

package/lib/UseStrictPlugin.js

@@ -12,12 +12,10 @@ const {
 } = require("./ModuleTypeConstants");
 const ConstDependency = require("./dependencies/ConstDependency");
 
-/** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./Module").BuildInfo} BuildInfo */
-/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("./javascript/JavascriptParser").Range} Range */
+/** @import { JavascriptParserOptions } from "../declarations/WebpackOptions" */
+/** @import Compiler from "./Compiler" */
+/** @import { BuildInfo } from "./Module" */
+/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "UseStrictPlugin";
 

package/lib/WarnCaseSensitiveModulesPlugin.js

@@ -5,10 +5,10 @@
 
 "use strict";
 
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Module")} Module */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
-/** @typedef {import("./NormalModule")} NormalModule */
+/** @import Compiler from "./Compiler" */
+/** @import Module from "./Module" */
+/** @import ModuleGraph from "./ModuleGraph" */
+/** @import NormalModule from "./NormalModule" */
 
 const WebpackError = require("./errors/WebpackError");
 

package/lib/WarnDeprecatedOptionPlugin.js

@@ -7,7 +7,7 @@
 
 const WebpackError = require("./errors/WebpackError");
 
-/** @typedef {import("./Compiler")} Compiler */
+/** @import Compiler from "./Compiler" */
 
 const PLUGIN_NAME = "WarnDeprecatedOptionPlugin";
 

package/lib/WarnNoModeSetPlugin.js

@@ -23,7 +23,7 @@ class NoModeWarning extends WebpackError {
 	}
 }
 
-/** @typedef {import("./Compiler")} Compiler */
+/** @import Compiler from "./Compiler" */
 
 const PLUGIN_NAME = "WarnNoModeSetPlugin";
 

package/lib/WatchIgnorePlugin.js

@@ -7,12 +7,14 @@
 
 const { groupBy } = require("./util/ArrayHelpers");
 
-/** @typedef {import("watchpack").TimeInfoEntries} TimeInfoEntries */
-/** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
-/** @typedef {import("./util/fs").WatchMethod} WatchMethod */
-/** @typedef {import("./util/fs").Watcher} Watcher */
+/** @import { TimeInfoEntries } from "watchpack" */
+/**
+ * @import {
+ * 	WatchIgnorePluginOptions
+ * } from "../declarations/plugins/WatchIgnorePlugin"
+ */
+/** @import Compiler from "./Compiler" */
+/** @import { WatchFileSystem, WatchMethod, Watcher } from "./util/fs" */
 
 const IGNORE_TIME_ENTRY = "ignore";
 

package/lib/Watching.js

@@ -7,14 +7,12 @@
 
 const Stats = require("./Stats");
 
-/** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
-/** @typedef {import("./Compilation")} Compilation */
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Compiler").ErrorCallback} ErrorCallback */
-/** @typedef {import("./logging/Logger").Logger} Logger */
-/** @typedef {import("./util/fs").TimeInfoEntries} TimeInfoEntries */
-/** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
-/** @typedef {import("./util/fs").Watcher} Watcher */
+/** @import { WatchOptions } from "../declarations/WebpackOptions" */
+/** @import Compilation from "./Compilation" */
+/** @import Compiler from "./Compiler" */
+/** @import { Logger } from "./logging/Logger" */
+/** @import { TimeInfoEntries, WatchFileSystem, Watcher } from "./util/fs" */
+/** @import { ErrorCallback } from "./webpack" */
 
 /**
  * Defines the callback type used by this module.
@@ -126,6 +124,8 @@ class Watching {
 	_go(fileTimeInfoEntries, contextTimeInfoEntries, changedFiles, removedFiles) {
 		this._initial = false;
 		if (this.startTime === null) this.startTime = Date.now();
+		// Whatever held this back let go — a build is starting.
+		this.blocked = false;
 		this.running = true;
 		if (this.watcher) {
 			this.pausedWatcher = this.watcher;

package/lib/WebpackIsIncludedPlugin.js

@@ -16,10 +16,8 @@ const {
 	toConstantDependency
 } = require("./javascript/JavascriptParserHelpers");
 
-/** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("./javascript/JavascriptParser").Range} Range */
+/** @import Compiler from "./Compiler" */
+/** @import JavascriptParser, { Range } from "./javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "WebpackIsIncludedPlugin";