From 6b5d345a2b24a99b13882382d159302e64b6ed18 Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Fri, 2 Oct 2015 09:30:36 -0700 Subject: [PATCH] refactor(core): adjust imports for move files to the right place - render/xhr_* -> compiler/xhr_* - render/event_config -> linker/event_config - render/dom/schema -> compiler/schema - render/dom/compiler/* -> compiler/* - render/dom/view/shared_styles_host -> render/dom/shared_styles_host --- modules/angular2/mock.ts | 2 +- modules/angular2/src/core/application_common.ts | 14 +++++++------- modules/angular2/src/core/application_ref.ts | 2 +- .../core/compiler/anchor_based_app_root_url.ts | 2 +- modules/angular2/src/core/compiler/compiler.ts | 4 ++-- .../src/core/compiler/directive_metadata.ts | 2 +- .../angular2/src/core/compiler/style_compiler.ts | 8 ++++---- .../src/core/compiler/style_url_resolver.ts | 2 +- .../src/core/compiler/template_normalizer.ts | 4 ++-- .../src/core/compiler/template_parser.ts | 4 ++-- modules/angular2/src/core/compiler/xhr_mock.ts | 2 +- modules/angular2/src/core/dom/parse5_adapter.ts | 2 +- .../angular2/src/core/linker/element_injector.ts | 2 +- .../angular2/src/core/render/dom/dom_renderer.ts | 2 +- .../src/core/render/dom/shared_styles_host.ts | 2 +- modules/angular2/src/core/render/render.ts | 2 +- modules/angular2/src/core/services.ts | 4 ++-- modules/angular2/src/test_lib/test_injector.ts | 14 +++++++------- .../angular2/src/web_workers/ui/di_bindings.ts | 16 ++++++++-------- modules/angular2/src/web_workers/ui/setup.ts | 2 +- modules/angular2/src/web_workers/ui/xhr_impl.ts | 2 +- .../src/web_workers/worker/application_common.ts | 4 ++-- .../angular2/src/web_workers/worker/xhr_impl.ts | 4 ++-- .../schema/dom_element_schema_registry_spec.ts | 4 ++-- .../test/core/compiler/schema_registry_mock.ts | 4 ++-- .../angular2/test/core/compiler/selector_spec.ts | 4 ++-- .../test/core/compiler/shadow_css_spec.ts | 2 +- .../test/core/compiler/style_compiler_spec.ts | 2 +- .../core/compiler/style_url_resolver_spec.ts | 2 +- .../test/core/compiler/template_compiler_spec.ts | 4 ++-- .../core/compiler/template_normalizer_spec.ts | 4 ++-- .../test/core/compiler/template_parser_spec.ts | 2 +- .../angular2/test/core/compiler/test_bindings.ts | 2 +- .../test/core/compiler/url_resolver_spec.ts | 2 +- .../angular2/test/core/compiler/xhr_impl_spec.ts | 2 +- .../angular2/test/core/compiler/xhr_mock_spec.ts | 2 +- .../test/core/linker/event_config_spec.ts | 2 +- .../core/render/dom/shared_styles_host_spec.ts | 4 ++-- modules/angular2/test/core/spies.dart | 2 +- modules/angular2/test/core/spies.ts | 2 +- modules/angular2_material/test/button_spec.ts | 4 ++-- .../test/test_url_resolver.dart | 2 +- .../angular2_material/test/test_url_resolver.ts | 2 +- .../src/compiler/selector_benchmark.ts | 4 ++-- modules/examples/src/material/demo_common.dart | 2 +- modules/examples/src/material/demo_common.ts | 2 +- .../src/material/progress-linear/index.ts | 2 +- modules/examples/src/material/switcher/index.ts | 2 +- .../lib/src/transform/common/ng_compiler.dart | 2 +- .../lib/src/transform/common/url_resolver.dart | 2 +- .../lib/src/transform/common/xhr_impl.dart | 2 +- .../lib/src/transform/inliner_for_test.dart | 2 +- .../template_compiler/reflection/model.dart | 4 ++-- tools/broccoli/trees/node_tree.ts | 2 +- 54 files changed, 91 insertions(+), 91 deletions(-) diff --git a/modules/angular2/mock.ts b/modules/angular2/mock.ts index 4f86236141..1f497f73ea 100644 --- a/modules/angular2/mock.ts +++ b/modules/angular2/mock.ts @@ -2,4 +2,4 @@ export * from './src/mock/mock_location_strategy'; export {LocationStrategy} from './src/router/location_strategy'; export {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; -export {MockXHR} from 'angular2/src/core/render/xhr_mock'; +export {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; diff --git a/modules/angular2/src/core/application_common.ts b/modules/angular2/src/core/application_common.ts index 12c07f2d83..94d94c19ba 100644 --- a/modules/angular2/src/core/application_common.ts +++ b/modules/angular2/src/core/application_common.ts @@ -13,8 +13,8 @@ import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; import {BrowserGetTestability} from 'angular2/src/core/testability/browser_testability'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; import { EventManager, DomEventsPlugin, @@ -22,8 +22,8 @@ import { } from 'angular2/src/core/render/dom/events/event_manager'; import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures'; -import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; +import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; import { ComponentRef, DynamicComponentLoader @@ -31,14 +31,14 @@ import { import {TestabilityRegistry, Testability} from 'angular2/src/core/testability/testability'; import {Renderer} from 'angular2/src/core/render/api'; import {DomRenderer, DOCUMENT, APP_ID_RANDOM_BINDING} from 'angular2/src/core/render/render'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import { DomElementSchemaRegistry -} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; import { SharedStylesHost, DomSharedStylesHost -} from 'angular2/src/core/render/dom/view/shared_styles_host'; +} from 'angular2/src/core/render/dom/shared_styles_host'; import {EXCEPTION_BINDING} from './platform_bindings'; import {AnimationBuilder} from 'angular2/src/animate/animation_builder'; import {BrowserDetails} from 'angular2/src/animate/browser_details'; diff --git a/modules/angular2/src/core/application_ref.ts b/modules/angular2/src/core/application_ref.ts index 9e70db01d2..858ffc6b3e 100644 --- a/modules/angular2/src/core/application_ref.ts +++ b/modules/angular2/src/core/application_ref.ts @@ -35,7 +35,7 @@ import {DEFAULT_PIPES} from 'angular2/src/core/pipes'; import {ViewResolver} from './linker/view_resolver'; import {DirectiveResolver} from './linker/directive_resolver'; import {PipeResolver} from './linker/pipe_resolver'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import { APP_ID_RANDOM_BINDING, } from 'angular2/src/core/render/render'; diff --git a/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts b/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts index 3b5855eeba..84bb63676f 100644 --- a/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts +++ b/modules/angular2/src/core/compiler/anchor_based_app_root_url.ts @@ -1,4 +1,4 @@ -import {AppRootUrl} from "angular2/src/core/services/app_root_url"; +import {AppRootUrl} from "angular2/src/core/compiler/app_root_url"; import {DOM} from "angular2/src/core/dom/dom_adapter"; import {Injectable} from "angular2/src/core/di"; diff --git a/modules/angular2/src/core/compiler/compiler.ts b/modules/angular2/src/core/compiler/compiler.ts index c407dc71a9..ed7493f4b0 100644 --- a/modules/angular2/src/core/compiler/compiler.ts +++ b/modules/angular2/src/core/compiler/compiler.ts @@ -19,10 +19,10 @@ import {TemplateCompiler} from 'angular2/src/core/compiler/template_compiler'; import {ChangeDetectorGenConfig} from 'angular2/src/core/change_detection/change_detection'; import {Compiler} from 'angular2/src/core/linker/compiler'; import {RuntimeCompiler} from 'angular2/src/core/compiler/runtime_compiler'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import { DomElementSchemaRegistry -} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; export function compilerBindings(): Array { return [ diff --git a/modules/angular2/src/core/compiler/directive_metadata.ts b/modules/angular2/src/core/compiler/directive_metadata.ts index 2c2a1fb16a..3b2ca76489 100644 --- a/modules/angular2/src/core/compiler/directive_metadata.ts +++ b/modules/angular2/src/core/compiler/directive_metadata.ts @@ -13,7 +13,7 @@ import { CHANGE_DECTION_STRATEGY_VALUES } from 'angular2/src/core/change_detection/change_detection'; import {ViewEncapsulation, VIEW_ENCAPSULATION_VALUES} from 'angular2/src/core/render/api'; -import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; +import {CssSelector} from 'angular2/src/core/compiler/selector'; import {splitAtColon} from './util'; import {LifecycleHooks, LIFECYCLE_HOOKS_VALUES} from 'angular2/src/core/linker/interfaces'; diff --git a/modules/angular2/src/core/compiler/style_compiler.ts b/modules/angular2/src/core/compiler/style_compiler.ts index 66d618ed93..e55f32f15b 100644 --- a/modules/angular2/src/core/compiler/style_compiler.ts +++ b/modules/angular2/src/core/compiler/style_compiler.ts @@ -1,11 +1,11 @@ import {CompileTypeMetadata, CompileTemplateMetadata} from './directive_metadata'; import {SourceModule, SourceExpression, moduleRef} from './source_module'; import {ViewEncapsulation} from 'angular2/src/core/render/api'; -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import {StringWrapper, isBlank} from 'angular2/src/core/facade/lang'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; -import {ShadowCss} from 'angular2/src/core/render/dom/compiler/shadow_css'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {ShadowCss} from 'angular2/src/core/compiler/shadow_css'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import {resolveStyleUrls} from './style_url_resolver'; import { escapeSingleQuoteString, @@ -148,4 +148,4 @@ function componentId(appId: string, templateId: number): string { function componentIdExpression(appIdExpression: string, templateIdExpression: string): string { return `${appIdExpression}+'-'+${codeGenToString(templateIdExpression)}`; -} \ No newline at end of file +} diff --git a/modules/angular2/src/core/compiler/style_url_resolver.ts b/modules/angular2/src/core/compiler/style_url_resolver.ts index 1448bef3c8..71f1940492 100644 --- a/modules/angular2/src/core/compiler/style_url_resolver.ts +++ b/modules/angular2/src/core/compiler/style_url_resolver.ts @@ -2,7 +2,7 @@ // https://github.com/webcomponents/webcomponentsjs/blob/master/src/HTMLImports/path.js import {RegExp, RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; /** * Rewrites URLs by resolving '@import' and 'url()' URLs from the given base URL, diff --git a/modules/angular2/src/core/compiler/template_normalizer.ts b/modules/angular2/src/core/compiler/template_normalizer.ts index 993dbb0fba..6872d8f22a 100644 --- a/modules/angular2/src/core/compiler/template_normalizer.ts +++ b/modules/angular2/src/core/compiler/template_normalizer.ts @@ -7,8 +7,8 @@ import {isPresent, isBlank} from 'angular2/src/core/facade/lang'; import {BaseException} from 'angular2/src/core/facade/exceptions'; import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import {resolveStyleUrls} from './style_url_resolver'; import {Injectable} from 'angular2/src/core/di'; import {ViewEncapsulation} from 'angular2/src/core/render/api'; diff --git a/modules/angular2/src/core/compiler/template_parser.ts b/modules/angular2/src/core/compiler/template_parser.ts index 91af5472f5..bb9d726676 100644 --- a/modules/angular2/src/core/compiler/template_parser.ts +++ b/modules/angular2/src/core/compiler/template_parser.ts @@ -35,9 +35,9 @@ import { DirectiveAst, BoundDirectivePropertyAst } from './template_ast'; -import {CssSelector, SelectorMatcher} from 'angular2/src/core/render/dom/compiler/selector'; +import {CssSelector, SelectorMatcher} from 'angular2/src/core/compiler/selector'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import {preparseElement, PreparsedElement, PreparsedElementType} from './template_preparser'; import { diff --git a/modules/angular2/src/core/compiler/xhr_mock.ts b/modules/angular2/src/core/compiler/xhr_mock.ts index c86fe37440..33d1ac9f09 100644 --- a/modules/angular2/src/core/compiler/xhr_mock.ts +++ b/modules/angular2/src/core/compiler/xhr_mock.ts @@ -1,4 +1,4 @@ -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import {ListWrapper, Map, MapWrapper} from 'angular2/src/core/facade/collection'; import {isBlank, isPresent, normalizeBlank} from 'angular2/src/core/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; diff --git a/modules/angular2/src/core/dom/parse5_adapter.ts b/modules/angular2/src/core/dom/parse5_adapter.ts index 85fab0b264..128e1666c3 100644 --- a/modules/angular2/src/core/dom/parse5_adapter.ts +++ b/modules/angular2/src/core/dom/parse5_adapter.ts @@ -15,7 +15,7 @@ import { DateWrapper } from 'angular2/src/core/facade/lang'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; -import {SelectorMatcher, CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; +import {SelectorMatcher, CssSelector} from 'angular2/src/core/compiler/selector'; var _attrToPropMap = { 'class': 'className', diff --git a/modules/angular2/src/core/linker/element_injector.ts b/modules/angular2/src/core/linker/element_injector.ts index 7e5bee8e83..4cef6c05a4 100644 --- a/modules/angular2/src/core/linker/element_injector.ts +++ b/modules/angular2/src/core/linker/element_injector.ts @@ -48,7 +48,7 @@ import { import {QueryList} from './query_list'; import {reflector} from 'angular2/src/core/reflection/reflection'; import {SetterFn} from 'angular2/src/core/reflection/types'; -import {EventConfig} from 'angular2/src/core/render/event_config'; +import {EventConfig} from 'angular2/src/core/linker/event_config'; import {PipeBinding} from '../pipes/pipe_binding'; import {LifecycleHooks} from './interfaces'; diff --git a/modules/angular2/src/core/render/dom/dom_renderer.ts b/modules/angular2/src/core/render/dom/dom_renderer.ts index 451e2eec04..42b7024a0e 100644 --- a/modules/angular2/src/core/render/dom/dom_renderer.ts +++ b/modules/angular2/src/core/render/dom/dom_renderer.ts @@ -13,7 +13,7 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {EventManager} from './events/event_manager'; -import {DomSharedStylesHost} from './view/shared_styles_host'; +import {DomSharedStylesHost} from './shared_styles_host'; import {WtfScopeFn, wtfLeave, wtfCreateScope} from '../../profile/profile'; import { diff --git a/modules/angular2/src/core/render/dom/shared_styles_host.ts b/modules/angular2/src/core/render/dom/shared_styles_host.ts index 5d42a1ab06..f1d9689972 100644 --- a/modules/angular2/src/core/render/dom/shared_styles_host.ts +++ b/modules/angular2/src/core/render/dom/shared_styles_host.ts @@ -1,7 +1,7 @@ import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Inject, Injectable} from 'angular2/src/core/di'; import {SetWrapper} from 'angular2/src/core/facade/collection'; -import {DOCUMENT} from '../dom_tokens'; +import {DOCUMENT} from './dom_tokens'; @Injectable() export class SharedStylesHost { diff --git a/modules/angular2/src/core/render/render.ts b/modules/angular2/src/core/render/render.ts index 78062bdd05..9b20996cea 100644 --- a/modules/angular2/src/core/render/render.ts +++ b/modules/angular2/src/core/render/render.ts @@ -4,7 +4,7 @@ * This module provides advanced support for extending dom strategy. */ -export * from './dom/view/shared_styles_host'; +export * from './dom/shared_styles_host'; export * from './dom/dom_renderer'; export * from './dom/dom_tokens'; export * from './api'; diff --git a/modules/angular2/src/core/services.ts b/modules/angular2/src/core/services.ts index b81bfa5b5c..09dbf9eedf 100644 --- a/modules/angular2/src/core/services.ts +++ b/modules/angular2/src/core/services.ts @@ -1,4 +1,4 @@ // Public API for Services -export {AppRootUrl} from 'angular2/src/core/services/app_root_url'; -export {UrlResolver} from 'angular2/src/core/services/url_resolver'; +export {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; +export {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; export {Title} from 'angular2/src/core/services/title'; diff --git a/modules/angular2/src/test_lib/test_injector.ts b/modules/angular2/src/test_lib/test_injector.ts index aebeb3bf24..f9e9ae7533 100644 --- a/modules/angular2/src/test_lib/test_injector.ts +++ b/modules/angular2/src/test_lib/test_injector.ts @@ -19,10 +19,10 @@ import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import {PipeResolver} from 'angular2/src/core/linker/pipe_resolver'; import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; -import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; +import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; @@ -35,7 +35,7 @@ import { import {MockDirectiveResolver} from 'angular2/src/mock/directive_resolver_mock'; import {MockViewResolver} from 'angular2/src/mock/view_resolver_mock'; -import {MockXHR} from 'angular2/src/core/render/xhr_mock'; +import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; import {MockLocationStrategy} from 'angular2/src/mock/mock_location_strategy'; import {LocationStrategy} from 'angular2/src/router/location_strategy'; import {MockNgZone} from 'angular2/src/mock/ng_zone_mock'; @@ -59,10 +59,10 @@ import { SharedStylesHost, DomSharedStylesHost } from 'angular2/src/core/render/render'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import { DomElementSchemaRegistry -} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; import {Serializer} from "angular2/src/web_workers/shared/serializer"; import {Log} from './utils'; import {compilerBindings} from 'angular2/src/core/compiler/compiler'; diff --git a/modules/angular2/src/web_workers/ui/di_bindings.ts b/modules/angular2/src/web_workers/ui/di_bindings.ts index ec5de61814..b68aa55547 100644 --- a/modules/angular2/src/web_workers/ui/di_bindings.ts +++ b/modules/angular2/src/web_workers/ui/di_bindings.ts @@ -17,16 +17,16 @@ import {KeyEventsPlugin} from 'angular2/src/core/render/dom/events/key_events'; import {HammerGesturesPlugin} from 'angular2/src/core/render/dom/events/hammer_gestures'; import {AppViewPool, APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool'; import {Renderer} from 'angular2/src/core/render/api'; -import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; +import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; import {DomRenderer, DOCUMENT, APP_ID_RANDOM_BINDING} from 'angular2/src/core/render/render'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import { DomElementSchemaRegistry -} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; import { SharedStylesHost, DomSharedStylesHost -} from 'angular2/src/core/render/dom/view/shared_styles_host'; +} from 'angular2/src/core/render/dom/shared_styles_host'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {NgZone} from 'angular2/src/core/zone/ng_zone'; import {AppViewManager} from 'angular2/src/core/linker/view_manager'; @@ -36,17 +36,17 @@ import {ViewResolver} from 'angular2/src/core/linker/view_resolver'; import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver'; import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component_loader'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import {Testability} from 'angular2/src/core/testability/testability'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; import {Serializer} from 'angular2/src/web_workers/shared/serializer'; import {ON_WEB_WORKER} from 'angular2/src/web_workers/shared/api'; import {RenderProtoViewRefStore} from 'angular2/src/web_workers/shared/render_proto_view_ref_store'; import { RenderViewWithFragmentsStore } from 'angular2/src/web_workers/shared/render_view_with_fragments_store'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; import {WebWorkerApplication} from 'angular2/src/web_workers/ui/impl'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; import {MessageBasedRenderer} from 'angular2/src/web_workers/ui/renderer'; diff --git a/modules/angular2/src/web_workers/ui/setup.ts b/modules/angular2/src/web_workers/ui/setup.ts index 355ba57e06..d75f30f8d2 100644 --- a/modules/angular2/src/web_workers/ui/setup.ts +++ b/modules/angular2/src/web_workers/ui/setup.ts @@ -1,7 +1,7 @@ import {SETUP_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; import {EventEmitter, ObservableWrapper} from 'angular2/src/core/facade/async'; import {MessageBus} from 'angular2/src/web_workers/shared/message_bus'; -import {AnchorBasedAppRootUrl} from 'angular2/src/core/services/anchor_based_app_root_url'; +import {AnchorBasedAppRootUrl} from 'angular2/src/core/compiler/anchor_based_app_root_url'; import {StringWrapper} from 'angular2/src/core/facade/lang'; import {Injectable} from 'angular2/src/core/di'; diff --git a/modules/angular2/src/web_workers/ui/xhr_impl.ts b/modules/angular2/src/web_workers/ui/xhr_impl.ts index e7e738883c..e8e210b03c 100644 --- a/modules/angular2/src/web_workers/ui/xhr_impl.ts +++ b/modules/angular2/src/web_workers/ui/xhr_impl.ts @@ -1,7 +1,7 @@ import {Injectable} from 'angular2/src/core/di'; import {PRIMITIVE} from 'angular2/src/web_workers/shared/serializer'; import {XHR_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import {ServiceMessageBrokerFactory} from 'angular2/src/web_workers/shared/service_message_broker'; import {bind} from './bind'; diff --git a/modules/angular2/src/web_workers/worker/application_common.ts b/modules/angular2/src/web_workers/worker/application_common.ts index 3777232d94..532d355090 100644 --- a/modules/angular2/src/web_workers/worker/application_common.ts +++ b/modules/angular2/src/web_workers/worker/application_common.ts @@ -11,9 +11,9 @@ import { } from 'angular2/src/core/facade/lang'; import {ExceptionHandler} from 'angular2/src/core/facade/exceptions'; import {Promise, PromiseWrapper, PromiseCompleter} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import {WebWorkerXHRImpl} from 'angular2/src/web_workers/worker/xhr_impl'; -import {AppRootUrl} from 'angular2/src/core/services/app_root_url'; +import {AppRootUrl} from 'angular2/src/core/compiler/app_root_url'; import {WebWorkerRenderer} from './renderer'; import {Renderer} from 'angular2/src/core/render/api'; import {ClientMessageBrokerFactory} from 'angular2/src/web_workers/shared/client_message_broker'; diff --git a/modules/angular2/src/web_workers/worker/xhr_impl.ts b/modules/angular2/src/web_workers/worker/xhr_impl.ts index ca5bab5816..c5a97d23e6 100644 --- a/modules/angular2/src/web_workers/worker/xhr_impl.ts +++ b/modules/angular2/src/web_workers/worker/xhr_impl.ts @@ -1,6 +1,6 @@ import {Injectable} from 'angular2/src/core/di'; import {Promise} from 'angular2/src/core/facade/async'; -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import { FnArg, UiArguments, @@ -10,7 +10,7 @@ import { import {XHR_CHANNEL} from 'angular2/src/web_workers/shared/messaging_api'; /** - * Implementation of render/xhr that relays XHR requests to the UI side where they are sent + * Implementation of compiler/xhr that relays XHR requests to the UI side where they are sent * and the result is proxied back to the worker */ @Injectable() diff --git a/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts b/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts index 7275b9ff85..18471ea4e2 100644 --- a/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts +++ b/modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts @@ -9,11 +9,11 @@ import { it, xit } from 'angular2/test_lib'; -import {IS_DART} from '../../../../platform'; +import {IS_DART} from '../../../platform'; import { DomElementSchemaRegistry -} from 'angular2/src/core/render/dom/schema/dom_element_schema_registry'; +} from 'angular2/src/core/compiler/schema/dom_element_schema_registry'; export function main() { // DOMElementSchema can only be used on the JS side where we can safely diff --git a/modules/angular2/test/core/compiler/schema_registry_mock.ts b/modules/angular2/test/core/compiler/schema_registry_mock.ts index ef661f67dc..c36f922f3d 100644 --- a/modules/angular2/test/core/compiler/schema_registry_mock.ts +++ b/modules/angular2/test/core/compiler/schema_registry_mock.ts @@ -1,4 +1,4 @@ -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import {StringMap} from 'angular2/src/core/facade/collection'; import {isPresent} from 'angular2/src/core/facade/lang'; @@ -14,4 +14,4 @@ export class MockSchemaRegistry implements ElementSchemaRegistry { var result = this.attrPropMapping[attrName]; return isPresent(result) ? result : attrName; } -} \ No newline at end of file +} diff --git a/modules/angular2/test/core/compiler/selector_spec.ts b/modules/angular2/test/core/compiler/selector_spec.ts index d209303982..23d0dcd3dd 100644 --- a/modules/angular2/test/core/compiler/selector_spec.ts +++ b/modules/angular2/test/core/compiler/selector_spec.ts @@ -1,7 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {SelectorMatcher} from 'angular2/src/core/render/dom/compiler/selector'; -import {CssSelector} from 'angular2/src/core/render/dom/compiler/selector'; +import {SelectorMatcher} from 'angular2/src/core/compiler/selector'; +import {CssSelector} from 'angular2/src/core/compiler/selector'; import {ListWrapper, MapWrapper} from 'angular2/src/core/facade/collection'; export function main() { diff --git a/modules/angular2/test/core/compiler/shadow_css_spec.ts b/modules/angular2/test/core/compiler/shadow_css_spec.ts index 10f2d99ed1..00f84f25b9 100644 --- a/modules/angular2/test/core/compiler/shadow_css_spec.ts +++ b/modules/angular2/test/core/compiler/shadow_css_spec.ts @@ -10,7 +10,7 @@ import { normalizeCSS, browserDetection } from 'angular2/test_lib'; -import {ShadowCss} from 'angular2/src/core/render/dom/compiler/shadow_css'; +import {ShadowCss} from 'angular2/src/core/compiler/shadow_css'; import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; diff --git a/modules/angular2/test/core/compiler/style_compiler_spec.ts b/modules/angular2/test/core/compiler/style_compiler_spec.ts index 7a1e254988..fcb338ac1c 100644 --- a/modules/angular2/test/core/compiler/style_compiler_spec.ts +++ b/modules/angular2/test/core/compiler/style_compiler_spec.ts @@ -14,7 +14,7 @@ import { } from 'angular2/test_lib'; import {bind} from 'angular2/src/core/di'; import {SpyXHR} from '../spies'; -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions'; import {CONST_EXPR, isPresent, isBlank, StringWrapper} from 'angular2/src/core/facade/lang'; diff --git a/modules/angular2/test/core/compiler/style_url_resolver_spec.ts b/modules/angular2/test/core/compiler/style_url_resolver_spec.ts index 4a7afdcf18..fb2f83813c 100644 --- a/modules/angular2/test/core/compiler/style_url_resolver_spec.ts +++ b/modules/angular2/test/core/compiler/style_url_resolver_spec.ts @@ -1,7 +1,7 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; import {resolveStyleUrls} from 'angular2/src/core/compiler/style_url_resolver'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; export function main() { describe('StyleUrlResolver', () => { diff --git a/modules/angular2/test/core/compiler/template_compiler_spec.ts b/modules/angular2/test/core/compiler/template_compiler_spec.ts index 7591d5b336..76b157ec24 100644 --- a/modules/angular2/test/core/compiler/template_compiler_spec.ts +++ b/modules/angular2/test/core/compiler/template_compiler_spec.ts @@ -24,8 +24,8 @@ import { import {CompileDirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata'; import {evalModule} from './eval_module'; import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {MockXHR} from 'angular2/src/core/render/xhr_mock'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; import {Locals} from 'angular2/src/core/change_detection/change_detection'; diff --git a/modules/angular2/test/core/compiler/template_normalizer_spec.ts b/modules/angular2/test/core/compiler/template_normalizer_spec.ts index cad084a1da..672f38e00e 100644 --- a/modules/angular2/test/core/compiler/template_normalizer_spec.ts +++ b/modules/angular2/test/core/compiler/template_normalizer_spec.ts @@ -20,8 +20,8 @@ import { import {ViewEncapsulation} from 'angular2/src/core/render/api'; import {TemplateNormalizer} from 'angular2/src/core/compiler/template_normalizer'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {MockXHR} from 'angular2/src/core/render/xhr_mock'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; import {TEST_BINDINGS} from './test_bindings'; export function main() { diff --git a/modules/angular2/test/core/compiler/template_parser_spec.ts b/modules/angular2/test/core/compiler/template_parser_spec.ts index 6878c84fd3..58b6d3833d 100644 --- a/modules/angular2/test/core/compiler/template_parser_spec.ts +++ b/modules/angular2/test/core/compiler/template_parser_spec.ts @@ -38,7 +38,7 @@ import { DirectiveAst } from 'angular2/src/core/compiler/template_ast'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; import {MockSchemaRegistry} from './schema_registry_mock'; import {Unparser} from '../change_detection/parser/unparser'; diff --git a/modules/angular2/test/core/compiler/test_bindings.ts b/modules/angular2/test/core/compiler/test_bindings.ts index 18bb8ae84d..2d0beedf2e 100644 --- a/modules/angular2/test/core/compiler/test_bindings.ts +++ b/modules/angular2/test/core/compiler/test_bindings.ts @@ -1,5 +1,5 @@ import {bind, Binding} from 'angular2/src/core/di'; import {MockSchemaRegistry} from './schema_registry_mock'; -import {ElementSchemaRegistry} from 'angular2/src/core/render/dom/schema/element_schema_registry'; +import {ElementSchemaRegistry} from 'angular2/src/core/compiler/schema/element_schema_registry'; export var TEST_BINDINGS = [bind(ElementSchemaRegistry).toValue(new MockSchemaRegistry({}, {}))]; diff --git a/modules/angular2/test/core/compiler/url_resolver_spec.ts b/modules/angular2/test/core/compiler/url_resolver_spec.ts index 2e981085f2..78abaf77d3 100644 --- a/modules/angular2/test/core/compiler/url_resolver_spec.ts +++ b/modules/angular2/test/core/compiler/url_resolver_spec.ts @@ -1,5 +1,5 @@ import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; export function main() { describe('UrlResolver', () => { diff --git a/modules/angular2/test/core/compiler/xhr_impl_spec.ts b/modules/angular2/test/core/compiler/xhr_impl_spec.ts index 6acffd8dd7..276d4b97f1 100644 --- a/modules/angular2/test/core/compiler/xhr_impl_spec.ts +++ b/modules/angular2/test/core/compiler/xhr_impl_spec.ts @@ -10,7 +10,7 @@ import { xit } from 'angular2/test_lib'; -import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; +import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; import {PromiseWrapper} from 'angular2/src/core/facade/async'; export function main() { diff --git a/modules/angular2/test/core/compiler/xhr_mock_spec.ts b/modules/angular2/test/core/compiler/xhr_mock_spec.ts index 7008a5e025..bf1f69a6c7 100644 --- a/modules/angular2/test/core/compiler/xhr_mock_spec.ts +++ b/modules/angular2/test/core/compiler/xhr_mock_spec.ts @@ -9,7 +9,7 @@ import { inject, it, } from 'angular2/test_lib'; -import {MockXHR} from 'angular2/src/core/render/xhr_mock'; +import {MockXHR} from 'angular2/src/core/compiler/xhr_mock'; import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async'; import {isPresent} from 'angular2/src/core/facade/lang'; diff --git a/modules/angular2/test/core/linker/event_config_spec.ts b/modules/angular2/test/core/linker/event_config_spec.ts index cce4de8dad..b463a3fe32 100644 --- a/modules/angular2/test/core/linker/event_config_spec.ts +++ b/modules/angular2/test/core/linker/event_config_spec.ts @@ -1,4 +1,4 @@ -import {EventConfig} from 'angular2/src/core/render/event_config'; +import {EventConfig} from 'angular2/src/core/linker/event_config'; import {ddescribe, describe, expect, it} from 'angular2/test_lib'; export function main() { diff --git a/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts b/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts index a435192daf..29bdd8347a 100644 --- a/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts +++ b/modules/angular2/test/core/render/dom/shared_styles_host_spec.ts @@ -17,7 +17,7 @@ import { } from 'angular2/test_lib'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; -import {DomSharedStylesHost} from 'angular2/src/core/render/dom/view/shared_styles_host'; +import {DomSharedStylesHost} from 'angular2/src/core/render/dom/shared_styles_host'; export function main() { describe('DomSharedStylesHost', () => { @@ -55,4 +55,4 @@ export function main() { expect(doc.head).toHaveText('a {};b {};'); }); }); -} \ No newline at end of file +} diff --git a/modules/angular2/test/core/spies.dart b/modules/angular2/test/core/spies.dart index f42df83e57..427873bfd0 100644 --- a/modules/angular2/test/core/spies.dart +++ b/modules/angular2/test/core/spies.dart @@ -14,7 +14,7 @@ import 'package:angular2/src/core/linker/view_listener.dart'; import 'package:angular2/src/core/linker/element_injector.dart'; import 'package:angular2/src/core/dom/dom_adapter.dart'; import 'package:angular2/test_lib.dart'; -import 'package:angular2/src/core/render/xhr.dart'; +import 'package:angular2/src/core/compiler/xhr.dart'; @proxy class SpyDependencyProvider extends SpyObject implements DependencyProvider { diff --git a/modules/angular2/test/core/spies.ts b/modules/angular2/test/core/spies.ts index 89dc779262..7846e5f99d 100644 --- a/modules/angular2/test/core/spies.ts +++ b/modules/angular2/test/core/spies.ts @@ -16,7 +16,7 @@ import {AppViewListener} from 'angular2/src/core/linker/view_listener'; import {ProtoViewFactory} from 'angular2/src/core/linker/proto_view_factory'; import {DomAdapter} from 'angular2/src/core/dom/dom_adapter'; import {ClientMessageBroker} from 'angular2/src/web_workers/shared/client_message_broker'; -import {XHR} from 'angular2/src/core/render/xhr'; +import {XHR} from 'angular2/src/core/compiler/xhr'; import { ElementInjector, diff --git a/modules/angular2_material/test/button_spec.ts b/modules/angular2_material/test/button_spec.ts index 3648caffeb..221a88045a 100644 --- a/modules/angular2_material/test/button_spec.ts +++ b/modules/angular2_material/test/button_spec.ts @@ -20,8 +20,8 @@ import {MdButton, MdAnchor} from 'angular2_material/src/components/button/button import {TestUrlResolver} from './test_url_resolver'; -import {XHR} from 'angular2/src/core/render/xhr'; -import {XHRImpl} from 'angular2/src/core/render/xhr_impl'; +import {XHR} from 'angular2/src/core/compiler/xhr'; +import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl'; export function main() { diff --git a/modules/angular2_material/test/test_url_resolver.dart b/modules/angular2_material/test/test_url_resolver.dart index cc1a15f650..cf9bc0c292 100644 --- a/modules/angular2_material/test/test_url_resolver.dart +++ b/modules/angular2_material/test/test_url_resolver.dart @@ -1,7 +1,7 @@ library ng_material.test_url_resolver; import 'package:angular2/src/core/dom/browser_adapter.dart'; -import 'package:angular2/src/core/services/url_resolver.dart'; +import 'package:angular2/src/core/compiler/url_resolver.dart'; void commonDemoSetup() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/angular2_material/test/test_url_resolver.ts b/modules/angular2_material/test/test_url_resolver.ts index b941422c43..4e9f7044fb 100644 --- a/modules/angular2_material/test/test_url_resolver.ts +++ b/modules/angular2_material/test/test_url_resolver.ts @@ -1,4 +1,4 @@ -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; export class TestUrlResolver extends UrlResolver { constructor() { diff --git a/modules/benchmarks/src/compiler/selector_benchmark.ts b/modules/benchmarks/src/compiler/selector_benchmark.ts index 5b7d14f4b7..a21a7953e1 100644 --- a/modules/benchmarks/src/compiler/selector_benchmark.ts +++ b/modules/benchmarks/src/compiler/selector_benchmark.ts @@ -1,5 +1,5 @@ -import {SelectorMatcher} from "angular2/src/core/render/dom/compiler/selector"; -import {CssSelector} from "angular2/src/core/render/dom/compiler/selector"; +import {SelectorMatcher} from "angular2/src/core/compiler/selector"; +import {CssSelector} from "angular2/src/core/compiler/selector"; import {StringWrapper, Math} from 'angular2/src/core/facade/lang'; import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; import {BrowserDomAdapter} from 'angular2/src/core/dom/browser_adapter'; diff --git a/modules/examples/src/material/demo_common.dart b/modules/examples/src/material/demo_common.dart index 47e7f4e3fb..e97107257b 100644 --- a/modules/examples/src/material/demo_common.dart +++ b/modules/examples/src/material/demo_common.dart @@ -1,7 +1,7 @@ library angular2_examples.material.demo_common; import 'package:angular2/src/core/dom/browser_adapter.dart'; -import 'package:angular2/src/core/services/url_resolver.dart'; +import 'package:angular2/src/core/compiler/url_resolver.dart'; void commonDemoSetup() { BrowserDomAdapter.makeCurrent(); diff --git a/modules/examples/src/material/demo_common.ts b/modules/examples/src/material/demo_common.ts index 23992b8127..cef5c2cd12 100644 --- a/modules/examples/src/material/demo_common.ts +++ b/modules/examples/src/material/demo_common.ts @@ -1,5 +1,5 @@ import {print} from 'angular2/src/core/facade/lang'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import {isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/core/facade/lang'; import {DOM} from 'angular2/src/core/dom/dom_adapter'; import {Injectable} from 'angular2/core'; diff --git a/modules/examples/src/material/progress-linear/index.ts b/modules/examples/src/material/progress-linear/index.ts index 37e7f23e8e..affba3e0d5 100644 --- a/modules/examples/src/material/progress-linear/index.ts +++ b/modules/examples/src/material/progress-linear/index.ts @@ -1,7 +1,7 @@ import {bootstrap} from 'angular2/bootstrap'; import {bind, Component, View, ViewEncapsulation} from 'angular2/core'; import {MdProgressLinear} from 'angular2_material/src/components/progress-linear/progress_linear'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; @Component({ diff --git a/modules/examples/src/material/switcher/index.ts b/modules/examples/src/material/switcher/index.ts index bf342710ed..067980f785 100644 --- a/modules/examples/src/material/switcher/index.ts +++ b/modules/examples/src/material/switcher/index.ts @@ -1,7 +1,7 @@ import {bootstrap} from 'angular2/bootstrap'; import {bind, Component, View, ViewEncapsulation} from 'angular2/core'; import {MdSwitch} from 'angular2_material/src/components/switcher/switch'; -import {UrlResolver} from 'angular2/src/core/services/url_resolver'; +import {UrlResolver} from 'angular2/src/core/compiler/url_resolver'; import {commonDemoSetup, DemoUrlResolver} from '../demo_common'; @Component({ diff --git a/modules_dart/transform/lib/src/transform/common/ng_compiler.dart b/modules_dart/transform/lib/src/transform/common/ng_compiler.dart index 50feaa97ee..e46af9c6c1 100644 --- a/modules_dart/transform/lib/src/transform/common/ng_compiler.dart +++ b/modules_dart/transform/lib/src/transform/common/ng_compiler.dart @@ -8,7 +8,7 @@ import 'package:angular2/src/core/compiler/template_normalizer.dart'; import 'package:angular2/src/core/compiler/template_parser.dart'; import 'package:angular2/src/core/change_detection/parser/lexer.dart' as ng; import 'package:angular2/src/core/change_detection/parser/parser.dart' as ng; -import 'package:angular2/src/core/render/dom/schema/dom_element_schema_registry.dart'; +import 'package:angular2/src/core/compiler/schema/dom_element_schema_registry.dart'; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:angular2/src/core/change_detection/interfaces.dart'; import 'package:angular2/src/core/compiler/change_detector_compiler.dart'; diff --git a/modules_dart/transform/lib/src/transform/common/url_resolver.dart b/modules_dart/transform/lib/src/transform/common/url_resolver.dart index b5497a293a..6cb8c11c7b 100644 --- a/modules_dart/transform/lib/src/transform/common/url_resolver.dart +++ b/modules_dart/transform/lib/src/transform/common/url_resolver.dart @@ -1,6 +1,6 @@ library angular2.transform.template_compiler.url_resolver; -import 'package:angular2/src/core/services/url_resolver.dart'; +import 'package:angular2/src/core/compiler/url_resolver.dart'; class TransformerUrlResolver implements UrlResolver { const TransformerUrlResolver(); diff --git a/modules_dart/transform/lib/src/transform/common/xhr_impl.dart b/modules_dart/transform/lib/src/transform/common/xhr_impl.dart index bb76d477e3..13f3f2610b 100644 --- a/modules_dart/transform/lib/src/transform/common/xhr_impl.dart +++ b/modules_dart/transform/lib/src/transform/common/xhr_impl.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.xhr_impl; import 'dart:async'; -import 'package:angular2/src/core/render/xhr.dart' show XHR; +import 'package:angular2/src/core/compiler/xhr.dart' show XHR; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:barback/barback.dart'; diff --git a/modules_dart/transform/lib/src/transform/inliner_for_test.dart b/modules_dart/transform/lib/src/transform/inliner_for_test.dart index 9ead5700a3..3fb0ee8ce2 100644 --- a/modules_dart/transform/lib/src/transform/inliner_for_test.dart +++ b/modules_dart/transform/lib/src/transform/inliner_for_test.dart @@ -4,7 +4,7 @@ import 'dart:async'; import 'package:analyzer/analyzer.dart'; import 'package:analyzer/src/generated/ast.dart'; -import 'package:angular2/src/core/render/xhr.dart' show XHR; +import 'package:angular2/src/core/compiler/xhr.dart' show XHR; import 'package:angular2/src/transform/common/asset_reader.dart'; import 'package:barback/barback.dart'; diff --git a/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart b/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart index d0fd4aae0b..80b68d1167 100644 --- a/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart +++ b/modules_dart/transform/lib/src/transform/template_compiler/reflection/model.dart @@ -1,7 +1,7 @@ library angular2.transform.template_compiler.reflection.model; -import 'package:angular2/src/core/render/dom/util.dart'; -import 'package:angular2/src/core/render/event_config.dart'; +import 'package:angular2/src/core/compiler/util.dart'; +import 'package:angular2/src/core/linker/event_config.dart'; /// Defines the names of getters, setters, and methods which need to be /// available to Angular 2 via the `reflector` at runtime. diff --git a/tools/broccoli/trees/node_tree.ts b/tools/broccoli/trees/node_tree.ts index 14ed5920eb..e7fc06e96c 100644 --- a/tools/broccoli/trees/node_tree.ts +++ b/tools/broccoli/trees/node_tree.ts @@ -23,7 +23,7 @@ module.exports = function makeNodeTree(destinationPath) { 'angular2/test/animate/**', 'angular2/test/core/zone/**', 'angular2/test/test_lib/fake_async_spec.ts', - 'angular2/test/core/render/xhr_impl_spec.ts', + 'angular2/test/core/compiler/xhr_impl_spec.ts', 'angular2/test/core/forms/**', 'angular2/test/tools/tools_spec.ts', 'angular1_router/**'