Skip to content

Commit d2f8f06

Browse files
authored
refactor: rename lib/dependencies/Harmony* files to ESM* (#22283)
1 parent 55a53f5 commit d2f8f06

63 files changed

Lines changed: 603 additions & 541 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"webpack": patch
3+
---
4+
5+
Rename the `lib/dependencies/Harmony*` files to `ESM*`.

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ The directory listings below are the canonical map of the repository. **Whenever
9696
file. `ProvidePlugin` substitutes an import rather than a value, so it is not one
9797
of these and lives in `lib/provide/`.
9898
- `lib/dependencies/` — The concrete `Dependency` subclasses and their templates
99-
(HarmonyImport, CommonJsRequire, RequireContext, …); the `Dependency` they extend is
99+
(ESMImport, CommonJsRequire, RequireContext, …); the `Dependency` they extend is
100100
in `lib/graph/` and the `DependencyTemplate` in `lib/template/`.
101101
- `lib/devtool/` — Source maps: the `devtool` plugins and the filename helpers they template with.
102102
- `lib/diagnostics/` — Plugins that raise a build-wide error or warning of their own:

‎lib/async-modules/AsyncModuleHelpers.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
"use strict";
77

8-
const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
8+
const ESMImportDependency = require("../dependencies/ESMImportDependency");
99

1010
/** @import ModuleGraph from "../graph/ModuleGraph" */
1111
/** @import Module from "../module/Module" */
@@ -35,15 +35,15 @@ const getOutgoingAsyncModules = (moduleGraph, module) => {
3535
// Walk the imports in source order: the spec gathers these from
3636
// `[[RequestedModules]]`, and their evaluation order is observable.
3737
for (const dependency of module.dependencies) {
38-
if (!(dependency instanceof HarmonyImportDependency)) continue;
38+
if (!(dependency instanceof ESMImportDependency)) continue;
3939
const referenced = moduleGraph.getModule(dependency);
4040
if (!referenced || seen.has(referenced)) continue;
4141
const connections = outgoingConnectionMap.get(referenced);
4242
if (
4343
connections &&
4444
connections.some(
4545
(c) =>
46-
c.dependency instanceof HarmonyImportDependency &&
46+
c.dependency instanceof ESMImportDependency &&
4747
c.isTargetActive(undefined)
4848
)
4949
) {

‎lib/async-modules/InferAsyncModulesPlugin.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
"use strict";
77

8-
const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
8+
const ESMImportDependency = require("../dependencies/ESMImportDependency");
99

1010
/** @import Compiler from "../Compiler" */
1111
/** @import Module from "../module/Module" */
@@ -38,7 +38,7 @@ class InferAsyncModulesPlugin {
3838
if (
3939
connections.some(
4040
(c) =>
41-
c.dependency instanceof HarmonyImportDependency &&
41+
c.dependency instanceof ESMImportDependency &&
4242
c.isTargetActive(undefined)
4343
)
4444
) {

‎lib/config/WebpackOptionsApply.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const ResolverCachePlugin = require("../cache/ResolverCachePlugin");
1313

1414
const CommonJsPlugin = require("../dependencies/CommonJsPlugin");
1515

16-
const HarmonyModulesPlugin = require("../dependencies/HarmonyModulesPlugin");
16+
const ESMModulesPlugin = require("../dependencies/ESMModulesPlugin");
1717

1818
const ImportMetaContextPlugin = require("../dependencies/ImportMetaContextPlugin");
1919
const ImportMetaPlugin = require("../dependencies/ImportMetaPlugin");
@@ -604,7 +604,7 @@ class WebpackOptionsApply extends OptionsApply {
604604
new FileUriPlugin().apply(compiler);
605605

606606
new CompatibilityPlugin().apply(compiler);
607-
new HarmonyModulesPlugin({
607+
new ESMModulesPlugin({
608608
deferImport: options.experiments.deferImport
609609
}).apply(compiler);
610610
if (options.amd !== false) {

‎lib/css/CssGenerator.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const {
1313
SourceMapSource
1414
} = require("webpack-sources");
1515
const CssImportDependency = require("../dependencies/CssImportDependency");
16-
const HarmonyImportSideEffectDependency = require("../dependencies/HarmonyImportSideEffectDependency");
16+
const ESMImportSideEffectDependency = require("../dependencies/ESMImportSideEffectDependency");
1717
const LoaderImportDependency = require("../dependencies/LoaderImportDependency");
1818
const ModuleFilenameHelpers = require("../devtool/ModuleFilenameHelpers");
1919
const { UsageState } = require("../graph/ExportsInfo");
@@ -666,7 +666,7 @@ class CssGenerator extends Generator {
666666
continue;
667667
}
668668

669-
if (connection.dependency instanceof HarmonyImportSideEffectDependency) {
669+
if (connection.dependency instanceof ESMImportSideEffectDependency) {
670670
continue;
671671
}
672672

‎lib/dependencies/CommonJsExportsParserPlugin.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const CommonJsObjectExportDependency = require("./CommonJsObjectExportDependency
1717
const CommonJsRequireDependency = require("./CommonJsRequireDependency");
1818
const CommonJsSelfReferenceDependency = require("./CommonJsSelfReferenceDependency");
1919
const DynamicExports = require("./DynamicExports");
20-
const HarmonyExports = require("./HarmonyExports");
20+
const ESMExports = require("./ESMExports");
2121
const ModuleDecoratorDependency = require("./ModuleDecoratorDependency");
2222
const RuntimeRequirementsDependency = require("./RuntimeRequirementsDependency");
2323

@@ -467,7 +467,7 @@ class CommonJsExportsParserPlugin {
467467
* @returns {boolean | undefined} true, when the expression was handled
468468
*/
469469
const handleAssignExport = (expr, base, members) => {
470-
if (HarmonyExports.isEnabled(parser.state)) return;
470+
if (ESMExports.isEnabled(parser.state)) return;
471471
// Handle reexporting
472472
const requireCall = parseRequireCall(parser, expr.right);
473473
if (
@@ -743,7 +743,7 @@ class CommonJsExportsParserPlugin {
743743
* @returns {boolean | void} true, when the expression was handled
744744
*/
745745
const handleAccessExport = (expr, base, members, call) => {
746-
if (HarmonyExports.isEnabled(parser.state)) return;
746+
if (ESMExports.isEnabled(parser.state)) return;
747747
if (members.length === 0) {
748748
bailout(
749749
`${base} is used directly at ${formatLocation(
@@ -833,8 +833,8 @@ class CommonJsExportsParserPlugin {
833833

834834
// Bailouts //
835835
parser.hooks.expression.for("module").tap(PLUGIN_NAME, (expr) => {
836-
const isHarmony = HarmonyExports.isEnabled(parser.state);
837-
// Silent under ESM, where `HarmonyExports` governs and nothing was lost.
836+
const isHarmony = ESMExports.isEnabled(parser.state);
837+
// Silent under ESM, where `ESMExports` governs and nothing was lost.
838838
bailout(
839839
isHarmony
840840
? undefined

‎lib/dependencies/CommonJsFullRequireDependency.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const {
1717
getRequireEsmModuleExportsAccess,
1818
isRequireEsmModuleExportsModule
1919
} = require("./CommonJsDependencyHelpers");
20-
const HarmonyImportGuard = require("./HarmonyImportGuard");
20+
const ESMImportGuard = require("./ESMImportGuard");
2121
const ModuleDependency = require("./ModuleDependency");
2222
const { getTrimmedIdsAndRange } = require("./chainedImports");
2323

@@ -35,7 +35,7 @@ const { getTrimmedIdsAndRange } = require("./chainedImports");
3535
/** @import { UsedByExports } from "../optimize/InnerGraph" */
3636
/** @import { RuntimeSpec } from "../util/runtime" */
3737
/** @import { IdRanges } from "./chainedImports" */
38-
/** @import { DependencyGuard } from "./HarmonyImportGuard" */
38+
/** @import { DependencyGuard } from "./ESMImportGuard" */
3939
/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExportInfoName[], IdRanges | undefined, boolean, undefined | boolean, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectDeserializerContext */
4040
/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExportInfoName[], IdRanges | undefined, boolean, undefined | boolean, DependencyGuard[] | undefined, boolean, boolean, UsedByExports | undefined]>} ObjectSerializerContext */
4141

@@ -95,7 +95,7 @@ class CommonJsFullRequireDependency extends ModuleDependency {
9595
}
9696
return !(
9797
guards !== undefined &&
98-
HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
98+
ESMImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
9999
);
100100
};
101101
}

‎lib/dependencies/CommonJsImportsParserPlugin.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const CommonJsRequireContextDependency = require("./CommonJsRequireContextDepend
1919
const CommonJsRequireDependency = require("./CommonJsRequireDependency");
2020
const ConstDependency = require("./ConstDependency");
2121
const ContextDependencyHelpers = require("./ContextDependencyHelpers");
22-
const HarmonyImportGuard = require("./HarmonyImportGuard");
22+
const ESMImportGuard = require("./ESMImportGuard");
2323
const LocalModuleDependency = require("./LocalModuleDependency");
2424
const { getLocalModule } = require("./LocalModulesHelpers");
2525
const RequireHeaderDependency = require("./RequireHeaderDependency");
@@ -216,7 +216,7 @@ const createRequireCallHandler = (
216216
dep.loc = parser.getLocation(expr);
217217
dep.optional = Boolean(parser.scope.inTry);
218218
parser.state.current.addDependency(dep);
219-
HarmonyImportGuard.attachDependencyGuards(parser, dep);
219+
ESMImportGuard.attachDependencyGuards(parser, dep);
220220
return dep;
221221
}
222222
};
@@ -675,7 +675,7 @@ class CommonJsImportsParserPlugin {
675675
dep._canConcatenate = true;
676676
dep.loc = parser.getLocation(expr);
677677
parser.state.current.addDependency(dep);
678-
HarmonyImportGuard.attachDependencyGuards(parser, dep);
678+
ESMImportGuard.attachDependencyGuards(parser, dep);
679679
return true;
680680
}
681681
};
@@ -718,7 +718,7 @@ class CommonJsImportsParserPlugin {
718718
dep._canConcatenate = true;
719719
dep.loc = parser.getLocation(expr.callee);
720720
parser.state.current.addDependency(dep);
721-
HarmonyImportGuard.attachDependencyGuards(parser, dep);
721+
ESMImportGuard.attachDependencyGuards(parser, dep);
722722
parser.walkExpressions(expr.arguments);
723723
return true;
724724
}

‎lib/dependencies/CommonJsPlugin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ class CommonJsPlugin {
279279
}
280280
}
281281

282+
// TODO in the next major release: rename to `ESMModuleDecoratorRuntimeModule`
282283
class HarmonyModuleDecoratorRuntimeModule extends RuntimeModule {
283284
constructor() {
284285
super("harmony module decorator");

0 commit comments

Comments
 (0)