From 8a47b489124204e7d2139927e3258f2be4e3aeb1 Mon Sep 17 00:00:00 2001 From: Misko Hevery Date: Thu, 22 Aug 2019 19:16:25 -0700 Subject: [PATCH] refactor: Move `dom_adapter.ts` to `@angular/common` (#32154) This work is needed in preparation for turning tokens into tree-shakable injectables. PR Close #32154 --- packages/common/src/common.ts | 6 +----- .../src/dom => common/src}/dom_adapter.ts | 5 +++-- packages/common/src/private_export.ts | 13 +++++++++++++ packages/common/test/directives/ng_if_spec.ts | 3 +-- .../common/test/directives/non_bindable_spec.ts | 2 +- packages/common/test/pipes/async_pipe_spec.ts | 3 +-- packages/compiler/test/selector/BUILD.bazel | 1 + packages/compiler/test/selector/selector_spec.ts | 2 +- .../test/animation/animation_integration_spec.ts | 2 +- packages/core/test/application_ref_spec.ts | 3 +-- packages/core/test/debug/debug_node_spec.ts | 3 +-- packages/core/test/dom/dom_adapter_spec.ts | 4 ++-- packages/core/test/linker/integration_spec.ts | 3 +-- .../test/linker/ng_container_integration_spec.ts | 1 - .../core/test/linker/projection_integration_spec.ts | 3 +-- packages/core/test/linker/query_list_spec.ts | 2 +- .../core/test/linker/regression_integration_spec.ts | 3 +-- .../core/test/linker/security_integration_spec.ts | 2 +- packages/core/test/render3/BUILD.bazel | 2 +- packages/core/test/render3/imported_renderer2.ts | 1 + packages/core/test/render3/load_domino.ts | 2 +- packages/core/test/spies.ts | 1 + packages/core/test/view/BUILD.bazel | 1 + packages/core/test/view/anchor_spec.ts | 2 +- packages/core/test/view/component_view_spec.ts | 2 +- packages/core/test/view/element_spec.ts | 2 +- packages/core/test/view/embedded_view_spec.ts | 2 +- packages/core/test/view/helper.ts | 2 +- packages/core/test/view/ng_content_spec.ts | 6 +++--- packages/core/test/view/provider_spec.ts | 2 +- packages/core/test/view/text_spec.ts | 2 +- .../forms/src/directives/default_value_accessor.ts | 2 +- packages/forms/test/BUILD.bazel | 1 + packages/forms/test/reactive_integration_spec.ts | 2 +- packages/forms/test/template_integration_spec.ts | 2 +- packages/http/src/backends/xhr_backend.ts | 2 +- packages/http/test/BUILD.bazel | 1 + packages/http/test/backends/xhr_backend_spec.ts | 2 +- packages/http/test/static_request_spec.ts | 1 + .../testing/src/dom_test_component_renderer.ts | 3 +-- .../platform-browser/src/browser/browser_adapter.ts | 4 +--- .../src/browser/generic_browser_adapter.ts | 2 +- .../browser/location/browser_platform_location.ts | 6 +----- packages/platform-browser/src/browser/meta.ts | 6 +----- .../src/browser/server-transition.ts | 4 +--- .../platform-browser/src/browser/testability.ts | 3 +-- packages/platform-browser/src/browser/title.ts | 3 +-- .../src/browser/tools/common_tools.ts | 2 +- packages/platform-browser/src/dom/debug/by.ts | 2 +- .../src/dom/events/event_manager.ts | 3 +-- .../platform-browser/src/dom/events/key_events.ts | 5 +---- .../platform-browser/src/dom/shared_styles_host.ts | 3 +-- packages/platform-browser/src/private_export.ts | 1 - .../platform-browser/test/browser/bootstrap_spec.ts | 3 +-- packages/platform-browser/test/browser/meta_spec.ts | 2 +- .../platform-browser/test/browser/title_spec.ts | 2 +- .../test/dom/events/event_manager_spec.ts | 3 +-- .../test/dom/shared_styles_host_spec.ts | 2 +- .../platform-browser/testing/src/browser_util.ts | 2 +- packages/platform-browser/testing/src/matchers.ts | 5 ++--- packages/platform-server/src/domino_adapter.ts | 3 ++- packages/platform-server/src/location.ts | 3 +-- packages/platform-server/src/server.ts | 8 +++++--- packages/platform-server/src/server_events.ts | 3 +-- packages/platform-server/src/server_renderer.ts | 4 ++-- packages/platform-server/src/styles_host.ts | 4 ++-- packages/platform-server/test/integration_spec.ts | 3 +-- .../src/web_workers/worker/worker_adapter.ts | 2 +- packages/platform-webworker/test/BUILD.bazel | 1 + .../worker/renderer_v2_integration_spec.ts | 2 +- packages/router/src/router_module.ts | 6 +----- packages/router/test/bootstrap.spec.ts | 4 ++-- 72 files changed, 96 insertions(+), 114 deletions(-) rename packages/{platform-browser/src/dom => common/src}/dom_adapter.ts (95%) create mode 100644 packages/common/src/private_export.ts diff --git a/packages/common/src/common.ts b/packages/common/src/common.ts index b5bffa3bdf..0cf150eea7 100644 --- a/packages/common/src/common.ts +++ b/packages/common/src/common.ts @@ -11,6 +11,7 @@ * @description * Entry point for all public APIs of the common package. */ +export * from './private_export'; export * from './location/index'; export {formatDate} from './i18n/format_date'; export {formatCurrency, formatNumber, formatPercent} from './i18n/format_number'; @@ -26,8 +27,3 @@ export {DeprecatedDatePipe, DeprecatedCurrencyPipe, DeprecatedDecimalPipe, Depre export {PLATFORM_BROWSER_ID as ɵPLATFORM_BROWSER_ID, PLATFORM_SERVER_ID as ɵPLATFORM_SERVER_ID, PLATFORM_WORKER_APP_ID as ɵPLATFORM_WORKER_APP_ID, PLATFORM_WORKER_UI_ID as ɵPLATFORM_WORKER_UI_ID, isPlatformBrowser, isPlatformServer, isPlatformWorkerApp, isPlatformWorkerUi} from './platform_id'; export {VERSION} from './version'; export {ViewportScroller, NullViewportScroller as ɵNullViewportScroller} from './viewport_scroller'; - -export {NgClassImplProvider__POST_R3__ as ɵNgClassImplProvider__POST_R3__, NgClassR2Impl as ɵNgClassR2Impl, NgClassImpl as ɵNgClassImpl} from './directives/ng_class_impl'; -export {NgStyleImplProvider__POST_R3__ as ɵNgStyleImplProvider__POST_R3__, NgStyleR2Impl as ɵNgStyleR2Impl, NgStyleImpl as ɵNgStyleImpl} from './directives/ng_style_impl'; -export {ngStyleDirectiveDef__POST_R3__ as ɵngStyleDirectiveDef__POST_R3__, ngStyleFactoryDef__POST_R3__ as ɵngStyleFactoryDef__POST_R3__} from './directives/ng_style'; -export {ngClassDirectiveDef__POST_R3__ as ɵngClassDirectiveDef__POST_R3__, ngClassFactoryDef__POST_R3__ as ɵngClassFactoryDef__POST_R3__} from './directives/ng_class'; diff --git a/packages/platform-browser/src/dom/dom_adapter.ts b/packages/common/src/dom_adapter.ts similarity index 95% rename from packages/platform-browser/src/dom/dom_adapter.ts rename to packages/common/src/dom_adapter.ts index 0c9c9a5a72..5cf0f1af91 100644 --- a/packages/platform-browser/src/dom/dom_adapter.ts +++ b/packages/common/src/dom_adapter.ts @@ -9,7 +9,7 @@ let _DOM: DomAdapter = null !; -export function getDOM() { +export function getDOM(): DomAdapter { return _DOM; } @@ -94,7 +94,8 @@ export abstract class DomAdapter { // Used by PlatformLocation abstract getHistory(): History; - abstract getLocation(): Location; + abstract getLocation(): + any; /** This is the ambient Location definition, NOT Location from @angular/common. */ abstract getBaseHref(doc: Document): string|null; abstract resetBaseElement(): void; diff --git a/packages/common/src/private_export.ts b/packages/common/src/private_export.ts new file mode 100644 index 0000000000..18d7c9ff47 --- /dev/null +++ b/packages/common/src/private_export.ts @@ -0,0 +1,13 @@ +/** + * @license + * Copyright Google Inc. 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 + */ + +export {ngClassDirectiveDef__POST_R3__ as ɵngClassDirectiveDef__POST_R3__, ngClassFactoryDef__POST_R3__ as ɵngClassFactoryDef__POST_R3__} from './directives/ng_class'; +export {NgClassImpl as ɵNgClassImpl, NgClassImplProvider__POST_R3__ as ɵNgClassImplProvider__POST_R3__, NgClassR2Impl as ɵNgClassR2Impl} from './directives/ng_class_impl'; +export {ngStyleDirectiveDef__POST_R3__ as ɵngStyleDirectiveDef__POST_R3__, ngStyleFactoryDef__POST_R3__ as ɵngStyleFactoryDef__POST_R3__} from './directives/ng_style'; +export {NgStyleImpl as ɵNgStyleImpl, NgStyleImplProvider__POST_R3__ as ɵNgStyleImplProvider__POST_R3__, NgStyleR2Impl as ɵNgStyleR2Impl} from './directives/ng_style_impl'; +export {DomAdapter as ɵDomAdapter, getDOM as ɵgetDOM, setRootDomAdapter as ɵsetRootDomAdapter} from './dom_adapter'; diff --git a/packages/common/test/directives/ng_if_spec.ts b/packages/common/test/directives/ng_if_spec.ts index a88119c7df..fc750d1cf7 100644 --- a/packages/common/test/directives/ng_if_spec.ts +++ b/packages/common/test/directives/ng_if_spec.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {CommonModule} from '@angular/common'; +import {CommonModule, ɵgetDOM as getDOM} from '@angular/common'; import {Component} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {expect} from '@angular/platform-browser/testing/src/matchers'; { diff --git a/packages/common/test/directives/non_bindable_spec.ts b/packages/common/test/directives/non_bindable_spec.ts index ee713c70c9..c3e2de960b 100644 --- a/packages/common/test/directives/non_bindable_spec.ts +++ b/packages/common/test/directives/non_bindable_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Component, Directive} from '@angular/core'; import {ElementRef} from '@angular/core/src/linker/element_ref'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {hasClass} from '@angular/platform-browser/testing/src/browser_util'; import {expect} from '@angular/platform-browser/testing/src/matchers'; diff --git a/packages/common/test/pipes/async_pipe_spec.ts b/packages/common/test/pipes/async_pipe_spec.ts index c7517144aa..fed5236e47 100644 --- a/packages/common/test/pipes/async_pipe_spec.ts +++ b/packages/common/test/pipes/async_pipe_spec.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {AsyncPipe} from '@angular/common'; +import {AsyncPipe, ɵgetDOM as getDOM} from '@angular/common'; import {EventEmitter, WrappedValue} from '@angular/core'; import {AsyncTestCompleter, beforeEach, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {browserDetection} from '@angular/platform-browser/testing/src/browser_util'; import {SpyChangeDetectorRef} from '../spies'; diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel index 291e85ccc3..0b3ba28f08 100644 --- a/packages/compiler/test/selector/BUILD.bazel +++ b/packages/compiler/test/selector/BUILD.bazel @@ -6,6 +6,7 @@ ts_library( srcs = glob(["**/*.ts"]), deps = [ "//packages:types", + "//packages/common", "//packages/compiler", "//packages/compiler/testing", "//packages/core/testing", diff --git a/packages/compiler/test/selector/selector_spec.ts b/packages/compiler/test/selector/selector_spec.ts index 8b5e64a378..a81e88fb0c 100644 --- a/packages/compiler/test/selector/selector_spec.ts +++ b/packages/compiler/test/selector/selector_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {CssSelector, SelectorMatcher} from '@angular/compiler/src/selector'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {el} from '@angular/platform-browser/testing/src/browser_util'; { diff --git a/packages/core/test/animation/animation_integration_spec.ts b/packages/core/test/animation/animation_integration_spec.ts index f80fea4d94..46ecf5d446 100644 --- a/packages/core/test/animation/animation_integration_spec.ts +++ b/packages/core/test/animation/animation_integration_spec.ts @@ -8,11 +8,11 @@ import {AUTO_STYLE, AnimationEvent, AnimationOptions, animate, animateChild, group, keyframes, query, state, style, transition, trigger, ɵPRE_STYLE as PRE_STYLE} from '@angular/animations'; import {AnimationDriver, ɵAnimationEngine, ɵNoopAnimationDriver as NoopAnimationDriver} from '@angular/animations/browser'; import {MockAnimationDriver, MockAnimationPlayer} from '@angular/animations/browser/testing'; +import {ɵgetDOM as getDOM} from '@angular/common'; import {ChangeDetectorRef, Component, HostBinding, HostListener, Inject, RendererFactory2, ViewChild} from '@angular/core'; import {TestBed, fakeAsync, flushMicrotasks} from '@angular/core/testing'; import {ɵDomRendererFactory2} from '@angular/platform-browser'; import {ANIMATION_MODULE_TYPE, BrowserAnimationsModule, NoopAnimationsModule} from '@angular/platform-browser/animations'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {hasStyle} from '@angular/platform-browser/testing/src/browser_util'; import {ivyEnabled, modifiedInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/application_ref_spec.ts b/packages/core/test/application_ref_spec.ts index bc547364fb..e44face1e7 100644 --- a/packages/core/test/application_ref_spec.ts +++ b/packages/core/test/application_ref_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {ResourceLoader} from '@angular/compiler'; import {APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, Compiler, CompilerFactory, Component, InjectionToken, LOCALE_ID, NgModule, NgZone, PlatformRef, TemplateRef, Type, ViewChild, ViewContainerRef} from '@angular/core'; import {ApplicationRef} from '@angular/core/src/application_ref'; @@ -14,7 +14,6 @@ import {ErrorHandler} from '@angular/core/src/error_handler'; import {ComponentRef} from '@angular/core/src/linker/component_factory'; import {getLocaleId} from '@angular/core/src/render3'; import {BrowserModule} from '@angular/platform-browser'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {createTemplate, dispatchEvent, getContent} from '@angular/platform-browser/testing/src/browser_util'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {onlyInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/debug/debug_node_spec.ts b/packages/core/test/debug/debug_node_spec.ts index 7f21230905..328dab2f9f 100644 --- a/packages/core/test/debug/debug_node_spec.ts +++ b/packages/core/test/debug/debug_node_spec.ts @@ -7,11 +7,10 @@ */ -import {CommonModule, NgIfContext} from '@angular/common'; +import {CommonModule, NgIfContext, ɵgetDOM as getDOM} from '@angular/common'; import {Component, DebugNode, Directive, ElementRef, EmbeddedViewRef, EventEmitter, HostBinding, Injectable, Input, NO_ERRORS_SCHEMA, OnInit, Output, Renderer2, TemplateRef, ViewChild, ViewContainerRef} from '@angular/core'; import {ComponentFixture, TestBed, async} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {hasClass} from '@angular/platform-browser/testing/src/browser_util'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {ivyEnabled} from '@angular/private/testing'; diff --git a/packages/core/test/dom/dom_adapter_spec.ts b/packages/core/test/dom/dom_adapter_spec.ts index af272f2ae4..d2cb6b3a48 100644 --- a/packages/core/test/dom/dom_adapter_spec.ts +++ b/packages/core/test/dom/dom_adapter_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; -import {el, isTextNode, stringifyElement} from '@angular/platform-browser/testing/src/browser_util'; +import {isTextNode} from '@angular/platform-browser/testing/src/browser_util'; { describe('dom adapter', () => { diff --git a/packages/core/test/linker/integration_spec.ts b/packages/core/test/linker/integration_spec.ts index 23727dbea7..eba658da46 100644 --- a/packages/core/test/linker/integration_spec.ts +++ b/packages/core/test/linker/integration_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {CommonModule, DOCUMENT} from '@angular/common'; +import {CommonModule, DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Compiler, ComponentFactory, ComponentRef, ErrorHandler, EventEmitter, Host, Inject, Injectable, InjectionToken, Injector, NO_ERRORS_SCHEMA, NgModule, NgModuleRef, OnDestroy, SkipSelf, ViewRef, ɵivyEnabled as ivyEnabled} from '@angular/core'; import {ChangeDetectionStrategy, ChangeDetectorRef, PipeTransform} from '@angular/core/src/change_detection/change_detection'; import {getDebugContext} from '@angular/core/src/errors'; @@ -18,7 +18,6 @@ import {ViewContainerRef} from '@angular/core/src/linker/view_container_ref'; import {EmbeddedViewRef} from '@angular/core/src/linker/view_ref'; import {Attribute, Component, ContentChildren, Directive, HostBinding, HostListener, Input, Output, Pipe} from '@angular/core/src/metadata'; import {TestBed, async, fakeAsync, getTestBed, tick} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {createMouseEvent, dispatchEvent, el, isCommentNode} from '@angular/platform-browser/testing/src/browser_util'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {modifiedInIvy, obsoleteInIvy, onlyInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/linker/ng_container_integration_spec.ts b/packages/core/test/linker/ng_container_integration_spec.ts index 56a30adb63..5339a4e0f0 100644 --- a/packages/core/test/linker/ng_container_integration_spec.ts +++ b/packages/core/test/linker/ng_container_integration_spec.ts @@ -9,7 +9,6 @@ import {AfterContentInit, AfterViewInit, Component, ContentChildren, Directive, Input, QueryList, ViewChildren, ɵivyEnabled as ivyEnabled} from '@angular/core'; import {TestBed} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {isCommentNode} from '@angular/platform-browser/testing/src/browser_util'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {modifiedInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/linker/projection_integration_spec.ts b/packages/core/test/linker/projection_integration_spec.ts index 1659f81598..8509ce9c24 100644 --- a/packages/core/test/linker/projection_integration_spec.ts +++ b/packages/core/test/linker/projection_integration_spec.ts @@ -6,11 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {CommonModule} from '@angular/common'; +import {CommonModule, ɵgetDOM as getDOM} from '@angular/common'; import {Component, ComponentFactoryResolver, ComponentRef, Directive, ElementRef, Injector, Input, NO_ERRORS_SCHEMA, NgModule, OnInit, TemplateRef, ViewChild, ViewContainerRef, ViewEncapsulation} from '@angular/core'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {modifiedInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/linker/query_list_spec.ts b/packages/core/test/linker/query_list_spec.ts index d0c795b7f1..c344f30f5a 100644 --- a/packages/core/test/linker/query_list_spec.ts +++ b/packages/core/test/linker/query_list_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {iterateListLike} from '@angular/core/src/change_detection/change_detection_util'; import {QueryList} from '@angular/core/src/linker/query_list'; import {fakeAsync, tick} from '@angular/core/testing'; import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; { describe('QueryList', () => { diff --git a/packages/core/test/linker/regression_integration_spec.ts b/packages/core/test/linker/regression_integration_spec.ts index 98556e5ebf..72b0087a92 100644 --- a/packages/core/test/linker/regression_integration_spec.ts +++ b/packages/core/test/linker/regression_integration_spec.ts @@ -6,12 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {ANALYZE_FOR_ENTRY_COMPONENTS, ApplicationRef, Component, ComponentRef, ContentChild, Directive, ErrorHandler, EventEmitter, HostListener, InjectionToken, Injector, Input, NgModule, NgModuleRef, NgZone, Output, Pipe, PipeTransform, Provider, QueryList, Renderer2, SimpleChanges, TemplateRef, ViewChild, ViewChildren, ViewContainerRef, destroyPlatform, ɵivyEnabled as ivyEnabled} from '@angular/core'; import {TestBed, fakeAsync, inject, tick} from '@angular/core/testing'; import {BrowserModule, By} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {modifiedInIvy, onlyInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/linker/security_integration_spec.ts b/packages/core/test/linker/security_integration_spec.ts index d2ed96e5fe..6806f0224f 100644 --- a/packages/core/test/linker/security_integration_spec.ts +++ b/packages/core/test/linker/security_integration_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Component, Directive, HostBinding, Input, NO_ERRORS_SCHEMA, ɵivyEnabled as ivyEnabled} from '@angular/core'; import {ComponentFixture, TestBed, getTestBed} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomSanitizer} from '@angular/platform-browser/src/security/dom_sanitization_service'; import {modifiedInIvy, onlyInIvy} from '@angular/private/testing'; diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index 2d769b430e..f8b0de5267 100644 --- a/packages/core/test/render3/BUILD.bazel +++ b/packages/core/test/render3/BUILD.bazel @@ -42,8 +42,8 @@ ts_library( "load_domino.ts", ], deps = [ + "//packages/common", "//packages/compiler", - "//packages/platform-browser", "//packages/platform-server", "@npm//zone.js", ], diff --git a/packages/core/test/render3/imported_renderer2.ts b/packages/core/test/render3/imported_renderer2.ts index d04587b35b..07978d7446 100644 --- a/packages/core/test/render3/imported_renderer2.ts +++ b/packages/core/test/render3/imported_renderer2.ts @@ -8,6 +8,7 @@ import {ɵAnimationEngine, ɵNoopAnimationStyleNormalizer} from '@angular/animations/browser'; import {MockAnimationDriver} from '@angular/animations/browser/testing'; +import {ɵgetDOM as getDOM} from '@angular/common'; import {NgZone, RendererFactory2, RendererType2} from '@angular/core'; import {NoopNgZone} from '@angular/core/src/zone/ng_zone'; import {EventManager, ɵDomRendererFactory2, ɵDomSharedStylesHost} from '@angular/platform-browser'; diff --git a/packages/core/test/render3/load_domino.ts b/packages/core/test/render3/load_domino.ts index 86b74c7d65..7aae75c0d8 100644 --- a/packages/core/test/render3/load_domino.ts +++ b/packages/core/test/render3/load_domino.ts @@ -11,7 +11,7 @@ require('zone.js/dist/zone-node.js'); import '@angular/compiler'; // For JIT mode. Must be in front of any other @angular/* imports. import {DominoAdapter} from '@angular/platform-server/src/domino_adapter'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; +import {ɵgetDOM as getDOM} from '@angular/common'; if (typeof window == 'undefined') { const domino = require('domino'); diff --git a/packages/core/test/spies.ts b/packages/core/test/spies.ts index acf434f58d..08acdd7c96 100644 --- a/packages/core/test/spies.ts +++ b/packages/core/test/spies.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ +import {DomAdapter} from '@angular/common/src/dom_adapter'; import {ElementRef} from '@angular/core'; import {ChangeDetectorRef} from '@angular/core/src/change_detection/change_detection'; import {SpyObject} from '@angular/core/testing/src/testing_internal'; diff --git a/packages/core/test/view/BUILD.bazel b/packages/core/test/view/BUILD.bazel index 306a050734..25eddead43 100644 --- a/packages/core/test/view/BUILD.bazel +++ b/packages/core/test/view/BUILD.bazel @@ -9,6 +9,7 @@ ts_library( ["**/*.ts"], ), deps = [ + "//packages/common", "//packages/core", "//packages/core/src/di/interface", "//packages/core/src/interface", diff --git a/packages/core/test/view/anchor_spec.ts b/packages/core/test/view/anchor_spec.ts index b9d0b8c910..3b3c93a496 100644 --- a/packages/core/test/view/anchor_spec.ts +++ b/packages/core/test/view/anchor_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {getDebugNode} from '@angular/core'; import {NodeFlags, anchorDef, asElementData, elementDef} from '@angular/core/src/view/index'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {compViewDef, createAndGetRootNodes} from './helper'; diff --git a/packages/core/test/view/component_view_spec.ts b/packages/core/test/view/component_view_spec.ts index b1091b980f..4d720df667 100644 --- a/packages/core/test/view/component_view_spec.ts +++ b/packages/core/test/view/component_view_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {SecurityContext} from '@angular/core'; import {ArgumentType, BindingFlags, NodeCheckFn, NodeFlags, Services, ViewData, ViewFlags, ViewState, asElementData, directiveDef, elementDef, rootRenderNodes} from '@angular/core/src/view/index'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {callMostRecentEventListenerHandler, compViewDef, createAndGetRootNodes, createRootView, isBrowser, recordNodeToRemove} from './helper'; diff --git a/packages/core/test/view/element_spec.ts b/packages/core/test/view/element_spec.ts index f6e37b963a..ab2691054b 100644 --- a/packages/core/test/view/element_spec.ts +++ b/packages/core/test/view/element_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {ErrorHandler, SecurityContext, getDebugNode} from '@angular/core'; import {getDebugContext} from '@angular/core/src/errors'; import {BindingFlags, NodeFlags, Services, ViewData, ViewDefinition, asElementData, elementDef} from '@angular/core/src/view/index'; import {TestBed} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {ARG_TYPE_VALUES, callMostRecentEventListenerHandler, checkNodeInlineOrDynamic, compViewDef, createAndGetRootNodes, isBrowser, recordNodeToRemove} from './helper'; diff --git a/packages/core/test/view/embedded_view_spec.ts b/packages/core/test/view/embedded_view_spec.ts index f8d9e87ff0..9ae9ff8ea6 100644 --- a/packages/core/test/view/embedded_view_spec.ts +++ b/packages/core/test/view/embedded_view_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {SecurityContext} from '@angular/core'; import {ArgumentType, BindingFlags, NodeCheckFn, NodeFlags, Services, ViewData, anchorDef, asElementData, attachEmbeddedView, detachEmbeddedView, directiveDef, elementDef, moveEmbeddedView, rootRenderNodes} from '@angular/core/src/view/index'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {compViewDef, compViewDefFactory, createAndGetRootNodes, createEmbeddedView} from './helper'; diff --git a/packages/core/test/view/helper.ts b/packages/core/test/view/helper.ts index b9b10f59f3..7dcbf927ce 100644 --- a/packages/core/test/view/helper.ts +++ b/packages/core/test/view/helper.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Injector, NgModuleRef} from '@angular/core'; import {ArgumentType, NodeCheckFn, NodeDef, Services, ViewData, ViewDefinition, ViewDefinitionFactory, ViewFlags, ViewUpdateFn, initServicesIfNeeded, rootRenderNodes, viewDef} from '@angular/core/src/view/index'; import {TestBed} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; export function isBrowser() { return getDOM().supportsDOMEvents(); diff --git a/packages/core/test/view/ng_content_spec.ts b/packages/core/test/view/ng_content_spec.ts index e2852f99ed..a2be95f301 100644 --- a/packages/core/test/view/ng_content_spec.ts +++ b/packages/core/test/view/ng_content_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {Injector, RenderComponentType, RootRenderer, Sanitizer, SecurityContext, TemplateRef, ViewContainerRef, ViewEncapsulation, getDebugNode} from '@angular/core'; -import {DebugContext, NodeDef, NodeFlags, RootData, Services, ViewData, ViewDefinition, ViewDefinitionFactory, ViewFlags, ViewHandleEventFn, ViewUpdateFn, anchorDef, asElementData, asProviderData, asTextData, attachEmbeddedView, detachEmbeddedView, directiveDef, elementDef, ngContentDef, rootRenderNodes, textDef, viewDef} from '@angular/core/src/view/index'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; +import {ɵgetDOM as getDOM} from '@angular/common'; +import {TemplateRef, ViewContainerRef} from '@angular/core'; +import {NodeDef, NodeFlags, ViewData, ViewDefinition, anchorDef, asElementData, asTextData, attachEmbeddedView, detachEmbeddedView, directiveDef, elementDef, ngContentDef, rootRenderNodes, textDef} from '@angular/core/src/view/index'; import {compViewDef, compViewDefFactory, createEmbeddedView, createRootView, isBrowser} from './helper'; diff --git a/packages/core/test/view/provider_spec.ts b/packages/core/test/view/provider_spec.ts index 098d87907b..01a67c5866 100644 --- a/packages/core/test/view/provider_spec.ts +++ b/packages/core/test/view/provider_spec.ts @@ -10,7 +10,7 @@ import {AfterContentChecked, AfterContentInit, AfterViewChecked, AfterViewInit, import {getDebugContext} from '@angular/core/src/errors'; import {ArgumentType, DepFlags, NodeFlags, Services, anchorDef, asElementData, directiveDef, elementDef, providerDef, textDef} from '@angular/core/src/view/index'; import {TestBed, withModule} from '@angular/core/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; +import {ɵgetDOM as getDOM} from '@angular/common'; import {ivyEnabled} from '@angular/private/testing'; import {ARG_TYPE_VALUES, checkNodeInlineOrDynamic, createRootView, createAndGetRootNodes, compViewDef, compViewDefFactory} from './helper'; diff --git a/packages/core/test/view/text_spec.ts b/packages/core/test/view/text_spec.ts index 7bb2029367..e2f41d5ea6 100644 --- a/packages/core/test/view/text_spec.ts +++ b/packages/core/test/view/text_spec.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {getDebugNode} from '@angular/core'; import {NodeFlags, Services, asTextData, elementDef, textDef} from '@angular/core/src/view/index'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {ARG_TYPE_VALUES, checkNodeInlineOrDynamic, compViewDef, createAndGetRootNodes} from './helper'; diff --git a/packages/forms/src/directives/default_value_accessor.ts b/packages/forms/src/directives/default_value_accessor.ts index ec93663b52..1e946e6795 100644 --- a/packages/forms/src/directives/default_value_accessor.ts +++ b/packages/forms/src/directives/default_value_accessor.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Directive, ElementRef, Inject, InjectionToken, Optional, Renderer2, forwardRef} from '@angular/core'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor'; export const DEFAULT_VALUE_ACCESSOR: any = { diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index 4f7e0b9109..009c6a1bd9 100644 --- a/packages/forms/test/BUILD.bazel +++ b/packages/forms/test/BUILD.bazel @@ -7,6 +7,7 @@ ts_library( # Visible to //:test_web_all target visibility = ["//:__pkg__"], deps = [ + "//packages/common", "//packages/core", "//packages/core/testing", "//packages/forms", diff --git a/packages/forms/test/reactive_integration_spec.ts b/packages/forms/test/reactive_integration_spec.ts index 6ae324db34..9a1b144dda 100644 --- a/packages/forms/test/reactive_integration_spec.ts +++ b/packages/forms/test/reactive_integration_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Component, Directive, Input, Type, forwardRef} from '@angular/core'; import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing'; import {AbstractControl, AsyncValidator, AsyncValidatorFn, COMPOSITION_BUFFER_MODE, FormArray, FormControl, FormControlDirective, FormControlName, FormGroup, FormGroupDirective, FormsModule, NG_ASYNC_VALIDATORS, NG_VALIDATORS, ReactiveFormsModule, Validators} from '@angular/forms'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {dispatchEvent, sortedClassList} from '@angular/platform-browser/testing/src/browser_util'; import {merge, timer} from 'rxjs'; import {tap} from 'rxjs/operators'; diff --git a/packages/forms/test/template_integration_spec.ts b/packages/forms/test/template_integration_spec.ts index a450f836b3..8c420e06f9 100644 --- a/packages/forms/test/template_integration_spec.ts +++ b/packages/forms/test/template_integration_spec.ts @@ -6,11 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Component, Directive, Type, forwardRef} from '@angular/core'; import {ComponentFixture, TestBed, async, fakeAsync, tick} from '@angular/core/testing'; import {AbstractControl, AsyncValidator, COMPOSITION_BUFFER_MODE, FormControl, FormsModule, NG_ASYNC_VALIDATORS, NgForm, NgFormSelectorWarning, NgModel} from '@angular/forms'; import {By} from '@angular/platform-browser/src/dom/debug/by'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {dispatchEvent, sortedClassList} from '@angular/platform-browser/testing/src/browser_util'; import {merge} from 'rxjs'; diff --git a/packages/http/src/backends/xhr_backend.ts b/packages/http/src/backends/xhr_backend.ts index 429b66978a..54256b2810 100644 --- a/packages/http/src/backends/xhr_backend.ts +++ b/packages/http/src/backends/xhr_backend.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Injectable} from '@angular/core'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; import {Observable, Observer} from 'rxjs'; import {ResponseOptions} from '../base_response_options'; import {ContentType, ReadyState, RequestMethod, ResponseContentType, ResponseType} from '../enums'; diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index 3b398d41c6..285e3567e3 100644 --- a/packages/http/test/BUILD.bazel +++ b/packages/http/test/BUILD.bazel @@ -7,6 +7,7 @@ ts_library( # Visible to //:test_web_all target visibility = ["//:__pkg__"], deps = [ + "//packages/common", "//packages/core", "//packages/core/testing", "//packages/http", diff --git a/packages/http/test/backends/xhr_backend_spec.ts b/packages/http/test/backends/xhr_backend_spec.ts index 2e7d60ba76..3fb285f204 100644 --- a/packages/http/test/backends/xhr_backend_spec.ts +++ b/packages/http/test/backends/xhr_backend_spec.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Injectable} from '@angular/core'; import {AsyncTestCompleter, SpyObject, afterEach, beforeEach, beforeEachProviders, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal'; import {BrowserXhr} from '@angular/http/src/backends/browser_xhr'; @@ -18,7 +19,6 @@ import {XSRFStrategy} from '@angular/http/src/interfaces'; import {Request} from '@angular/http/src/static_request'; import {Response} from '@angular/http/src/static_response'; import {URLSearchParams} from '@angular/http/src/url_search_params'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; import {setCookie} from '@angular/platform-browser/testing/src/browser_util'; let abortSpy: any; diff --git a/packages/http/test/static_request_spec.ts b/packages/http/test/static_request_spec.ts index 5217383296..570ef334cc 100644 --- a/packages/http/test/static_request_spec.ts +++ b/packages/http/test/static_request_spec.ts @@ -6,6 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {describe, expect, it} from '@angular/core/testing/src/testing_internal'; import {RequestOptions} from '@angular/http/src/base_request_options'; import {ContentType} from '@angular/http/src/enums'; diff --git a/packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts b/packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts index 151edba05a..473f7c47b6 100644 --- a/packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts +++ b/packages/platform-browser-dynamic/testing/src/dom_test_component_renderer.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable} from '@angular/core'; import {TestComponentRenderer} from '@angular/core/testing'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; /** * A DOM based implementation of the TestComponentRenderer. diff --git a/packages/platform-browser/src/browser/browser_adapter.ts b/packages/platform-browser/src/browser/browser_adapter.ts index 23d1223a2e..c46fb67e49 100644 --- a/packages/platform-browser/src/browser/browser_adapter.ts +++ b/packages/platform-browser/src/browser/browser_adapter.ts @@ -6,11 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {ɵparseCookieValue as parseCookieValue} from '@angular/common'; +import {ɵparseCookieValue as parseCookieValue, ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/common'; import {ɵglobal as global} from '@angular/core'; -import {setRootDomAdapter} from '../dom/dom_adapter'; - import {GenericBrowserDomAdapter} from './generic_browser_adapter'; diff --git a/packages/platform-browser/src/browser/generic_browser_adapter.ts b/packages/platform-browser/src/browser/generic_browser_adapter.ts index e7791cdaef..174567359c 100644 --- a/packages/platform-browser/src/browser/generic_browser_adapter.ts +++ b/packages/platform-browser/src/browser/generic_browser_adapter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {DomAdapter} from '../dom/dom_adapter'; +import {ɵDomAdapter as DomAdapter} from '@angular/common'; diff --git a/packages/platform-browser/src/browser/location/browser_platform_location.ts b/packages/platform-browser/src/browser/location/browser_platform_location.ts index 7171e3995b..c9fe0d49c4 100644 --- a/packages/platform-browser/src/browser/location/browser_platform_location.ts +++ b/packages/platform-browser/src/browser/location/browser_platform_location.ts @@ -6,15 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT, LocationChangeListener, PlatformLocation} from '@angular/common'; +import {DOCUMENT, LocationChangeListener, PlatformLocation, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable} from '@angular/core'; - -import {getDOM} from '../../dom/dom_adapter'; - import {supportsState} from './history'; - /** * `PlatformLocation` encapsulates all of the direct calls to platform APIs. * This class should not be used directly by an application developer. Instead, use diff --git a/packages/platform-browser/src/browser/meta.ts b/packages/platform-browser/src/browser/meta.ts index eb8ad345d3..94cf1ca4fb 100644 --- a/packages/platform-browser/src/browser/meta.ts +++ b/packages/platform-browser/src/browser/meta.ts @@ -6,13 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵDomAdapter as DomAdapter, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, ɵɵinject} from '@angular/core'; -import {DomAdapter, getDOM} from '../dom/dom_adapter'; - - - /** * Represents a meta element. * diff --git a/packages/platform-browser/src/browser/server-transition.ts b/packages/platform-browser/src/browser/server-transition.ts index cba20616ed..32a94f8102 100644 --- a/packages/platform-browser/src/browser/server-transition.ts +++ b/packages/platform-browser/src/browser/server-transition.ts @@ -6,11 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {APP_INITIALIZER, ApplicationInitStatus, Inject, InjectionToken, Injector, StaticProvider} from '@angular/core'; -import {getDOM} from '../dom/dom_adapter'; - /** * An id that identifies a particular application being bootstrapped, that should * match across the client/server boundary. diff --git a/packages/platform-browser/src/browser/testability.ts b/packages/platform-browser/src/browser/testability.ts index c057ed03bb..fcde1bed70 100644 --- a/packages/platform-browser/src/browser/testability.ts +++ b/packages/platform-browser/src/browser/testability.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {GetTestability, Testability, TestabilityRegistry, setTestabilityGetter, ɵglobal as global} from '@angular/core'; -import {getDOM} from '../dom/dom_adapter'; - export class BrowserGetTestability implements GetTestability { static init() { setTestabilityGetter(new BrowserGetTestability()); } diff --git a/packages/platform-browser/src/browser/title.ts b/packages/platform-browser/src/browser/title.ts index 623f2f8ea8..c78d0339e6 100644 --- a/packages/platform-browser/src/browser/title.ts +++ b/packages/platform-browser/src/browser/title.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, ɵɵinject} from '@angular/core'; -import {getDOM} from '../dom/dom_adapter'; /** * Factory to create Title service. diff --git a/packages/platform-browser/src/browser/tools/common_tools.ts b/packages/platform-browser/src/browser/tools/common_tools.ts index 511b081ee5..37e12036f7 100644 --- a/packages/platform-browser/src/browser/tools/common_tools.ts +++ b/packages/platform-browser/src/browser/tools/common_tools.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {ApplicationRef, ComponentRef} from '@angular/core'; -import {getDOM} from '../../dom/dom_adapter'; import {window} from './browser'; export class ChangeDetectionPerfRecord { diff --git a/packages/platform-browser/src/dom/debug/by.ts b/packages/platform-browser/src/dom/debug/by.ts index 2d7006b16f..1c328b90c7 100644 --- a/packages/platform-browser/src/dom/debug/by.ts +++ b/packages/platform-browser/src/dom/debug/by.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {DebugElement, DebugNode, Predicate, Type} from '@angular/core'; -import {getDOM} from '../../dom/dom_adapter'; diff --git a/packages/platform-browser/src/dom/events/event_manager.ts b/packages/platform-browser/src/dom/events/event_manager.ts index e54c2fc51e..460f19110c 100644 --- a/packages/platform-browser/src/dom/events/event_manager.ts +++ b/packages/platform-browser/src/dom/events/event_manager.ts @@ -6,10 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, InjectionToken, NgZone} from '@angular/core'; -import {getDOM} from '../dom_adapter'; - /** * The injection token for the event-manager plug-in service. * diff --git a/packages/platform-browser/src/dom/events/key_events.ts b/packages/platform-browser/src/dom/events/key_events.ts index b51a3368c1..df90c01095 100644 --- a/packages/platform-browser/src/dom/events/key_events.ts +++ b/packages/platform-browser/src/dom/events/key_events.ts @@ -6,11 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, NgZone} from '@angular/core'; - -import {getDOM} from '../dom_adapter'; - import {EventManagerPlugin} from './event_manager'; /** diff --git a/packages/platform-browser/src/dom/shared_styles_host.ts b/packages/platform-browser/src/dom/shared_styles_host.ts index 4c5662e406..54745b63b6 100644 --- a/packages/platform-browser/src/dom/shared_styles_host.ts +++ b/packages/platform-browser/src/dom/shared_styles_host.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, OnDestroy} from '@angular/core'; -import {getDOM} from './dom_adapter'; @Injectable() export class SharedStylesHost { diff --git a/packages/platform-browser/src/private_export.ts b/packages/platform-browser/src/private_export.ts index 4957e315bc..f81b8ee196 100644 --- a/packages/platform-browser/src/private_export.ts +++ b/packages/platform-browser/src/private_export.ts @@ -13,7 +13,6 @@ export {TRANSITION_ID as ɵTRANSITION_ID} from './browser/server-transition'; export {BrowserGetTestability as ɵBrowserGetTestability} from './browser/testability'; export {escapeHtml as ɵescapeHtml} from './browser/transfer_state'; export {ELEMENT_PROBE_PROVIDERS as ɵELEMENT_PROBE_PROVIDERS} from './dom/debug/ng_probe'; -export {DomAdapter as ɵDomAdapter, getDOM as ɵgetDOM, setRootDomAdapter as ɵsetRootDomAdapter} from './dom/dom_adapter'; export {DomRendererFactory2 as ɵDomRendererFactory2, NAMESPACE_URIS as ɵNAMESPACE_URIS, flattenStyles as ɵflattenStyles, shimContentAttribute as ɵshimContentAttribute, shimHostAttribute as ɵshimHostAttribute} from './dom/dom_renderer'; export {DomEventsPlugin as ɵDomEventsPlugin} from './dom/events/dom_events'; export {HammerGesturesPlugin as ɵHammerGesturesPlugin} from './dom/events/hammer_gestures'; diff --git a/packages/platform-browser/test/browser/bootstrap_spec.ts b/packages/platform-browser/test/browser/bootstrap_spec.ts index d89d377aea..8807b340d1 100644 --- a/packages/platform-browser/test/browser/bootstrap_spec.ts +++ b/packages/platform-browser/test/browser/bootstrap_spec.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT, isPlatformBrowser} from '@angular/common'; +import {DOCUMENT, isPlatformBrowser, ɵgetDOM as getDOM} from '@angular/common'; import {APP_INITIALIZER, CUSTOM_ELEMENTS_SCHEMA, Compiler, Component, Directive, ErrorHandler, Inject, Injector, Input, LOCALE_ID, NgModule, OnDestroy, PLATFORM_ID, PLATFORM_INITIALIZER, Pipe, Provider, Sanitizer, StaticProvider, Type, VERSION, createPlatformFactory} from '@angular/core'; import {ApplicationRef, destroyPlatform} from '@angular/core/src/application_ref'; import {Console} from '@angular/core/src/console'; @@ -15,7 +15,6 @@ import {Testability, TestabilityRegistry} from '@angular/core/src/testability/te import {AsyncTestCompleter, Log, afterEach, beforeEach, beforeEachProviders, describe, inject, it} from '@angular/core/testing/src/testing_internal'; import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {expect} from '@angular/platform-browser/testing/src/matchers'; import {ivyEnabled, modifiedInIvy, onlyInIvy} from '@angular/private/testing'; diff --git a/packages/platform-browser/test/browser/meta_spec.ts b/packages/platform-browser/test/browser/meta_spec.ts index 66325a40f7..3bea3d12a2 100644 --- a/packages/platform-browser/test/browser/meta_spec.ts +++ b/packages/platform-browser/test/browser/meta_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule, Meta} from '@angular/platform-browser'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {expect} from '@angular/platform-browser/testing/src/matchers'; { diff --git a/packages/platform-browser/test/browser/title_spec.ts b/packages/platform-browser/test/browser/title_spec.ts index a9032eb4f5..617018a2bd 100644 --- a/packages/platform-browser/test/browser/title_spec.ts +++ b/packages/platform-browser/test/browser/title_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Injectable} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {BrowserModule, Title} from '@angular/platform-browser'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {expect} from '@angular/platform-browser/testing/src/matchers'; { 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 3510d4f146..42f954d770 100644 --- a/packages/platform-browser/test/dom/events/event_manager_spec.ts +++ b/packages/platform-browser/test/dom/events/event_manager_spec.ts @@ -6,12 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {NgZone} from '@angular/core/src/zone/ng_zone'; import {beforeEach, describe, expect, it} from '@angular/core/testing/src/testing_internal'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomEventsPlugin} from '@angular/platform-browser/src/dom/events/dom_events'; import {EventManager, EventManagerPlugin} from '@angular/platform-browser/src/dom/events/event_manager'; - import {createMouseEvent, el} from '../../../testing/src/browser_util'; (function() { 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 63960a8d52..489546964c 100644 --- a/packages/platform-browser/test/dom/shared_styles_host_spec.ts +++ b/packages/platform-browser/test/dom/shared_styles_host_spec.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {beforeEach, describe, it} from '@angular/core/testing/src/testing_internal'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomSharedStylesHost} from '@angular/platform-browser/src/dom/shared_styles_host'; import {expect} from '@angular/platform-browser/testing/src/matchers'; diff --git a/packages/platform-browser/testing/src/browser_util.ts b/packages/platform-browser/testing/src/browser_util.ts index 489013e313..41fed84a72 100644 --- a/packages/platform-browser/testing/src/browser_util.ts +++ b/packages/platform-browser/testing/src/browser_util.ts @@ -6,8 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {NgZone, ɵglobal as global} from '@angular/core'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; export let browserDetection: BrowserDetection; diff --git a/packages/platform-browser/testing/src/matchers.ts b/packages/platform-browser/testing/src/matchers.ts index 092c490877..b582f4e599 100644 --- a/packages/platform-browser/testing/src/matchers.ts +++ b/packages/platform-browser/testing/src/matchers.ts @@ -7,14 +7,13 @@ */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Type, ɵglobal as global} from '@angular/core'; import {ComponentFixture} from '@angular/core/testing'; -import {By, ɵgetDOM as getDOM} from '@angular/platform-browser'; - +import {By} from '@angular/platform-browser'; import {childNodesAsList, hasClass, hasStyle, isCommentNode} from './browser_util'; - /** * Jasmine matchers that check Angular specific conditions. * diff --git a/packages/platform-server/src/domino_adapter.ts b/packages/platform-server/src/domino_adapter.ts index 0639c20be6..b4a8206915 100644 --- a/packages/platform-server/src/domino_adapter.ts +++ b/packages/platform-server/src/domino_adapter.ts @@ -7,7 +7,8 @@ */ const domino = require('domino'); -import {ɵBrowserDomAdapter as BrowserDomAdapter, ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/platform-browser'; +import {ɵBrowserDomAdapter as BrowserDomAdapter} from '@angular/platform-browser'; +import {ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/common'; function _notImplemented(methodName: string) { return new Error('This method is not implemented in DominoAdapter: ' + methodName); diff --git a/packages/platform-server/src/location.ts b/packages/platform-server/src/location.ts index 7f633be669..55849154ce 100644 --- a/packages/platform-server/src/location.ts +++ b/packages/platform-server/src/location.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT, LocationChangeEvent, LocationChangeListener, PlatformLocation} from '@angular/common'; +import {DOCUMENT, LocationChangeEvent, LocationChangeListener, PlatformLocation, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, Optional} from '@angular/core'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; import {Subject} from 'rxjs'; import * as url from 'url'; import {INITIAL_CONFIG, PlatformConfig} from './tokens'; diff --git a/packages/platform-server/src/server.ts b/packages/platform-server/src/server.ts index 0e65b23c4c..448cd48a52 100644 --- a/packages/platform-server/src/server.ts +++ b/packages/platform-server/src/server.ts @@ -7,10 +7,10 @@ */ import {ɵAnimationEngine} from '@angular/animations/browser'; -import {DOCUMENT, PlatformLocation, ViewportScroller, ɵNullViewportScroller as NullViewportScroller, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID} from '@angular/common'; +import {DOCUMENT, PlatformLocation, ViewportScroller, ɵNullViewportScroller as NullViewportScroller, ɵPLATFORM_SERVER_ID as PLATFORM_SERVER_ID, ɵgetDOM as getDOM} from '@angular/common'; import {HttpClientModule} from '@angular/common/http'; -import {Injectable, InjectionToken, Injector, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, RootRenderer, StaticProvider, Testability, createPlatformFactory, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core'; -import {BrowserModule, EVENT_MANAGER_PLUGINS, ɵSharedStylesHost as SharedStylesHost, ɵgetDOM as getDOM} from '@angular/platform-browser'; +import {Injector, NgModule, NgZone, Optional, PLATFORM_ID, PLATFORM_INITIALIZER, PlatformRef, Provider, RendererFactory2, StaticProvider, Testability, createPlatformFactory, platformCore, ɵALLOW_MULTIPLE_PLATFORMS as ALLOW_MULTIPLE_PLATFORMS} from '@angular/core'; +import {BrowserModule, EVENT_MANAGER_PLUGINS, ɵSharedStylesHost as SharedStylesHost} from '@angular/platform-browser'; import {ɵplatformCoreDynamic as platformCoreDynamic} from '@angular/platform-browser-dynamic'; import {NoopAnimationsModule, ɵAnimationRendererFactory} from '@angular/platform-browser/animations'; @@ -27,6 +27,8 @@ function notSupported(feature: string): Error { throw new Error(`platform-server does not support '${feature}'.`); } +type __retain_for_correct_d_ts_generation__ = [PlatformRef]; + export const INTERNAL_SERVER_PLATFORM_PROVIDERS: StaticProvider[] = [ {provide: DOCUMENT, useFactory: _document, deps: [Injector]}, {provide: PLATFORM_ID, useValue: PLATFORM_SERVER_ID}, diff --git a/packages/platform-server/src/server_events.ts b/packages/platform-server/src/server_events.ts index 15afdcef8b..82405f632c 100644 --- a/packages/platform-server/src/server_events.ts +++ b/packages/platform-server/src/server_events.ts @@ -6,9 +6,8 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable} from '@angular/core'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; @Injectable() export class ServerEventManagerPlugin /* extends EventManagerPlugin which is private */ { diff --git a/packages/platform-server/src/server_renderer.ts b/packages/platform-server/src/server_renderer.ts index 1229980975..71e0f8f070 100644 --- a/packages/platform-server/src/server_renderer.ts +++ b/packages/platform-server/src/server_renderer.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {DomElementSchemaRegistry} from '@angular/compiler'; import {Inject, Injectable, NgZone, Renderer2, RendererFactory2, RendererStyleFlags2, RendererType2, ViewEncapsulation} from '@angular/core'; -import {EventManager, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵgetDOM as getDOM, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute} from '@angular/platform-browser'; +import {EventManager, ɵNAMESPACE_URIS as NAMESPACE_URIS, ɵSharedStylesHost as SharedStylesHost, ɵflattenStyles as flattenStyles, ɵshimContentAttribute as shimContentAttribute, ɵshimHostAttribute as shimHostAttribute} from '@angular/platform-browser'; const EMPTY_ARRAY: any[] = []; diff --git a/packages/platform-server/src/styles_host.ts b/packages/platform-server/src/styles_host.ts index 2cec205732..7e45eb9ba1 100644 --- a/packages/platform-server/src/styles_host.ts +++ b/packages/platform-server/src/styles_host.ts @@ -6,9 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {DOCUMENT} from '@angular/common'; +import {DOCUMENT, ɵgetDOM as getDOM} from '@angular/common'; import {Inject, Injectable, Optional} from '@angular/core'; -import {ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID, ɵgetDOM as getDOM} from '@angular/platform-browser'; +import {ɵSharedStylesHost as SharedStylesHost, ɵTRANSITION_ID} from '@angular/platform-browser'; @Injectable() export class ServerStylesHost extends SharedStylesHost { diff --git a/packages/platform-server/test/integration_spec.ts b/packages/platform-server/test/integration_spec.ts index 9b6bb35e96..09d8ce2529 100644 --- a/packages/platform-server/test/integration_spec.ts +++ b/packages/platform-server/test/integration_spec.ts @@ -7,13 +7,12 @@ */ import {AnimationBuilder, animate, state, style, transition, trigger} from '@angular/animations'; -import {DOCUMENT, PlatformLocation, isPlatformServer} from '@angular/common'; +import {DOCUMENT, PlatformLocation, isPlatformServer, ɵgetDOM as getDOM} from '@angular/common'; import {HTTP_INTERCEPTORS, HttpClient, HttpClientModule, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http'; import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing'; import {ApplicationRef, CompilerFactory, Component, HostListener, Inject, Injectable, Input, NgModule, NgZone, PLATFORM_ID, PlatformRef, ViewEncapsulation, destroyPlatform, getPlatform} from '@angular/core'; import {async, inject} from '@angular/core/testing'; import {BrowserModule, Title, TransferState, makeStateKey} from '@angular/platform-browser'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {BEFORE_APP_SERIALIZED, INITIAL_CONFIG, PlatformState, ServerModule, ServerTransferStateModule, platformDynamicServer, renderModule, renderModuleFactory} from '@angular/platform-server'; import {ivyEnabled, modifiedInIvy} from '@angular/private/testing'; import {Observable} from 'rxjs'; diff --git a/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts b/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts index f83b68d19e..eac98e1756 100644 --- a/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts +++ b/packages/platform-webworker/src/web_workers/worker/worker_adapter.ts @@ -6,7 +6,7 @@ * found in the LICENSE file at https://angular.io/license */ -import {ɵDomAdapter as DomAdapter, ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/platform-browser'; +import {ɵDomAdapter as DomAdapter, ɵsetRootDomAdapter as setRootDomAdapter} from '@angular/common'; /** * This adapter is required to log error messages. diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel index 0844a10223..fc12d2fe63 100644 --- a/packages/platform-webworker/test/BUILD.bazel +++ b/packages/platform-webworker/test/BUILD.bazel @@ -6,6 +6,7 @@ ts_library( srcs = glob(["**/*.ts"]), deps = [ "//packages:types", + "//packages/common", "//packages/compiler", "//packages/core", "//packages/core/testing", diff --git a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts index 95f67b3e01..b2fbe8c1dc 100644 --- a/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts +++ b/packages/platform-webworker/test/web_workers/worker/renderer_v2_integration_spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ +import {ɵgetDOM as getDOM} from '@angular/common'; import {Component, ComponentRef, Renderer2, RendererFactory2, RendererType2, destroyPlatform} from '@angular/core'; import {TestBed} from '@angular/core/testing'; import {platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing'; -import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter'; import {DomRendererFactory2} from '@angular/platform-browser/src/dom/dom_renderer'; import {BrowserTestingModule} from '@angular/platform-browser/testing'; import {browserDetection, dispatchEvent, hasClass} from '@angular/platform-browser/testing/src/browser_util'; diff --git a/packages/router/src/router_module.ts b/packages/router/src/router_module.ts index 9a15bcc637..d74be09ad9 100644 --- a/packages/router/src/router_module.ts +++ b/packages/router/src/router_module.ts @@ -6,11 +6,9 @@ * found in the LICENSE file at https://angular.io/license */ -import {APP_BASE_HREF, HashLocationStrategy, LOCATION_INITIALIZED, Location, LocationStrategy, PathLocationStrategy, PlatformLocation, ViewportScroller} from '@angular/common'; +import {APP_BASE_HREF, HashLocationStrategy, LOCATION_INITIALIZED, Location, LocationStrategy, PathLocationStrategy, PlatformLocation, ViewportScroller, ɵgetDOM as getDOM} from '@angular/common'; import {ANALYZE_FOR_ENTRY_COMPONENTS, APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, ApplicationRef, Compiler, ComponentRef, Inject, Injectable, InjectionToken, Injector, ModuleWithProviders, NgModule, NgModuleFactoryLoader, NgProbeToken, Optional, Provider, SkipSelf, SystemJsNgModuleLoader} from '@angular/core'; -import {ɵgetDOM as getDOM} from '@angular/platform-browser'; import {Subject, of } from 'rxjs'; - import {EmptyOutletComponent} from './components/empty_outlet'; import {Route, Routes} from './config'; import {RouterLink, RouterLinkWithHref} from './directives/router_link'; @@ -28,8 +26,6 @@ import {UrlHandlingStrategy} from './url_handling_strategy'; import {DefaultUrlSerializer, UrlSerializer, UrlTree} from './url_tree'; import {flatten} from './utils/collection'; - - /** * The directives defined in the `RouterModule`. */ diff --git a/packages/router/test/bootstrap.spec.ts b/packages/router/test/bootstrap.spec.ts index a3be5403c4..8830999d73 100644 --- a/packages/router/test/bootstrap.spec.ts +++ b/packages/router/test/bootstrap.spec.ts @@ -6,10 +6,10 @@ * found in the LICENSE file at https://angular.io/license */ -import {APP_BASE_HREF, DOCUMENT, Location} from '@angular/common'; +import {APP_BASE_HREF, DOCUMENT, Location, ɵgetDOM as getDOM} from '@angular/common'; import {ApplicationRef, CUSTOM_ELEMENTS_SCHEMA, Component, NgModule, destroyPlatform} from '@angular/core'; import {inject} from '@angular/core/testing'; -import {BrowserModule, ɵgetDOM as getDOM} from '@angular/platform-browser'; +import {BrowserModule} from '@angular/platform-browser'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; import {NavigationEnd, Resolve, Router, RouterModule} from '@angular/router'; import {filter, first} from 'rxjs/operators';