From 89eefcd7b5a9de83b0482d8141ca73ff719ac07d Mon Sep 17 00:00:00 2001 From: vsavkin Date: Mon, 23 Nov 2015 10:18:04 -0800 Subject: [PATCH] cleanup(tooling): move tooling to the browser platform and rename profile into instrumentation BREAKING CHANGE Before import * as p from 'angular2/profile'; import * as t from 'angular2/tools'; After import * as p from 'angular2/instrumentation'; import * as t from 'angular2/platform/browser'; --- TOOLS_JS.md | 2 +- modules/angular2/angular2.ts | 2 +- modules/angular2/http.ts | 2 +- modules/angular2/{profile.ts => instrumentation.ts} | 0 modules/angular2/platform/browser.ts | 4 +++- modules/angular2/platform/browser_static.ts | 4 +++- modules/angular2/platform/common_dom.ts | 4 +++- modules/angular2/router.ts | 4 ++-- modules/angular2/src/http/backends/browser_jsonp.ts | 2 +- modules/angular2/src/http/backends/browser_xhr.ts | 2 +- modules/angular2/src/http/backends/jsonp_backend.ts | 4 ++-- modules/angular2/src/http/backends/mock_backend.ts | 2 +- modules/angular2/src/http/backends/xhr_backend.ts | 2 +- modules/angular2/src/http/base_request_options.ts | 2 +- modules/angular2/src/http/base_response_options.ts | 2 +- modules/angular2/src/http/http.ts | 4 ++-- .../{ => platform/browser}/tools/common_tools.ts | 0 .../src/{ => platform/browser}/tools/tools.dart | 0 .../src/{ => platform/browser}/tools/tools.ts | 0 modules/angular2/src/platform/browser_common.ts | 9 +++++---- .../src/platform/{browser => dom}/debug/by.ts | 0 .../debug/debug_element_view_listener.ts | 0 .../angular2/src/router/hash_location_strategy.ts | 2 +- modules/angular2/src/router/location.ts | 2 +- modules/angular2/src/router/location_strategy.ts | 2 +- .../angular2/src/router/path_location_strategy.ts | 2 +- modules/angular2/src/router/router_link.ts | 2 +- modules/angular2/src/router/router_outlet.ts | 2 +- modules/angular2/src/testing/test_injector.ts | 4 +--- .../test/common/directives/ng_class_spec.ts | 3 ++- .../angular2/test/common/directives/ng_for_spec.ts | 4 +--- .../test/common/directives/ng_style_spec.ts | 2 +- .../test/common/directives/ng_switch_spec.ts | 2 +- .../angular2/test/common/forms/integration_spec.ts | 3 +-- .../angular2/test/core/debug/debug_element_spec.ts | 2 +- .../core/linker/dynamic_component_loader_spec.ts | 2 +- .../test/core/linker/projection_integration_spec.ts | 2 +- .../test/core/linker/query_integration_spec.ts | 2 -- .../angular2/test/core/metadata/decorators_spec.ts | 2 +- modules/angular2/test/core/util/decorators_spec.ts | 2 +- .../test/platform/{ => browser}/bootstrap_spec.ts | 0 .../test/{ => platform/browser}/tools/spies.dart | 0 .../test/{ => platform/browser}/tools/spies.ts | 2 +- .../test/{ => platform/browser}/tools/tools_spec.ts | 2 +- .../test/platform/{ => browser}/xhr_impl_spec.ts | 0 modules/angular2/test/public_api_spec.ts | 10 +++++----- .../router/integration/router_integration_spec.ts | 2 +- modules/angular2/test/router/route_config_spec.ts | 2 +- modules/angular2/test/router/router_link_spec.ts | 2 +- .../angular2/test/testing/testing_public_spec.ts | 2 +- modules/angular2/test/upgrade/metadata_spec.ts | 2 +- modules/angular2/tools.ts | 4 ---- modules/angular2/web_worker/worker.ts | 2 +- tools/broccoli/trees/node_tree.ts | 13 ++++++++++++- 54 files changed, 72 insertions(+), 64 deletions(-) rename modules/angular2/{profile.ts => instrumentation.ts} (100%) rename modules/angular2/src/{ => platform/browser}/tools/common_tools.ts (100%) rename modules/angular2/src/{ => platform/browser}/tools/tools.dart (100%) rename modules/angular2/src/{ => platform/browser}/tools/tools.ts (100%) rename modules/angular2/src/platform/{browser => dom}/debug/by.ts (100%) rename modules/angular2/src/platform/{browser => dom}/debug/debug_element_view_listener.ts (100%) rename modules/angular2/test/platform/{ => browser}/bootstrap_spec.ts (100%) rename modules/angular2/test/{ => platform/browser}/tools/spies.dart (100%) rename modules/angular2/test/{ => platform/browser}/tools/spies.ts (92%) rename modules/angular2/test/{ => platform/browser}/tools/tools_spec.ts (88%) rename modules/angular2/test/platform/{ => browser}/xhr_impl_spec.ts (100%) delete mode 100644 modules/angular2/tools.ts diff --git a/TOOLS_JS.md b/TOOLS_JS.md index cf3b9f34fc..2b9fc6572e 100644 --- a/TOOLS_JS.md +++ b/TOOLS_JS.md @@ -14,7 +14,7 @@ Ctrl + Shift + j. By default the debug tools are disabled. You can enable debug tools as follows: ```typescript -import 'angular2/tools'; +import {enableDebugTools} 'angular2/platform/browser'; bootstrap(Application).then((appRef) => { enableDebugTools(appRef); diff --git a/modules/angular2/angular2.ts b/modules/angular2/angular2.ts index 11af515512..264768fb42 100644 --- a/modules/angular2/angular2.ts +++ b/modules/angular2/angular2.ts @@ -1,6 +1,6 @@ export * from './common'; export * from './core'; -export * from './profile'; +export * from './instrumentation'; export * from './platform/browser'; export * from './src/platform/dom/dom_adapter'; export * from './upgrade'; diff --git a/modules/angular2/http.ts b/modules/angular2/http.ts index 20058d784a..e41db22f27 100644 --- a/modules/angular2/http.ts +++ b/modules/angular2/http.ts @@ -4,7 +4,7 @@ * The http module provides services to perform http requests. To get started, see the {@link Http} * class. */ -import {provide, Provider} from 'angular2/angular2'; +import {provide, Provider} from 'angular2/core'; import {Http, Jsonp} from './src/http/http'; import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend'; import {JSONPBackend, JSONPBackend_, JSONPConnection} from './src/http/backends/jsonp_backend'; diff --git a/modules/angular2/profile.ts b/modules/angular2/instrumentation.ts similarity index 100% rename from modules/angular2/profile.ts rename to modules/angular2/instrumentation.ts diff --git a/modules/angular2/platform/browser.ts b/modules/angular2/platform/browser.ts index 693e3804d5..3f261bc2da 100644 --- a/modules/angular2/platform/browser.ts +++ b/modules/angular2/platform/browser.ts @@ -6,7 +6,9 @@ export { BrowserDomAdapter, By, Title, - DOCUMENT + DOCUMENT, + enableDebugTools, + disableDebugTools } from 'angular2/src/platform/browser_common'; import {Type, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/platform/browser_static.ts b/modules/angular2/platform/browser_static.ts index 4ca014cc17..8c99b20214 100644 --- a/modules/angular2/platform/browser_static.ts +++ b/modules/angular2/platform/browser_static.ts @@ -5,7 +5,9 @@ export { inspectNativeElement, BrowserDomAdapter, By, - Title + Title, + enableDebugTools, + disableDebugTools } from 'angular2/src/platform/browser_common'; import {Type, isPresent, CONST_EXPR} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/platform/common_dom.ts b/modules/angular2/platform/common_dom.ts index 507f35ebf0..0ee82f355a 100644 --- a/modules/angular2/platform/common_dom.ts +++ b/modules/angular2/platform/common_dom.ts @@ -5,4 +5,6 @@ export {DOM, setRootDomAdapter, DomAdapter} from 'angular2/src/platform/dom/dom_ export {DomRenderer} from 'angular2/src/platform/dom/dom_renderer'; export {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; export {SharedStylesHost, DomSharedStylesHost} from 'angular2/src/platform/dom/shared_styles_host'; -export {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events'; \ No newline at end of file +export {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events'; +export * from 'angular2/src/platform/dom/debug/by'; +export * from 'angular2/src/platform/dom/debug/debug_element_view_listener'; \ No newline at end of file diff --git a/modules/angular2/router.ts b/modules/angular2/router.ts index ec8bd6bc8b..8d2901f459 100644 --- a/modules/angular2/router.ts +++ b/modules/angular2/router.ts @@ -18,7 +18,7 @@ export * from './src/router/route_definition'; export {OnActivate, OnDeactivate, OnReuse, CanDeactivate, CanReuse} from './src/router/interfaces'; export {CanActivate} from './src/router/lifecycle_annotations'; export {Instruction, ComponentInstruction} from './src/router/instruction'; -export {OpaqueToken} from 'angular2/angular2'; +export {OpaqueToken} from 'angular2/core'; import {LocationStrategy} from './src/router/location_strategy'; import {PathLocationStrategy} from './src/router/path_location_strategy'; @@ -27,7 +27,7 @@ import {RouterOutlet} from './src/router/router_outlet'; import {RouterLink} from './src/router/router_link'; import {RouteRegistry} from './src/router/route_registry'; import {Location} from './src/router/location'; -import {ApplicationRef, provide, OpaqueToken, Provider} from 'angular2/angular2'; +import {ApplicationRef, provide, OpaqueToken, Provider} from 'angular2/core'; import {CONST_EXPR} from './src/facade/lang'; import {BaseException} from 'angular2/src/facade/exceptions'; diff --git a/modules/angular2/src/http/backends/browser_jsonp.ts b/modules/angular2/src/http/backends/browser_jsonp.ts index 1600b0db50..f610bac5b8 100644 --- a/modules/angular2/src/http/backends/browser_jsonp.ts +++ b/modules/angular2/src/http/backends/browser_jsonp.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {global} from 'angular2/src/facade/lang'; let _nextRequestId = 0; diff --git a/modules/angular2/src/http/backends/browser_xhr.ts b/modules/angular2/src/http/backends/browser_xhr.ts index 28dae67c3c..0665ae7b46 100644 --- a/modules/angular2/src/http/backends/browser_xhr.ts +++ b/modules/angular2/src/http/backends/browser_xhr.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; // Make sure not to evaluate this in a non-browser environment! @Injectable() diff --git a/modules/angular2/src/http/backends/jsonp_backend.ts b/modules/angular2/src/http/backends/jsonp_backend.ts index 4059ce7c4a..0eb0f1d119 100644 --- a/modules/angular2/src/http/backends/jsonp_backend.ts +++ b/modules/angular2/src/http/backends/jsonp_backend.ts @@ -3,11 +3,11 @@ import {ReadyStates, RequestMethods, ResponseTypes} from '../enums'; import {Request} from '../static_request'; import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {BrowserJsonp} from './browser_jsonp'; import {makeTypeError} from 'angular2/src/facade/exceptions'; import {StringWrapper, isPresent} from 'angular2/src/facade/lang'; -import {Observable} from 'angular2/angular2'; +import {Observable} from 'angular2/core'; const JSONP_ERR_NO_CALLBACK = 'JSONP injected script did not invoke callback.'; const JSONP_ERR_WRONG_METHOD = 'JSONP requests must use GET request method.'; diff --git a/modules/angular2/src/http/backends/mock_backend.ts b/modules/angular2/src/http/backends/mock_backend.ts index c3b26bfe67..d5ebd127da 100644 --- a/modules/angular2/src/http/backends/mock_backend.ts +++ b/modules/angular2/src/http/backends/mock_backend.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {Request} from '../static_request'; import {Response} from '../static_response'; import {ReadyStates} from '../enums'; diff --git a/modules/angular2/src/http/backends/xhr_backend.ts b/modules/angular2/src/http/backends/xhr_backend.ts index a234e07ac8..8daf3d580a 100644 --- a/modules/angular2/src/http/backends/xhr_backend.ts +++ b/modules/angular2/src/http/backends/xhr_backend.ts @@ -4,7 +4,7 @@ import {Request} from '../static_request'; import {Response} from '../static_response'; import {Headers} from '../headers'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {BrowserXhr} from './browser_xhr'; import {isPresent} from 'angular2/src/facade/lang'; import {Observable} from 'angular2/angular2'; diff --git a/modules/angular2/src/http/base_request_options.ts b/modules/angular2/src/http/base_request_options.ts index e528478060..457be4653c 100644 --- a/modules/angular2/src/http/base_request_options.ts +++ b/modules/angular2/src/http/base_request_options.ts @@ -2,7 +2,7 @@ import {isPresent, isString} from 'angular2/src/facade/lang'; import {Headers} from './headers'; import {RequestMethods} from './enums'; import {RequestOptionsArgs} from './interfaces'; -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {URLSearchParams} from './url_search_params'; import {normalizeMethodName} from './http_utils'; diff --git a/modules/angular2/src/http/base_response_options.ts b/modules/angular2/src/http/base_response_options.ts index 0168dcfb0a..946de06830 100644 --- a/modules/angular2/src/http/base_response_options.ts +++ b/modules/angular2/src/http/base_response_options.ts @@ -1,4 +1,4 @@ -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {isPresent, isJsObject} from 'angular2/src/facade/lang'; import {Headers} from './headers'; import {ResponseTypes} from './enums'; diff --git a/modules/angular2/src/http/http.ts b/modules/angular2/src/http/http.ts index 09f4815999..0f977b9f2e 100644 --- a/modules/angular2/src/http/http.ts +++ b/modules/angular2/src/http/http.ts @@ -1,12 +1,12 @@ import {isString, isPresent, isBlank} from 'angular2/src/facade/lang'; import {makeTypeError} from 'angular2/src/facade/exceptions'; -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {RequestOptionsArgs, Connection, ConnectionBackend} from './interfaces'; import {Request} from './static_request'; import {Response} from './static_response'; import {BaseRequestOptions, RequestOptions} from './base_request_options'; import {RequestMethods} from './enums'; -import {Observable} from 'angular2/angular2'; +import {Observable} from 'angular2/core'; function httpRequest(backend: ConnectionBackend, request: Request): Observable { return backend.createConnection(request).response; diff --git a/modules/angular2/src/tools/common_tools.ts b/modules/angular2/src/platform/browser/tools/common_tools.ts similarity index 100% rename from modules/angular2/src/tools/common_tools.ts rename to modules/angular2/src/platform/browser/tools/common_tools.ts diff --git a/modules/angular2/src/tools/tools.dart b/modules/angular2/src/platform/browser/tools/tools.dart similarity index 100% rename from modules/angular2/src/tools/tools.dart rename to modules/angular2/src/platform/browser/tools/tools.dart diff --git a/modules/angular2/src/tools/tools.ts b/modules/angular2/src/platform/browser/tools/tools.ts similarity index 100% rename from modules/angular2/src/tools/tools.ts rename to modules/angular2/src/platform/browser/tools/tools.ts diff --git a/modules/angular2/src/platform/browser_common.ts b/modules/angular2/src/platform/browser_common.ts index f869ba084b..2d990c0d50 100644 --- a/modules/angular2/src/platform/browser_common.ts +++ b/modules/angular2/src/platform/browser_common.ts @@ -33,13 +33,14 @@ import {wtfInit} from 'angular2/src/core/profile/wtf_init'; export {DOCUMENT} from 'angular2/src/platform/dom/dom_tokens'; export {Title} from 'angular2/src/platform/browser/title'; export { - // DebugElementViewListener, + DebugElementViewListener, ELEMENT_PROBE_PROVIDERS, ELEMENT_PROBE_BINDINGS, - inspectNativeElement -} from 'angular2/src/platform/browser/debug/debug_element_view_listener'; -export {By} from 'angular2/src/platform/browser/debug/by'; + inspectNativeElement, + By +} from 'angular2/platform/common_dom'; export {BrowserDomAdapter} from './browser/browser_adapter'; +export {enableDebugTools, disableDebugTools} from 'angular2/src/platform/browser/tools/tools'; export const BROWSER_PROVIDERS: Array = CONST_EXPR([ PLATFORM_COMMON_PROVIDERS, diff --git a/modules/angular2/src/platform/browser/debug/by.ts b/modules/angular2/src/platform/dom/debug/by.ts similarity index 100% rename from modules/angular2/src/platform/browser/debug/by.ts rename to modules/angular2/src/platform/dom/debug/by.ts diff --git a/modules/angular2/src/platform/browser/debug/debug_element_view_listener.ts b/modules/angular2/src/platform/dom/debug/debug_element_view_listener.ts similarity index 100% rename from modules/angular2/src/platform/browser/debug/debug_element_view_listener.ts rename to modules/angular2/src/platform/dom/debug/debug_element_view_listener.ts diff --git a/modules/angular2/src/router/hash_location_strategy.ts b/modules/angular2/src/router/hash_location_strategy.ts index 614053c279..4e063a1bc2 100644 --- a/modules/angular2/src/router/hash_location_strategy.ts +++ b/modules/angular2/src/router/hash_location_strategy.ts @@ -1,5 +1,5 @@ import {DOM} from 'angular2/src/platform/dom/dom_adapter'; -import {Injectable} from 'angular2/angular2'; +import {Injectable} from 'angular2/core'; import {LocationStrategy, normalizeQueryParams} from './location_strategy'; import {EventListener, History, Location} from 'angular2/src/facade/browser'; diff --git a/modules/angular2/src/router/location.ts b/modules/angular2/src/router/location.ts index d71c4dae04..74e460d8a9 100644 --- a/modules/angular2/src/router/location.ts +++ b/modules/angular2/src/router/location.ts @@ -1,6 +1,6 @@ import {LocationStrategy} from './location_strategy'; import {EventEmitter, ObservableWrapper} from 'angular2/src/facade/async'; -import {Injectable, Inject} from 'angular2/angular2'; +import {Injectable, Inject} from 'angular2/core'; /** * `Location` is a service that applications can use to interact with a browser's URL. diff --git a/modules/angular2/src/router/location_strategy.ts b/modules/angular2/src/router/location_strategy.ts index 0a06f89393..2b13122b7c 100644 --- a/modules/angular2/src/router/location_strategy.ts +++ b/modules/angular2/src/router/location_strategy.ts @@ -1,5 +1,5 @@ import {CONST_EXPR} from 'angular2/src/facade/lang'; -import {OpaqueToken} from 'angular2/angular2'; +import {OpaqueToken} from 'angular2/core'; /** * `LocationStrategy` is responsible for representing and reading route state diff --git a/modules/angular2/src/router/path_location_strategy.ts b/modules/angular2/src/router/path_location_strategy.ts index 56eebe029a..d1e69bb917 100644 --- a/modules/angular2/src/router/path_location_strategy.ts +++ b/modules/angular2/src/router/path_location_strategy.ts @@ -1,5 +1,5 @@ import {DOM} from 'angular2/src/platform/dom/dom_adapter'; -import {Injectable, Inject} from 'angular2/angular2'; +import {Injectable, Inject} from 'angular2/core'; import {EventListener, History, Location} from 'angular2/src/facade/browser'; import {isBlank} from 'angular2/src/facade/lang'; import {BaseException} from 'angular2/src/facade/exceptions'; diff --git a/modules/angular2/src/router/router_link.ts b/modules/angular2/src/router/router_link.ts index cf96551b00..6ea1e5d6bb 100644 --- a/modules/angular2/src/router/router_link.ts +++ b/modules/angular2/src/router/router_link.ts @@ -1,4 +1,4 @@ -import {Directive} from 'angular2/angular2'; +import {Directive} from 'angular2/core'; import {isString} from 'angular2/src/facade/lang'; import {Router} from './router'; diff --git a/modules/angular2/src/router/router_outlet.ts b/modules/angular2/src/router/router_outlet.ts index 871da01f9c..b8f6a6cfc9 100644 --- a/modules/angular2/src/router/router_outlet.ts +++ b/modules/angular2/src/router/router_outlet.ts @@ -12,7 +12,7 @@ import { Injector, provide, Dependency -} from 'angular2/angular2'; +} from 'angular2/core'; import * as routerMod from './router'; import {ComponentInstruction, RouteParams, RouteData} from './instruction'; diff --git a/modules/angular2/src/testing/test_injector.ts b/modules/angular2/src/testing/test_injector.ts index 1ac4b66987..c5e23a6a0b 100644 --- a/modules/angular2/src/testing/test_injector.ts +++ b/modules/angular2/src/testing/test_injector.ts @@ -31,9 +31,7 @@ import {MockNgZone} from 'angular2/src/mock/ng_zone_mock'; import {TestComponentBuilder} from './test_component_builder'; import {Injector} from 'angular2/src/core/di'; -import { - ELEMENT_PROBE_PROVIDERS -} from 'angular2/src/platform/browser/debug/debug_element_view_listener'; +import {ELEMENT_PROBE_PROVIDERS} from 'angular2/platform/common_dom'; import {ListWrapper} from 'angular2/src/facade/collection'; import {FunctionWrapper, Type} from 'angular2/src/facade/lang'; diff --git a/modules/angular2/test/common/directives/ng_class_spec.ts b/modules/angular2/test/common/directives/ng_class_spec.ts index 8dad97bac1..a63ad2dc55 100644 --- a/modules/angular2/test/common/directives/ng_class_spec.ts +++ b/modules/angular2/test/common/directives/ng_class_spec.ts @@ -15,7 +15,8 @@ import { xit, } from 'angular2/testing_internal'; import {ListWrapper, StringMapWrapper, SetWrapper} from 'angular2/src/facade/collection'; -import {Component, View, NgFor, provide} from 'angular2/angular2'; +import {Component, View, provide} from 'angular2/core'; +import {NgFor} from 'angular2/common'; import {NgClass} from 'angular2/src/common/directives/ng_class'; import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; diff --git a/modules/angular2/test/common/directives/ng_for_spec.ts b/modules/angular2/test/common/directives/ng_for_spec.ts index e66fcba0ec..ca9099cb05 100644 --- a/modules/angular2/test/common/directives/ng_for_spec.ts +++ b/modules/angular2/test/common/directives/ng_for_spec.ts @@ -14,9 +14,7 @@ import { } from 'angular2/testing_internal'; import {ListWrapper} from 'angular2/src/facade/collection'; - -import {Component, View, TemplateRef, ContentChild} from 'angular2/angular2'; - +import {Component, View, TemplateRef, ContentChild} from 'angular2/core'; import {NgFor} from 'angular2/src/common/directives/ng_for'; diff --git a/modules/angular2/test/common/directives/ng_style_spec.ts b/modules/angular2/test/common/directives/ng_style_spec.ts index 34fe7a1166..306264886f 100644 --- a/modules/angular2/test/common/directives/ng_style_spec.ts +++ b/modules/angular2/test/common/directives/ng_style_spec.ts @@ -16,7 +16,7 @@ import { import {StringMapWrapper} from 'angular2/src/facade/collection'; -import {Component, View} from 'angular2/angular2'; +import {Component, View} from 'angular2/core'; import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {NgStyle} from 'angular2/src/common/directives/ng_style'; diff --git a/modules/angular2/test/common/directives/ng_switch_spec.ts b/modules/angular2/test/common/directives/ng_switch_spec.ts index 5a04be44b4..4eb288481d 100644 --- a/modules/angular2/test/common/directives/ng_switch_spec.ts +++ b/modules/angular2/test/common/directives/ng_switch_spec.ts @@ -12,7 +12,7 @@ import { xit, } from 'angular2/testing_internal'; -import {Component, View} from 'angular2/angular2'; +import {Component, View} from 'angular2/core'; import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/src/common/directives/ng_switch'; diff --git a/modules/angular2/test/common/forms/integration_spec.ts b/modules/angular2/test/common/forms/integration_spec.ts index 7bf858dc08..e5fef814f0 100644 --- a/modules/angular2/test/common/forms/integration_spec.ts +++ b/modules/angular2/test/common/forms/integration_spec.ts @@ -1,4 +1,4 @@ -import {Component, Directive, View, Output, EventEmitter} from 'angular2/angular2'; +import {Component, Directive, View, Output, EventEmitter} from 'angular2/core'; import { ComponentFixture, afterEach, @@ -33,7 +33,6 @@ import { Validators, Validator } from 'angular2/common'; -import {Input, Provider, forwardRef} from 'angular2/core'; import {By} from 'angular2/platform/browser'; import {ListWrapper} from 'angular2/src/facade/collection'; import {ObservableWrapper} from 'angular2/src/facade/async'; diff --git a/modules/angular2/test/core/debug/debug_element_spec.ts b/modules/angular2/test/core/debug/debug_element_spec.ts index cf871345f2..9968e3a441 100644 --- a/modules/angular2/test/core/debug/debug_element_spec.ts +++ b/modules/angular2/test/core/debug/debug_element_spec.ts @@ -21,7 +21,7 @@ import {PromiseWrapper, EventEmitter, ObservableWrapper} from 'angular2/src/faca import {Injectable} from 'angular2/core'; import {NgFor, NgIf} from 'angular2/common'; import {Scope} from 'angular2/core'; -import {By} from 'angular2/platform/browser'; +import {By} from 'angular2/platform/common_dom'; import { Directive, diff --git a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts index 4845cb64ad..e40aae8be9 100644 --- a/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts +++ b/modules/angular2/test/core/linker/dynamic_component_loader_spec.ts @@ -19,7 +19,7 @@ import { import {OnDestroy} from 'angular2/core'; import {Injector, inspectElement} from 'angular2/core'; import {NgIf} from 'angular2/common'; -import {By} from 'angular2/platform/browser'; +import {By} from 'angular2/platform/common_dom'; import {Component, View, ViewMetadata} from 'angular2/src/core/metadata'; import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; import {ElementRef} from 'angular2/src/core/linker/element_ref'; diff --git a/modules/angular2/test/core/linker/projection_integration_spec.ts b/modules/angular2/test/core/linker/projection_integration_spec.ts index 1213e256f5..6c5fa3f9e0 100644 --- a/modules/angular2/test/core/linker/projection_integration_spec.ts +++ b/modules/angular2/test/core/linker/projection_integration_spec.ts @@ -36,7 +36,7 @@ import { ViewEncapsulation, ViewMetadata } from 'angular2/core'; -import {By} from 'angular2/platform/browser'; +import {By} from 'angular2/platform/common_dom'; export function main() { describe('projection', () => { diff --git a/modules/angular2/test/core/linker/query_integration_spec.ts b/modules/angular2/test/core/linker/query_integration_spec.ts index e04f48c356..8455748786 100644 --- a/modules/angular2/test/core/linker/query_integration_spec.ts +++ b/modules/angular2/test/core/linker/query_integration_spec.ts @@ -36,10 +36,8 @@ import { } from 'angular2/core'; import {NgIf, NgFor} from 'angular2/common'; import {asNativeElements} from 'angular2/core'; -import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter'; export function main() { - BrowserDomAdapter.makeCurrent(); describe('Query API', () => { describe("querying by directive type", () => { it('should contain all direct child directives in the light dom (constructor)', diff --git a/modules/angular2/test/core/metadata/decorators_spec.ts b/modules/angular2/test/core/metadata/decorators_spec.ts index ddff690fec..5971a39772 100644 --- a/modules/angular2/test/core/metadata/decorators_spec.ts +++ b/modules/angular2/test/core/metadata/decorators_spec.ts @@ -10,7 +10,7 @@ import { xit, } from 'angular2/testing_internal'; -import {Component, View, Directive} from 'angular2/angular2'; +import {Component, View, Directive} from 'angular2/core'; import {reflector} from 'angular2/src/core/reflection/reflection'; export function main() { diff --git a/modules/angular2/test/core/util/decorators_spec.ts b/modules/angular2/test/core/util/decorators_spec.ts index ea44bdf5bd..c1e32ff138 100644 --- a/modules/angular2/test/core/util/decorators_spec.ts +++ b/modules/angular2/test/core/util/decorators_spec.ts @@ -12,7 +12,7 @@ import { import {makeDecorator, makeParamDecorator, Class} from 'angular2/src/core/util/decorators'; import {global} from 'angular2/src/facade/lang'; -import {Inject} from 'angular2/angular2'; +import {Inject} from 'angular2/core'; import {reflector} from 'angular2/src/core/reflection/reflection'; class TestAnnotation { diff --git a/modules/angular2/test/platform/bootstrap_spec.ts b/modules/angular2/test/platform/browser/bootstrap_spec.ts similarity index 100% rename from modules/angular2/test/platform/bootstrap_spec.ts rename to modules/angular2/test/platform/browser/bootstrap_spec.ts diff --git a/modules/angular2/test/tools/spies.dart b/modules/angular2/test/platform/browser/tools/spies.dart similarity index 100% rename from modules/angular2/test/tools/spies.dart rename to modules/angular2/test/platform/browser/tools/spies.dart diff --git a/modules/angular2/test/tools/spies.ts b/modules/angular2/test/platform/browser/tools/spies.ts similarity index 92% rename from modules/angular2/test/tools/spies.ts rename to modules/angular2/test/platform/browser/tools/spies.ts index a1769fc9a9..c7a8c66e7d 100644 --- a/modules/angular2/test/tools/spies.ts +++ b/modules/angular2/test/platform/browser/tools/spies.ts @@ -1,5 +1,5 @@ import {SpyObject} from 'angular2/testing_internal'; -import {Injector, provide} from 'angular2/angular2'; +import {Injector, provide} from 'angular2/core'; import {ComponentRef} from 'angular2/src/core/linker/dynamic_component_loader'; import {global} from 'angular2/src/facade/lang'; import {ApplicationRef, ApplicationRef_} from 'angular2/src/core/application_ref'; diff --git a/modules/angular2/test/tools/tools_spec.ts b/modules/angular2/test/platform/browser/tools/tools_spec.ts similarity index 88% rename from modules/angular2/test/tools/tools_spec.ts rename to modules/angular2/test/platform/browser/tools/tools_spec.ts index 766cea1067..1c61b2ebaa 100644 --- a/modules/angular2/test/tools/tools_spec.ts +++ b/modules/angular2/test/platform/browser/tools/tools_spec.ts @@ -10,7 +10,7 @@ import { xit } from 'angular2/testing_internal'; -import {enableDebugTools, disableDebugTools} from 'angular2/tools'; +import {enableDebugTools, disableDebugTools} from 'angular2/platform/browser'; import {SpyComponentRef, callNgProfilerTimeChangeDetection} from './spies'; export function main() { diff --git a/modules/angular2/test/platform/xhr_impl_spec.ts b/modules/angular2/test/platform/browser/xhr_impl_spec.ts similarity index 100% rename from modules/angular2/test/platform/xhr_impl_spec.ts rename to modules/angular2/test/platform/browser/xhr_impl_spec.ts diff --git a/modules/angular2/test/public_api_spec.ts b/modules/angular2/test/public_api_spec.ts index 98ec477d2a..543ab0e1a8 100644 --- a/modules/angular2/test/public_api_spec.ts +++ b/modules/angular2/test/public_api_spec.ts @@ -596,17 +596,16 @@ var NG_ALL = [ 'DirectiveResolver', 'DirectiveResolver.resolve()', 'DynamicComponentLoader', - 'DomAdapter', - 'DomAdapter.attrToPropMap:dart', - 'DomAdapter.attrToPropMap=:dart', - 'setRootDomAdapter()', - 'DOM', + 'DomAdapter:js', + 'setRootDomAdapter():js', + 'DOM:js', /* Abstract methods 'DynamicComponentLoader.loadAsRoot()', 'DynamicComponentLoader.loadIntoLocation()', 'DynamicComponentLoader.loadNextToLocation()', */ + 'enableDebugTools():js', 'ELEMENT_PROBE_PROVIDERS:js', 'ELEMENT_PROBE_BINDINGS:js', 'ElementRef', @@ -1412,6 +1411,7 @@ var NG_ALL = [ 'AfterViewInit:dart', 'ControlValueAccessor:dart', 'DoCheck:dart', + 'disableDebugTools():js', 'Form:dart', 'HostViewRef:dart', 'HostViewRef.changeDetectorRef', diff --git a/modules/angular2/test/router/integration/router_integration_spec.ts b/modules/angular2/test/router/integration/router_integration_spec.ts index 8d1fe44a59..1f0c0c04bb 100644 --- a/modules/angular2/test/router/integration/router_integration_spec.ts +++ b/modules/angular2/test/router/integration/router_integration_spec.ts @@ -14,7 +14,7 @@ import { xit, } from 'angular2/testing_internal'; -import {bootstrap} from 'angular2/bootstrap'; +import {bootstrap} from 'angular2/platform/browser'; import {Component, Directive, View} from 'angular2/src/core/metadata'; import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {provide, ViewChild, AfterViewInit} from 'angular2/core'; diff --git a/modules/angular2/test/router/route_config_spec.ts b/modules/angular2/test/router/route_config_spec.ts index bc1dc5400f..ac64143273 100644 --- a/modules/angular2/test/router/route_config_spec.ts +++ b/modules/angular2/test/router/route_config_spec.ts @@ -11,7 +11,7 @@ import { xit, } from 'angular2/testing_internal'; -import {bootstrap} from 'angular2/bootstrap'; +import {bootstrap} from 'angular2/platform/browser'; import {Component, Directive, View} from 'angular2/src/core/metadata'; import {DOM} from 'angular2/src/platform/dom/dom_adapter'; import {provide} from 'angular2/core'; diff --git a/modules/angular2/test/router/router_link_spec.ts b/modules/angular2/test/router/router_link_spec.ts index b29d160ff6..49c90696fc 100644 --- a/modules/angular2/test/router/router_link_spec.ts +++ b/modules/angular2/test/router/router_link_spec.ts @@ -17,7 +17,7 @@ import { import {SpyRouter, SpyLocation} from './spies'; import {provide, Component, View} from 'angular2/core'; -import {By} from 'angular2/platform/browser'; +import {By} from 'angular2/platform/common_dom'; import { Location, diff --git a/modules/angular2/test/testing/testing_public_spec.ts b/modules/angular2/test/testing/testing_public_spec.ts index e4485e36ea..055d85611b 100644 --- a/modules/angular2/test/testing/testing_public_spec.ts +++ b/modules/angular2/test/testing/testing_public_spec.ts @@ -16,7 +16,7 @@ import { import {Injectable, bind} from 'angular2/core'; import {NgIf} from 'angular2/common'; -import {Directive, Component, View, ViewMetadata} from 'angular2/angular2'; +import {Directive, Component, View, ViewMetadata} from 'angular2/core'; import {XHR} from 'angular2/src/compiler/xhr'; import {XHRImpl} from 'angular2/src/platform/browser/xhr_impl'; diff --git a/modules/angular2/test/upgrade/metadata_spec.ts b/modules/angular2/test/upgrade/metadata_spec.ts index 22ad243fd1..88d0faff75 100644 --- a/modules/angular2/test/upgrade/metadata_spec.ts +++ b/modules/angular2/test/upgrade/metadata_spec.ts @@ -11,7 +11,7 @@ import { xit, } from 'angular2/testing_internal'; -import {Component, View} from 'angular2/angular2'; +import {Component, View} from 'angular2/core'; import {getComponentInfo, parseFields} from 'angular2/src/upgrade/metadata'; import {DOM} from 'angular2/src/platform/dom/dom_adapter'; diff --git a/modules/angular2/tools.ts b/modules/angular2/tools.ts deleted file mode 100644 index 29ad537859..0000000000 --- a/modules/angular2/tools.ts +++ /dev/null @@ -1,4 +0,0 @@ -/* - * Debugging and profiling tools for Angular 2 - */ -export {enableDebugTools, disableDebugTools} from 'angular2/src/tools/tools'; diff --git a/modules/angular2/web_worker/worker.ts b/modules/angular2/web_worker/worker.ts index 75c3e1def4..744b7705b1 100644 --- a/modules/angular2/web_worker/worker.ts +++ b/modules/angular2/web_worker/worker.ts @@ -39,7 +39,7 @@ export * from '../src/common/forms'; export {DebugElement} from '../src/core/debug/debug_element'; export * from '../src/core/change_detection'; -export * from '../profile'; +export * from '../instrumentation'; export * from '../src/web_workers/worker/application'; export { ClientMessageBroker, diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index 4e2f9f4d29..da6e6647eb 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -25,8 +25,19 @@ module.exports = function makeNodeTree(projects, destinationPath) { 'angular2/test/testing/fake_async_spec.ts', 'angular2/test/testing/testing_public_spec.ts', 'angular2/test/platform/xhr_impl_spec.ts', + 'angular2/test/platform/browser/**/*.ts', 'angular2/test/common/forms/**', - 'angular2/test/tools/tools_spec.ts', + + // we call browser's bootstrap + 'angular2/test/router/route_config_spec.ts', + 'angular2/test/router/integration/router_integration_spec.ts', + + // we check the public api by importing angular2/angular2 + 'angular2/test/symbol_inspector/**/*.ts', + 'angular2/test/public_api_spec.ts', + + 'angular2/test/upgrade/**/*.ts', + 'angular1_router/**', 'angular2/examples/**/!(*_spec.ts)', ]