diff --git a/packages/animations/browser/src/private_export.ts b/packages/animations/browser/src/private_export.ts index 01567e1fc8e..cf5bcec5178 100644 --- a/packages/animations/browser/src/private_export.ts +++ b/packages/animations/browser/src/private_export.ts @@ -32,3 +32,5 @@ export { camelCaseToDashCase as ɵcamelCaseToDashCase, normalizeKeyframes as ɵnormalizeKeyframes, } from './util'; +export {TransitionAnimationPlayer as ɵTransitionAnimationPlayer} from './render/transition_animation_engine'; +export {ENTER_CLASSNAME as ɵENTER_CLASSNAME, LEAVE_CLASSNAME as ɵLEAVE_CLASSNAME} from './util'; diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel index 9e869fb038e..158816937d9 100644 --- a/packages/animations/browser/test/BUILD.bazel +++ b/packages/animations/browser/test/BUILD.bazel @@ -5,8 +5,10 @@ ts_project( name = "test_lib", testonly = True, srcs = glob(["**/*.ts"]), + interop_deps = [ + "//packages/private/testing", + ], deps = [ - "//packages:types_rjs", "//packages/animations:animations_rjs", "//packages/animations/browser:browser_rjs", "//packages/animations/browser/testing:testing_rjs", diff --git a/packages/animations/browser/test/dsl/animation_spec.ts b/packages/animations/browser/test/dsl/animation_spec.ts index f4c61caa40b..734716d8ee2 100644 --- a/packages/animations/browser/test/dsl/animation_spec.ts +++ b/packages/animations/browser/test/dsl/animation_spec.ts @@ -5,6 +5,9 @@ * 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 */ + +import {isNode} from '@angular/private/testing'; + import { animate, animation, diff --git a/packages/animations/browser/test/dsl/animation_trigger_spec.ts b/packages/animations/browser/test/dsl/animation_trigger_spec.ts index 1955dd101a8..7eec73e8419 100644 --- a/packages/animations/browser/test/dsl/animation_trigger_spec.ts +++ b/packages/animations/browser/test/dsl/animation_trigger_spec.ts @@ -6,6 +6,8 @@ * found in the LICENSE file at https://angular.dev/license */ +import {isNode} from '@angular/private/testing'; + import {animate, AnimationOptions, state, style, transition} from '../../../src/animations'; import {AnimationTransitionInstruction} from '../../src/dsl/animation_transition_instruction'; import {AnimationTrigger} from '../../src/dsl/animation_trigger'; diff --git a/packages/animations/browser/test/render/timeline_animation_engine_spec.ts b/packages/animations/browser/test/render/timeline_animation_engine_spec.ts index 878b834d9d8..2fb10f850d3 100644 --- a/packages/animations/browser/test/render/timeline_animation_engine_spec.ts +++ b/packages/animations/browser/test/render/timeline_animation_engine_spec.ts @@ -5,6 +5,9 @@ * 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 */ + +import {isNode} from '@angular/private/testing'; + import {animate, AnimationMetadata, style} from '../../../src/animations'; import { diff --git a/packages/animations/browser/test/render/transition_animation_engine_spec.ts b/packages/animations/browser/test/render/transition_animation_engine_spec.ts index 27da4b3a516..6a63b6bf1a5 100644 --- a/packages/animations/browser/test/render/transition_animation_engine_spec.ts +++ b/packages/animations/browser/test/render/transition_animation_engine_spec.ts @@ -10,7 +10,6 @@ import { AnimationEvent, AnimationMetadata, AnimationTriggerMetadata, - NoopAnimationPlayer, state, style, transition, @@ -30,6 +29,7 @@ import { TransitionAnimationPlayer, } from '../../src/render/transition_animation_engine'; import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver'; +import {isNode} from '@angular/private/testing'; const DEFAULT_NAMESPACE_ID = 'id'; diff --git a/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts b/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts index 3c9c7a1d183..b68e41ce13e 100644 --- a/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts +++ b/packages/animations/browser/test/render/web_animations/web_animations_driver_spec.ts @@ -5,6 +5,7 @@ * 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 */ +import {isNode} from '@angular/private/testing'; import {WebAnimationsDriver} from '../../../src/render/web_animations/web_animations_driver'; import {WebAnimationsPlayer} from '../../../src/render/web_animations/web_animations_player'; diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel index fb5e0ffd036..4c8399c879f 100644 --- a/packages/animations/test/BUILD.bazel +++ b/packages/animations/test/BUILD.bazel @@ -12,6 +12,7 @@ ts_project( "//packages/platform-browser/animations", "//packages/platform-browser/animations/async", "//packages/platform-browser/testing", + "//packages/private/testing", ], deps = [ "//packages:types_rjs", diff --git a/packages/animations/test/browser_animation_builder_spec.ts b/packages/animations/test/browser_animation_builder_spec.ts index 072cf1ad67b..2f0fc320986 100644 --- a/packages/animations/test/browser_animation_builder_spec.ts +++ b/packages/animations/test/browser_animation_builder_spec.ts @@ -20,6 +20,7 @@ import {ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-br import {NoopAnimationsModule} from '@angular/platform-browser/animations'; import {ɵAsyncAnimationRendererFactory as AsyncAnimationRendererFactory} from '@angular/platform-browser/animations/async'; import {BrowserTestingModule, platformBrowserTesting} from '@angular/platform-browser/testing'; +import {isNode} from '@angular/private/testing'; describe('BrowserAnimationBuilder', () => { if (isNode) { diff --git a/packages/common/http/test/resource_spec.ts b/packages/common/http/test/resource_spec.ts index c5277c8d677..08cc88cc955 100644 --- a/packages/common/http/test/resource_spec.ts +++ b/packages/common/http/test/resource_spec.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ +import {isNode} from '@angular/private/testing'; import {ApplicationRef, Injector, signal} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import { diff --git a/packages/common/test/directives/ng_component_outlet_spec.ts b/packages/common/test/directives/ng_component_outlet_spec.ts index 731b1f37d53..1891a21d35b 100644 --- a/packages/common/test/directives/ng_component_outlet_spec.ts +++ b/packages/common/test/directives/ng_component_outlet_spec.ts @@ -28,7 +28,7 @@ import { ViewContainerRef, } from '@angular/core'; import {TestBed, waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('insert/remove', () => { beforeEach(() => { diff --git a/packages/common/test/directives/ng_for_spec.ts b/packages/common/test/directives/ng_for_spec.ts index 1dd494277cb..5f5f8d8c36d 100644 --- a/packages/common/test/directives/ng_for_spec.ts +++ b/packages/common/test/directives/ng_for_spec.ts @@ -10,7 +10,7 @@ import {CommonModule, NgFor, NgForOf} from '../../index'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; let thisArg: any; diff --git a/packages/common/test/directives/ng_if_spec.ts b/packages/common/test/directives/ng_if_spec.ts index fe650afd97e..a68bf8f1b9f 100644 --- a/packages/common/test/directives/ng_if_spec.ts +++ b/packages/common/test/directives/ng_if_spec.ts @@ -10,7 +10,7 @@ import {CommonModule, NgIf, ɵgetDOM as getDOM} from '../../index'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('ngIf directive', () => { let fixture: ComponentFixture; diff --git a/packages/common/test/directives/ng_optimized_image_spec.ts b/packages/common/test/directives/ng_optimized_image_spec.ts index 762b4300896..bd7759432d5 100644 --- a/packages/common/test/directives/ng_optimized_image_spec.ts +++ b/packages/common/test/directives/ng_optimized_image_spec.ts @@ -6,14 +6,14 @@ * found in the LICENSE file at https://angular.dev/license */ -import {CommonModule, DOCUMENT, IMAGE_CONFIG, ImageConfig} from '../../index'; -import {RuntimeErrorCode} from '../../src/errors'; -import {PLATFORM_SERVER_ID} from '../../src/platform_id'; import {ChangeDetectionStrategy, Component, PLATFORM_ID, Provider, Type} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; -import {withHead} from '@angular/private/testing'; +import {isBrowser, isNode, withHead} from '@angular/private/testing'; +import {expect} from '@angular/private/testing/matchers'; +import {CommonModule, DOCUMENT, IMAGE_CONFIG, ImageConfig} from '../../index'; +import {RuntimeErrorCode} from '../../src/errors'; +import {PLATFORM_SERVER_ID} from '../../src/platform_id'; import {PRELOADED_IMAGES} from '../..//src/directives/ng_optimized_image/tokens'; import { diff --git a/packages/common/test/directives/ng_plural_spec.ts b/packages/common/test/directives/ng_plural_spec.ts index 76f84cfc8c4..a66cc16dbac 100644 --- a/packages/common/test/directives/ng_plural_spec.ts +++ b/packages/common/test/directives/ng_plural_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, NgLocalization, NgPlural, NgPluralCase} from '../../index'; import {Component, Injectable} from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('ngPlural', () => { let fixture: ComponentFixture; diff --git a/packages/common/test/directives/ng_switch_spec.ts b/packages/common/test/directives/ng_switch_spec.ts index 6cdd6b9efcf..2bc7ad91cf3 100644 --- a/packages/common/test/directives/ng_switch_spec.ts +++ b/packages/common/test/directives/ng_switch_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, NgSwitch, NgSwitchCase, NgSwitchDefault} from '../../index'; import {Attribute, Component, Directive, TemplateRef, ViewChild} from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('NgSwitch', () => { let fixture: ComponentFixture; diff --git a/packages/common/test/directives/ng_template_outlet_spec.ts b/packages/common/test/directives/ng_template_outlet_spec.ts index bac56ce74d8..e635f498cd7 100644 --- a/packages/common/test/directives/ng_template_outlet_spec.ts +++ b/packages/common/test/directives/ng_template_outlet_spec.ts @@ -22,7 +22,7 @@ import { TemplateRef, } from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('NgTemplateOutlet', () => { let fixture: ComponentFixture; diff --git a/packages/common/test/directives/non_bindable_spec.ts b/packages/common/test/directives/non_bindable_spec.ts index f9c5fee918c..982407d50fa 100644 --- a/packages/common/test/directives/non_bindable_spec.ts +++ b/packages/common/test/directives/non_bindable_spec.ts @@ -9,8 +9,8 @@ import {Component, Directive} from '@angular/core'; import {ElementRef} from '@angular/core/src/linker/element_ref'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; -import {hasClass} from '@angular/platform-browser/testing/src/browser_util'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {hasClass} from '@angular/private/testing'; +import {expect} from '@angular/private/testing/matchers'; describe('non-bindable', () => { beforeEach(() => { diff --git a/packages/common/test/pipes/json_pipe_spec.ts b/packages/common/test/pipes/json_pipe_spec.ts index a2a73b4b089..f5ec44bed26 100644 --- a/packages/common/test/pipes/json_pipe_spec.ts +++ b/packages/common/test/pipes/json_pipe_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, JsonPipe} from '../../index'; import {Component} from '@angular/core'; import {TestBed, waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('JsonPipe', () => { const regNewLine = '\n'; diff --git a/packages/common/test/pipes/slice_pipe_spec.ts b/packages/common/test/pipes/slice_pipe_spec.ts index 0d3e1401418..08742d9971b 100644 --- a/packages/common/test/pipes/slice_pipe_spec.ts +++ b/packages/common/test/pipes/slice_pipe_spec.ts @@ -9,7 +9,7 @@ import {CommonModule, SlicePipe} from '../../index'; import {Component} from '@angular/core'; import {TestBed, waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('SlicePipe', () => { let list: number[]; diff --git a/packages/common/test/viewport_scroller_spec.ts b/packages/common/test/viewport_scroller_spec.ts index aa01bb44467..b991a5bf65b 100644 --- a/packages/common/test/viewport_scroller_spec.ts +++ b/packages/common/test/viewport_scroller_spec.ts @@ -7,6 +7,7 @@ */ import {BrowserViewportScroller, ViewportScroller} from '../src/viewport_scroller'; +import {isNode} from '@angular/private/testing'; describe('BrowserViewportScroller', () => { describe('setHistoryScrollRestoration', () => { diff --git a/packages/compiler/src/compiler.ts b/packages/compiler/src/compiler.ts index a10c3398c98..83173092df3 100644 --- a/packages/compiler/src/compiler.ts +++ b/packages/compiler/src/compiler.ts @@ -32,6 +32,7 @@ import {publishFacade} from './jit_compiler_facade'; import * as outputAst from './output/output_ast'; import {global} from './util'; +export {SECURITY_SCHEMA} from './schema/dom_security_schema'; export {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SchemaMetadata} from './core'; export {core}; @@ -247,9 +248,11 @@ export * from './resource_loader'; export * from './schema/dom_element_schema_registry'; export * from './schema/element_schema_registry'; export * from './directive_matching'; -export {Version} from './util'; +export {Version, escapeRegExp} from './util'; export * from './version'; export {outputAst}; +export {CompilerFacadeImpl} from './jit_compiler_facade'; + // This file only reexports content of the `src` folder. Keep it that way. // This function call has a global side effects and publishes the compiler into global namespace for diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel index 270a737e7c9..664f82653d7 100644 --- a/packages/compiler/test/BUILD.bazel +++ b/packages/compiler/test/BUILD.bazel @@ -25,6 +25,7 @@ ts_library( "//packages/platform-browser", "//packages/platform-browser-dynamic", "//packages/platform-browser/testing", + "//packages/private/testing", "@npm//source-map", ], ) diff --git a/packages/compiler/test/expression_parser/BUILD.bazel b/packages/compiler/test/expression_parser/BUILD.bazel index 012b8a24b8f..6f1263eee60 100644 --- a/packages/compiler/test/expression_parser/BUILD.bazel +++ b/packages/compiler/test/expression_parser/BUILD.bazel @@ -5,10 +5,10 @@ ts_library( testonly = True, srcs = glob(["**/*.ts"]), deps = [ - "//packages:types", "//packages/compiler", "//packages/compiler/test/expression_parser/utils", "//packages/platform-browser/testing", + "//packages/private/testing", ], ) diff --git a/packages/compiler/test/expression_parser/parser_spec.ts b/packages/compiler/test/expression_parser/parser_spec.ts index 89c48c8fed1..12ca2fd89f5 100644 --- a/packages/compiler/test/expression_parser/parser_spec.ts +++ b/packages/compiler/test/expression_parser/parser_spec.ts @@ -22,7 +22,7 @@ import { } from '../../src/expression_parser/ast'; import {Lexer} from '../../src/expression_parser/lexer'; import {Parser, SplitInterpolation} from '../../src/expression_parser/parser'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import {unparse, unparseWithSpan} from './utils/unparser'; import {validate} from './utils/validator'; diff --git a/packages/compiler/test/i18n/integration_common.ts b/packages/compiler/test/i18n/integration_common.ts index d3eaeaac324..c6f8e043cbf 100644 --- a/packages/compiler/test/i18n/integration_common.ts +++ b/packages/compiler/test/i18n/integration_common.ts @@ -15,8 +15,8 @@ import {ResourceLoader} from '../../src/resource_loader'; import {Component, DebugElement, TRANSLATIONS, TRANSLATIONS_FORMAT} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {stringifyElement} from '@angular/platform-browser/testing/src/browser_util'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {stringifyElement} from '@angular/private/testing'; +import {expect} from '@angular/private/testing/matchers'; @Component({ selector: 'i18n-cmp', diff --git a/packages/compiler/test/i18n/integration_xliff2_spec.ts b/packages/compiler/test/i18n/integration_xliff2_spec.ts index 6ecbffc2097..a370ebfd817 100644 --- a/packages/compiler/test/i18n/integration_xliff2_spec.ts +++ b/packages/compiler/test/i18n/integration_xliff2_spec.ts @@ -8,7 +8,7 @@ import {Xliff2} from '../../src/i18n/serializers/xliff2'; import {waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { configureCompiler, diff --git a/packages/compiler/test/i18n/integration_xliff_spec.ts b/packages/compiler/test/i18n/integration_xliff_spec.ts index fecdfd84991..1937d093f20 100644 --- a/packages/compiler/test/i18n/integration_xliff_spec.ts +++ b/packages/compiler/test/i18n/integration_xliff_spec.ts @@ -8,7 +8,7 @@ import {Xliff} from '../../src/i18n/serializers/xliff'; import {waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { configureCompiler, diff --git a/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts b/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts index be68a514307..48144f84ddc 100644 --- a/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts +++ b/packages/compiler/test/i18n/integration_xmb_xtb_spec.ts @@ -8,7 +8,7 @@ import {Xmb} from '../../src/i18n/serializers/xmb'; import {waitForAsync} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { configureCompiler, diff --git a/packages/compiler/test/integration_spec.ts b/packages/compiler/test/integration_spec.ts index 3cb2c2c2f6d..4c30b5b267e 100644 --- a/packages/compiler/test/integration_spec.ts +++ b/packages/compiler/test/integration_spec.ts @@ -9,7 +9,7 @@ import {Component, Directive, Input} from '@angular/core'; import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('integration tests', () => { let fixture: ComponentFixture; diff --git a/packages/compiler/test/schema/dom_element_schema_registry_spec.ts b/packages/compiler/test/schema/dom_element_schema_registry_spec.ts index 4de68c1be93..209b609ef6d 100644 --- a/packages/compiler/test/schema/dom_element_schema_registry_spec.ts +++ b/packages/compiler/test/schema/dom_element_schema_registry_spec.ts @@ -8,6 +8,7 @@ import {DomElementSchemaRegistry} from '../../src/schema/dom_element_schema_registry'; import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, SecurityContext} from '@angular/core'; +import {isNode} from '@angular/private/testing'; import {Element} from '../../src/ml_parser/ast'; import {HtmlParser} from '../../src/ml_parser/html_parser'; diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel index b583f1b2298..a8cc08a01ea 100644 --- a/packages/compiler/test/selector/BUILD.bazel +++ b/packages/compiler/test/selector/BUILD.bazel @@ -8,6 +8,7 @@ ts_library( "//packages:types", "//packages/compiler", "//packages/platform-browser/testing", + "//packages/private/testing", ], ) diff --git a/packages/compiler/test/selector/selector_spec.ts b/packages/compiler/test/selector/selector_spec.ts index 211cd1116cb..4517e442d51 100644 --- a/packages/compiler/test/selector/selector_spec.ts +++ b/packages/compiler/test/selector/selector_spec.ts @@ -7,7 +7,7 @@ */ import {CssSelector, SelectorMatcher} from '../../src/directive_matching'; -import {el} from '@angular/platform-browser/testing/src/browser_util'; +import {el} from '@angular/private/testing'; describe('SelectorMatcher', () => { let matcher: SelectorMatcher; diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts index ce3cbfdda16..8be1f49ff60 100644 --- a/packages/forms/test/reactive_integration_spec.ts +++ b/packages/forms/test/reactive_integration_spec.ts @@ -18,6 +18,11 @@ import { ViewChild, } from '@angular/core'; import {ComponentFixture, fakeAsync, TestBed, tick} from '@angular/core/testing'; +import {By} from '@angular/platform-browser/src/dom/debug/by'; +import {dispatchEvent, isNode, sortedClassList} from '@angular/private/testing'; +import {expect} from '@angular/private/testing/matchers'; +import {merge, NEVER, Observable, of, Subject, Subscription, timer} from 'rxjs'; +import {map, tap} from 'rxjs/operators'; import { AbstractControl, AsyncValidator, @@ -41,11 +46,6 @@ import { Validator, Validators, } from '../index'; -import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {dispatchEvent, sortedClassList} from '@angular/platform-browser/testing/src/browser_util'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; -import {merge, NEVER, Observable, of, Subject, Subscription, timer} from 'rxjs'; -import {map, tap} from 'rxjs/operators'; import { ControlEvent, diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts index 4606a010f53..c23a8a32ebc 100644 --- a/packages/forms/test/template_integration_spec.ts +++ b/packages/forms/test/template_integration_spec.ts @@ -26,7 +26,7 @@ import { Validator, } from '../index'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {dispatchEvent, sortedClassList} from '@angular/platform-browser/testing/src/browser_util'; +import {dispatchEvent, sortedClassList} from '@angular/private/testing'; import {merge} from 'rxjs'; import {NgModelCustomComp, NgModelCustomWrapper} from './value_accessor_integration_spec'; diff --git a/packages/forms/test/value_accessor_integration_spec.ts b/packages/forms/test/value_accessor_integration_spec.ts index 6d3270d0772..724119e4c79 100644 --- a/packages/forms/test/value_accessor_integration_spec.ts +++ b/packages/forms/test/value_accessor_integration_spec.ts @@ -33,7 +33,7 @@ import { Validators, } from '../index'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {dispatchEvent} from '@angular/platform-browser/testing/src/browser_util'; +import {dispatchEvent, isNode} from '@angular/private/testing'; describe('value accessors', () => { function initTest(component: Type, ...directives: Type[]): ComponentFixture { diff --git a/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts b/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts index 1494cf9deda..3f2708baf02 100644 --- a/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts +++ b/packages/platform-browser-dynamic/test/metadata_overrider_spec.ts @@ -7,7 +7,7 @@ */ import {ɵMetadataOverrider as MetadataOverrider} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; interface SomeMetadataType { plainProp?: string; diff --git a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts index 69ae3d5bac0..ba8c9af559e 100644 --- a/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts +++ b/packages/platform-browser-dynamic/test/resource_loader/resource_loader_impl_spec.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ +import {isBrowser} from '@angular/private/testing'; import {ResourceLoaderImpl} from '../../src/resource_loader/resource_loader_impl'; if (isBrowser) { diff --git a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts index 9c191473d6a..0d048aa7e54 100644 --- a/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts +++ b/packages/platform-browser-dynamic/test/testing_public_browser_spec.ts @@ -13,6 +13,7 @@ import {ResourceLoaderImpl} from '../src/resource_loader/resource_loader_impl'; import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '../testing'; import {BrowserTestingModule, platformBrowserTesting} from '@angular/platform-browser/testing'; import {NoopAnimationsModule} from '@angular/platform-browser/animations'; +import {isBrowser} from '@angular/private/testing'; // Components for the tests. class FancyService { diff --git a/packages/platform-browser/animations/async/test/animation_renderer_spec.ts b/packages/platform-browser/animations/async/test/animation_renderer_spec.ts index 4914d75dea2..1ae7dc99789 100644 --- a/packages/platform-browser/animations/async/test/animation_renderer_spec.ts +++ b/packages/platform-browser/animations/async/test/animation_renderer_spec.ts @@ -37,7 +37,7 @@ import { import {TestBed} from '@angular/core/testing'; import {ɵDomRendererFactory2 as DomRendererFactory2} from '../../../index'; import {InjectableAnimationEngine} from '../../../animations/src/providers'; -import {el} from '../../../testing/src/browser_util'; +import {el, isNode} from '@angular/private/testing'; import { AsyncAnimationRendererFactory, diff --git a/packages/platform-browser/animations/test/animation_renderer_spec.ts b/packages/platform-browser/animations/test/animation_renderer_spec.ts index 8b98eb1ae6b..d22bba50c7d 100644 --- a/packages/platform-browser/animations/test/animation_renderer_spec.ts +++ b/packages/platform-browser/animations/test/animation_renderer_spec.ts @@ -38,9 +38,7 @@ import { } from '../index'; import {provideAnimationsAsync} from '../async'; import {DomRendererFactory2} from '../../src/dom/dom_renderer'; -import {withBody} from '@angular/private/testing'; - -import {el} from '../../testing/src/browser_util'; +import {withBody, isNode, el} from '@angular/private/testing'; (function () { if (isNode) return; diff --git a/packages/platform-browser/animations/test/noop_animations_module_spec.ts b/packages/platform-browser/animations/test/noop_animations_module_spec.ts index 95aaa6c3d02..590aab279fa 100644 --- a/packages/platform-browser/animations/test/noop_animations_module_spec.ts +++ b/packages/platform-browser/animations/test/noop_animations_module_spec.ts @@ -10,6 +10,7 @@ import {ɵAnimationEngine} from '@angular/animations/browser'; import {Component} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserAnimationsModule, NoopAnimationsModule, provideNoopAnimations} from '../index'; +import {isNode} from '@angular/private/testing'; describe('NoopAnimationsModule', () => { beforeEach(() => { diff --git a/packages/platform-browser/test/browser/bootstrap_spec.ts b/packages/platform-browser/test/browser/bootstrap_spec.ts index 5a163fe28db..60c5ec96a59 100644 --- a/packages/platform-browser/test/browser/bootstrap_spec.ts +++ b/packages/platform-browser/test/browser/bootstrap_spec.ts @@ -53,7 +53,8 @@ import {Log} from '@angular/core/testing/src/testing_internal'; import {BrowserModule} from '../../index'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; import {provideAnimations, provideNoopAnimations} from '../../animations'; -import {expect} from '../../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; +import {isNode} from '@angular/private/testing'; import {bootstrapApplication} from '../../src/browser'; diff --git a/packages/platform-browser/test/browser/meta_spec.ts b/packages/platform-browser/test/browser/meta_spec.ts index 449abdf1930..3a4bab9eb93 100644 --- a/packages/platform-browser/test/browser/meta_spec.ts +++ b/packages/platform-browser/test/browser/meta_spec.ts @@ -10,7 +10,7 @@ import {ɵgetDOM as getDOM} from '@angular/common'; import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule, Meta} from '../../index'; -import {expect} from '../../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('Meta service', () => { let doc: Document; diff --git a/packages/platform-browser/test/browser/title_spec.ts b/packages/platform-browser/test/browser/title_spec.ts index 5547e0af3f5..4c79d343621 100644 --- a/packages/platform-browser/test/browser/title_spec.ts +++ b/packages/platform-browser/test/browser/title_spec.ts @@ -10,7 +10,7 @@ import {ɵgetDOM as getDOM} from '@angular/common'; import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule, Title} from '../../index'; -import {expect} from '../../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('title service', () => { let doc: Document; diff --git a/packages/platform-browser/test/browser/tools/tools_spec.ts b/packages/platform-browser/test/browser/tools/tools_spec.ts index 4a8a44d04f8..ffdd28137ff 100644 --- a/packages/platform-browser/test/browser/tools/tools_spec.ts +++ b/packages/platform-browser/test/browser/tools/tools_spec.ts @@ -8,6 +8,7 @@ import {ApplicationRef, Injector, ɵglobal as global} from '@angular/core'; import {ComponentRef} from '@angular/core/src/render3'; +import {isNode} from '@angular/private/testing'; import {disableDebugTools, enableDebugTools} from '../../../index'; import {AngularProfiler} from '../../../src/browser/tools/common_tools'; diff --git a/packages/platform-browser/test/dom/dom_renderer_spec.ts b/packages/platform-browser/test/dom/dom_renderer_spec.ts index 55693e4bf55..72110bd0d38 100644 --- a/packages/platform-browser/test/dom/dom_renderer_spec.ts +++ b/packages/platform-browser/test/dom/dom_renderer_spec.ts @@ -13,7 +13,8 @@ import { NAMESPACE_URIS, REMOVE_STYLES_ON_COMPONENT_DESTROY, } from '../../src/dom/dom_renderer'; -import {expect} from '../../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; +import {isNode} from '@angular/private/testing'; describe('DefaultDomRendererV2', () => { if (isNode) { diff --git a/packages/platform-browser/test/dom/events/event_manager_spec.ts b/packages/platform-browser/test/dom/events/event_manager_spec.ts index a8a1b9e0902..83dd12a3689 100644 --- a/packages/platform-browser/test/dom/events/event_manager_spec.ts +++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts @@ -11,8 +11,8 @@ import {NgZone} from '@angular/core/src/zone/ng_zone'; import {DomEventsPlugin} from '../../../src/dom/events/dom_events'; import {EventManager, EventManagerPlugin} from '../../../src/dom/events/event_manager'; -import {createMouseEvent, el} from '../../../testing/src/browser_util'; import {TestBed} from '@angular/core/testing'; +import {isNode, createMouseEvent, el} from '@angular/private/testing'; (function () { if (isNode) return; diff --git a/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts b/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts index 1dc09e025d4..32c485b574e 100644 --- a/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts +++ b/packages/platform-browser/test/dom/events/hammer_gestures_spec.ts @@ -9,6 +9,7 @@ import {ApplicationRef, Injector, NgZone} from '@angular/core'; import {fakeAsync, inject, TestBed, tick} from '@angular/core/testing'; import {EventManager} from '../../../index'; import {HammerGestureConfig, HammerGesturesPlugin} from '../../../src/dom/events/hammer_gestures'; +import {isNode} from '@angular/private/testing'; describe('HammerGesturesPlugin', () => { let plugin: HammerGesturesPlugin; diff --git a/packages/platform-browser/test/dom/shadow_dom_spec.ts b/packages/platform-browser/test/dom/shadow_dom_spec.ts index f9bcc9e95aa..6e3e4fa0145 100644 --- a/packages/platform-browser/test/dom/shadow_dom_spec.ts +++ b/packages/platform-browser/test/dom/shadow_dom_spec.ts @@ -9,7 +9,8 @@ import {Component, NgModule, ViewEncapsulation} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule} from '../../index'; -import {expect} from '../../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; +import {isNode} from '@angular/private/testing'; describe('ShadowDOM Support', () => { if (isNode) { diff --git a/packages/platform-browser/test/dom/shared_styles_host_spec.ts b/packages/platform-browser/test/dom/shared_styles_host_spec.ts index 9dc9802c1b1..261ae29a6df 100644 --- a/packages/platform-browser/test/dom/shared_styles_host_spec.ts +++ b/packages/platform-browser/test/dom/shared_styles_host_spec.ts @@ -8,7 +8,7 @@ import {ɵgetDOM as getDOM} from '@angular/common'; import {SharedStylesHost} from '../../src/dom/shared_styles_host'; -import {expect} from '../../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; describe('SharedStylesHost', () => { let doc: Document; diff --git a/packages/platform-browser/test/testing_public_spec.ts b/packages/platform-browser/test/testing_public_spec.ts index 1daca1b24a2..9fea7000826 100644 --- a/packages/platform-browser/test/testing_public_spec.ts +++ b/packages/platform-browser/test/testing_public_spec.ts @@ -34,7 +34,8 @@ import { waitForAsync, withModule, } from '@angular/core/testing'; -import {expect} from '../testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; +import {isBrowser} from '@angular/private/testing'; // Services, and components for the tests. diff --git a/packages/platform-server/src/private_export.ts b/packages/platform-server/src/private_export.ts index ce5fb0fc2a8..6529cf24007 100644 --- a/packages/platform-server/src/private_export.ts +++ b/packages/platform-server/src/private_export.ts @@ -12,3 +12,4 @@ export { } from './server'; export {SERVER_CONTEXT as ɵSERVER_CONTEXT, renderInternal as ɵrenderInternal} from './utils'; export {ENABLE_DOM_EMULATION as ɵENABLE_DOM_EMULATION} from './tokens'; +export {DominoAdapter as ɵDominoAdapter} from './domino_adapter'; diff --git a/packages/private/testing/BUILD.bazel b/packages/private/testing/BUILD.bazel index 1fc4db4a7a1..0e67017fe96 100644 --- a/packages/private/testing/BUILD.bazel +++ b/packages/private/testing/BUILD.bazel @@ -16,7 +16,10 @@ ng_module( ), module_name = "@angular/private/testing", deps = [ + "//packages/common", "//packages/core", + "//packages/core/testing", + "//packages/platform-browser", "//packages/platform-server:bundled_domino_lib", ], ) diff --git a/packages/private/testing/index.ts b/packages/private/testing/index.ts index fe6a0ac8ac1..737794cd6ab 100644 --- a/packages/private/testing/index.ts +++ b/packages/private/testing/index.ts @@ -7,3 +7,5 @@ */ export * from './src/utils'; +export * from './src/browser_utils'; +export * from './src/globals'; diff --git a/packages/platform-browser/testing/src/matchers.ts b/packages/private/testing/matchers/index.ts similarity index 98% rename from packages/platform-browser/testing/src/matchers.ts rename to packages/private/testing/matchers/index.ts index a56199093fd..89d5b3046e3 100644 --- a/packages/platform-browser/testing/src/matchers.ts +++ b/packages/private/testing/matchers/index.ts @@ -9,9 +9,9 @@ import {ɵgetDOM as getDOM} from '@angular/common'; import {Type} from '@angular/core'; import {ComponentFixture} from '@angular/core/testing'; -import {By} from '../../index'; +import {By} from '@angular/platform-browser'; -import {childNodesAsList, hasClass, hasStyle, isCommentNode} from './browser_util'; +import {childNodesAsList, hasClass, hasStyle, isCommentNode} from '../src/browser_utils'; /** * Jasmine matchers that check Angular specific conditions. diff --git a/packages/platform-browser/testing/src/browser_util.ts b/packages/private/testing/src/browser_utils.ts similarity index 100% rename from packages/platform-browser/testing/src/browser_util.ts rename to packages/private/testing/src/browser_utils.ts diff --git a/packages/private/testing/src/globals.ts b/packages/private/testing/src/globals.ts new file mode 100644 index 00000000000..2a883871ceb --- /dev/null +++ b/packages/private/testing/src/globals.ts @@ -0,0 +1,12 @@ +/** + * @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 + */ + +// Set by the test initialization scripts. + +export const isBrowser = !!(globalThis as any).isBrowser; +export const isNode = !!(globalThis as any).isNode; diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts index e9a31a2f381..ded247cdfd1 100644 --- a/packages/router/test/bootstrap.spec.ts +++ b/packages/router/test/bootstrap.spec.ts @@ -22,6 +22,7 @@ import { provideZonelessChangeDetection, } from '@angular/core'; import {TestBed} from '@angular/core/testing'; +import {isNode} from '@angular/private/testing'; import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; import { diff --git a/packages/router/test/computed_state_restoration.spec.ts b/packages/router/test/computed_state_restoration.spec.ts index f3101a187ad..24f42c1e2dd 100644 --- a/packages/router/test/computed_state_restoration.spec.ts +++ b/packages/router/test/computed_state_restoration.spec.ts @@ -9,7 +9,7 @@ import {Location} from '@angular/common'; import {Component, Injectable, NgModule, Type} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import {Router, RouterModule, RouterOutlet, UrlTree, withRouterConfig} from '../index'; import {EMPTY, of} from 'rxjs'; diff --git a/packages/router/test/integration/eager_url_update_strategy.spec.ts b/packages/router/test/integration/eager_url_update_strategy.spec.ts index f4de8b83b79..92ec31d9e83 100644 --- a/packages/router/test/integration/eager_url_update_strategy.spec.ts +++ b/packages/router/test/integration/eager_url_update_strategy.spec.ts @@ -30,7 +30,7 @@ import { createRoot, advance, } from './integration_helpers'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import {timeout} from '../helpers'; export function eagerUrlUpdateStrategyIntegrationSuite() { diff --git a/packages/router/test/integration/guards.spec.ts b/packages/router/test/integration/guards.spec.ts index 58590b08570..f77b4879ca7 100644 --- a/packages/router/test/integration/guards.spec.ts +++ b/packages/router/test/integration/guards.spec.ts @@ -53,7 +53,7 @@ import { } from '../../src'; import {wrapIntoObservable} from '../../src/utils/collection'; import {RouterTestingHarness} from '../../testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { TeamCmp, RootCmp, diff --git a/packages/router/test/integration/integration.spec.ts b/packages/router/test/integration/integration.spec.ts index 8759a8fb5eb..2948f8129c3 100644 --- a/packages/router/test/integration/integration.spec.ts +++ b/packages/router/test/integration/integration.spec.ts @@ -16,7 +16,7 @@ import { signal, } from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { ActivationEnd, ActivationStart, diff --git a/packages/router/test/integration/lazy_loading.spec.ts b/packages/router/test/integration/lazy_loading.spec.ts index ec88fd9222f..db450e95050 100644 --- a/packages/router/test/integration/lazy_loading.spec.ts +++ b/packages/router/test/integration/lazy_loading.spec.ts @@ -17,7 +17,7 @@ import { QueryList, } from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { Router, Event, diff --git a/packages/router/test/integration/navigation_errors.spec.ts b/packages/router/test/integration/navigation_errors.spec.ts index c0421af0562..f140c5298b9 100644 --- a/packages/router/test/integration/navigation_errors.spec.ts +++ b/packages/router/test/integration/navigation_errors.spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.dev/license */ import {inject, Injectable} from '@angular/core'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import {Location} from '@angular/common'; import {TestBed} from '@angular/core/testing'; import { diff --git a/packages/router/test/integration/route_reuse_strategy.spec.ts b/packages/router/test/integration/route_reuse_strategy.spec.ts index 47fee448f76..64370ee5e95 100644 --- a/packages/router/test/integration/route_reuse_strategy.spec.ts +++ b/packages/router/test/integration/route_reuse_strategy.spec.ts @@ -5,7 +5,7 @@ * 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 */ -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import {CommonModule, Location} from '@angular/common'; import {Component, OnDestroy, NgModule, InjectionToken, Inject, signal} from '@angular/core'; import {TestBed} from '@angular/core/testing'; diff --git a/packages/router/test/integration/router_events.spec.ts b/packages/router/test/integration/router_events.spec.ts index c183e4e540b..3a1ae6c07ea 100644 --- a/packages/router/test/integration/router_events.spec.ts +++ b/packages/router/test/integration/router_events.spec.ts @@ -8,7 +8,7 @@ import {filter, tap, first} from 'rxjs/operators'; import {Event} from '../../index'; import {TestBed} from '@angular/core/testing'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { Router, ChildActivationStart, diff --git a/packages/router/test/integration/router_links.spec.ts b/packages/router/test/integration/router_links.spec.ts index 23f2be2fe8b..987beab9ccd 100644 --- a/packages/router/test/integration/router_links.spec.ts +++ b/packages/router/test/integration/router_links.spec.ts @@ -10,7 +10,7 @@ import {Location} from '@angular/common'; import {TestBed, ComponentFixture} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; import {Router} from '../../src'; -import {expect} from '@angular/platform-browser/testing/src/matchers'; +import {expect} from '@angular/private/testing/matchers'; import { RootCmp, BlankCmp, diff --git a/packages/router/test/view_transitions.spec.ts b/packages/router/test/view_transitions.spec.ts index 4dfaeceae37..26c3cc0d1d0 100644 --- a/packages/router/test/view_transitions.spec.ts +++ b/packages/router/test/view_transitions.spec.ts @@ -9,7 +9,7 @@ import {DOCUMENT} from '@angular/common'; import {Component, destroyPlatform, provideZonelessChangeDetection} from '@angular/core'; import {bootstrapApplication} from '@angular/platform-browser'; -import {withBody} from '@angular/private/testing'; +import {withBody, isNode} from '@angular/private/testing'; import { Event, NavigationEnd, diff --git a/packages/tsconfig-build.json b/packages/tsconfig-build.json index 10d3126ab0e..9501d611e46 100644 --- a/packages/tsconfig-build.json +++ b/packages/tsconfig-build.json @@ -32,7 +32,8 @@ "importHelpers": true, "paths": { "zone.js": ["./zone.js/lib/zone"], - "@angular/*": ["./*/index"] + "@angular/*": ["./*/index"], + "@angular/common/locales/*": ["./common/locales/*"] } }, "bazelOptions": { diff --git a/packages/types.d.ts b/packages/types.d.ts index f247117cd5c..3921605637c 100644 --- a/packages/types.d.ts +++ b/packages/types.d.ts @@ -21,6 +21,3 @@ // /packages/tsconfig-test.json when `testonly = True` is set // and packages such as platform-server that need these types should // use `/// ` in their main entry points - -declare let isNode: boolean; -declare let isBrowser: boolean;