From 69a6e09e7eb13b592fb5430cf83800d9d73aea71 Mon Sep 17 00:00:00 2001 From: Andrew Scott Date: Mon, 20 Mar 2023 15:47:24 -0700 Subject: [PATCH] refactor(router): Remove deprecated loadChildren file (#49504) This file was used while migrations were happening internally. All code is now updated to the callback PR Close #49504 --- .../router/src/deprecated_load_children.ts | 18 ------------------ packages/router/src/router_config_loader.ts | 13 ++----------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 packages/router/src/deprecated_load_children.ts diff --git a/packages/router/src/deprecated_load_children.ts b/packages/router/src/deprecated_load_children.ts deleted file mode 100644 index b9b9e50ed48..00000000000 --- a/packages/router/src/deprecated_load_children.ts +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @license - * Copyright Google LLC All Rights Reserved. - * - * Use of this source code is governed by an MIT-style license that can be - * found in the LICENSE file at https://angular.io/license - */ - -import {Injector, NgModuleFactory} from '@angular/core'; -import {Observable} from 'rxjs'; - -// This file exists to support the legacy `loadChildren: string` behavior being patched back into -// Angular. - -export function deprecatedLoadChildrenString( - injector: Injector, loadChildren: unknown): Observable>|null { - return null; -} diff --git a/packages/router/src/router_config_loader.ts b/packages/router/src/router_config_loader.ts index 2678bdd075e..c4449501f5f 100644 --- a/packages/router/src/router_config_loader.ts +++ b/packages/router/src/router_config_loader.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {Compiler, EnvironmentInjector, Injectable, InjectFlags, InjectionToken, Injector, NgModuleFactory, Type} from '@angular/core'; +import {Compiler, EnvironmentInjector, inject, Injectable, InjectFlags, InjectionToken, Injector, NgModuleFactory, Type} from '@angular/core'; import {ConnectableObservable, from, Observable, of, Subject} from 'rxjs'; import {finalize, map, mergeMap, refCount, tap} from 'rxjs/operators'; -import {deprecatedLoadChildrenString} from './deprecated_load_children'; import {DefaultExport, LoadChildren, LoadChildrenCallback, LoadedRouterConfig, Route, Routes} from './models'; import {wrapIntoObservable} from './utils/collection'; import {assertStandalone, standardizeConfig, validateConfig} from './utils/config'; @@ -38,11 +37,7 @@ export class RouterConfigLoader { private childrenLoaders = new WeakMap>(); onLoadStartListener?: (r: Route) => void; onLoadEndListener?: (r: Route) => void; - - constructor( - private injector: Injector, - private compiler: Compiler, - ) {} + private readonly compiler = inject(Compiler); loadComponent(route: Route): Observable> { if (this.componentLoaders.get(route)) { @@ -124,10 +119,6 @@ export class RouterConfigLoader { private loadModuleFactoryOrRoutes(loadChildren: LoadChildren): Observable|Routes> { - const deprecatedResult = deprecatedLoadChildrenString(this.injector, loadChildren); - if (deprecatedResult) { - return deprecatedResult; - } return wrapIntoObservable((loadChildren as LoadChildrenCallback)()) .pipe( map(maybeUnwrapDefaultExport),