Skip to content

Commit 87a62de

Browse files
refactor: move the last single-owner helpers out of lib/util (#22253)
* refactor: move two single-owner helpers out of lib/util chunkSetIntersections is reachable only from SplitChunksPlugin and extractSourceMap only from NormalModule, so each belongs with its subsystem rather than in lib/util, which holds what no one owns. No re-export is owed: find-deep-imports records no ecosystem import of either path, and types.d.ts is byte-identical. * refactor: move findCaseMismatch and the destructuring walk out of lib/util findCaseMismatch is reachable only from NormalModuleFactory, and traverseDestructuringAssignmentProperties only from three parser plugins in lib/dependencies, so each belongs with its subsystem.
1 parent 95930fd commit 87a62de

13 files changed

Lines changed: 13 additions & 13 deletions

‎lib/dependencies/CommonJsImportsParserPlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const {
1414
const RuntimeGlobals = require("../runtime/RuntimeGlobals");
1515

1616
const memoize = require("../util/memoize");
17-
const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
1817
const CommonJsFullRequireDependency = require("./CommonJsFullRequireDependency");
1918
const CommonJsRequireContextDependency = require("./CommonJsRequireContextDependency");
2019
const CommonJsRequireDependency = require("./CommonJsRequireDependency");
@@ -27,6 +26,7 @@ const RequireHeaderDependency = require("./RequireHeaderDependency");
2726
const RequireResolveContextDependency = require("./RequireResolveContextDependency");
2827
const RequireResolveDependency = require("./RequireResolveDependency");
2928
const RequireResolveHeaderDependency = require("./RequireResolveHeaderDependency");
29+
const traverseDestructuringAssignmentProperties = require("./traverseDestructuringAssignmentProperties");
3030

3131
const getUnsupportedFeatureWarning = memoize(() =>
3232
require("../errors/UnsupportedFeatureWarning")

‎lib/dependencies/HarmonyImportSpecifierDependency.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ const InitFragment = require("../template/InitFragment");
1919
const Template = require("../template/Template");
2020
const makeSerializable = require("../util/makeSerializable");
2121
const { propertyAccess } = require("../util/property");
22-
const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
2322
const HarmonyImportDependency = require("./HarmonyImportDependency");
2423
const HarmonyImportGuard = require("./HarmonyImportGuard");
2524
const { ImportPhaseUtils } = require("./ImportPhase");
2625
const { getTrimmedIdsAndRange } = require("./chainedImports");
26+
const traverseDestructuringAssignmentProperties = require("./traverseDestructuringAssignmentProperties");
2727

2828
/** @import { ReplaceSource } from "webpack-sources" */
2929
/** @import { GetConditionFn, ReferencedExports, UpdateHashContext } from "../graph/Dependency" */

‎lib/dependencies/ImportParserPlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const {
1212
getImportAttributes
1313
} = require("../javascript/JavascriptParser");
1414
const memoize = require("../util/memoize");
15-
const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
1615
const ContextDependencyHelpers = require("./ContextDependencyHelpers");
1716
const { getNonOptionalPart } = require("./HarmonyImportDependency");
1817
const HarmonyImportGuard = require("./HarmonyImportGuard");
@@ -21,6 +20,7 @@ const ImportDependency = require("./ImportDependency");
2120
const ImportEagerDependency = require("./ImportEagerDependency");
2221
const { createGetImportPhase } = require("./ImportPhase");
2322
const ImportWeakDependency = require("./ImportWeakDependency");
23+
const traverseDestructuringAssignmentProperties = require("./traverseDestructuringAssignmentProperties");
2424

2525
const getUnsupportedFeatureWarning = memoize(() =>
2626
require("../errors/UnsupportedFeatureWarning")

lib/util/traverseDestructuringAssignmentProperties.js renamed to lib/dependencies/traverseDestructuringAssignmentProperties.js

File renamed without changes.

‎lib/module/NormalModule.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const getValidate = memoize(() => require("schema-utils").validate);
6161

6262
const getGenerator = memoize(() => require("./Generator"));
6363

64-
const getExtractSourceMap = memoize(() => require("../util/extractSourceMap"));
64+
const getExtractSourceMap = memoize(() => require("./extractSourceMap"));
6565

6666
const getInvalidDependenciesModuleWarning = memoize(() =>
6767
require("../errors/InvalidDependenciesModuleWarning")

‎lib/module/NormalModuleFactory.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,6 @@ const LazySet = require("../util/LazySet");
2828
const { getScheme } = require("../util/URLAbsoluteSpecifier");
2929
const asyncLib = require("../util/async");
3030
const { cachedCleverMerge, cachedSetProperty } = require("../util/cleverMerge");
31-
const {
32-
applyCaseCorrections,
33-
findCaseMismatch
34-
} = require("../util/findCaseMismatch");
3531
const {
3632
ABSOLUTE_PATH_REGEXP,
3733
WINDOWS_PATH_SEPARATOR_REGEXP,
@@ -44,6 +40,10 @@ const Module = require("./Module");
4440
const ModuleFactory = require("./ModuleFactory");
4541
const { JAVASCRIPT_MODULE_TYPE_AUTO } = require("./ModuleTypeConstants");
4642
const NormalModule = require("./NormalModule");
43+
const {
44+
applyCaseCorrections,
45+
findCaseMismatch
46+
} = require("./findCaseMismatch");
4747

4848
/** @typedef {import("enhanced-resolve").Resolver["options"]["alias"]} AliasOptions */
4949
/** @import { ResolveContext, ResolveRequest } from "enhanced-resolve" */

‎lib/optimize/SplitChunksPlugin.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const Chunk = require("../graph/Chunk");
1010
const { requestToId } = require("../ids/IdHelpers");
1111
const { isSubset } = require("../util/SetHelpers");
1212
const SortableSet = require("../util/SortableSet");
13-
const { discoverIntersections } = require("../util/chunkSetIntersections");
1413
const {
1514
compareIterables,
1615
compareModulesByIdentifier
@@ -20,6 +19,7 @@ const { makePathsRelative } = require("../util/identifier");
2019
const memoize = require("../util/memoize");
2120
const MinMaxSizeWarning = require("./MinMaxSizeWarning");
2221
const { STAGE_ADVANCED } = require("./OptimizationStages");
22+
const { discoverIntersections } = require("./chunkSetIntersections");
2323
const deterministicGrouping = require("./deterministicGrouping");
2424

2525
/**

0 commit comments

Comments
 (0)