Skip to content

Commit cf0a2d3

Browse files
committed
refactor(common): remove unused code and migrate to provideHttpClient
Replaces deprecated `HttpClientModule` with `provideHttpClient` and cleans up unused code
1 parent b5f8d0b commit cf0a2d3

File tree

8 files changed

+14
-22
lines changed

8 files changed

+14
-22
lines changed

packages/common/http/src/backend.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import {HttpRequest} from './request';
1212
import {HttpEvent} from './response';
1313
import {FetchBackend} from './fetch';
1414
import {HttpXhrBackend} from './xhr';
15-
import {isPlatformServer} from '@angular/common';
1615
import {
1716
EnvironmentInjector,
1817
inject,
1918
Injectable,
20-
PLATFORM_ID,
2119
ɵConsole as Console,
2220
ɵformatRuntimeError as formatRuntimeError,
2321
PendingTasks,

packages/common/http/test/module_spec.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import {HTTP_INTERCEPTORS, HttpInterceptor} from '../src/interceptor';
1313
import {HttpRequest} from '../src/request';
1414
import {HttpEvent, HttpResponse} from '../src/response';
1515
import {HttpTestingController} from '../testing/src/api';
16-
import {HttpClientTestingModule} from '../testing/src/module';
1716
import {TestRequest} from '../testing/src/request';
1817
import {Injectable, Injector} from '@angular/core';
1918
import {TestBed} from '@angular/core/testing';
2019
import {Observable} from 'rxjs';
2120
import {map} from 'rxjs/operators';
21+
import {provideHttpClientTesting} from '../testing/src/provider';
2222

2323
const IS_INTERCEPTOR_C_ENABLED = new HttpContextToken<boolean | undefined>(() => undefined);
2424

@@ -80,11 +80,12 @@ describe('HttpClientModule', () => {
8080
let injector: Injector;
8181
beforeEach(() => {
8282
TestBed.configureTestingModule({
83-
imports: [HttpClientTestingModule],
83+
imports: [],
8484
providers: [
8585
{provide: HTTP_INTERCEPTORS, useClass: InterceptorA, multi: true},
8686
{provide: HTTP_INTERCEPTORS, useClass: InterceptorB, multi: true},
8787
{provide: HTTP_INTERCEPTORS, useClass: InterceptorC, multi: true},
88+
provideHttpClientTesting(),
8889
],
8990
});
9091
injector = TestBed.inject(Injector);
@@ -134,8 +135,10 @@ describe('HttpClientModule', () => {
134135
it('allows interceptors to inject HttpClient', (done) => {
135136
TestBed.resetTestingModule();
136137
TestBed.configureTestingModule({
137-
imports: [HttpClientTestingModule],
138-
providers: [{provide: HTTP_INTERCEPTORS, useClass: ReentrantInterceptor, multi: true}],
138+
providers: [
139+
{provide: HTTP_INTERCEPTORS, useClass: ReentrantInterceptor, multi: true},
140+
provideHttpClientTesting(),
141+
],
139142
});
140143
injector = TestBed.inject(Injector);
141144
injector

packages/common/http/test/provider_spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
HttpXhrBackend,
2222
JsonpClientBackend,
2323
} from '../index';
24-
import {HttpClientTestingModule, HttpTestingController, provideHttpClientTesting} from '../testing';
24+
import {HttpTestingController, provideHttpClientTesting} from '../testing';
2525
import {
2626
ApplicationRef,
2727
createEnvironmentInjector,
@@ -438,8 +438,8 @@ describe('provideHttpClient', () => {
438438

439439
it('should be able to connect to a legacy-provided HttpClient context', () => {
440440
TestBed.configureTestingModule({
441-
imports: [HttpClientTestingModule],
442-
providers: [provideLegacyInterceptor('parent')],
441+
imports: [],
442+
providers: [provideLegacyInterceptor('parent'), provideHttpClientTesting()],
443443
});
444444

445445
const child = createEnvironmentInjector(

packages/common/http/testing/src/module.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import {HttpClientModule} from '../../index';
9+
import {provideHttpClient, withInterceptorsFromDi} from '../../index';
1010
import {NgModule} from '@angular/core';
1111

1212
import {provideHttpClientTesting} from './provider';
@@ -21,7 +21,7 @@ import {provideHttpClientTesting} from './provider';
2121
* @deprecated Add `provideHttpClientTesting()` to your providers instead.
2222
*/
2323
@NgModule({
24-
imports: [HttpClientModule],
25-
providers: [provideHttpClientTesting()],
24+
imports: [],
25+
providers: [provideHttpClientTesting(), provideHttpClient(withInterceptorsFromDi())],
2626
})
2727
export class HttpClientTestingModule {}

packages/common/src/directives/ng_template_outlet.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import {
1212
Injector,
1313
Input,
1414
OnChanges,
15-
SimpleChange,
1615
SimpleChanges,
1716
TemplateRef,
1817
ViewContainerRef,

packages/common/test/directives/ng_component_outlet_spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import {CommonModule} from '../../index';
1010
import {NgComponentOutlet} from '../../src/directives/ng_component_outlet';
1111
import {
12-
Compiler,
1312
Component,
1413
ComponentRef,
1514
createEnvironmentInjector,
@@ -19,7 +18,6 @@ import {
1918
Injector,
2019
Input,
2120
NgModule,
22-
NgModuleFactory,
2321
NO_ERRORS_SCHEMA,
2422
Optional,
2523
QueryList,

packages/router/src/operators/check_guards.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import {
2525
CanActivateFn,
2626
CanDeactivateFn,
2727
GuardResult,
28-
CanLoadFn,
2928
CanMatchFn,
3029
Route,
30+
CanLoadFn,
3131
} from '../models';
3232
import {redirectingNavigationError} from '../navigation_canceling_error';
3333
import type {NavigationTransition} from '../navigation_transition';

packages/router/src/utils/type_guards.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
import {EmptyError} from 'rxjs';
1010

1111
import {CanActivateChildFn, CanActivateFn, CanDeactivateFn, CanLoadFn, CanMatchFn} from '../models';
12-
import {
13-
NAVIGATION_CANCELING_ERROR,
14-
NavigationCancelingError,
15-
RedirectingNavigationCancelingError,
16-
} from '../navigation_canceling_error';
17-
import {isUrlTree} from '../url_tree';
1812

1913
/**
2014
* Simple function check, but generic so type inference will flow. Example:

0 commit comments

Comments
 (0)