diff --git a/goldens/public-api/platform-browser-dynamic/index.api.md b/goldens/public-api/platform-browser-dynamic/index.api.md index 81246dfde5e..4e8ac3a179d 100644 --- a/goldens/public-api/platform-browser-dynamic/index.api.md +++ b/goldens/public-api/platform-browser-dynamic/index.api.md @@ -4,10 +4,10 @@ ```ts +import * as _angular_core from '@angular/core'; import { Compiler } from '@angular/core'; import { CompilerFactory } from '@angular/core'; import { CompilerOptions } from '@angular/core'; -import * as i0 from '@angular/core'; import { Version } from '@angular/core'; // @public @deprecated (undocumented) @@ -17,7 +17,7 @@ export class JitCompilerFactory implements CompilerFactory { } // @public (undocumented) -export const platformBrowserDynamic: (extraProviders?: i0.StaticProvider[]) => i0.PlatformRef; +export const platformBrowserDynamic: (extraProviders?: _angular_core.StaticProvider[]) => _angular_core.PlatformRef; // @public (undocumented) export const VERSION: Version; diff --git a/goldens/public-api/platform-browser-dynamic/testing/index.api.md b/goldens/public-api/platform-browser-dynamic/testing/index.api.md index fbc1ef4f5d0..6ec165a64d3 100644 --- a/goldens/public-api/platform-browser-dynamic/testing/index.api.md +++ b/goldens/public-api/platform-browser-dynamic/testing/index.api.md @@ -4,7 +4,7 @@ ```ts -import * as i0 from '@angular/core'; +import * as _angular_core from '@angular/core'; import * as i1 from '@angular/platform-browser/testing'; import { PlatformRef } from '@angular/core'; import { StaticProvider } from '@angular/core'; @@ -12,11 +12,11 @@ import { StaticProvider } from '@angular/core'; // @public export class BrowserDynamicTestingModule { // (undocumented) - static ɵfac: i0.ɵɵFactoryDeclaration; + static ɵfac: _angular_core.ɵɵFactoryDeclaration; // (undocumented) - static ɵinj: i0.ɵɵInjectorDeclaration; + static ɵinj: _angular_core.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: _angular_core.ɵɵNgModuleDeclaration; } // @public (undocumented) diff --git a/packages/core/testing/src/test_bed_compiler.ts b/packages/core/testing/src/test_bed_compiler.ts index c6fab466ad5..e468a718c84 100644 --- a/packages/core/testing/src/test_bed_compiler.ts +++ b/packages/core/testing/src/test_bed_compiler.ts @@ -989,7 +989,7 @@ export class TestBedCompiler { } const providers: StaticProvider[] = []; - const compilerOptions = this.platform.injector.get(COMPILER_OPTIONS); + const compilerOptions = this.platform.injector.get(COMPILER_OPTIONS, []); compilerOptions.forEach((opts) => { if (opts.providers) { providers.push(opts.providers); diff --git a/packages/platform-browser-dynamic/testing/src/private_export_testing.ts b/packages/platform-browser-dynamic/testing/src/private_export_testing.ts index fe41cc88644..ef9a808981d 100644 --- a/packages/platform-browser-dynamic/testing/src/private_export_testing.ts +++ b/packages/platform-browser-dynamic/testing/src/private_export_testing.ts @@ -6,5 +6,5 @@ * found in the LICENSE file at https://angular.dev/license */ -export {DOMTestComponentRenderer as ɵDOMTestComponentRenderer} from './dom_test_component_renderer'; export {platformCoreDynamicTesting as ɵplatformCoreDynamicTesting} from './platform_core_dynamic_testing'; +export {ɵDOMTestComponentRenderer} from '@angular/platform-browser/testing'; diff --git a/packages/platform-browser-dynamic/testing/src/testing.ts b/packages/platform-browser-dynamic/testing/src/testing.ts index 08c9eaf9703..254bc86e905 100644 --- a/packages/platform-browser-dynamic/testing/src/testing.ts +++ b/packages/platform-browser-dynamic/testing/src/testing.ts @@ -7,11 +7,9 @@ */ import {createPlatformFactory, NgModule, PlatformRef, StaticProvider} from '@angular/core'; -import {TestComponentRenderer} from '@angular/core/testing'; import {ɵINTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS as INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from '@angular/platform-browser-dynamic'; import {BrowserTestingModule} from '@angular/platform-browser/testing'; -import {DOMTestComponentRenderer} from './dom_test_component_renderer'; import {platformCoreDynamicTesting} from './platform_core_dynamic_testing'; export * from './private_export_testing'; @@ -32,6 +30,5 @@ export const platformBrowserDynamicTesting = createPlatformFactory( */ @NgModule({ exports: [BrowserTestingModule], - providers: [{provide: TestComponentRenderer, useClass: DOMTestComponentRenderer}], }) export class BrowserDynamicTestingModule {} diff --git a/packages/platform-browser/testing/src/browser.ts b/packages/platform-browser/testing/src/browser.ts index ac10560e7a7..fd69a5f658a 100644 --- a/packages/platform-browser/testing/src/browser.ts +++ b/packages/platform-browser/testing/src/browser.ts @@ -18,7 +18,9 @@ import { ɵChangeDetectionScheduler as ChangeDetectionScheduler, ɵChangeDetectionSchedulerImpl as ChangeDetectionSchedulerImpl, } from '@angular/core'; +import {TestComponentRenderer} from '@angular/core/testing'; import {BrowserModule, ɵBrowserDomAdapter as BrowserDomAdapter} from '@angular/platform-browser'; +import {DOMTestComponentRenderer} from './dom_test_component_renderer'; function initBrowserTests() { BrowserDomAdapter.makeCurrent(); @@ -51,6 +53,7 @@ export const platformBrowserTesting = createPlatformFactory( internalProvideZoneChangeDetection({}), {provide: ChangeDetectionScheduler, useExisting: ChangeDetectionSchedulerImpl}, {provide: PlatformLocation, useClass: MockPlatformLocation}, + {provide: TestComponentRenderer, useClass: DOMTestComponentRenderer}, ], }) export class BrowserTestingModule {} diff --git a/packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts b/packages/platform-browser/testing/src/dom_test_component_renderer.ts similarity index 100% rename from packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts rename to packages/platform-browser/testing/src/dom_test_component_renderer.ts diff --git a/packages/platform-browser/testing/src/private_export_testing.ts b/packages/platform-browser/testing/src/private_export_testing.ts new file mode 100644 index 00000000000..690770bf8f7 --- /dev/null +++ b/packages/platform-browser/testing/src/private_export_testing.ts @@ -0,0 +1,9 @@ +/** + * @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.dev/license + */ + +export {DOMTestComponentRenderer as ɵDOMTestComponentRenderer} from './dom_test_component_renderer'; diff --git a/packages/platform-browser/testing/src/testing.ts b/packages/platform-browser/testing/src/testing.ts index 0249250c0e2..cc8c478c49e 100644 --- a/packages/platform-browser/testing/src/testing.ts +++ b/packages/platform-browser/testing/src/testing.ts @@ -12,3 +12,4 @@ * Entry point for all public APIs of the platform-browser/testing package. */ export * from './browser'; +export * from './private_export_testing';