Skip to content

Commit 70bdb88

Browse files
alan-agius4alxhub
authored andcommitted
fix(platform-browser): ensure platformBrowserTesting includes platformBrowser providers (#60480)
Previously, `platformBrowserTesting` did not include any `platformBrowser` providers, causing an inconsistency with `platformBrowserDynamicTesting`. This update resolves the issue by restructuring platform inheritance to ensure proper provider inclusion: - `platformCore → platformBrowser → platformBrowserTesting` - `platformBrowser → platformBrowserDynamic → platformBrowserDynamicTesting` Now, `platformBrowserTesting` correctly inherits from `platformBrowser`, aligning with the expected behavior. PR Close #60480
1 parent 6890eab commit 70bdb88

File tree

17 files changed

+45
-130
lines changed

17 files changed

+45
-130
lines changed

goldens/public-api/platform-browser-dynamic/index.api.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
55
```ts
66

7-
import * as _angular_core from '@angular/core';
87
import { Compiler } from '@angular/core';
98
import { CompilerFactory } from '@angular/core';
109
import { CompilerOptions } from '@angular/core';
10+
import * as i0 from '@angular/core';
11+
import { StaticProvider } from '@angular/core';
1112
import { Version } from '@angular/core';
1213

1314
// @public @deprecated (undocumented)
@@ -17,7 +18,7 @@ export class JitCompilerFactory implements CompilerFactory {
1718
}
1819

1920
// @public (undocumented)
20-
export const platformBrowserDynamic: (extraProviders?: _angular_core.StaticProvider[]) => _angular_core.PlatformRef;
21+
export const platformBrowserDynamic: (extraProviders?: StaticProvider[]) => i0.PlatformRef;
2122

2223
// @public (undocumented)
2324
export const VERSION: Version;

goldens/public-api/platform-browser-dynamic/testing/index.api.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
55
```ts
66

7-
import * as _angular_core from '@angular/core';
7+
import * as i0 from '@angular/core';
88
import * as i1 from '@angular/platform-browser/testing';
99
import { PlatformRef } from '@angular/core';
1010
import { StaticProvider } from '@angular/core';
1111

1212
// @public
1313
export class BrowserDynamicTestingModule {
1414
// (undocumented)
15-
static ɵfac: _angular_core.ɵɵFactoryDeclaration<BrowserDynamicTestingModule, never>;
15+
static ɵfac: i0.ɵɵFactoryDeclaration<BrowserDynamicTestingModule, never>;
1616
// (undocumented)
17-
static ɵinj: _angular_core.ɵɵInjectorDeclaration<BrowserDynamicTestingModule>;
17+
static ɵinj: i0.ɵɵInjectorDeclaration<BrowserDynamicTestingModule>;
1818
// (undocumented)
19-
static ɵmod: _angular_core.ɵɵNgModuleDeclaration<BrowserDynamicTestingModule, never, never, [typeof i1.BrowserTestingModule]>;
19+
static ɵmod: i0.ɵɵNgModuleDeclaration<BrowserDynamicTestingModule, never, never, [typeof i1.BrowserTestingModule]>;
2020
}
2121

2222
// @public (undocumented)

goldens/public-api/platform-server/testing/index.api.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
import * as i0 from '@angular/core';
88
import * as i1 from '@angular/platform-browser-dynamic/testing';
9+
import { StaticProvider } from '@angular/core';
910

1011
// @public
11-
export const platformServerTesting: (extraProviders?: i0.StaticProvider[]) => i0.PlatformRef;
12+
export const platformServerTesting: (extraProviders?: StaticProvider[]) => i0.PlatformRef;
1213

1314
// @public
1415
export class ServerTestingModule {

packages/platform-browser-dynamic/src/platform-browser-dynamic.ts

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

9-
import {createPlatformFactory} from '@angular/core';
10-
11-
import {platformCoreDynamic} from './platform_core_dynamic';
12-
import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';
13-
14-
export * from './private_export';
159
export {VERSION} from './version';
1610
export {JitCompilerFactory} from './compiler_factory';
11+
export {platformBrowserDynamic} from './platform_providers';
1712

18-
/**
19-
* @publicApi
20-
*/
21-
export const platformBrowserDynamic = createPlatformFactory(
22-
platformCoreDynamic,
23-
'browserDynamic',
24-
INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
25-
);
13+
export * from './private_export';

packages/platform-browser-dynamic/src/platform_core_dynamic.ts

Lines changed: 0 additions & 26 deletions
This file was deleted.

packages/platform-browser-dynamic/src/platform_providers.ts

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

9-
import {ɵPLATFORM_BROWSER_ID as PLATFORM_BROWSER_ID} from '@angular/common';
9+
import {
10+
COMPILER_OPTIONS,
11+
CompilerFactory,
12+
createPlatformFactory,
13+
StaticProvider,
14+
} from '@angular/core';
15+
import {platformBrowser} from '@angular/platform-browser';
1016
import {ResourceLoader} from '@angular/compiler';
11-
import {COMPILER_OPTIONS, PLATFORM_ID, StaticProvider} from '@angular/core';
12-
import {ɵINTERNAL_BROWSER_PLATFORM_PROVIDERS as INTERNAL_BROWSER_PLATFORM_PROVIDERS} from '@angular/platform-browser';
13-
1417
import {ResourceLoaderImpl} from './resource_loader/resource_loader_impl';
18+
import {JitCompilerFactory} from './compiler_factory';
1519

16-
/**
17-
* @publicApi
18-
*/
1920
export const INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: StaticProvider[] = [
20-
INTERNAL_BROWSER_PLATFORM_PROVIDERS,
2121
{
2222
provide: COMPILER_OPTIONS,
2323
useValue: {providers: [{provide: ResourceLoader, useClass: ResourceLoaderImpl, deps: []}]},
2424
multi: true,
2525
},
26-
{provide: PLATFORM_ID, useValue: PLATFORM_BROWSER_ID},
26+
{provide: CompilerFactory, useClass: JitCompilerFactory, deps: [COMPILER_OPTIONS]},
2727
];
28+
29+
/**
30+
* @publicApi
31+
*/
32+
export const platformBrowserDynamic = createPlatformFactory(
33+
platformBrowser,
34+
'browserDynamic',
35+
INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
36+
);

packages/platform-browser-dynamic/src/private_export.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
export {platformCoreDynamic as ɵplatformCoreDynamic} from './platform_core_dynamic';
109
export {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './platform_providers';

packages/platform-browser-dynamic/testing/src/platform_core_dynamic_testing.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/platform-browser-dynamic/testing/src/private_export_testing.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/platform-browser-dynamic/testing/src/testing.ts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,15 @@
77
*/
88

99
import {createPlatformFactory, NgModule, PlatformRef, StaticProvider} from '@angular/core';
10-
import {ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic';
10+
import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
1111
import {BrowserTestingModule} from '@angular/platform-browser/testing';
1212

13-
import {platformCoreDynamicTesting} from './platform_core_dynamic_testing';
14-
15-
export * from './private_export_testing';
16-
1713
/**
1814
* @publicApi
1915
*/
2016
export const platformBrowserDynamicTesting = createPlatformFactory(
21-
platformCoreDynamicTesting,
17+
platformBrowserDynamic,
2218
'browserDynamicTesting',
23-
INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
2419
);
2520

2621
/**

0 commit comments

Comments
 (0)