webpack 5.111.0 → 5.112.0

package/lib/performance/HotspotsPlugin.js

@@ -5,15 +5,18 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
 const HotspotsWarning = require("../errors/HotspotsWarning");
 const { LOADER_TIMING } = require("../loaders/LoaderRunner");
+const NormalModule = require("../module/NormalModule");
 const { compareStrings } = require("../util/comparators");
 const { contextify } = require("../util/identifier");
 
 /** @typedef {import("tapable").FullTap} FullTap */
 /** @typedef {import("../../declarations/WebpackOptions").PerformanceOptions} PerformanceOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../module/NormalModuleFactory")} NormalModuleFactory */
+/** @typedef {import("../context/ContextModuleFactory")} ContextModuleFactory */
 /** @typedef {import("../errors/HotspotsWarning").HookDetails} HookDetails */
 /** @typedef {import("../errors/HotspotsWarning").HotspotDetails} HotspotDetails */
 
@@ -159,7 +162,7 @@ class HotspotsPlugin {
 						// The completion callback is the plugin's own code as well, so it
 						// is charged to the plugin rather than to whoever resumed it.
 						return measure(pluginTime, name, hookName, () =>
-							/** @type {EXPECTED_FUNCTION} */ (fn)(...args, finish)
+							fn(...args, finish)
 						);
 					}
 				};
