Skip to content

Commit 4fa53b3

Browse files
perf(defer): emit only the namespace shapes a build can reach
The deferred namespace runtime carried both shapes in every bundle, so a build that only defers ES modules still shipped the synthesized path it can never enter — and the other way round. Call sites now mark which shape they ask for, the way `hasFetchPriority` marks a chunk, and the runtime module emits only those branches. The marker is set by the same code that decides whether to hand over an export list, so it cannot disagree with what was generated, and it travels in the runtime requirements rather than beside them. Over the defer/mangle/analyzable cases the pull request now takes 400 B less gzip and 3.69 KiB less raw than main, where it previously added 3.62 KiB gzip. A build that only defers ES modules loses 8-17% of its gzipped bundle; one that mixes exports types is unchanged.
1 parent 2131357 commit 4fa53b3

8 files changed

Lines changed: 163 additions & 65 deletions

‎lib/ContextModule.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,6 +1745,7 @@ module.exports = webpackEmptyAsyncContext;`;
17451745
ImportPhaseUtils.isDefer(this.options.phase || ImportPhase.Evaluation)
17461746
) {
17471747
set.add(RuntimeGlobals.makeDeferredNamespaceObject);
1748+
set.add(RuntimeGlobals.hasSynthesizedDeferredNamespace);
17481749
}
17491750
}
17501751
return {

‎lib/RuntimeGlobals.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -260,6 +260,17 @@ module.exports.hasFetchPriority = "has fetch priority";
260260
*/
261261
module.exports.hasOwnProperty = "__webpack_require__.o";
262262

263+
/**
264+
* a flag when a deferred namespace is built from a known export list
265+
*/
266+
module.exports.hasSealedDeferredNamespace = "has sealed deferred namespace";
267+
268+
/**
269+
* a flag when a deferred namespace is synthesized from the module's exports
270+
*/
271+
module.exports.hasSynthesizedDeferredNamespace =
272+
"has synthesized deferred namespace";
273+
263274
/**
264275
* function downloading the update manifest
265276
*/

‎lib/RuntimePlugin.js‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,10 +345,20 @@ class RuntimePlugin {
345345
const asyncModule = runtimeRequirement.has(
346346
RuntimeGlobals.asyncModule
347347
);
348+
const sealed = runtimeRequirement.has(
349+
RuntimeGlobals.hasSealedDeferredNamespace
350+
);
351+
// An unmarked build keeps both shapes, so a call site that
352+
// predates the markers still gets the permissive runtime.
353+
const synthesized =
354+
!sealed ||
355+
runtimeRequirement.has(
356+
RuntimeGlobals.hasSynthesizedDeferredNamespace
357+
);
348358
compilation.addLazyRuntimeModule(
349359
chunk,
350360
getMakeDeferredNamespaceObjectRuntimeModule,
351-
(Ctor) => new Ctor(asyncModule)
361+
(Ctor) => new Ctor(asyncModule, sealed, synthesized)
352362
);
353363
return true;
354364
});

‎lib/RuntimeTemplate.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1999,6 +1999,11 @@ class RuntimeTemplate {
19991999
module,
20002000
exportsType
20012001
);
2002+
runtimeRequirements.add(
2003+
deferredExportNames
2004+
? RuntimeGlobals.hasSealedDeferredNamespace
2005+
: RuntimeGlobals.hasSynthesizedDeferredNamespace
2006+
);
20022007
mode += deferredExportNames
20032008
? `, ${JSON.stringify(deferredExportNames)}`
20042009
: "";
@@ -2484,6 +2489,11 @@ class RuntimeTemplate {
24842489
module,
24852490
exportsType
24862491
);
2492+
runtimeRequirements.add(
2493+
names
2494+
? RuntimeGlobals.hasSealedDeferredNamespace
2495+
: RuntimeGlobals.hasSynthesizedDeferredNamespace
2496+
);
24872497
const init = `${RuntimeGlobals.makeDeferredNamespaceObject}(${JSON.stringify(
24882498
id
24892499
)}, ${type}${names ? `, ${JSON.stringify(names)}` : ""})`;

‎lib/dependencies/HarmonyExportImportedSpecifierDependency.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,11 @@ HarmonyExportImportedSpecifierDependency.Template = class HarmonyExportImportedS
18061806
module,
18071807
exportsType
18081808
);
1809+
runtimeRequirements.add(
1810+
names
1811+
? RuntimeGlobals.hasSealedDeferredNamespace
1812+
: RuntimeGlobals.hasSynthesizedDeferredNamespace
1813+
);
18091814
map.set(
18101815
key,
18111816
`/* reexport deferred namespace object */ ${name}_deferred_namespace_cache || (${name}_deferred_namespace_cache = ${RuntimeGlobals.makeDeferredNamespaceObject}(${moduleId}, ${mode}${names ? `, ${JSON.stringify(names)}` : ""}))`

‎lib/optimize/ConcatenatedModule.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2791,6 +2791,11 @@ ${defineGetters}`
27912791
info.module,
27922792
deferredExportsType
27932793
);
2794+
runtimeRequirements.add(
2795+
names
2796+
? RuntimeGlobals.hasSealedDeferredNamespace
2797+
: RuntimeGlobals.hasSynthesizedDeferredNamespace
2798+
);
27942799
result.add(
27952800
`\nvar ${info.deferredNamespaceObjectName} = /*#__PURE__*/${
27962801
RuntimeGlobals.makeDeferredNamespaceObject

‎lib/runtime/MakeDeferredNamespaceObjectRuntime.js‎

Lines changed: 118 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -322,11 +322,17 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
322322

323323
/**
324324
* @param {boolean} hasAsyncRuntime if async module is used.
325+
* @param {boolean} sealed a call site builds a namespace from a known export list
326+
* @param {boolean} synthesized a call site builds one from the module's exports
325327
*/
326-
constructor(hasAsyncRuntime) {
328+
constructor(hasAsyncRuntime, sealed, synthesized) {
327329
super("make deferred namespace object");
328330
/** @type {boolean} */
329331
this.hasAsyncRuntime = hasAsyncRuntime;
332+
/** @type {boolean} */
333+
this.sealed = sealed;
334+
/** @type {boolean} */
335+
this.synthesized = synthesized;
330336
}
331337

332338
/**
@@ -340,6 +346,10 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
340346
const lt = runtimeTemplate.renderLet();
341347
const fn = RuntimeGlobals.makeDeferredNamespaceObject;
342348
const hasAsync = this.hasAsyncRuntime;
349+
// A build reaches only the shapes its call sites ask for, so the other
350+
// one's branches are dead weight in every bundle that ships this runtime.
351+
const sealed = this.sealed;
352+
const synthesized = this.synthesized;
343353
const init = `${runtimeTemplate.optionalChaining("init", "()")};`;
344354
return `${fn} = ${runtimeTemplate.basicFunction(
345355
"moduleId, mode, exportNames",
@@ -369,20 +379,28 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
369379
"mode &= ~16;",
370380
// Only a real ES module namespace has the spec's exotic shape; a
371381
// synthesized one (JSON, asset, CommonJS interop) keeps the old form.
372-
"if (!(mode & 8)) exportNames = undefined;",
382+
sealed && synthesized
383+
? "if (!(mode & 8)) exportNames = undefined;"
384+
: "",
373385
`${lt} byMode = __webpack_module_deferred_namespace_cache__[moduleId];`,
374386
"if (byMode && byMode[mode] !== undefined) return byMode[mode];",
375387
"if (!byMode) byMode = __webpack_module_deferred_namespace_cache__[moduleId] = {};",
376-
`${cst} cachedModule = __webpack_module_cache__[moduleId];`,
377-
"if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {",
378-
Template.indent([
379-
`${lt} exports = cachedModule.exports;`,
380-
hasAsync
381-
? `if (${RuntimeGlobals.asyncModuleExportSymbol} in exports) exports = exports[${RuntimeGlobals.asyncModuleExportSymbol}];`
382-
: "",
383-
`return byMode[mode] = ${RuntimeGlobals.createFakeNamespaceObject}(exports, mode);`
384-
]),
385-
"}",
388+
synthesized
389+
? `${cst} cachedModule = __webpack_module_cache__[moduleId];`
390+
: "",
391+
synthesized
392+
? "if (cachedModule && cachedModule.error === undefined && !(mode & 8)) {"
393+
: "",
394+
synthesized
395+
? Template.indent([
396+
`${lt} exports = cachedModule.exports;`,
397+
hasAsync
398+
? `if (${RuntimeGlobals.asyncModuleExportSymbol} in exports) exports = exports[${RuntimeGlobals.asyncModuleExportSymbol}];`
399+
: "",
400+
`return byMode[mode] = ${RuntimeGlobals.createFakeNamespaceObject}(exports, mode);`
401+
])
402+
: "",
403+
synthesized ? "}" : "",
386404
"",
387405
`${lt} init = ${runtimeTemplate.basicFunction("", [
388406
// A deferred namespace that forces evaluation of a module that is
@@ -395,7 +413,9 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
395413
? `if (${RuntimeGlobals.asyncModuleExportSymbol} in ns) ns = ns[${RuntimeGlobals.asyncModuleExportSymbol}];`
396414
: "",
397415
"init = null;",
398-
"if (mode & 8 || mode & 4 && ns.__esModule && typeof ns === 'object') {",
416+
synthesized
417+
? "if (mode & 8 || mode & 4 && ns.__esModule && typeof ns === 'object') {"
418+
: "",
399419
Template.indent([
400420
// Drop only the read-side traps after init: with the
401421
// resolved namespace's own keys mirrored onto
@@ -416,20 +436,24 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
416436
// on the target instead of returning false.
417437
// A sealed target holds placeholder values, so the read traps stay to
418438
// keep the live bindings visible.
419-
"if (!exportNames) {",
420-
Template.indent([
421-
"delete handler.get;",
422-
"delete handler.has;",
423-
"delete handler.ownKeys;",
424-
"delete handler.getOwnPropertyDescriptor;"
425-
]),
426-
"}"
427-
]),
428-
"} else {",
429-
Template.indent([
430-
`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns, mode);`
439+
sealed && synthesized ? "if (!exportNames) {" : "",
440+
synthesized
441+
? Template.indent([
442+
"delete handler.get;",
443+
"delete handler.has;",
444+
"delete handler.ownKeys;",
445+
"delete handler.getOwnPropertyDescriptor;"
446+
])
447+
: "",
448+
sealed && synthesized ? "}" : ""
431449
]),
432-
"}",
450+
synthesized ? "} else {" : "",
451+
synthesized
452+
? Template.indent([
453+
`ns = ${RuntimeGlobals.createFakeNamespaceObject}(ns, mode);`
454+
])
455+
: "",
456+
synthesized ? "}" : "",
433457
// Mirror own properties from the resolved namespace onto the proxy
434458
// target so that proxy invariants hold for callers that structurally
435459
// introspect via `Object.keys` / `Object.getOwnPropertyNames` /
@@ -443,18 +467,22 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
443467
// proposal, the [[StringTag]] of a Deferred Module Namespace
444468
// Exotic Object is "Deferred Module"), and the target was already
445469
// pre-populated with those values below.
446-
`${cst} keys = exportNames ? [] : Reflect.ownKeys(ns);`,
447-
"for (var i = 0; i < keys.length; i++) {",
448-
Template.indent([
449-
`${cst} k = keys[i];`,
450-
'if (k === "__esModule" || k === Symbol.toStringTag) continue;',
451-
`if (!${runtimeTemplate.objectHasOwn("ns_target", "k")}) {`,
452-
Template.indent([
453-
"try { Object.defineProperty(ns_target, k, Reflect.getOwnPropertyDescriptor(ns, k)); } catch (_) {}"
454-
]),
455-
"}"
456-
]),
457-
"}"
470+
synthesized
471+
? `${cst} keys = ${sealed ? "exportNames ? [] : " : ""}Reflect.ownKeys(ns);`
472+
: "",
473+
synthesized ? "for (var i = 0; i < keys.length; i++) {" : "",
474+
synthesized
475+
? Template.indent([
476+
`${cst} k = keys[i];`,
477+
'if (k === "__esModule" || k === Symbol.toStringTag) continue;',
478+
`if (!${runtimeTemplate.objectHasOwn("ns_target", "k")}) {`,
479+
Template.indent([
480+
"try { Object.defineProperty(ns_target, k, Reflect.getOwnPropertyDescriptor(ns, k)); } catch (_) {}"
481+
]),
482+
"}"
483+
])
484+
: "",
485+
synthesized ? "}" : ""
458486
])};`,
459487
"",
460488
// The proxy target is a fresh placeholder, separate from
@@ -467,16 +495,22 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
467495
`${cst} ns_target = { __proto__: null };`,
468496
// With the export list known at build time the target carries the spec's
469497
// keys and is sealed, so `[[IsExtensible]]` is false up front.
470-
"if (exportNames) for (var e = 0; e < exportNames.length; e++) ns_target[exportNames[e]] = undefined;",
498+
sealed
499+
? `${synthesized ? "if (exportNames) " : ""}for (var e = 0; e < exportNames.length; e++) ns_target[exportNames[e]] = undefined;`
500+
: "",
471501
// Pre-populate the synthetic deferred-namespace properties with
472502
// fully non-configurable, non-writable, non-enumerable descriptors
473503
// (matching the TC39 import-defer spec for Module Namespace
474504
// Exotic Objects). The trap returns the same descriptors below.
475505
// `__esModule` is not one of the spec's keys, so a sealed namespace omits
476506
// it; the synthesized form keeps it for interop.
477-
'if (!exportNames) Object.defineProperty(ns_target, "__esModule", { value: true });',
507+
synthesized
508+
? `${sealed ? "if (!exportNames) " : ""}Object.defineProperty(ns_target, "__esModule", { value: true });`
509+
: "",
478510
'Object.defineProperty(ns_target, Symbol.toStringTag, { value: "Deferred Module" });',
479-
"if (exportNames) Object.seal(ns_target);",
511+
sealed
512+
? `${synthesized ? "if (exportNames) " : ""}Object.seal(ns_target);`
513+
: "",
480514
`${lt} ns = ns_target;`,
481515
`${cst} handler = {`,
482516
Template.indent([
@@ -502,14 +536,18 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
502536
init,
503537
// A sealed namespace has exactly the spec's keys, so anything
504538
// else is absent rather than read off the exports object.
505-
"if (exportNames) return name in ns_target ? ns[name] : undefined;",
506-
"return ns[name];"
539+
sealed
540+
? `${synthesized ? "if (exportNames) " : ""}return name in ns_target ? ns[name] : undefined;`
541+
: "",
542+
synthesized ? "return ns[name];" : ""
507543
])},`,
508544
`${runtimeTemplate.method("has", "_, name", [
509545
"switch (name) {",
510546
Template.indent(
511547
[
512-
'case "__esModule": if (!exportNames) return true; break;',
548+
synthesized
549+
? `case "__esModule": ${sealed ? "if (!exportNames) " : ""}return true;${sealed ? " break;" : ""}`
550+
: "",
513551
"case Symbol.toStringTag:",
514552
hasAsync
515553
? `case ${RuntimeGlobals.deferredModuleAsyncTransitiveDependenciesSymbol}:`
@@ -522,23 +560,31 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
522560
"}",
523561
'if (typeof name === "symbol") return name in ns_target;',
524562
init,
525-
"if (exportNames) return name in ns_target;",
526-
"return name in ns;"
563+
sealed
564+
? `${synthesized ? "if (exportNames) " : ""}return name in ns_target;`
565+
: "",
566+
synthesized ? "return name in ns;" : ""
527567
])},`,
528568
`${runtimeTemplate.method("ownKeys", "", [
529569
init,
530570
// The sealed target already carries the spec's keys, sorted.
531-
"if (exportNames) return Reflect.ownKeys(ns_target);",
532-
`${cst} filtered = Reflect.ownKeys(ns).filter(${runtimeTemplate.expressionFunction(
533-
'x !== "then" && x !== Symbol.toStringTag',
534-
"x"
535-
)});`,
536-
`${cst} keys = ${
537-
runtimeTemplate.supportsSpread()
538-
? "[...filtered, Symbol.toStringTag]"
539-
: "filtered.concat([Symbol.toStringTag])"
540-
};`,
541-
"return keys;"
571+
sealed
572+
? `${synthesized ? "if (exportNames) " : ""}return Reflect.ownKeys(ns_target);`
573+
: "",
574+
synthesized
575+
? `${cst} filtered = Reflect.ownKeys(ns).filter(${runtimeTemplate.expressionFunction(
576+
'x !== "then" && x !== Symbol.toStringTag',
577+
"x"
578+
)});`
579+
: "",
580+
synthesized
581+
? `${cst} keys = ${
582+
runtimeTemplate.supportsSpread()
583+
? "[...filtered, Symbol.toStringTag]"
584+
: "filtered.concat([Symbol.toStringTag])"
585+
};`
586+
: "",
587+
synthesized ? "return keys;" : ""
542588
])},`,
543589
`${runtimeTemplate.method("getOwnPropertyDescriptor", "_, name", [
544590
"switch (name) {",
@@ -547,7 +593,9 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
547593
// (non-configurable, non-writable, non-enumerable) so the
548594
// proxy invariant holds for both the trap result and any
549595
// post-init forwarding via the deleted-handler path.
550-
'case "__esModule": if (!exportNames) return { value: true, writable: false, enumerable: false, configurable: false }; break;',
596+
synthesized
597+
? `case "__esModule": ${sealed ? "if (!exportNames) " : ""}return { value: true, writable: false, enumerable: false, configurable: false };${sealed ? " break;" : ""}`
598+
: "",
551599
'case Symbol.toStringTag: return { value: "Deferred Module", writable: false, enumerable: false, configurable: false };',
552600
'case "then": return undefined;'
553601
]),
@@ -556,12 +604,18 @@ class MakeDeferredNamespaceObjectRuntimeModule extends HelperRuntimeModule {
556604
init,
557605
// A namespace exposes data properties; webpack backs the exports
558606
// with getters, so the spec's shape is synthesized here.
559-
"if (exportNames) return name in ns_target ? { value: ns[name], writable: true, enumerable: true, configurable: false } : undefined;",
560-
`${lt} desc = Reflect.getOwnPropertyDescriptor(ns, name);`,
561-
'if (mode & 2 && name == "default" && !desc) {',
562-
Template.indent("desc = { value: ns, configurable: true };"),
563-
"}",
564-
"return desc;"
607+
sealed
608+
? `${synthesized ? "if (exportNames) " : ""}return name in ns_target ? { value: ns[name], writable: true, enumerable: true, configurable: false } : undefined;`
609+
: "",
610+
synthesized
611+
? `${lt} desc = Reflect.getOwnPropertyDescriptor(ns, name);`
612+
: "",
613+
synthesized ? 'if (mode & 2 && name == "default" && !desc) {' : "",
614+
synthesized
615+
? Template.indent("desc = { value: ns, configurable: true };")
616+
: "",
617+
synthesized ? "}" : "",
618+
synthesized ? "return desc;" : ""
565619
])},`,
566620
// `defineProperty` always rejects, but per the TC39 spec it
567621
// must still trigger evaluation for string keys (the spec

‎types.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30222,6 +30222,8 @@ declare namespace exports {
3022230222
export let hasCssModules: "has css modules";
3022330223
export let hasFetchPriority: "has fetch priority";
3022430224
export let hasOwnProperty: "__webpack_require__.o";
30225+
export let hasSealedDeferredNamespace: "has sealed deferred namespace";
30226+
export let hasSynthesizedDeferredNamespace: "has synthesized deferred namespace";
3022530227
export let hmrDownloadManifest: "__webpack_require__.hmrM";
3022630228
export let hmrDownloadUpdateHandlers: "__webpack_require__.hmrC";
3022730229
export let hmrInvalidateModuleHandlers: "__webpack_require__.hmrI";

0 commit comments

Comments
 (0)