Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(core): tree shake depepdency interceptor token (#52199)

Browse source 
We have the `DEFER_BLOCK_DEPENDENCY_INTERCEPTOR` DI token that we use in tests to intercept the dependency loading function from deferred blocks, however we were referencing it in a way that caused it to be retained in production bundles as well.

These changes guard the call site with `ngDevMode` since the token is only used for testing.

PR Close #52199
This commit is contained in:
Kristiyan Kostadinov 2023-10-13 09:14:24 +02:00 committed by Pawel Kozlowski
parent e481b10300
commit 262d4d52b5
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
packages/core/src/defer/instructions.ts
View file

@ -39,8 +39,7 @@ import {addDepsToRegistry, assertDeferredDependenciesLoaded, getLDeferBlockDetai
* implementation.
*/
export const DEFER_BLOCK_DEPENDENCY_INTERCEPTOR =
new InjectionToken<DeferBlockDependencyInterceptor>(
ngDevMode ? 'DEFER_BLOCK_DEPENDENCY_INTERCEPTOR' : '');
new InjectionToken<DeferBlockDependencyInterceptor>('DEFER_BLOCK_DEPENDENCY_INTERCEPTOR');
/**
* **INTERNAL**, token used for configuring defer block behavior.
@ -611,13 +610,17 @@ export function triggerResourceLoading(tDetails: TDeferBlockDetails, lView: LVie
// Switch from NOT_STARTED -> IN_PROGRESS state.
tDetails.loadingState = DeferDependenciesLoadingState.IN_PROGRESS;
// Check if dependency function interceptor is configured.
const deferDependencyInterceptor =
injector.get(DEFER_BLOCK_DEPENDENCY_INTERCEPTOR, null, {optional: true});
let dependenciesFn = tDetails.dependencyResolverFn;
const dependenciesFn = deferDependencyInterceptor ?
deferDependencyInterceptor.intercept(tDetails.dependencyResolverFn) :
tDetails.dependencyResolverFn;
if (ngDevMode) {
// Check if dependency function interceptor is configured.
const deferDependencyInterceptor =
injector.get(DEFER_BLOCK_DEPENDENCY_INTERCEPTOR, null, {optional: true});
if (deferDependencyInterceptor) {
dependenciesFn = deferDependencyInterceptor.intercept(dependenciesFn);
}
}
// The `dependenciesFn` might be `null` when all dependencies within
// a given defer block were eagerly references elsewhere in a file,

3
packages/core/test/bundling/defer/bundle.golden_symbols.json
View file

@ -104,9 +104,6 @@
{
"name": "DEFER_BLOCK_CONFIG"
},
{
"name": "DEFER_BLOCK_DEPENDENCY_INTERCEPTOR"
},
{
"name": "DEFER_BLOCK_STATE"
},