@@ -171,15 +174,12 @@ class HotspotsPlugin {
 				 * @param {EXPECTED_ANY[]} args the tap's arguments
 				 * @returns {EXPECTED_ANY} whatever the tap returned
 				 */
-				fn: (...args) =>
-					measure(pluginTime, name, hookName, () =>
-						/** @type {EXPECTED_FUNCTION} */ (fn)(...args)
-					)
+				fn: (...args) => measure(pluginTime, name, hookName, () => fn(...args))
 			};
 		};
 
 		/**
-		 * @param {EXPECTED_ANY} instance anything carrying tapable hooks
+		 * @param {Compiler | Compilation | NormalModuleFactory | ContextModuleFactory} instance anything carrying tapable hooks
 		 * @returns {void}
 		 */
 		const interceptAll = (instance) => {
@@ -224,12 +224,13 @@ class HotspotsPlugin {
 				NormalModule.getCompilationHooks(compilation).loader.tap(
 					PLUGIN_NAME,
 					(loaderContext) => {
-						/** @type {EXPECTED_ANY} */
+						/** @type {{ [LOADER_TIMING]?: <T>(loader: { path: string }, run: () => T) => T }} */
 						(loaderContext)[LOADER_TIMING] =
 							/**
+							 * @template T
 							 * @param {{ path: string }} loader the loader about to run
-							 * @param {() => EXPECTED_ANY} run its own execution
-							 * @returns {EXPECTED_ANY} whatever it returned
+							 * @param {() => T} run its own execution
+							 * @returns {T} whatever it returned
 							 */
 							(loader, run) =>
 								measure(

package/lib/performance/LargeModulesPlugin.js

@@ -8,11 +8,10 @@
 const LargeModulesWarning = require("../errors/LargeModulesWarning");
 const { compareStrings } = require("../util/comparators");
 const getModuleSize = require("./getModuleSize");
-const getSourceModules = require("./getSourceModules");
 
 /** @typedef {import("../../declarations/WebpackOptions").PerformanceOptions} PerformanceOptions */
 /** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+/** @typedef {import("../module/Module")} Module */
 /** @typedef {import("../errors/LargeModulesWarning").LargeModuleDetails} LargeModuleDetails */
 
 const PLUGIN_NAME = "LargeModulesPlugin";
@@ -70,7 +69,7 @@ class LargeModulesPlugin {
 					for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
 						// Through scope hoisting one module stands for the several it
 						// absorbed, and it is those the report has to name.
-						for (const inner of getSourceModules(module)) {
+						for (const inner of module.getSourceModules()) {
 							const size = getModuleSize(inner);
 
 							sizes.set(inner, (sizes.get(inner) || 0) + size);

package/lib/performance/LegacyJavascriptPlugin.js

@@ -9,7 +9,6 @@ const LegacyJavascriptWarning = require("../errors/LegacyJavascriptWarning");
 const { compareStrings } = require("../util/comparators");
 const { WINDOWS_PATH_SEPARATOR_REGEXP } = require("../util/identifier");
 const getModuleSize = require("./getModuleSize");
-const getSourceModules = require("./getSourceModules");
 
 /** @import { Environment, PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
@@ -88,7 +87,7 @@ class LegacyJavascriptPlugin {
 				let totalSize = 0;
 
 				for (const module of compilation.modules) {
-					for (const inner of getSourceModules(module)) {
+					for (const inner of module.getSourceModules()) {
 						const resource = inner.nameForCondition();
 
 						if (!resource) continue;

package/lib/performance/MissingSideEffectsPlugin.js

@@ -5,7 +5,6 @@
 
 "use strict";
 
-const NormalModule = require("../NormalModule");
 const MissingSideEffectsWarning = require("../errors/MissingSideEffectsWarning");
 const { compareStrings } = require("../util/comparators");
 const getModuleSize = require("./getModuleSize");
@@ -13,7 +12,7 @@ const hasOnlyUnusedExports = require("./hasOnlyUnusedExports");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 /**
  * @import {
  * 	MissingSideEffectsDetails
@@ -32,7 +31,7 @@ const MAX_REPORTED_PACKAGES = 5;
  * @returns {string | undefined} the package name, or undefined
  */
 const getUndeclaredPackage = (module) => {
-	if (!(module instanceof NormalModule)) return undefined;
+	if (!module.is("normal")) return undefined;
 
 	const resolveData = module.resourceResolveData;
 	const description = resolveData && resolveData.descriptionFileData;

package/lib/performance/MissingSourceMapsPlugin.js

@@ -6,15 +6,14 @@
 "use strict";
 
 const { SourceMapSource } = require("webpack-sources");
-const NormalModule = require("../NormalModule");
 const MissingSourceMapsWarning = require("../errors/MissingSourceMapsWarning");
 const { compareStrings } = require("../util/comparators");
-const getSourceModules = require("./getSourceModules");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
-/** @import RequestShortener from "../RequestShortener" */
+/** @import Module from "../module/Module" */
+/** @import NormalModule from "../module/NormalModule" */
+/** @import RequestShortener from "../util/RequestShortener" */
 /** @import { MissingSourceMapDetails } from "../errors/MissingSourceMapsWarning" */
 
 const PLUGIN_NAME = "MissingSourceMapsPlugin";
@@ -67,12 +66,12 @@ class MissingSourceMapsPlugin {
 				for (const parent of compilation.modules) {
 					// Scope hoisting makes several modules into one, and each of them
 					// kept the source its own loaders produced.
-					for (const module of getSourceModules(parent)) {
+					for (const module of parent.getSourceModules()) {
 						if (seen.has(module)) continue;
 
 						seen.add(module);
 
-						if (!(module instanceof NormalModule)) continue;
+						if (!module.is("normal")) continue;
 
 						// Only where a real map was asked for: the cheap devtools map to
 						// the loader output by design, so nothing is lost there.

package/lib/performance/PureAnnotationsPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
+const PureAnnotationsWarning = require("../errors/PureAnnotationsWarning");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const PureAnnotationsWarning = require("../errors/PureAnnotationsWarning");
+} = require("../module/ModuleTypeConstants");
 const { getBuildDiagnostics } = require("../util/buildDiagnostics");
 const { compareStrings } = require("../util/comparators");
 const { CompilerHintNotationRegExp } = require("../util/magicComment");
@@ -18,7 +18,7 @@ const { CompilerHintNotationRegExp } = require("../util/magicComment");
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
 /** @import { Program } from "estree" */
-/** @import { BuildInfo } from "../Module" */
+/** @import { BuildInfo } from "../module/Module" */
 /** @import JavascriptParser from "../javascript/JavascriptParser" */
 /** @import { PureAnnotationDetails } from "../errors/PureAnnotationsWarning" */
 

package/lib/performance/RedundantDynamicImportsPlugin.js

@@ -5,18 +5,16 @@
 
 "use strict";
 
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const Entrypoint = require("../Entrypoint");
 const RedundantDynamicImportWarning = require("../errors/RedundantDynamicImportWarning");
 const { compareStrings } = require("../util/comparators");
 const formatLocation = require("../util/formatLocation");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGroup from "../ChunkGroup" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGroup from "../graph/ChunkGroup" */
 /** @import Compiler from "../Compiler" */
-/** @import DependenciesBlock from "../DependenciesBlock" */
-/** @import Module from "../Module" */
+/** @import DependenciesBlock from "../graph/DependenciesBlock" */
+/** @import Module from "../module/Module" */
 
 const PLUGIN_NAME = "RedundantDynamicImportsPlugin";
 
@@ -70,7 +68,7 @@ class RedundantDynamicImportsPlugin {
 						// An entrypoint is a load path in itself and carries nothing of
 						// what reaches it: an async one — a worker — starts from its own
 						// chunks, however much the module spawning it had loaded.
-						if (group.isInitial() || group instanceof Entrypoint) {
+						if (group.isInitial() || group.isEntrypoint()) {
 							entrypoints.add(group);
 							continue;
 						}
@@ -143,7 +141,7 @@ class RedundantDynamicImportsPlugin {
 				 */
 				const walk = (block, importer, contexts) => {
 					for (const nested of block.blocks) {
-						if (nested instanceof AsyncDependenciesBlock) {
+						if (nested.isAsyncBlock()) {
 							for (const dependency of nested.dependencies) {
 								const target = moduleGraph.getModule(dependency);
 

package/lib/performance/ScopeHoistingBailoutsPlugin.js

@@ -15,8 +15,8 @@ const getModuleSize = require("./getModuleSize");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
-/** @import RequestShortener from "../RequestShortener" */
+/** @import Module from "../module/Module" */
+/** @import RequestShortener from "../util/RequestShortener" */
 /**
  * @import {
  * 	ScopeHoistingBailoutGroup

package/lib/performance/SizeLimitsPlugin.js

@@ -5,25 +5,24 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const AssetsOverSizeLimitWarning = require("../errors/AssetsOverSizeLimitWarning");
+const EntrypointsOverSizeLimitWarning = require("../errors/EntrypointsOverSizeLimitWarning");
+const NoAsyncChunksWarning = require("../errors/NoAsyncChunksWarning");
+const RuntimeInLargeChunkWarning = require("../errors/RuntimeInLargeChunkWarning");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const { find } = require("../util/SetHelpers");
 const { compareStrings } = require("../util/comparators");
-const AssetsOverSizeLimitWarning = require("./AssetsOverSizeLimitWarning");
-const EntrypointsOverSizeLimitWarning = require("./EntrypointsOverSizeLimitWarning");
-const NoAsyncChunksWarning = require("./NoAsyncChunksWarning");
-const RuntimeInLargeChunkWarning = require("./RuntimeInLargeChunkWarning");
 const getModuleSize = require("./getModuleSize");
 
 /** @import { Source } from "webpack-sources" */
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
-/** @import ChunkGroup from "../ChunkGroup" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import ChunkGroup from "../graph/ChunkGroup" */
 /** @import Compilation, { Asset } from "../Compilation" */
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
-/** @import Entrypoint from "../Entrypoint" */
+/** @import Module from "../module/Module" */
+/** @import Entrypoint from "../graph/Entrypoint" */
 /** @import WebpackError from "../errors/WebpackError" */
 
 /**
@@ -82,7 +81,7 @@ const hasEmbeddedRuntime = (chunkGraph, entrypoint) => {
 	// module beats counting, which depends on runtime modules being counted twice.
 	let carriesCode = false;
 	for (const module of chunkGraph.getChunkModulesIterable(runtimeChunk)) {
-		if (!(module instanceof RuntimeModule)) {
+		if (!module.is("runtime")) {
 			carriesCode = true;
 			break;
 		}
@@ -269,10 +268,8 @@ module.exports = class SizeLimitsPlugin {
 			}
 
 			if (hints) {
-				// 1. Individual Chunk: Size < 250kb
-				// 2. Collective Initial Chunks [entrypoint] (Each Set?): Size < 250kb
-				// 3. No Async Chunks
-				// if !1, then 2, if !2 return
+				// Each asset is checked against the limit first, then each entrypoint's
+				// initial chunks together; async chunks count towards neither.
 				if (assetsOverSizeLimit.length > 0) {
 					addLargestModules(compilation, assetsOverSizeLimit);
 					warnings.push(

package/lib/performance/TopLevelThisPlugin.js

@@ -5,20 +5,19 @@
 
 "use strict";
 
+const TopLevelThisWarning = require("../errors/TopLevelThisWarning");
 const {
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
-} = require("../ModuleTypeConstants");
-const TopLevelThisWarning = require("../errors/TopLevelThisWarning");
+} = require("../module/ModuleTypeConstants");
 const { getBuildDiagnostics } = require("../util/buildDiagnostics");
 const { compareStrings } = require("../util/comparators");
-const getSourceModules = require("./getSourceModules");
 
-/** @import { Program } from "estree" */
+/** @import { Expression, PrivateIdentifier, Program } from "estree" */
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Module, { BuildInfo } from "../Module" */
+/** @import Module, { BuildInfo } from "../module/Module" */
 /** @import JavascriptParser from "../javascript/JavascriptParser" */
 /** @import { TopLevelThisDetails } from "../errors/TopLevelThisWarning" */
 
@@ -71,7 +70,9 @@ const countTopLevelThis = (ast) => {
 		if (CLASS_TYPES.has(type)) {
 			queue.push(fields.superClass);
 
-			const body = /** @type {EXPECTED_ANY} */ (fields.body);
+			const body =
+				/** @type {{ body: { computed?: boolean, key?: Expression | PrivateIdentifier }[] } | null | undefined} */
+				(fields.body);
 
 			for (const element of (body && body.body) || []) {
 				if (element.computed) queue.push(element.key);
@@ -162,7 +163,7 @@ class TopLevelThisPlugin {
 					for (const parent of compilation.modules) {
 						// Scope hoisting makes several modules into one, and the evidence
 						// sits on the ones that were parsed.
-						for (const module of getSourceModules(parent)) {
+						for (const module of parent.getSourceModules()) {
 							if (seen.has(module)) continue;
 
 							seen.add(module);

package/lib/performance/UnsplitVendorsPlugin.js

@@ -9,7 +9,6 @@ const UnsplitVendorsWarning = require("../errors/UnsplitVendorsWarning");
 const { compareStrings } = require("../util/comparators");
 const { NODE_MODULES_REGEXP } = require("../util/identifier");
 const getModuleSize = require("./getModuleSize");
-const getSourceModules = require("./getSourceModules");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
@@ -60,7 +59,7 @@ class UnsplitVendorsPlugin {
 					let applicationModules = 0;
 
 					for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
-						for (const inner of getSourceModules(module)) {
+						for (const inner of module.getSourceModules()) {
 							const resource = inner.nameForCondition();
 
 							// A module with no resource is webpack's own (a runtime module),

package/lib/performance/UnusedAliasesPlugin.js

@@ -6,20 +6,19 @@
 "use strict";
 
 const UnusedAliasesWarning = require("../errors/UnusedAliasesWarning");
-const { join } = require("../util/fs");
+const { join } = require("../fs/fs");
 const {
 	ABSOLUTE_PATH_REGEXP,
 	WINDOWS_PATH_SEPARATOR_REGEXP
 } = require("../util/identifier");
 const matchAlias = require("../util/matchAlias");
-const getSourceModules = require("./getSourceModules");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Dependency from "../Dependency" */
-/** @import DependenciesBlock from "../DependenciesBlock" */
-/** @import { ContextDependencyOptions } from "../dependencies/ContextDependency" */
-/** @import Module from "../Module" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import DependenciesBlock from "../graph/DependenciesBlock" */
+/** @import { ContextDependencyOptions } from "../dependencies/context/ContextDependency" */
+/** @import Module from "../module/Module" */
 
 /**
  * One `resolve.alias` entry, prepared for repeated matching.
@@ -159,7 +158,7 @@ class UnusedAliasesPlugin {
 					for (const module of compilation.modules) {
 						if (unused === 0) break;
 
-						for (const sourceModule of getSourceModules(module)) {
+						for (const sourceModule of module.getSourceModules()) {
 							const rawRequest =
 								/** @type {Module & { rawRequest?: string }} */
 								(sourceModule).rawRequest;

package/lib/performance/UnusedAssetsPlugin.js

@@ -5,10 +5,9 @@
 
 "use strict";
 
-const { ASSET_TYPE } = require("../ModuleSourceTypeConstants");
-const HarmonyImportBareSideEffectDependency = require("../dependencies/HarmonyImportBareSideEffectDependency");
-const HarmonyImportSideEffectDependency = require("../dependencies/HarmonyImportSideEffectDependency");
 const UnusedAssetsWarning = require("../errors/UnusedAssetsWarning");
+const isDependencyKind = require("../graph/isDependencyKind");
+const { ASSET_TYPE } = require("../module/ModuleSourceTypeConstants");
 const { compareStrings } = require("../util/comparators");
 const getModuleSize = require("./getModuleSize");
 
@@ -63,8 +62,9 @@ class UnusedAssetsPlugin {
 						// Anything else — a `url()`, a `new URL()`, an html `src` — reads
 						// the file, and a bare import asks for it on purpose.
 						if (
-							!(dependency instanceof HarmonyImportSideEffectDependency) ||
-							dependency instanceof HarmonyImportBareSideEffectDependency
+							dependency === null ||
+							!isDependencyKind(dependency, "esm-side-effect-import") ||
+							isDependencyKind(dependency, "esm-bare-side-effect-import")
 						) {
 							onlyUnread = false;
 							break;

package/lib/performance/UnusedDefinesPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const { VALUE_DEP_PREFIX, getDeclaredKeys } = require("../DefinePlugin");
+const { VALUE_DEP_PREFIX, getDeclaredKeys } = require("../define/DefinePlugin");
 const UnusedDefinesWarning = require("../errors/UnusedDefinesWarning");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import { NormalModuleBuildInfo } from "../NormalModule" */
+/** @import { NormalModuleBuildInfo } from "../module/NormalModule" */
 
 const PLUGIN_NAME = "UnusedDefinesPlugin";
 

package/lib/performance/UnusedExternalsPlugin.js

@@ -5,11 +5,10 @@
 
 "use strict";
 
-const ExternalModule = require("../ExternalModule");
+const UnusedExternalsWarning = require("../errors/UnusedExternalsWarning");
 const {
 	getAlternateCoreModuleRequest
-} = require("../ExternalModuleFactoryPlugin");
-const UnusedExternalsWarning = require("../errors/UnusedExternalsWarning");
+} = require("../externals/ExternalModuleFactoryPlugin");
 
 /**
  * @import {
@@ -74,7 +73,7 @@ class UnusedExternalsPlugin {
 				if (compilation.modules.size === 0) return;
 
 				for (const module of compilation.modules) {
-					if (module instanceof ExternalModule) {
+					if (module.is("external")) {
 						// The request as written, not what it was rewritten to.
 						declared.delete(module.userRequest);
 

package/lib/performance/UnusedFederationPlugin.js

@@ -5,10 +5,8 @@
 
 "use strict";
 
-const RemoteModule = require("../container/RemoteModule");
 const { getDeclaredRemotes } = require("../container/declaredRemotes");
 const UnusedFederationWarning = require("../errors/UnusedFederationWarning");
-const ConsumeSharedModule = require("../sharing/ConsumeSharedModule");
 const { getDeclaredShared } = require("../sharing/declaredShared");
 const { compareStrings } = require("../util/comparators");
 
@@ -80,9 +78,9 @@ class UnusedFederationPlugin {
 				const remoteRequests = new Set();
 
 				for (const module of compilation.modules) {
-					if (module instanceof ConsumeSharedModule) {
+					if (module.is("consume-shared")) {
 						usedShared.add(module.options.shareKey);
-					} else if (module instanceof RemoteModule) {
+					} else if (module.is("remote")) {
 						remoteRequests.add(module.request);
 					}
 				}

package/lib/performance/UnusedModulesPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const HarmonyImportBareSideEffectDependency = require("../dependencies/HarmonyImportBareSideEffectDependency");
 const UnusedModulesWarning = require("../errors/UnusedModulesWarning");
+const isDependencyKind = require("../graph/isDependencyKind");
 const { compareStrings } = require("../util/comparators");
 const getModuleSize = require("./getModuleSize");
 const hasOnlyUnusedExports = require("./hasOnlyUnusedExports");
@@ -14,8 +14,8 @@ const isOnlyReexported = require("./isOnlyReexported");
 
 /** @import { PerformanceOptions } from "../../declarations/WebpackOptions" */
 /** @import Compiler from "../Compiler" */
-/** @import Module, { BuildInfo } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import Module, { BuildInfo } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import { UnusedModuleDetails } from "../errors/UnusedModulesWarning" */
 
 const PLUGIN_NAME = "UnusedModulesPlugin";
@@ -34,7 +34,8 @@ const MAX_REPORTED_MODULES = 5;
 const everyImportBinds = (module, moduleGraph) => {
 	for (const connection of moduleGraph.getIncomingConnections(module)) {
 		if (
-			connection.dependency instanceof HarmonyImportBareSideEffectDependency
+			connection.dependency !== null &&
+			isDependencyKind(connection.dependency, "esm-bare-side-effect-import")
 		) {
 			return false;
 		}

package/lib/performance/getModuleSize.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 /**
  * Asks the module for its own source types rather than assuming javascript, so

package/lib/performance/hasOnlyUnusedExports.js

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const { UsageState } = require("../ExportsInfo");
+const { UsageState } = require("../graph/ExportsInfo");
 
-/** @import ChunkGraph from "../ChunkGraph" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 /**
  * Tells whether a module provides exports and no runtime uses any of them.

package/lib/performance/isOnlyReexported.js

@@ -5,11 +5,10 @@
 
 "use strict";
 
-const HarmonyExportImportedSpecifierDependency = require("../dependencies/HarmonyExportImportedSpecifierDependency");
-const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
 
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 /**
  * Tells whether every module pulling this one in does so by re-exporting it.
@@ -36,9 +35,11 @@ const isOnlyReexported = (module, moduleGraph) => {
 		const dependency = connection.dependency;
 
 		// Only an ESM import statement can carry a re-export.
-		if (!(dependency instanceof HarmonyImportDependency)) return false;
+		if (dependency === null || !isDependencyKind(dependency, "esm-import")) {
+			return false;
+		}
 
-		if (dependency instanceof HarmonyExportImportedSpecifierDependency) {
+		if (isDependencyKind(dependency, "esm-reexport")) {
 			const statements = reexportedStatements.get(origin);
 
 			if (statements === undefined) {

package/lib/{AutomaticPrefetchPlugin.js → prefetch/AutomaticPrefetchPlugin.js}

@@ -5,11 +5,10 @@
 
 "use strict";
 
-const NormalModule = require("./NormalModule");
-const PrefetchDependency = require("./dependencies/PrefetchDependency");
-const asyncLib = require("./util/async");
+const asyncLib = require("../util/async");
+const PrefetchDependency = require("./PrefetchDependency");
 
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "AutomaticPrefetchPlugin";
 
@@ -40,7 +39,7 @@ class AutomaticPrefetchPlugin {
 			lastModules = [];
 
 			for (const m of compilation.modules) {
-				if (m instanceof NormalModule) {
+				if (m.is("normal")) {
 					lastModules.push({
 						context: m.context,
 						request: m.request

package/lib/prefetch/ChunkPrefetchFunctionRuntimeModule.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const RuntimeModule = require("../runtime/RuntimeModule");
+const Template = require("../template/Template");
 const { getOnlyHandlerKey } = require("../util/handlerKeys");
 const { propertyAccess } = require("../util/property");