From 27a47e784137c525b3567794ee0d623cdb9c11ac Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Tue, 31 May 2016 15:22:59 -0700 Subject: [PATCH] refactor(imports): simplify paths --- .../@angular/common/src/directives/core_directives.ts | 2 +- modules/@angular/common/src/directives/ng_class.ts | 4 ++-- modules/@angular/common/src/directives/ng_for.ts | 4 ++-- modules/@angular/common/src/directives/ng_if.ts | 2 +- modules/@angular/common/src/directives/ng_plural.ts | 4 ++-- modules/@angular/common/src/directives/ng_style.ts | 2 +- modules/@angular/common/src/directives/ng_switch.ts | 4 ++-- .../@angular/common/src/directives/ng_template_outlet.ts | 2 +- .../src/forms/directives/abstract_control_directive.ts | 4 ++-- .../src/forms/directives/default_value_accessor.ts | 2 +- .../@angular/common/src/forms/directives/ng_control.ts | 2 +- .../common/src/forms/directives/ng_control_name.ts | 2 +- .../common/src/forms/directives/ng_control_status.ts | 2 +- modules/@angular/common/src/forms/directives/ng_form.ts | 6 +++--- .../common/src/forms/directives/ng_form_control.ts | 4 ++-- .../common/src/forms/directives/ng_form_model.ts | 8 ++++---- modules/@angular/common/src/forms/directives/ng_model.ts | 2 +- .../common/src/forms/directives/number_value_accessor.ts | 2 +- .../src/forms/directives/radio_control_value_accessor.ts | 4 ++-- .../forms/directives/select_control_value_accessor.ts | 4 ++-- .../directives/select_multiple_control_value_accessor.ts | 4 ++-- modules/@angular/common/src/forms/directives/shared.ts | 6 +++--- modules/@angular/common/src/forms/form_builder.ts | 4 ++-- modules/@angular/common/src/forms/model.ts | 8 ++++---- modules/@angular/common/src/forms/validators.ts | 8 ++++---- .../common/src/location/hash_location_strategy.ts | 2 +- modules/@angular/common/src/location/location.ts | 2 +- .../common/src/location/path_location_strategy.ts | 4 ++-- modules/@angular/common/src/pipes/async_pipe.ts | 4 ++-- modules/@angular/common/src/pipes/date_pipe.ts | 6 +++--- modules/@angular/common/src/pipes/i18n_plural_pipe.ts | 2 +- modules/@angular/common/src/pipes/i18n_select_pipe.ts | 4 ++-- .../common/src/pipes/invalid_pipe_argument_exception.ts | 4 ++-- modules/@angular/common/src/pipes/json_pipe.ts | 2 +- modules/@angular/common/src/pipes/lowercase_pipe.ts | 2 +- modules/@angular/common/src/pipes/number_pipe.ts | 7 ++++--- modules/@angular/common/src/pipes/replace_pipe.ts | 2 +- modules/@angular/common/src/pipes/slice_pipe.ts | 5 ++--- modules/@angular/common/src/pipes/uppercase_pipe.ts | 2 +- modules/@angular/compiler/src/compiler.ts | 2 +- modules/@angular/compiler/src/css/lexer.ts | 4 ++-- modules/@angular/compiler/src/css/parser.ts | 2 +- modules/@angular/compiler/src/expression_parser/ast.ts | 2 +- modules/@angular/compiler/src/expression_parser/lexer.ts | 6 +++--- .../@angular/compiler/src/expression_parser/parser.ts | 6 +++--- modules/@angular/compiler/src/i18n/expander.ts | 2 +- modules/@angular/compiler/src/i18n/message.ts | 2 +- modules/@angular/compiler/src/i18n/shared.ts | 2 +- modules/@angular/compiler/src/i18n/xmb_serializer.ts | 2 +- modules/@angular/compiler/src/offline_compiler.ts | 9 +++------ modules/@angular/compiler/src/output/abstract_emitter.ts | 4 ++-- .../@angular/compiler/src/output/abstract_js_emitter.ts | 4 ++-- modules/@angular/compiler/src/output/dart_emitter.ts | 4 ++-- modules/@angular/compiler/src/output/dart_imports.ts | 4 ++-- .../@angular/compiler/src/output/interpretive_view.ts | 4 ++-- modules/@angular/compiler/src/output/output_ast.ts | 2 +- .../@angular/compiler/src/output/output_interpreter.ts | 8 ++++---- modules/@angular/compiler/src/output/output_jit.ts | 2 +- modules/@angular/compiler/src/output/path_util.ts | 4 ++-- modules/@angular/compiler/src/output/ts_emitter.ts | 4 ++-- .../compiler/src/view_compiler/compile_element.ts | 4 ++-- .../compiler/src/view_compiler/compile_method.ts | 4 ++-- .../@angular/compiler/src/view_compiler/compile_query.ts | 4 ++-- .../@angular/compiler/src/view_compiler/compile_view.ts | 4 ++-- modules/@angular/compiler/src/view_compiler/constants.ts | 2 +- .../@angular/compiler/src/view_compiler/event_binder.ts | 4 ++-- .../compiler/src/view_compiler/expression_converter.ts | 4 ++-- .../compiler/src/view_compiler/property_binder.ts | 2 +- modules/@angular/compiler/src/view_compiler/util.ts | 4 ++-- .../@angular/compiler/src/view_compiler/view_binder.ts | 2 +- .../@angular/compiler/src/view_compiler/view_builder.ts | 4 ++-- .../core/src/change_detection/change_detection_util.ts | 6 +++--- modules/@angular/core/src/change_detection/constants.ts | 2 +- .../change_detection/differs/default_iterable_differ.ts | 6 +++--- .../change_detection/differs/default_keyvalue_differ.ts | 6 +++--- .../src/change_detection/differs/iterable_differs.ts | 6 +++--- .../src/change_detection/differs/keyvalue_differs.ts | 6 +++--- modules/@angular/core/src/debug/debug_node.ts | 4 ++-- modules/@angular/core/src/debug/debug_renderer.ts | 2 +- modules/@angular/core/src/di/forward_ref.ts | 2 +- modules/@angular/core/src/di/injector.ts | 2 +- modules/@angular/core/src/di/metadata.ts | 2 +- modules/@angular/core/src/di/provider.ts | 4 ++-- modules/@angular/core/src/di/reflective_exceptions.ts | 6 +++--- modules/@angular/core/src/di/reflective_injector.ts | 6 +++--- modules/@angular/core/src/di/reflective_key.ts | 4 ++-- modules/@angular/core/src/di/reflective_provider.ts | 4 ++-- modules/@angular/core/src/linker/component_factory.ts | 4 ++-- modules/@angular/core/src/linker/component_resolver.ts | 6 +++--- modules/@angular/core/src/linker/debug_context.ts | 4 ++-- .../@angular/core/src/linker/dynamic_component_loader.ts | 2 +- modules/@angular/core/src/linker/element.ts | 6 +++--- modules/@angular/core/src/linker/exceptions.ts | 2 +- modules/@angular/core/src/linker/query_list.ts | 6 +++--- .../core/src/linker/systemjs_component_resolver.ts | 2 +- modules/@angular/core/src/linker/view_container_ref.ts | 6 +++--- modules/@angular/core/src/linker/view_ref.ts | 2 +- modules/@angular/core/src/linker/view_utils.ts | 6 +++--- modules/@angular/core/src/metadata/di.ts | 2 +- modules/@angular/core/src/metadata/directives.ts | 2 +- modules/@angular/core/src/metadata/view.ts | 2 +- modules/@angular/core/src/profile/wtf_impl.ts | 2 +- .../src/reflection/platform_reflection_capabilities.ts | 2 +- .../core/src/reflection/reflection_capabilities.ts | 4 ++-- modules/@angular/core/src/reflection/reflector.ts | 6 +++--- modules/@angular/core/src/render/api.ts | 2 +- modules/@angular/core/src/testability/testability.ts | 8 ++++---- modules/@angular/core/src/util/decorators.ts | 2 +- modules/@angular/core/src/zone/ng_zone.ts | 4 ++-- modules/@angular/http/src/backends/browser_jsonp.ts | 2 +- modules/@angular/http/src/backends/jsonp_backend.ts | 4 ++-- modules/@angular/http/src/backends/xhr_backend.ts | 2 +- .../platform-browser/src/browser/browser_adapter.ts | 4 ++-- .../src/browser/generic_browser_adapter.ts | 4 ++-- .../src/browser/location/browser_platform_location.ts | 2 +- .../@angular/platform-browser/src/browser/testability.ts | 4 ++-- .../platform-browser/src/browser/tools/common_tools.ts | 4 ++-- .../@angular/platform-browser/src/browser/tools/tools.ts | 2 +- modules/@angular/platform-browser/src/dom/debug/by.ts | 4 ++-- modules/@angular/platform-browser/src/dom/dom_adapter.ts | 2 +- .../@angular/platform-browser/src/dom/dom_renderer.ts | 6 +++--- .../platform-browser/src/dom/events/event_manager.ts | 4 ++-- .../platform-browser/src/dom/events/hammer_common.ts | 2 +- .../platform-browser/src/dom/events/hammer_gestures.ts | 4 ++-- .../platform-browser/src/dom/events/key_events.ts | 4 ++-- .../platform-browser/src/dom/shared_styles_host.ts | 2 +- modules/@angular/platform-browser/src/dom/util.ts | 2 +- .../platform-browser/src/security/html_sanitizer.ts | 2 +- .../platform-browser/src/security/style_sanitizer.ts | 2 +- .../platform-browser/src/security/url_sanitizer.ts | 2 +- .../src/web_workers/shared/client_message_broker.ts | 6 +++--- .../src/web_workers/shared/message_bus.ts | 2 +- .../src/web_workers/shared/post_message_bus.ts | 6 +++--- .../src/web_workers/shared/serializer.ts | 6 +++--- .../src/web_workers/shared/service_message_broker.ts | 6 +++--- .../src/web_workers/ui/event_dispatcher.ts | 4 ++-- .../src/web_workers/ui/event_serializer.ts | 4 ++-- .../src/web_workers/ui/platform_location.ts | 4 ++-- .../src/web_workers/worker/platform_location.ts | 8 ++++---- .../platform-browser/src/web_workers/worker/renderer.ts | 6 +++--- .../src/web_workers/worker/worker_adapter.ts | 2 +- modules/@angular/platform-browser/src/xhr/xhr_cache.ts | 6 +++--- modules/@angular/platform-browser/src/xhr/xhr_impl.ts | 4 ++-- .../router-deprecated/src/directives/router_link.ts | 2 +- .../router-deprecated/src/directives/router_outlet.ts | 6 +++--- .../src/route_config/route_config_impl.ts | 2 +- .../src/route_config/route_config_normalizer.ts | 4 ++-- .../src/rules/route_handlers/async_route_handler.ts | 2 +- .../src/rules/route_handlers/route_handler.ts | 2 +- .../src/rules/route_handlers/sync_route_handler.ts | 4 ++-- .../src/rules/route_paths/param_route_path.ts | 6 +++--- .../src/rules/route_paths/regex_route_path.ts | 2 +- modules/@angular/router-deprecated/src/rules/rule_set.ts | 8 ++++---- modules/@angular/router-deprecated/src/rules/rules.ts | 8 ++++---- 154 files changed, 291 insertions(+), 294 deletions(-) diff --git a/modules/@angular/common/src/directives/core_directives.ts b/modules/@angular/common/src/directives/core_directives.ts index 3e680937c2..cae92097b8 100644 --- a/modules/@angular/common/src/directives/core_directives.ts +++ b/modules/@angular/common/src/directives/core_directives.ts @@ -1,4 +1,4 @@ -import {Type} from '../../src/facade/lang'; +import {Type} from '../facade/lang'; import {NgClass} from './ng_class'; import {NgFor} from './ng_for'; import {NgIf} from './ng_if'; diff --git a/modules/@angular/common/src/directives/ng_class.ts b/modules/@angular/common/src/directives/ng_class.ts index 29c9b9f1c0..7f546bb24c 100644 --- a/modules/@angular/common/src/directives/ng_class.ts +++ b/modules/@angular/common/src/directives/ng_class.ts @@ -11,8 +11,8 @@ import { CollectionChangeRecord, KeyValueChangeRecord } from '@angular/core'; -import {isPresent, isString, isArray} from '../../src/facade/lang'; -import {StringMapWrapper, isListLikeIterable} from '../../src/facade/collection'; +import {isPresent, isString, isArray} from '../facade/lang'; +import {StringMapWrapper, isListLikeIterable} from '../facade/collection'; /** * The `NgClass` directive conditionally adds and removes CSS classes on an HTML element based on diff --git a/modules/@angular/common/src/directives/ng_for.ts b/modules/@angular/common/src/directives/ng_for.ts index 221172f7ed..860f767a0a 100644 --- a/modules/@angular/common/src/directives/ng_for.ts +++ b/modules/@angular/common/src/directives/ng_for.ts @@ -11,8 +11,8 @@ import { DefaultIterableDiffer, CollectionChangeRecord } from '@angular/core'; -import {isPresent, isBlank, getTypeNameForDebugging} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent, isBlank, getTypeNameForDebugging} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; export class NgForRow { constructor(public $implicit: any, public index: number, public count: number) {} diff --git a/modules/@angular/common/src/directives/ng_if.ts b/modules/@angular/common/src/directives/ng_if.ts index 1037c55c9f..27cc9f7339 100644 --- a/modules/@angular/common/src/directives/ng_if.ts +++ b/modules/@angular/common/src/directives/ng_if.ts @@ -1,5 +1,5 @@ import {Directive, ViewContainerRef, TemplateRef} from '@angular/core'; -import {isBlank} from '../../src/facade/lang'; +import {isBlank} from '../facade/lang'; /** * Removes or recreates a portion of the DOM tree based on an {expression}. diff --git a/modules/@angular/common/src/directives/ng_plural.ts b/modules/@angular/common/src/directives/ng_plural.ts index 60def2bbd5..4d1bbb9816 100644 --- a/modules/@angular/common/src/directives/ng_plural.ts +++ b/modules/@angular/common/src/directives/ng_plural.ts @@ -8,8 +8,8 @@ import { AfterContentInit, Input } from '@angular/core'; -import {isPresent, NumberWrapper} from '../../src/facade/lang'; -import {Map} from '../../src/facade/collection'; +import {isPresent, NumberWrapper} from '../facade/lang'; +import {Map} from '../facade/collection'; import {SwitchView} from './ng_switch'; diff --git a/modules/@angular/common/src/directives/ng_style.ts b/modules/@angular/common/src/directives/ng_style.ts index 07043989b2..b920173d0e 100644 --- a/modules/@angular/common/src/directives/ng_style.ts +++ b/modules/@angular/common/src/directives/ng_style.ts @@ -7,7 +7,7 @@ import { Directive, Renderer } from '@angular/core'; -import {isPresent, isBlank} from '../../src/facade/lang'; +import {isPresent, isBlank} from '../facade/lang'; /** * The `NgStyle` directive changes styles based on a result of expression evaluation. diff --git a/modules/@angular/common/src/directives/ng_switch.ts b/modules/@angular/common/src/directives/ng_switch.ts index 5ac0c6c17d..f822f3d124 100644 --- a/modules/@angular/common/src/directives/ng_switch.ts +++ b/modules/@angular/common/src/directives/ng_switch.ts @@ -1,6 +1,6 @@ import {Directive, Host, ViewContainerRef, TemplateRef} from '@angular/core'; -import {isPresent, isBlank, normalizeBlank} from '../../src/facade/lang'; -import {ListWrapper, Map} from '../../src/facade/collection'; +import {isPresent, isBlank, normalizeBlank} from '../facade/lang'; +import {ListWrapper, Map} from '../facade/collection'; const _WHEN_DEFAULT = /*@ts2dart_const*/ new Object(); diff --git a/modules/@angular/common/src/directives/ng_template_outlet.ts b/modules/@angular/common/src/directives/ng_template_outlet.ts index 8cb31e93a6..7135ec3661 100644 --- a/modules/@angular/common/src/directives/ng_template_outlet.ts +++ b/modules/@angular/common/src/directives/ng_template_outlet.ts @@ -1,5 +1,5 @@ import {Directive, Input, ViewContainerRef, ViewRef, TemplateRef} from '@angular/core'; -import {isPresent} from '../../src/facade/lang'; +import {isPresent} from '../facade/lang'; /** * Creates and inserts an embedded view based on a prepared `TemplateRef`. diff --git a/modules/@angular/common/src/forms/directives/abstract_control_directive.ts b/modules/@angular/common/src/forms/directives/abstract_control_directive.ts index a5ffab45c7..584d1cb976 100644 --- a/modules/@angular/common/src/forms/directives/abstract_control_directive.ts +++ b/modules/@angular/common/src/forms/directives/abstract_control_directive.ts @@ -1,6 +1,6 @@ import {AbstractControl} from '../model'; -import {isPresent} from '../../../src/facade/lang'; -import {unimplemented} from '../../../src/facade/exceptions'; +import {isPresent} from '../../facade/lang'; +import {unimplemented} from '../../facade/exceptions'; /** * Base class for control directives. diff --git a/modules/@angular/common/src/forms/directives/default_value_accessor.ts b/modules/@angular/common/src/forms/directives/default_value_accessor.ts index 4f0f000fa1..e8a962cc66 100644 --- a/modules/@angular/common/src/forms/directives/default_value_accessor.ts +++ b/modules/@angular/common/src/forms/directives/default_value_accessor.ts @@ -1,5 +1,5 @@ import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core'; -import {isBlank} from '../../../src/facade/lang'; +import {isBlank} from '../../facade/lang'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; export const DEFAULT_VALUE_ACCESSOR: any = /*@ts2dart_const*/ diff --git a/modules/@angular/common/src/forms/directives/ng_control.ts b/modules/@angular/common/src/forms/directives/ng_control.ts index ae9899d84a..f96af30570 100644 --- a/modules/@angular/common/src/forms/directives/ng_control.ts +++ b/modules/@angular/common/src/forms/directives/ng_control.ts @@ -1,4 +1,4 @@ -import {unimplemented} from '../../../src/facade/exceptions'; +import {unimplemented} from '../../facade/exceptions'; import {ControlValueAccessor} from './control_value_accessor'; import {AbstractControlDirective} from './abstract_control_directive'; diff --git a/modules/@angular/common/src/forms/directives/ng_control_name.ts b/modules/@angular/common/src/forms/directives/ng_control_name.ts index b9ac348057..019ac33b74 100644 --- a/modules/@angular/common/src/forms/directives/ng_control_name.ts +++ b/modules/@angular/common/src/forms/directives/ng_control_name.ts @@ -11,7 +11,7 @@ import { Self } from '@angular/core'; -import {EventEmitter, ObservableWrapper} from '../../../src/facade/async'; +import {EventEmitter, ObservableWrapper} from '../../facade/async'; import {ControlContainer} from './control_container'; import {NgControl} from './ng_control'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor'; diff --git a/modules/@angular/common/src/forms/directives/ng_control_status.ts b/modules/@angular/common/src/forms/directives/ng_control_status.ts index 0bd917cb38..5f29cc6adb 100644 --- a/modules/@angular/common/src/forms/directives/ng_control_status.ts +++ b/modules/@angular/common/src/forms/directives/ng_control_status.ts @@ -1,6 +1,6 @@ import {Directive, Self} from '@angular/core'; import {NgControl} from './ng_control'; -import {isPresent} from '../../../src/facade/lang'; +import {isPresent} from '../../facade/lang'; /** * Directive automatically applied to Angular forms that sets CSS classes diff --git a/modules/@angular/common/src/forms/directives/ng_form.ts b/modules/@angular/common/src/forms/directives/ng_form.ts index d72ad5b5cf..da64f7f558 100644 --- a/modules/@angular/common/src/forms/directives/ng_form.ts +++ b/modules/@angular/common/src/forms/directives/ng_form.ts @@ -3,9 +3,9 @@ import { PromiseWrapper, ObservableWrapper, EventEmitter -} from '../../../src/facade/async'; -import {ListWrapper} from '../../../src/facade/collection'; -import {isPresent} from '../../../src/facade/lang'; +} from '../../facade/async'; +import {ListWrapper} from '../../facade/collection'; +import {isPresent} from '../../facade/lang'; import {NgControl} from './ng_control'; import {Form} from './form_interface'; import {NgControlGroup} from './ng_control_group'; diff --git a/modules/@angular/common/src/forms/directives/ng_form_control.ts b/modules/@angular/common/src/forms/directives/ng_form_control.ts index a7620fa106..17b9885079 100644 --- a/modules/@angular/common/src/forms/directives/ng_form_control.ts +++ b/modules/@angular/common/src/forms/directives/ng_form_control.ts @@ -8,8 +8,8 @@ import { Self } from '@angular/core'; -import {StringMapWrapper} from '../../../src/facade/collection'; -import {EventEmitter, ObservableWrapper} from '../../../src/facade/async'; +import {StringMapWrapper} from '../../facade/collection'; +import {EventEmitter, ObservableWrapper} from '../../facade/async'; import {NgControl} from './ng_control'; import {Control} from '../model'; diff --git a/modules/@angular/common/src/forms/directives/ng_form_model.ts b/modules/@angular/common/src/forms/directives/ng_form_model.ts index 6ea56ab801..9b68180830 100644 --- a/modules/@angular/common/src/forms/directives/ng_form_model.ts +++ b/modules/@angular/common/src/forms/directives/ng_form_model.ts @@ -7,10 +7,10 @@ import { Optional, Self } from '@angular/core'; -import {isBlank} from '../../../src/facade/lang'; -import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection'; -import {BaseException} from '../../../src/facade/exceptions'; -import {ObservableWrapper, EventEmitter} from '../../../src/facade/async'; +import {isBlank} from '../../facade/lang'; +import {ListWrapper, StringMapWrapper} from '../../facade/collection'; +import {BaseException} from '../../facade/exceptions'; +import {ObservableWrapper, EventEmitter} from '../../facade/async'; import {NgControl} from './ng_control'; import {NgControlGroup} from './ng_control_group'; import {ControlContainer} from './control_container'; diff --git a/modules/@angular/common/src/forms/directives/ng_model.ts b/modules/@angular/common/src/forms/directives/ng_model.ts index fae8b177c9..ae84f28871 100644 --- a/modules/@angular/common/src/forms/directives/ng_model.ts +++ b/modules/@angular/common/src/forms/directives/ng_model.ts @@ -7,7 +7,7 @@ import { Optional, Self } from '@angular/core'; -import {EventEmitter, ObservableWrapper} from '../../../src/facade/async'; +import {EventEmitter, ObservableWrapper} from '../../facade/async'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor'; import {NgControl} from './ng_control'; import {Control} from '../model'; diff --git a/modules/@angular/common/src/forms/directives/number_value_accessor.ts b/modules/@angular/common/src/forms/directives/number_value_accessor.ts index dd9aa40753..ca84ed50af 100644 --- a/modules/@angular/common/src/forms/directives/number_value_accessor.ts +++ b/modules/@angular/common/src/forms/directives/number_value_accessor.ts @@ -1,5 +1,5 @@ import {Directive, ElementRef, Renderer, forwardRef} from '@angular/core'; -import {NumberWrapper} from '../../../src/facade/lang'; +import {NumberWrapper} from '../../facade/lang'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; export const NUMBER_VALUE_ACCESSOR: any = /*@ts2dart_const*/ /*@ts2dart_Provider*/ { diff --git a/modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts b/modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts index 9a1a9d36ea..f87656f195 100644 --- a/modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts +++ b/modules/@angular/common/src/forms/directives/radio_control_value_accessor.ts @@ -9,8 +9,8 @@ import { Injector, Injectable } from '@angular/core'; -import {isPresent} from '../../../src/facade/lang'; -import {ListWrapper} from '../../../src/facade/collection'; +import {isPresent} from '../../facade/lang'; +import {ListWrapper} from '../../facade/collection'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; import {NgControl} from './ng_control'; diff --git a/modules/@angular/common/src/forms/directives/select_control_value_accessor.ts b/modules/@angular/common/src/forms/directives/select_control_value_accessor.ts index 3212fec1e5..4ba6d0061b 100644 --- a/modules/@angular/common/src/forms/directives/select_control_value_accessor.ts +++ b/modules/@angular/common/src/forms/directives/select_control_value_accessor.ts @@ -14,8 +14,8 @@ import { isPresent, isBlank, looseIdentical -} from '../../../src/facade/lang'; -import {MapWrapper} from '../../../src/facade/collection'; +} from '../../facade/lang'; +import {MapWrapper} from '../../facade/collection'; import {NG_VALUE_ACCESSOR, ControlValueAccessor} from './control_value_accessor'; diff --git a/modules/@angular/common/src/forms/directives/select_multiple_control_value_accessor.ts b/modules/@angular/common/src/forms/directives/select_multiple_control_value_accessor.ts index 7228f001a2..83d3fde761 100644 --- a/modules/@angular/common/src/forms/directives/select_multiple_control_value_accessor.ts +++ b/modules/@angular/common/src/forms/directives/select_multiple_control_value_accessor.ts @@ -16,9 +16,9 @@ import { isPresent, looseIdentical, isString -} from '../../../src/facade/lang'; +} from '../../facade/lang'; import {ControlValueAccessor, NG_VALUE_ACCESSOR} from './control_value_accessor'; -import {MapWrapper} from '../../../src/facade/collection'; +import {MapWrapper} from '../../facade/collection'; const SELECT_MULTIPLE_VALUE_ACCESSOR = { provide: NG_VALUE_ACCESSOR, diff --git a/modules/@angular/common/src/forms/directives/shared.ts b/modules/@angular/common/src/forms/directives/shared.ts index 6af4c48a01..8baceaf856 100644 --- a/modules/@angular/common/src/forms/directives/shared.ts +++ b/modules/@angular/common/src/forms/directives/shared.ts @@ -1,6 +1,6 @@ -import {ListWrapper, StringMapWrapper} from '../../../src/facade/collection'; -import {isBlank, isPresent, looseIdentical, hasConstructor} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; +import {ListWrapper, StringMapWrapper} from '../../facade/collection'; +import {isBlank, isPresent, looseIdentical, hasConstructor} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; import {ControlContainer} from './control_container'; import {NgControl} from './ng_control'; diff --git a/modules/@angular/common/src/forms/form_builder.ts b/modules/@angular/common/src/forms/form_builder.ts index e7f147e697..b388606c76 100644 --- a/modules/@angular/common/src/forms/form_builder.ts +++ b/modules/@angular/common/src/forms/form_builder.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; -import {StringMapWrapper} from '../../src/facade/collection'; -import {isPresent, isArray} from '../../src/facade/lang'; +import {StringMapWrapper} from '../facade/collection'; +import {isPresent, isArray} from '../facade/lang'; import * as modelModule from './model'; import {ValidatorFn, AsyncValidatorFn} from './directives/validators'; diff --git a/modules/@angular/common/src/forms/model.ts b/modules/@angular/common/src/forms/model.ts index b4df59bc1f..4efa0d5eb8 100644 --- a/modules/@angular/common/src/forms/model.ts +++ b/modules/@angular/common/src/forms/model.ts @@ -1,7 +1,7 @@ -import {isPresent, isBlank, normalizeBool} from '../../src/facade/lang'; -import {Observable, EventEmitter, ObservableWrapper} from '../../src/facade/async'; -import {PromiseWrapper} from '../../src/facade/promise'; -import {StringMapWrapper, ListWrapper} from '../../src/facade/collection'; +import {isPresent, isBlank, normalizeBool} from '../facade/lang'; +import {Observable, EventEmitter, ObservableWrapper} from '../facade/async'; +import {PromiseWrapper} from '../facade/promise'; +import {StringMapWrapper, ListWrapper} from '../facade/collection'; import {ValidatorFn, AsyncValidatorFn} from './directives/validators'; /** diff --git a/modules/@angular/common/src/forms/validators.ts b/modules/@angular/common/src/forms/validators.ts index 8976fd0aff..0be2d8a321 100644 --- a/modules/@angular/common/src/forms/validators.ts +++ b/modules/@angular/common/src/forms/validators.ts @@ -1,8 +1,8 @@ import {OpaqueToken} from '@angular/core'; -import {isBlank, isPresent, isString} from '../../src/facade/lang'; -import {PromiseWrapper} from '../../src/facade/promise'; -import {ObservableWrapper} from '../../src/facade/async'; -import {StringMapWrapper} from '../../src/facade/collection'; +import {isBlank, isPresent, isString} from '../facade/lang'; +import {PromiseWrapper} from '../facade/promise'; +import {ObservableWrapper} from '../facade/async'; +import {StringMapWrapper} from '../facade/collection'; import * as modelModule from './model'; import {ValidatorFn, AsyncValidatorFn} from './directives/validators'; diff --git a/modules/@angular/common/src/location/hash_location_strategy.ts b/modules/@angular/common/src/location/hash_location_strategy.ts index 741688f3ba..8eb35f2c93 100644 --- a/modules/@angular/common/src/location/hash_location_strategy.ts +++ b/modules/@angular/common/src/location/hash_location_strategy.ts @@ -1,5 +1,5 @@ import {Injectable, Inject, Optional} from '@angular/core'; -import {isPresent} from '../../src/facade/lang'; +import {isPresent} from '../facade/lang'; import {LocationStrategy, APP_BASE_HREF} from './location_strategy'; import {Location} from './location'; diff --git a/modules/@angular/common/src/location/location.ts b/modules/@angular/common/src/location/location.ts index 05156be179..52e653ce8f 100644 --- a/modules/@angular/common/src/location/location.ts +++ b/modules/@angular/common/src/location/location.ts @@ -1,5 +1,5 @@ import {Injectable, EventEmitter} from '@angular/core'; -import {ObservableWrapper} from '../../src/facade/async'; +import {ObservableWrapper} from '../facade/async'; import {LocationStrategy} from './location_strategy'; diff --git a/modules/@angular/common/src/location/path_location_strategy.ts b/modules/@angular/common/src/location/path_location_strategy.ts index 1763eb9a75..678393dbe1 100644 --- a/modules/@angular/common/src/location/path_location_strategy.ts +++ b/modules/@angular/common/src/location/path_location_strategy.ts @@ -1,6 +1,6 @@ import {Injectable, Inject, Optional} from '@angular/core'; -import {isBlank} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isBlank} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {PlatformLocation, UrlChangeListener} from './platform_location'; import {LocationStrategy, APP_BASE_HREF} from './location_strategy'; diff --git a/modules/@angular/common/src/pipes/async_pipe.ts b/modules/@angular/common/src/pipes/async_pipe.ts index 88f76ced6b..62307ca8fc 100644 --- a/modules/@angular/common/src/pipes/async_pipe.ts +++ b/modules/@angular/common/src/pipes/async_pipe.ts @@ -1,7 +1,7 @@ import {Pipe, Injectable, ChangeDetectorRef, OnDestroy, WrappedValue} from '@angular/core'; -import {isBlank, isPresent, isPromise} from '../../src/facade/lang'; -import {ObservableWrapper, Observable, EventEmitter} from '../../src/facade/async'; +import {isBlank, isPresent, isPromise} from '../facade/lang'; +import {ObservableWrapper, Observable, EventEmitter} from '../facade/async'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; diff --git a/modules/@angular/common/src/pipes/date_pipe.ts b/modules/@angular/common/src/pipes/date_pipe.ts index dddddeaec8..b2d6dacb8c 100644 --- a/modules/@angular/common/src/pipes/date_pipe.ts +++ b/modules/@angular/common/src/pipes/date_pipe.ts @@ -5,9 +5,9 @@ import { isString, DateWrapper, isBlank, -} from '../../src/facade/lang'; -import {DateFormatter} from '../../src/facade/intl'; -import {StringMapWrapper} from '../../src/facade/collection'; +} from '../facade/lang'; +import {DateFormatter} from '../facade/intl'; +import {StringMapWrapper} from '../facade/collection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; diff --git a/modules/@angular/common/src/pipes/i18n_plural_pipe.ts b/modules/@angular/common/src/pipes/i18n_plural_pipe.ts index 8e04e6af4b..83049a28ec 100644 --- a/modules/@angular/common/src/pipes/i18n_plural_pipe.ts +++ b/modules/@angular/common/src/pipes/i18n_plural_pipe.ts @@ -1,5 +1,5 @@ import {PipeTransform, Pipe} from '@angular/core'; -import {isStringMap, StringWrapper, isPresent, RegExpWrapper} from '../../src/facade/lang'; +import {isStringMap, StringWrapper, isPresent, RegExpWrapper} from '../facade/lang'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; var interpolationExp: RegExp = RegExpWrapper.create('#'); diff --git a/modules/@angular/common/src/pipes/i18n_select_pipe.ts b/modules/@angular/common/src/pipes/i18n_select_pipe.ts index 87859222bc..6c7f498eb8 100644 --- a/modules/@angular/common/src/pipes/i18n_select_pipe.ts +++ b/modules/@angular/common/src/pipes/i18n_select_pipe.ts @@ -1,6 +1,6 @@ import {PipeTransform, Pipe} from '@angular/core'; -import {isStringMap} from '../../src/facade/lang'; -import {StringMapWrapper} from '../../src/facade/collection'; +import {isStringMap} from '../facade/lang'; +import {StringMapWrapper} from '../facade/collection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; /** diff --git a/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts b/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts index 5271a84eaf..f4bcfcfb93 100644 --- a/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts +++ b/modules/@angular/common/src/pipes/invalid_pipe_argument_exception.ts @@ -1,5 +1,5 @@ -import {Type, stringify} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {Type, stringify} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; export class InvalidPipeArgumentException extends BaseException { constructor(type: Type, value: Object) { diff --git a/modules/@angular/common/src/pipes/json_pipe.ts b/modules/@angular/common/src/pipes/json_pipe.ts index c219a008d4..8eefa4715f 100644 --- a/modules/@angular/common/src/pipes/json_pipe.ts +++ b/modules/@angular/common/src/pipes/json_pipe.ts @@ -1,5 +1,5 @@ import {PipeTransform, Pipe} from '@angular/core'; -import {Json} from '../../src/facade/lang'; +import {Json} from '../facade/lang'; /** diff --git a/modules/@angular/common/src/pipes/lowercase_pipe.ts b/modules/@angular/common/src/pipes/lowercase_pipe.ts index 01b230d05c..300cf99d79 100644 --- a/modules/@angular/common/src/pipes/lowercase_pipe.ts +++ b/modules/@angular/common/src/pipes/lowercase_pipe.ts @@ -1,5 +1,5 @@ import {PipeTransform, Pipe} from '@angular/core'; -import {isString, isBlank} from '../../src/facade/lang'; +import {isString, isBlank} from '../facade/lang'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; /** diff --git a/modules/@angular/common/src/pipes/number_pipe.ts b/modules/@angular/common/src/pipes/number_pipe.ts index b06c39eb59..b243543b51 100644 --- a/modules/@angular/common/src/pipes/number_pipe.ts +++ b/modules/@angular/common/src/pipes/number_pipe.ts @@ -7,9 +7,10 @@ import { NumberWrapper, RegExpWrapper, Type -} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; -import {NumberFormatter, NumberFormatStyle} from '../../src/facade/intl'; +} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {NumberFormatter, NumberFormatStyle} from '../facade/intl'; + import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; var defaultLocale: string = 'en-US'; diff --git a/modules/@angular/common/src/pipes/replace_pipe.ts b/modules/@angular/common/src/pipes/replace_pipe.ts index 9f2f58f62b..5fbcf12a5c 100644 --- a/modules/@angular/common/src/pipes/replace_pipe.ts +++ b/modules/@angular/common/src/pipes/replace_pipe.ts @@ -7,7 +7,7 @@ import { isFunction, RegExpWrapper, StringWrapper -} from '../../src/facade/lang'; +} from '../facade/lang'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; diff --git a/modules/@angular/common/src/pipes/slice_pipe.ts b/modules/@angular/common/src/pipes/slice_pipe.ts index fbd258cf61..b03b269d89 100644 --- a/modules/@angular/common/src/pipes/slice_pipe.ts +++ b/modules/@angular/common/src/pipes/slice_pipe.ts @@ -1,7 +1,6 @@ import {PipeTransform, Pipe} from '@angular/core'; - -import {isBlank, isString, isArray, StringWrapper} from '../../src/facade/lang'; -import {ListWrapper} from '../../src/facade/collection'; +import {isBlank, isString, isArray, StringWrapper} from '../facade/lang'; +import {ListWrapper} from '../facade/collection'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; diff --git a/modules/@angular/common/src/pipes/uppercase_pipe.ts b/modules/@angular/common/src/pipes/uppercase_pipe.ts index 7679354d98..0dfc883c1a 100644 --- a/modules/@angular/common/src/pipes/uppercase_pipe.ts +++ b/modules/@angular/common/src/pipes/uppercase_pipe.ts @@ -1,5 +1,5 @@ import {PipeTransform, Pipe} from '@angular/core'; -import {isString, isBlank} from '../../src/facade/lang'; +import {isString, isBlank} from '../facade/lang'; import {InvalidPipeArgumentException} from './invalid_pipe_argument_exception'; /** diff --git a/modules/@angular/compiler/src/compiler.ts b/modules/@angular/compiler/src/compiler.ts index 24580037ae..4ecc135387 100644 --- a/modules/@angular/compiler/src/compiler.ts +++ b/modules/@angular/compiler/src/compiler.ts @@ -1,5 +1,5 @@ import {ComponentResolver, Type} from '@angular/core'; -import {assertionsEnabled} from '../src/facade/lang'; +import {assertionsEnabled} from './facade/lang'; export * from './template_ast'; export {TEMPLATE_TRANSFORMS} from './template_parser'; diff --git a/modules/@angular/compiler/src/css/lexer.ts b/modules/@angular/compiler/src/css/lexer.ts index 34c4554cbf..eca9cbde16 100644 --- a/modules/@angular/compiler/src/css/lexer.ts +++ b/modules/@angular/compiler/src/css/lexer.ts @@ -1,5 +1,5 @@ -import {NumberWrapper, StringWrapper, isPresent, resolveEnumToken} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {NumberWrapper, StringWrapper, isPresent, resolveEnumToken} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import { isWhitespace, diff --git a/modules/@angular/compiler/src/css/parser.ts b/modules/@angular/compiler/src/css/parser.ts index 7e9f620572..eff65cbe2c 100644 --- a/modules/@angular/compiler/src/css/parser.ts +++ b/modules/@angular/compiler/src/css/parser.ts @@ -11,7 +11,7 @@ import { NumberWrapper, StringWrapper, isPresent -} from '../../src/facade/lang'; +} from '../facade/lang'; import { CssLexerMode, diff --git a/modules/@angular/compiler/src/expression_parser/ast.ts b/modules/@angular/compiler/src/expression_parser/ast.ts index ea91530914..445e9edfbc 100644 --- a/modules/@angular/compiler/src/expression_parser/ast.ts +++ b/modules/@angular/compiler/src/expression_parser/ast.ts @@ -1,4 +1,4 @@ -import {ListWrapper} from '../../src/facade/collection'; +import {ListWrapper} from '../facade/collection'; export class AST { visit(visitor: AstVisitor, context: any = null): any { return null; } diff --git a/modules/@angular/compiler/src/expression_parser/lexer.ts b/modules/@angular/compiler/src/expression_parser/lexer.ts index ca0e1fe018..b6578f05a6 100644 --- a/modules/@angular/compiler/src/expression_parser/lexer.ts +++ b/modules/@angular/compiler/src/expression_parser/lexer.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; -import {SetWrapper} from '../../src/facade/collection'; -import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {SetWrapper} from '../facade/collection'; +import {NumberWrapper, StringJoiner, StringWrapper, isPresent} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; export enum TokenType { Character, diff --git a/modules/@angular/compiler/src/expression_parser/parser.ts b/modules/@angular/compiler/src/expression_parser/parser.ts index 349b0642a7..cce424c7b4 100644 --- a/modules/@angular/compiler/src/expression_parser/parser.ts +++ b/modules/@angular/compiler/src/expression_parser/parser.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; -import {isBlank, isPresent, StringWrapper} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; -import {ListWrapper} from '../../src/facade/collection'; +import {isBlank, isPresent, StringWrapper} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {ListWrapper} from '../facade/collection'; import { Lexer, EOF, diff --git a/modules/@angular/compiler/src/i18n/expander.ts b/modules/@angular/compiler/src/i18n/expander.ts index a833a810d0..af9692efdd 100644 --- a/modules/@angular/compiler/src/i18n/expander.ts +++ b/modules/@angular/compiler/src/i18n/expander.ts @@ -10,7 +10,7 @@ import { htmlVisitAll } from '../html_ast'; -import {BaseException} from '../../src/facade/exceptions'; +import {BaseException} from '../facade/exceptions'; /** diff --git a/modules/@angular/compiler/src/i18n/message.ts b/modules/@angular/compiler/src/i18n/message.ts index d5d6a602ed..3c77a818f1 100644 --- a/modules/@angular/compiler/src/i18n/message.ts +++ b/modules/@angular/compiler/src/i18n/message.ts @@ -1,4 +1,4 @@ -import {isPresent, escape} from '../../src/facade/lang'; +import {isPresent, escape} from '../facade/lang'; /** * A message extracted from a template. diff --git a/modules/@angular/compiler/src/i18n/shared.ts b/modules/@angular/compiler/src/i18n/shared.ts index c0ae76acf4..7418543896 100644 --- a/modules/@angular/compiler/src/i18n/shared.ts +++ b/modules/@angular/compiler/src/i18n/shared.ts @@ -10,7 +10,7 @@ import { HtmlExpansionCaseAst, htmlVisitAll } from '../html_ast'; -import {isPresent, isBlank, StringWrapper} from '../../src/facade/lang'; +import {isPresent, isBlank, StringWrapper} from '../facade/lang'; import {Message} from './message'; import {Parser} from '../expression_parser/parser'; diff --git a/modules/@angular/compiler/src/i18n/xmb_serializer.ts b/modules/@angular/compiler/src/i18n/xmb_serializer.ts index 249d65b988..351751de73 100644 --- a/modules/@angular/compiler/src/i18n/xmb_serializer.ts +++ b/modules/@angular/compiler/src/i18n/xmb_serializer.ts @@ -1,4 +1,4 @@ -import {isPresent, isBlank, RegExpWrapper} from '../../src/facade/lang'; +import {isPresent, isBlank, RegExpWrapper} from '../facade/lang'; import {HtmlAst, HtmlElementAst} from '../html_ast'; import {Message, id} from './message'; import {HtmlParser} from '../html_parser'; diff --git a/modules/@angular/compiler/src/offline_compiler.ts b/modules/@angular/compiler/src/offline_compiler.ts index 61639cd0ee..e6218de861 100644 --- a/modules/@angular/compiler/src/offline_compiler.ts +++ b/modules/@angular/compiler/src/offline_compiler.ts @@ -7,8 +7,8 @@ import { createHostComponentMeta } from './compile_metadata'; -import {BaseException} from '../src/facade/exceptions'; -import {ListWrapper} from '../src/facade/collection'; +import {BaseException} from './facade/exceptions'; +import {ListWrapper} from './facade/collection'; import {StyleCompiler, StylesCompileResult} from './style_compiler'; import {ViewCompiler, ViewCompileResult} from './view_compiler/view_compiler'; import {TemplateParser} from './template_parser'; @@ -17,10 +17,7 @@ import {OutputEmitter} from './output/abstract_emitter'; import * as o from './output/output_ast'; import {XHR} from './xhr'; -import { - MODULE_SUFFIX, - assetUrl, -} from './util'; +import {assetUrl} from './util'; var _COMPONENT_FACTORY_IDENTIFIER = new CompileIdentifierMetadata({ name: 'ComponentFactory', diff --git a/modules/@angular/compiler/src/output/abstract_emitter.ts b/modules/@angular/compiler/src/output/abstract_emitter.ts index 56453cddbe..41d82add9a 100644 --- a/modules/@angular/compiler/src/output/abstract_emitter.ts +++ b/modules/@angular/compiler/src/output/abstract_emitter.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, isString, StringWrapper} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent, isBlank, isString, StringWrapper} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import * as o from './output_ast'; var _SINGLE_QUOTE_ESCAPE_STRING_RE = /'|\\|\n|\r|\$/g; diff --git a/modules/@angular/compiler/src/output/abstract_js_emitter.ts b/modules/@angular/compiler/src/output/abstract_js_emitter.ts index 99464c7163..7b52117b5e 100644 --- a/modules/@angular/compiler/src/output/abstract_js_emitter.ts +++ b/modules/@angular/compiler/src/output/abstract_js_emitter.ts @@ -1,5 +1,5 @@ -import {isPresent} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import * as o from './output_ast'; import { EmitterVisitorContext, diff --git a/modules/@angular/compiler/src/output/dart_emitter.ts b/modules/@angular/compiler/src/output/dart_emitter.ts index a98dffe2dd..1fa41ea759 100644 --- a/modules/@angular/compiler/src/output/dart_emitter.ts +++ b/modules/@angular/compiler/src/output/dart_emitter.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank, isArray} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent, isBlank, isArray} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {CompileIdentifierMetadata} from '../compile_metadata'; import * as o from './output_ast'; import { diff --git a/modules/@angular/compiler/src/output/dart_imports.ts b/modules/@angular/compiler/src/output/dart_imports.ts index 4981a1a003..3b51bd42f0 100644 --- a/modules/@angular/compiler/src/output/dart_imports.ts +++ b/modules/@angular/compiler/src/output/dart_imports.ts @@ -1,5 +1,5 @@ -import {BaseException} from '../../src/facade/exceptions'; -import {isPresent, isBlank, RegExpWrapper, Math} from '../../src/facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {isPresent, isBlank, RegExpWrapper, Math} from '../facade/lang'; import {Injectable} from '@angular/core'; import {AssetUrl, ImportGenerator} from './path_util'; diff --git a/modules/@angular/compiler/src/output/interpretive_view.ts b/modules/@angular/compiler/src/output/interpretive_view.ts index 58b05d3ff0..48464d0eb6 100644 --- a/modules/@angular/compiler/src/output/interpretive_view.ts +++ b/modules/@angular/compiler/src/output/interpretive_view.ts @@ -1,7 +1,7 @@ import {AppElement, AppView, DebugAppView} from '../../core_private'; -import {isPresent} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {InstanceFactory, DynamicInstance} from './output_interpreter'; export class InterpretiveAppViewInstanceFactory implements InstanceFactory { diff --git a/modules/@angular/compiler/src/output/output_ast.ts b/modules/@angular/compiler/src/output/output_ast.ts index 21723fd0c1..c09e356d0b 100644 --- a/modules/@angular/compiler/src/output/output_ast.ts +++ b/modules/@angular/compiler/src/output/output_ast.ts @@ -1,4 +1,4 @@ -import {isString, isPresent, isBlank} from '../../src/facade/lang'; +import {isString, isPresent, isBlank} from '../facade/lang'; import {CompileIdentifierMetadata} from '../compile_metadata'; //// Types diff --git a/modules/@angular/compiler/src/output/output_interpreter.ts b/modules/@angular/compiler/src/output/output_interpreter.ts index 11aacd80cd..2c9fe8378b 100644 --- a/modules/@angular/compiler/src/output/output_interpreter.ts +++ b/modules/@angular/compiler/src/output/output_interpreter.ts @@ -1,8 +1,8 @@ import {reflector} from '../../core_private'; -import {isPresent, IS_DART, FunctionWrapper} from '../../src/facade/lang'; -import {ObservableWrapper} from '../../src/facade/async'; -import {BaseException, unimplemented} from '../../src/facade/exceptions'; -import {ListWrapper} from '../../src/facade/collection'; +import {isPresent, IS_DART, FunctionWrapper} from '../facade/lang'; +import {ObservableWrapper} from '../facade/async'; +import {BaseException, unimplemented} from '../facade/exceptions'; +import {ListWrapper} from '../facade/collection'; import * as o from './output_ast'; import {debugOutputAstAsDart} from './dart_emitter'; diff --git a/modules/@angular/compiler/src/output/output_jit.ts b/modules/@angular/compiler/src/output/output_jit.ts index 742b42c5d1..90a55a0f3c 100644 --- a/modules/@angular/compiler/src/output/output_jit.ts +++ b/modules/@angular/compiler/src/output/output_jit.ts @@ -1,7 +1,7 @@ import { isPresent, evalExpression, -} from '../../src/facade/lang'; +} from '../facade/lang'; import * as o from './output_ast'; import {EmitterVisitorContext} from './abstract_emitter'; import {AbstractJsEmitterVisitor} from './abstract_js_emitter'; diff --git a/modules/@angular/compiler/src/output/path_util.ts b/modules/@angular/compiler/src/output/path_util.ts index 9f4fd031ed..57a51062b0 100644 --- a/modules/@angular/compiler/src/output/path_util.ts +++ b/modules/@angular/compiler/src/output/path_util.ts @@ -1,5 +1,5 @@ -import {BaseException} from '../../src/facade/exceptions'; -import {isPresent, isBlank, RegExpWrapper, Math} from '../../src/facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {isPresent, isBlank, RegExpWrapper, Math} from '../facade/lang'; import {Injectable} from '@angular/core'; // asset:// diff --git a/modules/@angular/compiler/src/output/ts_emitter.ts b/modules/@angular/compiler/src/output/ts_emitter.ts index 3c1e6ea980..cfbc0f8616 100644 --- a/modules/@angular/compiler/src/output/ts_emitter.ts +++ b/modules/@angular/compiler/src/output/ts_emitter.ts @@ -1,6 +1,6 @@ import * as o from './output_ast'; -import {isPresent, isBlank, isArray} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent, isBlank, isArray} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {CompileIdentifierMetadata} from '../compile_metadata'; import { OutputEmitter, diff --git a/modules/@angular/compiler/src/view_compiler/compile_element.ts b/modules/@angular/compiler/src/view_compiler/compile_element.ts index d84bc2da09..a448f968f4 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_element.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_element.ts @@ -1,6 +1,6 @@ import {BaseException} from '@angular/core'; -import {isPresent, isBlank} from '../../src/facade/lang'; -import {ListWrapper, StringMapWrapper} from '../../src/facade/collection'; +import {isPresent, isBlank} from '../facade/lang'; +import {ListWrapper, StringMapWrapper} from '../facade/collection'; import * as o from '../output/output_ast'; import {Identifiers, identifierToken} from '../identifiers'; diff --git a/modules/@angular/compiler/src/view_compiler/compile_method.ts b/modules/@angular/compiler/src/view_compiler/compile_method.ts index de1c5642c8..9c21d57199 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_method.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_method.ts @@ -1,5 +1,5 @@ -import {isPresent} from '../../src/facade/lang'; -import {ListWrapper} from '../../src/facade/collection'; +import {isPresent} from '../facade/lang'; +import {ListWrapper} from '../facade/collection'; import * as o from '../output/output_ast'; import {TemplateAst} from '../template_ast'; diff --git a/modules/@angular/compiler/src/view_compiler/compile_query.ts b/modules/@angular/compiler/src/view_compiler/compile_query.ts index fca08f4d28..84fa9fe73d 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_query.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_query.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank} from '../../src/facade/lang'; -import {ListWrapper} from '../../src/facade/collection'; +import {isPresent, isBlank} from '../facade/lang'; +import {ListWrapper} from '../facade/collection'; import * as o from '../output/output_ast'; import {Identifiers} from '../identifiers'; diff --git a/modules/@angular/compiler/src/view_compiler/compile_view.ts b/modules/@angular/compiler/src/view_compiler/compile_view.ts index ac0dfb23a7..2694e4f6cd 100644 --- a/modules/@angular/compiler/src/view_compiler/compile_view.ts +++ b/modules/@angular/compiler/src/view_compiler/compile_view.ts @@ -1,7 +1,7 @@ import {ViewType} from '../../core_private'; -import {isPresent, isBlank} from '../../src/facade/lang'; -import {ListWrapper} from '../../src/facade/collection'; +import {isPresent, isBlank} from '../facade/lang'; +import {ListWrapper} from '../facade/collection'; import * as o from '../output/output_ast'; import {EventHandlerVars} from './constants'; diff --git a/modules/@angular/compiler/src/view_compiler/constants.ts b/modules/@angular/compiler/src/view_compiler/constants.ts index 5415ccc1db..cf66fb8b2f 100644 --- a/modules/@angular/compiler/src/view_compiler/constants.ts +++ b/modules/@angular/compiler/src/view_compiler/constants.ts @@ -1,7 +1,7 @@ import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core'; import {ChangeDetectorState, ViewType} from '../../core_private'; -import {isBlank, resolveEnumToken} from '../../src/facade/lang'; +import {isBlank, resolveEnumToken} from '../facade/lang'; import {CompileIdentifierMetadata} from '../compile_metadata'; import * as o from '../output/output_ast'; import {Identifiers} from '../identifiers'; diff --git a/modules/@angular/compiler/src/view_compiler/event_binder.ts b/modules/@angular/compiler/src/view_compiler/event_binder.ts index 8af6f040e5..b1791d46e6 100644 --- a/modules/@angular/compiler/src/view_compiler/event_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/event_binder.ts @@ -1,5 +1,5 @@ -import {isBlank, isPresent, StringWrapper} from '../../src/facade/lang'; -import {ListWrapper, StringMapWrapper} from '../../src/facade/collection'; +import {isBlank, isPresent, StringWrapper} from '../facade/lang'; +import {ListWrapper, StringMapWrapper} from '../facade/collection'; import {EventHandlerVars, ViewProperties} from './constants'; diff --git a/modules/@angular/compiler/src/view_compiler/expression_converter.ts b/modules/@angular/compiler/src/view_compiler/expression_converter.ts index ed34ccb62f..e310fea022 100644 --- a/modules/@angular/compiler/src/view_compiler/expression_converter.ts +++ b/modules/@angular/compiler/src/view_compiler/expression_converter.ts @@ -1,5 +1,5 @@ -import {BaseException} from '../../src/facade/exceptions'; -import {isBlank, isPresent, isArray} from '../../src/facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {isBlank, isPresent, isArray} from '../facade/lang'; import * as cdAst from '../expression_parser/ast'; import * as o from '../output/output_ast'; diff --git a/modules/@angular/compiler/src/view_compiler/property_binder.ts b/modules/@angular/compiler/src/view_compiler/property_binder.ts index 88f1800239..c3b0dd06fd 100644 --- a/modules/@angular/compiler/src/view_compiler/property_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/property_binder.ts @@ -1,6 +1,6 @@ import {EMPTY_STATE as EMPTY_ANIMATION_STATE, LifecycleHooks, isDefaultChangeDetectionStrategy, SecurityContext} from '../../core_private'; -import {isBlank, isPresent} from '../../src/facade/lang'; +import {isBlank, isPresent} from '../facade/lang'; import * as cdAst from '../expression_parser/ast'; import * as o from '../output/output_ast'; diff --git a/modules/@angular/compiler/src/view_compiler/util.ts b/modules/@angular/compiler/src/view_compiler/util.ts index 7bd73825a5..4f0834a776 100644 --- a/modules/@angular/compiler/src/view_compiler/util.ts +++ b/modules/@angular/compiler/src/view_compiler/util.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent, isBlank} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import * as o from '../output/output_ast'; import { diff --git a/modules/@angular/compiler/src/view_compiler/view_binder.ts b/modules/@angular/compiler/src/view_compiler/view_binder.ts index 1362dc39b9..e02fd062e1 100644 --- a/modules/@angular/compiler/src/view_compiler/view_binder.ts +++ b/modules/@angular/compiler/src/view_compiler/view_binder.ts @@ -1,6 +1,6 @@ import { ListWrapper, -} from '../../src/facade/collection'; +} from '../facade/collection'; import { TemplateAst, TemplateAstVisitor, diff --git a/modules/@angular/compiler/src/view_compiler/view_builder.ts b/modules/@angular/compiler/src/view_compiler/view_builder.ts index 983d281367..2cf024c72a 100644 --- a/modules/@angular/compiler/src/view_compiler/view_builder.ts +++ b/modules/@angular/compiler/src/view_compiler/view_builder.ts @@ -1,8 +1,8 @@ import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core'; import {isDefaultChangeDetectionStrategy, ViewType} from '../../core_private'; -import {isPresent, StringWrapper} from '../../src/facade/lang'; -import {ListWrapper, StringMapWrapper, SetWrapper} from '../../src/facade/collection'; +import {isPresent, StringWrapper} from '../facade/lang'; +import {ListWrapper, StringMapWrapper, SetWrapper} from '../facade/collection'; import * as o from '../output/output_ast'; import {Identifiers, identifierToken} from '../identifiers'; diff --git a/modules/@angular/core/src/change_detection/change_detection_util.ts b/modules/@angular/core/src/change_detection/change_detection_util.ts index f827d6a68b..33b5e7c54a 100644 --- a/modules/@angular/core/src/change_detection/change_detection_util.ts +++ b/modules/@angular/core/src/change_detection/change_detection_util.ts @@ -1,7 +1,7 @@ -import {looseIdentical, isPrimitive} from '../../src/facade/lang'; -import {isListLikeIterable, areIterablesEqual} from '../../src/facade/collection'; +import {looseIdentical, isPrimitive} from '../facade/lang'; +import {isListLikeIterable, areIterablesEqual} from '../facade/collection'; -export {looseIdentical} from '../../src/facade/lang'; +export {looseIdentical} from '../facade/lang'; export var uninitialized: Object = /*@ts2dart_const*/ new Object(); export function devModeEqual(a: any, b: any): boolean { diff --git a/modules/@angular/core/src/change_detection/constants.ts b/modules/@angular/core/src/change_detection/constants.ts index ea0ac9efa9..37c4ecb8c1 100644 --- a/modules/@angular/core/src/change_detection/constants.ts +++ b/modules/@angular/core/src/change_detection/constants.ts @@ -1,4 +1,4 @@ -import {isBlank} from '../../src/facade/lang'; +import {isBlank} from '../facade/lang'; /** * Describes the current state of the change detector. diff --git a/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts b/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts index cc0fc02f2f..b1d068fb8b 100644 --- a/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts +++ b/modules/@angular/core/src/change_detection/differs/default_iterable_differ.ts @@ -1,5 +1,5 @@ -import {BaseException} from '../../../src/facade/exceptions'; -import {isListLikeIterable, iterateListLike} from '../../../src/facade/collection'; +import {BaseException} from '../../facade/exceptions'; +import {isListLikeIterable, iterateListLike} from '../../facade/collection'; import { isBlank, @@ -8,7 +8,7 @@ import { getMapKey, looseIdentical, isArray -} from '../../../src/facade/lang'; +} from '../../facade/lang'; import {ChangeDetectorRef} from '../change_detector_ref'; import {IterableDiffer, IterableDifferFactory, TrackByFn} from './iterable_differs'; diff --git a/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts b/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts index 6ca8d454cb..bd8611a41e 100644 --- a/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts +++ b/modules/@angular/core/src/change_detection/differs/default_keyvalue_differ.ts @@ -1,6 +1,6 @@ -import {MapWrapper, StringMapWrapper} from '../../../src/facade/collection'; -import {stringify, looseIdentical, isJsObject, isBlank} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; +import {MapWrapper, StringMapWrapper} from '../../facade/collection'; +import {stringify, looseIdentical, isJsObject, isBlank} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; import {ChangeDetectorRef} from '../change_detector_ref'; import {KeyValueDiffer, KeyValueDifferFactory} from './keyvalue_differs'; diff --git a/modules/@angular/core/src/change_detection/differs/iterable_differs.ts b/modules/@angular/core/src/change_detection/differs/iterable_differs.ts index 6777066614..b820164dec 100644 --- a/modules/@angular/core/src/change_detection/differs/iterable_differs.ts +++ b/modules/@angular/core/src/change_detection/differs/iterable_differs.ts @@ -1,6 +1,6 @@ -import {isBlank, isPresent, getTypeNameForDebugging} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; -import {ListWrapper} from '../../../src/facade/collection'; +import {isBlank, isPresent, getTypeNameForDebugging} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; +import {ListWrapper} from '../../facade/collection'; import {ChangeDetectorRef} from '../change_detector_ref'; import {Provider, SkipSelfMetadata, OptionalMetadata} from '../../di'; diff --git a/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts b/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts index 6bfa77496d..bd16c3027d 100644 --- a/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts +++ b/modules/@angular/core/src/change_detection/differs/keyvalue_differs.ts @@ -1,6 +1,6 @@ -import {isBlank, isPresent} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; -import {ListWrapper} from '../../../src/facade/collection'; +import {isBlank, isPresent} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; +import {ListWrapper} from '../../facade/collection'; import {ChangeDetectorRef} from '../change_detector_ref'; import {Provider, SkipSelfMetadata, OptionalMetadata} from '../../di'; diff --git a/modules/@angular/core/src/debug/debug_node.ts b/modules/@angular/core/src/debug/debug_node.ts index aeb45f5252..79d176215d 100644 --- a/modules/@angular/core/src/debug/debug_node.ts +++ b/modules/@angular/core/src/debug/debug_node.ts @@ -1,5 +1,5 @@ -import {isPresent} from '../../src/facade/lang'; -import {Predicate, ListWrapper, MapWrapper} from '../../src/facade/collection'; +import {isPresent} from '../facade/lang'; +import {Predicate, ListWrapper, MapWrapper} from '../facade/collection'; import {Injector} from '../di'; import {RenderDebugInfo} from '../render/api'; diff --git a/modules/@angular/core/src/debug/debug_renderer.ts b/modules/@angular/core/src/debug/debug_renderer.ts index e15fcdd21d..690b5b2466 100644 --- a/modules/@angular/core/src/debug/debug_renderer.ts +++ b/modules/@angular/core/src/debug/debug_renderer.ts @@ -1,4 +1,4 @@ -import {isPresent} from '../../src/facade/lang'; +import {isPresent} from '../facade/lang'; import {Renderer, RootRenderer, RenderComponentType, RenderDebugInfo} from '../render/api'; import { DebugNode, diff --git a/modules/@angular/core/src/di/forward_ref.ts b/modules/@angular/core/src/di/forward_ref.ts index 83751003c6..a362f3ad7c 100644 --- a/modules/@angular/core/src/di/forward_ref.ts +++ b/modules/@angular/core/src/di/forward_ref.ts @@ -1,4 +1,4 @@ -import {Type, stringify, isFunction} from '../../src/facade/lang'; +import {Type, stringify, isFunction} from '../facade/lang'; /** * An interface that a function passed into {@link forwardRef} has to implement. diff --git a/modules/@angular/core/src/di/injector.ts b/modules/@angular/core/src/di/injector.ts index b7b459733e..ffcaa5026a 100644 --- a/modules/@angular/core/src/di/injector.ts +++ b/modules/@angular/core/src/di/injector.ts @@ -1,4 +1,4 @@ -import {unimplemented} from '../../src/facade/exceptions'; +import {unimplemented} from '../facade/exceptions'; const _THROW_IF_NOT_FOUND = /*@ts2dart_const*/ new Object(); export const THROW_IF_NOT_FOUND = /*@ts2dart_const*/ _THROW_IF_NOT_FOUND; diff --git a/modules/@angular/core/src/di/metadata.ts b/modules/@angular/core/src/di/metadata.ts index 8b52152588..bf230fc6c7 100644 --- a/modules/@angular/core/src/di/metadata.ts +++ b/modules/@angular/core/src/di/metadata.ts @@ -1,4 +1,4 @@ -import {stringify} from '../../src/facade/lang'; +import {stringify} from '../facade/lang'; /** * A parameter metadata that specifies a dependency. diff --git a/modules/@angular/core/src/di/provider.ts b/modules/@angular/core/src/di/provider.ts index a40e92d73b..817d7db87a 100644 --- a/modules/@angular/core/src/di/provider.ts +++ b/modules/@angular/core/src/di/provider.ts @@ -1,5 +1,5 @@ -import {normalizeBool, Type, isType, isBlank, isFunction, stringify} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {normalizeBool, Type, isType, isBlank, isFunction, stringify} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; /** * Describes how the {@link Injector} should instantiate a given token. diff --git a/modules/@angular/core/src/di/reflective_exceptions.ts b/modules/@angular/core/src/di/reflective_exceptions.ts index 7c83763a3a..194fba9ac5 100644 --- a/modules/@angular/core/src/di/reflective_exceptions.ts +++ b/modules/@angular/core/src/di/reflective_exceptions.ts @@ -1,6 +1,6 @@ -import {ListWrapper} from '../../src/facade/collection'; -import {stringify, isBlank} from '../../src/facade/lang'; -import {BaseException, WrappedException} from '../../src/facade/exceptions'; +import {ListWrapper} from '../facade/collection'; +import {stringify, isBlank} from '../facade/lang'; +import {BaseException, WrappedException} from '../facade/exceptions'; import {ReflectiveKey} from './reflective_key'; import {ReflectiveInjector} from './reflective_injector'; diff --git a/modules/@angular/core/src/di/reflective_injector.ts b/modules/@angular/core/src/di/reflective_injector.ts index 9619f21608..f46fa74bd4 100644 --- a/modules/@angular/core/src/di/reflective_injector.ts +++ b/modules/@angular/core/src/di/reflective_injector.ts @@ -1,4 +1,4 @@ -import {ListWrapper} from '../../src/facade/collection'; +import {ListWrapper} from '../facade/collection'; import {Provider} from './provider'; import { ResolvedReflectiveProvider, @@ -13,8 +13,8 @@ import { InstantiationError, OutOfBoundsError } from './reflective_exceptions'; -import {Type} from '../../src/facade/lang'; -import {BaseException, unimplemented} from '../../src/facade/exceptions'; +import {Type} from '../facade/lang'; +import {BaseException, unimplemented} from '../facade/exceptions'; import {ReflectiveKey} from './reflective_key'; import {SelfMetadata, SkipSelfMetadata} from './metadata'; import {Injector, THROW_IF_NOT_FOUND} from './injector'; diff --git a/modules/@angular/core/src/di/reflective_key.ts b/modules/@angular/core/src/di/reflective_key.ts index 5923392612..3b8215efb0 100644 --- a/modules/@angular/core/src/di/reflective_key.ts +++ b/modules/@angular/core/src/di/reflective_key.ts @@ -1,5 +1,5 @@ -import {stringify, isBlank} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {stringify, isBlank} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {resolveForwardRef} from './forward_ref'; /** diff --git a/modules/@angular/core/src/di/reflective_provider.ts b/modules/@angular/core/src/di/reflective_provider.ts index 6a7054fcf4..2b39acc5b9 100644 --- a/modules/@angular/core/src/di/reflective_provider.ts +++ b/modules/@angular/core/src/di/reflective_provider.ts @@ -3,8 +3,8 @@ import { isBlank, isPresent, isArray, -} from '../../src/facade/lang'; -import {MapWrapper, ListWrapper} from '../../src/facade/collection'; +} from '../facade/lang'; +import {MapWrapper, ListWrapper} from '../facade/collection'; import {reflector} from '../reflection/reflection'; import {ReflectiveKey} from './reflective_key'; import { diff --git a/modules/@angular/core/src/linker/component_factory.ts b/modules/@angular/core/src/linker/component_factory.ts index 812007282c..ce2846b8d1 100644 --- a/modules/@angular/core/src/linker/component_factory.ts +++ b/modules/@angular/core/src/linker/component_factory.ts @@ -1,5 +1,5 @@ -import {Type, isPresent, isBlank} from '../../src/facade/lang'; -import {unimplemented} from '../../src/facade/exceptions'; +import {Type, isPresent, isBlank} from '../facade/lang'; +import {unimplemented} from '../facade/exceptions'; import {ElementRef} from './element_ref'; import {ViewRef, ViewRef_} from './view_ref'; import {AppElement} from './element'; diff --git a/modules/@angular/core/src/linker/component_resolver.ts b/modules/@angular/core/src/linker/component_resolver.ts index 84fa62674b..8f942d3619 100644 --- a/modules/@angular/core/src/linker/component_resolver.ts +++ b/modules/@angular/core/src/linker/component_resolver.ts @@ -1,6 +1,6 @@ -import {Type, isBlank, isString, stringify} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; -import {PromiseWrapper} from '../../src/facade/async'; +import {Type, isBlank, isString, stringify} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {PromiseWrapper} from '../facade/async'; import {reflector} from '../reflection/reflection'; import {ComponentFactory} from './component_factory'; import {Injectable} from '../di/decorators'; diff --git a/modules/@angular/core/src/linker/debug_context.ts b/modules/@angular/core/src/linker/debug_context.ts index 820670b178..2d2432b310 100644 --- a/modules/@angular/core/src/linker/debug_context.ts +++ b/modules/@angular/core/src/linker/debug_context.ts @@ -1,5 +1,5 @@ -import {isPresent, isBlank} from '../../src/facade/lang'; -import {ListWrapper, StringMapWrapper} from '../../src/facade/collection'; +import {isPresent, isBlank} from '../facade/lang'; +import {ListWrapper, StringMapWrapper} from '../facade/collection'; import {Injector} from '../di'; import {ViewType} from './view_type'; import {RenderDebugInfo} from '../render/api'; diff --git a/modules/@angular/core/src/linker/dynamic_component_loader.ts b/modules/@angular/core/src/linker/dynamic_component_loader.ts index 289d8ddb7e..2234294504 100644 --- a/modules/@angular/core/src/linker/dynamic_component_loader.ts +++ b/modules/@angular/core/src/linker/dynamic_component_loader.ts @@ -1,5 +1,5 @@ import {ComponentResolver} from './component_resolver'; -import {Type, isPresent} from '../../src/facade/lang'; +import {Type, isPresent} from '../facade/lang'; import {ComponentRef} from './component_factory'; import {ViewContainerRef} from './view_container_ref'; import {ResolvedReflectiveProvider} from '../di/reflective_provider'; diff --git a/modules/@angular/core/src/linker/element.ts b/modules/@angular/core/src/linker/element.ts index 2aa6afcd27..c40ce93ed0 100644 --- a/modules/@angular/core/src/linker/element.ts +++ b/modules/@angular/core/src/linker/element.ts @@ -1,6 +1,6 @@ -import {isPresent} from '../../src/facade/lang'; -import {ListWrapper} from '../../src/facade/collection'; -import {BaseException} from '../../src/facade/exceptions'; +import {isPresent} from '../facade/lang'; +import {ListWrapper} from '../facade/collection'; +import {BaseException} from '../facade/exceptions'; import {AppView} from './view'; import {ViewType} from './view_type'; diff --git a/modules/@angular/core/src/linker/exceptions.ts b/modules/@angular/core/src/linker/exceptions.ts index 5b49757e00..9468970809 100644 --- a/modules/@angular/core/src/linker/exceptions.ts +++ b/modules/@angular/core/src/linker/exceptions.ts @@ -1,4 +1,4 @@ -import {BaseException, WrappedException} from '../../src/facade/exceptions'; +import {BaseException, WrappedException} from '../facade/exceptions'; /** * An error thrown if application changes model breaking the top-down data flow. diff --git a/modules/@angular/core/src/linker/query_list.ts b/modules/@angular/core/src/linker/query_list.ts index d4efe6176f..b0d0f55721 100644 --- a/modules/@angular/core/src/linker/query_list.ts +++ b/modules/@angular/core/src/linker/query_list.ts @@ -1,6 +1,6 @@ -import {ListWrapper} from '../../src/facade/collection'; -import {getSymbolIterator} from '../../src/facade/lang'; -import {Observable, EventEmitter} from '../../src/facade/async'; +import {ListWrapper} from '../facade/collection'; +import {getSymbolIterator} from '../facade/lang'; +import {Observable, EventEmitter} from '../facade/async'; /** diff --git a/modules/@angular/core/src/linker/systemjs_component_resolver.ts b/modules/@angular/core/src/linker/systemjs_component_resolver.ts index 7e495cba0a..fb9c0a0d74 100644 --- a/modules/@angular/core/src/linker/systemjs_component_resolver.ts +++ b/modules/@angular/core/src/linker/systemjs_component_resolver.ts @@ -1,5 +1,5 @@ import { ComponentResolver } from './component_resolver'; -import { Type, isString, global } from '../../src/facade/lang'; +import { Type, isString, global } from '../facade/lang'; import { ComponentFactory } from './component_factory'; /** diff --git a/modules/@angular/core/src/linker/view_container_ref.ts b/modules/@angular/core/src/linker/view_container_ref.ts index ebb3020b13..fdedcd885a 100644 --- a/modules/@angular/core/src/linker/view_container_ref.ts +++ b/modules/@angular/core/src/linker/view_container_ref.ts @@ -1,7 +1,7 @@ -import {ListWrapper} from '../../src/facade/collection'; -import {unimplemented} from '../../src/facade/exceptions'; +import {ListWrapper} from '../facade/collection'; +import {unimplemented} from '../facade/exceptions'; import {Injector} from '../di/injector'; -import {isPresent} from '../../src/facade/lang'; +import {isPresent} from '../facade/lang'; import {wtfCreateScope, wtfLeave, WtfScopeFn} from '../profile/profile'; import {AppElement} from './element'; diff --git a/modules/@angular/core/src/linker/view_ref.ts b/modules/@angular/core/src/linker/view_ref.ts index fa9dfcaa0d..2412d3ec24 100644 --- a/modules/@angular/core/src/linker/view_ref.ts +++ b/modules/@angular/core/src/linker/view_ref.ts @@ -1,4 +1,4 @@ -import {unimplemented} from '../../src/facade/exceptions'; +import {unimplemented} from '../facade/exceptions'; import {ChangeDetectorRef} from '../change_detection/change_detector_ref'; import {AppView} from './view'; import {ChangeDetectionStrategy} from '../change_detection/constants'; diff --git a/modules/@angular/core/src/linker/view_utils.ts b/modules/@angular/core/src/linker/view_utils.ts index 3ba7a5cce1..d2643a6507 100644 --- a/modules/@angular/core/src/linker/view_utils.ts +++ b/modules/@angular/core/src/linker/view_utils.ts @@ -1,7 +1,7 @@ import {SanitizationService} from '../security'; -import {isBlank, isPresent, looseIdentical} from '../../src/facade/lang'; -import {ListWrapper, StringMapWrapper} from '../../src/facade/collection'; -import {BaseException} from '../../src/facade/exceptions'; +import {isBlank, isPresent, looseIdentical} from '../facade/lang'; +import {ListWrapper, StringMapWrapper} from '../facade/collection'; +import {BaseException} from '../facade/exceptions'; import {AppElement} from './element'; import {ExpressionChangedAfterItHasBeenCheckedException} from './exceptions'; import {devModeEqual} from '../change_detection/change_detection'; diff --git a/modules/@angular/core/src/metadata/di.ts b/modules/@angular/core/src/metadata/di.ts index c1638a8888..e3cf808201 100644 --- a/modules/@angular/core/src/metadata/di.ts +++ b/modules/@angular/core/src/metadata/di.ts @@ -1,4 +1,4 @@ -import {stringify, isString, Type, StringWrapper} from '../../src/facade/lang'; +import {stringify, isString, Type, StringWrapper} from '../facade/lang'; import {DependencyMetadata} from '../di/metadata'; import {resolveForwardRef} from '../di/forward_ref'; diff --git a/modules/@angular/core/src/metadata/directives.ts b/modules/@angular/core/src/metadata/directives.ts index 1b8d7e2292..44f0c80168 100644 --- a/modules/@angular/core/src/metadata/directives.ts +++ b/modules/@angular/core/src/metadata/directives.ts @@ -1,4 +1,4 @@ -import {isPresent, Type} from '../../src/facade/lang'; +import {isPresent, Type} from '../facade/lang'; import {InjectableMetadata} from '../di/metadata'; import {ViewEncapsulation} from './view'; import {ChangeDetectionStrategy} from '../change_detection/constants'; diff --git a/modules/@angular/core/src/metadata/view.ts b/modules/@angular/core/src/metadata/view.ts index 5b0b9176d0..a01e12cf7d 100644 --- a/modules/@angular/core/src/metadata/view.ts +++ b/modules/@angular/core/src/metadata/view.ts @@ -1,4 +1,4 @@ -import {Type} from '../../src/facade/lang'; +import {Type} from '../facade/lang'; import {AnimationEntryMetadata} from '../animation/metadata'; /** diff --git a/modules/@angular/core/src/profile/wtf_impl.ts b/modules/@angular/core/src/profile/wtf_impl.ts index f3b6e6b378..35d21b8c8c 100644 --- a/modules/@angular/core/src/profile/wtf_impl.ts +++ b/modules/@angular/core/src/profile/wtf_impl.ts @@ -1,4 +1,4 @@ -import {global} from '../../src/facade/lang'; +import {global} from '../facade/lang'; /** * A scope function for the Web Tracing Framework (WTF). diff --git a/modules/@angular/core/src/reflection/platform_reflection_capabilities.ts b/modules/@angular/core/src/reflection/platform_reflection_capabilities.ts index 3ecb6a6573..37d2dcc7bb 100644 --- a/modules/@angular/core/src/reflection/platform_reflection_capabilities.ts +++ b/modules/@angular/core/src/reflection/platform_reflection_capabilities.ts @@ -1,4 +1,4 @@ -import {Type} from '../../src/facade/lang'; +import {Type} from '../facade/lang'; import {GetterFn, SetterFn, MethodFn} from './types'; export interface PlatformReflectionCapabilities { diff --git a/modules/@angular/core/src/reflection/reflection_capabilities.ts b/modules/@angular/core/src/reflection/reflection_capabilities.ts index e009b8a7e7..b9314a2950 100644 --- a/modules/@angular/core/src/reflection/reflection_capabilities.ts +++ b/modules/@angular/core/src/reflection/reflection_capabilities.ts @@ -1,5 +1,5 @@ -import {Type, isPresent, isFunction, global, stringify, ConcreteType} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {Type, isPresent, isFunction, global, stringify, ConcreteType} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {GetterFn, SetterFn, MethodFn} from './types'; import {PlatformReflectionCapabilities} from './platform_reflection_capabilities'; diff --git a/modules/@angular/core/src/reflection/reflector.ts b/modules/@angular/core/src/reflection/reflector.ts index ad5d945d5c..7e4c96c0b7 100644 --- a/modules/@angular/core/src/reflection/reflector.ts +++ b/modules/@angular/core/src/reflection/reflector.ts @@ -1,5 +1,5 @@ -import {Type, isPresent, stringify} from '../../src/facade/lang'; -import {BaseException, WrappedException} from '../../src/facade/exceptions'; +import {Type, isPresent, stringify} from '../facade/lang'; +import {BaseException, WrappedException} from '../facade/exceptions'; import { ListWrapper, Map, @@ -7,7 +7,7 @@ import { Set, SetWrapper, StringMapWrapper -} from '../../src/facade/collection'; +} from '../facade/collection'; import {SetterFn, GetterFn, MethodFn} from './types'; import {ReflectorReader} from './reflector_reader'; import {PlatformReflectionCapabilities} from './platform_reflection_capabilities'; diff --git a/modules/@angular/core/src/render/api.ts b/modules/@angular/core/src/render/api.ts index 8ed2f106c3..6d3d868618 100644 --- a/modules/@angular/core/src/render/api.ts +++ b/modules/@angular/core/src/render/api.ts @@ -1,4 +1,4 @@ -import {unimplemented} from '../../src/facade/exceptions'; +import {unimplemented} from '../facade/exceptions'; import {ViewEncapsulation} from '../metadata/view'; import {Injector} from '../di/injector'; import {AnimationKeyframe} from '../../src/animation/animation_keyframe'; diff --git a/modules/@angular/core/src/testability/testability.ts b/modules/@angular/core/src/testability/testability.ts index 64fa908a74..6e3569f88f 100644 --- a/modules/@angular/core/src/testability/testability.ts +++ b/modules/@angular/core/src/testability/testability.ts @@ -1,8 +1,8 @@ -import {Map, MapWrapper} from '../../src/facade/collection'; -import {scheduleMicroTask} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {Map, MapWrapper} from '../facade/collection'; +import {scheduleMicroTask} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {NgZone} from '../zone/ng_zone'; -import {ObservableWrapper} from '../../src/facade/async'; +import {ObservableWrapper} from '../facade/async'; import {Injectable} from '../di/decorators'; diff --git a/modules/@angular/core/src/util/decorators.ts b/modules/@angular/core/src/util/decorators.ts index 1c1f5093af..d497f16d2f 100644 --- a/modules/@angular/core/src/util/decorators.ts +++ b/modules/@angular/core/src/util/decorators.ts @@ -1,4 +1,4 @@ -import {ConcreteType, global, Type, isFunction, stringify} from '../../src/facade/lang'; +import {ConcreteType, global, Type, isFunction, stringify} from '../facade/lang'; var _nextClassId = 0; diff --git a/modules/@angular/core/src/zone/ng_zone.ts b/modules/@angular/core/src/zone/ng_zone.ts index 0b583f8511..4856f0f5fa 100644 --- a/modules/@angular/core/src/zone/ng_zone.ts +++ b/modules/@angular/core/src/zone/ng_zone.ts @@ -1,6 +1,6 @@ -import {EventEmitter} from '../../src/facade/async'; +import {EventEmitter} from '../facade/async'; import {NgZoneImpl, NgZoneError} from './ng_zone_impl'; -import {BaseException} from '../../src/facade/exceptions'; +import {BaseException} from '../facade/exceptions'; export {NgZoneError} from './ng_zone_impl'; diff --git a/modules/@angular/http/src/backends/browser_jsonp.ts b/modules/@angular/http/src/backends/browser_jsonp.ts index 30f901bf52..96135a92cf 100644 --- a/modules/@angular/http/src/backends/browser_jsonp.ts +++ b/modules/@angular/http/src/backends/browser_jsonp.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {global} from '../../src/facade/lang'; +import {global} from '../facade/lang'; let _nextRequestId = 0; export const JSONP_HOME = '__ng_jsonp__'; diff --git a/modules/@angular/http/src/backends/jsonp_backend.ts b/modules/@angular/http/src/backends/jsonp_backend.ts index e65166f5d8..15fab59d88 100644 --- a/modules/@angular/http/src/backends/jsonp_backend.ts +++ b/modules/@angular/http/src/backends/jsonp_backend.ts @@ -5,8 +5,8 @@ import {Response} from '../static_response'; import {ResponseOptions, BaseResponseOptions} from '../base_response_options'; import {Injectable} from '@angular/core'; import {BrowserJsonp} from './browser_jsonp'; -import {makeTypeError} from '../../src/facade/exceptions'; -import {StringWrapper, isPresent} from '../../src/facade/lang'; +import {makeTypeError} from '../facade/exceptions'; +import {StringWrapper, isPresent} from '../facade/lang'; import {Observable} from 'rxjs/Observable'; import {Observer} from 'rxjs/Observer'; diff --git a/modules/@angular/http/src/backends/xhr_backend.ts b/modules/@angular/http/src/backends/xhr_backend.ts index 181e8dabcc..59005cda33 100644 --- a/modules/@angular/http/src/backends/xhr_backend.ts +++ b/modules/@angular/http/src/backends/xhr_backend.ts @@ -8,7 +8,7 @@ import {Response} from '../static_response'; import {Headers} from '../headers'; import {ResponseOptions} from '../base_response_options'; import {BrowserXhr} from './browser_xhr'; -import {isPresent, isString} from '../../src/facade/lang'; +import {isPresent, isString} from '../facade/lang'; import {Observable} from 'rxjs/Observable'; import {Observer} from 'rxjs/Observer'; import {isSuccess, getResponseURL} from '../http_utils'; diff --git a/modules/@angular/platform-browser/src/browser/browser_adapter.ts b/modules/@angular/platform-browser/src/browser/browser_adapter.ts index 4848784bd1..97064f98d5 100644 --- a/modules/@angular/platform-browser/src/browser/browser_adapter.ts +++ b/modules/@angular/platform-browser/src/browser/browser_adapter.ts @@ -1,5 +1,5 @@ -import {ListWrapper} from '../../src/facade/collection'; -import {isBlank, isPresent, isFunction, global, setValueOnPath, DateWrapper} from '../../src/facade/lang'; +import {ListWrapper} from '../facade/collection'; +import {isBlank, isPresent, isFunction, global, setValueOnPath, DateWrapper} from '../facade/lang'; import {GenericBrowserDomAdapter} from './generic_browser_adapter'; import {setRootDomAdapter} from '../dom/dom_adapter'; diff --git a/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts b/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts index d441fc3637..1c8d1157ff 100644 --- a/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts +++ b/modules/@angular/platform-browser/src/browser/generic_browser_adapter.ts @@ -1,5 +1,5 @@ -import {StringMapWrapper} from '../../src/facade/collection'; -import {isPresent, isFunction, Type} from '../../src/facade/lang'; +import {StringMapWrapper} from '../facade/collection'; +import {isPresent, isFunction, Type} from '../facade/lang'; import {DomAdapter} from '../dom/dom_adapter'; diff --git a/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts b/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts index 1f74bdb949..37b1bb7d40 100644 --- a/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts +++ b/modules/@angular/platform-browser/src/browser/location/browser_platform_location.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {History, Location} from '../../../src/facade/browser'; +import {History, Location} from '../../facade/browser'; import {UrlChangeListener, PlatformLocation} from '@angular/common'; import {getDOM} from '../../dom/dom_adapter'; import {supportsState} from './history'; diff --git a/modules/@angular/platform-browser/src/browser/testability.ts b/modules/@angular/platform-browser/src/browser/testability.ts index d1af2ab903..8f24369048 100644 --- a/modules/@angular/platform-browser/src/browser/testability.ts +++ b/modules/@angular/platform-browser/src/browser/testability.ts @@ -6,8 +6,8 @@ import { setTestabilityGetter } from '@angular/core'; -import {ListWrapper} from '../../src/facade/collection'; -import {global, isPresent} from '../../src/facade/lang'; +import {ListWrapper} from '../facade/collection'; +import {global, isPresent} from '../facade/lang'; import {getDOM} from '../dom/dom_adapter'; diff --git a/modules/@angular/platform-browser/src/browser/tools/common_tools.ts b/modules/@angular/platform-browser/src/browser/tools/common_tools.ts index 514001839b..5a282f1114 100644 --- a/modules/@angular/platform-browser/src/browser/tools/common_tools.ts +++ b/modules/@angular/platform-browser/src/browser/tools/common_tools.ts @@ -1,6 +1,6 @@ import {ApplicationRef, ComponentRef} from '@angular/core'; -import {isPresent, NumberWrapper} from '../../../src/facade/lang'; -import {window} from '../../../src/facade/browser'; +import {isPresent, NumberWrapper} from '../../facade/lang'; +import {window} from '../../facade/browser'; import {getDOM} from '../../dom/dom_adapter'; diff --git a/modules/@angular/platform-browser/src/browser/tools/tools.ts b/modules/@angular/platform-browser/src/browser/tools/tools.ts index b5ccca5668..5e12fadac0 100644 --- a/modules/@angular/platform-browser/src/browser/tools/tools.ts +++ b/modules/@angular/platform-browser/src/browser/tools/tools.ts @@ -1,5 +1,5 @@ import {ComponentRef} from '@angular/core'; -import {global} from '../../../src/facade/lang'; +import {global} from '../../facade/lang'; import {AngularTools} from './common_tools'; diff --git a/modules/@angular/platform-browser/src/dom/debug/by.ts b/modules/@angular/platform-browser/src/dom/debug/by.ts index 19d277afca..b919a6e1ad 100644 --- a/modules/@angular/platform-browser/src/dom/debug/by.ts +++ b/modules/@angular/platform-browser/src/dom/debug/by.ts @@ -1,6 +1,6 @@ import {DebugElement} from '@angular/core'; -import {Type, isPresent} from '../../../src/facade/lang'; -import {Predicate} from '../../../src/facade/collection'; +import {Type, isPresent} from '../../facade/lang'; +import {Predicate} from '../../facade/collection'; import {getDOM} from '../../dom/dom_adapter'; diff --git a/modules/@angular/platform-browser/src/dom/dom_adapter.ts b/modules/@angular/platform-browser/src/dom/dom_adapter.ts index 7b15cbfc47..de8e29c536 100644 --- a/modules/@angular/platform-browser/src/dom/dom_adapter.ts +++ b/modules/@angular/platform-browser/src/dom/dom_adapter.ts @@ -1,4 +1,4 @@ -import {isBlank, Type} from '../../src/facade/lang'; +import {isBlank, Type} from '../facade/lang'; var _DOM: DomAdapter = null; diff --git a/modules/@angular/platform-browser/src/dom/dom_renderer.ts b/modules/@angular/platform-browser/src/dom/dom_renderer.ts index 3fa9298f3b..1b11d4348e 100644 --- a/modules/@angular/platform-browser/src/dom/dom_renderer.ts +++ b/modules/@angular/platform-browser/src/dom/dom_renderer.ts @@ -16,11 +16,11 @@ import { StringWrapper, isArray, isString -} from '../../src/facade/lang'; +} from '../facade/lang'; -import {StringMapWrapper} from '../../src/facade/collection'; +import {StringMapWrapper} from '../facade/collection'; -import {BaseException} from '../../src/facade/exceptions'; +import {BaseException} from '../facade/exceptions'; import {DomSharedStylesHost} from './shared_styles_host'; import { diff --git a/modules/@angular/platform-browser/src/dom/events/event_manager.ts b/modules/@angular/platform-browser/src/dom/events/event_manager.ts index 1fdc14e5fa..c31ee70d37 100644 --- a/modules/@angular/platform-browser/src/dom/events/event_manager.ts +++ b/modules/@angular/platform-browser/src/dom/events/event_manager.ts @@ -1,7 +1,7 @@ import {Injectable, Inject, OpaqueToken, NgZone} from '@angular/core'; -import {BaseException} from '../../../src/facade/exceptions'; -import {ListWrapper} from '../../../src/facade/collection'; +import {BaseException} from '../../facade/exceptions'; +import {ListWrapper} from '../../facade/collection'; export const EVENT_MANAGER_PLUGINS: OpaqueToken = new OpaqueToken("EventManagerPlugins"); diff --git a/modules/@angular/platform-browser/src/dom/events/hammer_common.ts b/modules/@angular/platform-browser/src/dom/events/hammer_common.ts index e78dee0343..56287cbd46 100644 --- a/modules/@angular/platform-browser/src/dom/events/hammer_common.ts +++ b/modules/@angular/platform-browser/src/dom/events/hammer_common.ts @@ -1,5 +1,5 @@ import {EventManagerPlugin} from './event_manager'; -import {StringMapWrapper} from '../../../src/facade/collection'; +import {StringMapWrapper} from '../../facade/collection'; var _eventNames = { // pan diff --git a/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts b/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts index 6cab3d8552..42727d5919 100644 --- a/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts +++ b/modules/@angular/platform-browser/src/dom/events/hammer_gestures.ts @@ -1,6 +1,6 @@ import {Injectable, Inject, OpaqueToken} from '@angular/core'; -import {isPresent} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; +import {isPresent} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; import {HammerGesturesPluginCommon} from './hammer_common'; export const HAMMER_GESTURE_CONFIG: OpaqueToken = new OpaqueToken("HammerGestureConfig"); diff --git a/modules/@angular/platform-browser/src/dom/events/key_events.ts b/modules/@angular/platform-browser/src/dom/events/key_events.ts index 381f75f53c..4570fe766c 100644 --- a/modules/@angular/platform-browser/src/dom/events/key_events.ts +++ b/modules/@angular/platform-browser/src/dom/events/key_events.ts @@ -2,8 +2,8 @@ import {NgZone, Injectable} from '@angular/core'; import { isPresent, StringWrapper, -} from '../../../src/facade/lang'; -import {StringMapWrapper, ListWrapper} from '../../../src/facade/collection'; +} from '../../facade/lang'; +import {StringMapWrapper, ListWrapper} from '../../facade/collection'; import {getDOM} from '../dom_adapter'; import {EventManagerPlugin} from './event_manager'; diff --git a/modules/@angular/platform-browser/src/dom/shared_styles_host.ts b/modules/@angular/platform-browser/src/dom/shared_styles_host.ts index e149a6ffb8..db2e62eab7 100644 --- a/modules/@angular/platform-browser/src/dom/shared_styles_host.ts +++ b/modules/@angular/platform-browser/src/dom/shared_styles_host.ts @@ -1,5 +1,5 @@ import {Inject, Injectable} from '@angular/core'; -import {SetWrapper} from '../../src/facade/collection'; +import {SetWrapper} from '../facade/collection'; import {getDOM} from './dom_adapter'; import {DOCUMENT} from './dom_tokens'; diff --git a/modules/@angular/platform-browser/src/dom/util.ts b/modules/@angular/platform-browser/src/dom/util.ts index 1348d3c2bf..4de398cc98 100644 --- a/modules/@angular/platform-browser/src/dom/util.ts +++ b/modules/@angular/platform-browser/src/dom/util.ts @@ -1,4 +1,4 @@ -import {StringWrapper} from '../../src/facade/lang'; +import {StringWrapper} from '../facade/lang'; var CAMEL_CASE_REGEXP = /([A-Z])/g; var DASH_CASE_REGEXP = /-([a-z])/g; diff --git a/modules/@angular/platform-browser/src/security/html_sanitizer.ts b/modules/@angular/platform-browser/src/security/html_sanitizer.ts index 0c423e6a9a..b386def69d 100644 --- a/modules/@angular/platform-browser/src/security/html_sanitizer.ts +++ b/modules/@angular/platform-browser/src/security/html_sanitizer.ts @@ -1,5 +1,5 @@ import {getDOM, DomAdapter} from '../dom/dom_adapter'; -import {assertionsEnabled} from '../../src/facade/lang'; +import {assertionsEnabled} from '../facade/lang'; import {sanitizeUrl} from './url_sanitizer'; diff --git a/modules/@angular/platform-browser/src/security/style_sanitizer.ts b/modules/@angular/platform-browser/src/security/style_sanitizer.ts index fc145f3914..a5475e9370 100644 --- a/modules/@angular/platform-browser/src/security/style_sanitizer.ts +++ b/modules/@angular/platform-browser/src/security/style_sanitizer.ts @@ -1,5 +1,5 @@ import {getDOM} from '../dom/dom_adapter'; -import {assertionsEnabled} from '../../src/facade/lang'; +import {assertionsEnabled} from '../facade/lang'; import {sanitizeUrl} from './url_sanitizer'; diff --git a/modules/@angular/platform-browser/src/security/url_sanitizer.ts b/modules/@angular/platform-browser/src/security/url_sanitizer.ts index 970340bd06..3f6c2bcae1 100644 --- a/modules/@angular/platform-browser/src/security/url_sanitizer.ts +++ b/modules/@angular/platform-browser/src/security/url_sanitizer.ts @@ -1,5 +1,5 @@ import {getDOM} from '../dom/dom_adapter'; -import {assertionsEnabled} from '../../src/facade/lang'; +import {assertionsEnabled} from '../facade/lang'; /** * A pattern that recognizes a commonly useful subset of URLs that are safe. diff --git a/modules/@angular/platform-browser/src/web_workers/shared/client_message_broker.ts b/modules/@angular/platform-browser/src/web_workers/shared/client_message_broker.ts index 69ca4e6cb4..ae0d2c1191 100644 --- a/modules/@angular/platform-browser/src/web_workers/shared/client_message_broker.ts +++ b/modules/@angular/platform-browser/src/web_workers/shared/client_message_broker.ts @@ -1,12 +1,12 @@ import {MessageBus} from './message_bus'; -import {print, isPresent, DateWrapper, stringify, StringWrapper} from '../../../src/facade/lang'; +import {print, isPresent, DateWrapper, stringify, StringWrapper} from '../../facade/lang'; import { PromiseCompleter, PromiseWrapper, ObservableWrapper, EventEmitter -} from '../../../src/facade/async'; -import {StringMapWrapper} from '../../../src/facade/collection'; +} from '../../facade/async'; +import {StringMapWrapper} from '../../facade/collection'; import {Serializer} from './serializer'; import {Injectable, Type} from '@angular/core'; diff --git a/modules/@angular/platform-browser/src/web_workers/shared/message_bus.ts b/modules/@angular/platform-browser/src/web_workers/shared/message_bus.ts index 29660c0398..f02aaabb15 100644 --- a/modules/@angular/platform-browser/src/web_workers/shared/message_bus.ts +++ b/modules/@angular/platform-browser/src/web_workers/shared/message_bus.ts @@ -1,4 +1,4 @@ -import {EventEmitter} from '../../../src/facade/async'; +import {EventEmitter} from '../../facade/async'; import {NgZone} from '@angular/core'; /** diff --git a/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts b/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts index db42fe6899..b9565eb2d2 100644 --- a/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts +++ b/modules/@angular/platform-browser/src/web_workers/shared/post_message_bus.ts @@ -1,7 +1,7 @@ import {MessageBus, MessageBusSource, MessageBusSink} from './message_bus'; -import {BaseException} from '../../../src/facade/exceptions'; -import {EventEmitter, ObservableWrapper} from '../../../src/facade/async'; -import {StringMapWrapper} from '../../../src/facade/collection'; +import {BaseException} from '../../facade/exceptions'; +import {EventEmitter, ObservableWrapper} from '../../facade/async'; +import {StringMapWrapper} from '../../facade/collection'; import {Injectable, NgZone} from '@angular/core'; // TODO(jteplitz602) Replace this with the definition in lib.webworker.d.ts(#3492) diff --git a/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts b/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts index 481d7a9d06..f1b752a3ab 100644 --- a/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts +++ b/modules/@angular/platform-browser/src/web_workers/shared/serializer.ts @@ -1,6 +1,6 @@ -import {Type, isArray, isPresent, serializeEnum} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; -import {Map, StringMapWrapper, MapWrapper} from '../../../src/facade/collection'; +import {Type, isArray, isPresent, serializeEnum} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; +import {Map, StringMapWrapper, MapWrapper} from '../../facade/collection'; import {RenderComponentType, Injectable, ViewEncapsulation} from '@angular/core'; import {VIEW_ENCAPSULATION_VALUES} from '../../../core_private'; import {RenderStore} from './render_store'; diff --git a/modules/@angular/platform-browser/src/web_workers/shared/service_message_broker.ts b/modules/@angular/platform-browser/src/web_workers/shared/service_message_broker.ts index b17b64e86f..2aa3e5bcea 100644 --- a/modules/@angular/platform-browser/src/web_workers/shared/service_message_broker.ts +++ b/modules/@angular/platform-browser/src/web_workers/shared/service_message_broker.ts @@ -1,9 +1,9 @@ import {Injectable} from '@angular/core'; -import {ListWrapper, Map} from '../../../src/facade/collection'; +import {ListWrapper, Map} from '../../facade/collection'; import {Serializer} from '../shared/serializer'; -import {isPresent, Type, FunctionWrapper} from '../../../src/facade/lang'; +import {isPresent, Type, FunctionWrapper} from '../../facade/lang'; import {MessageBus} from '../shared/message_bus'; -import {EventEmitter, PromiseWrapper, ObservableWrapper} from '../../../src/facade/async'; +import {EventEmitter, PromiseWrapper, ObservableWrapper} from '../../facade/async'; export abstract class ServiceMessageBrokerFactory { /** diff --git a/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts b/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts index 9f708830eb..fdf7c600f2 100644 --- a/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts +++ b/modules/@angular/platform-browser/src/web_workers/ui/event_dispatcher.ts @@ -6,8 +6,8 @@ import { serializeEventWithTarget, serializeTransitionEvent } from './event_serializer'; -import {BaseException} from '../../../src/facade/exceptions'; -import {EventEmitter, ObservableWrapper} from '../../../src/facade/async'; +import {BaseException} from '../../facade/exceptions'; +import {EventEmitter, ObservableWrapper} from '../../facade/async'; export class EventDispatcher { constructor(private _sink: EventEmitter, private _serializer: Serializer) {} diff --git a/modules/@angular/platform-browser/src/web_workers/ui/event_serializer.ts b/modules/@angular/platform-browser/src/web_workers/ui/event_serializer.ts index c41bd79667..6d3e0c2646 100644 --- a/modules/@angular/platform-browser/src/web_workers/ui/event_serializer.ts +++ b/modules/@angular/platform-browser/src/web_workers/ui/event_serializer.ts @@ -1,5 +1,5 @@ -import {Set} from '../../../src/facade/collection'; -import {isPresent} from '../../../src/facade/lang'; +import {Set} from '../../facade/collection'; +import {isPresent} from '../../facade/lang'; const MOUSE_EVENT_PROPERTIES = [ "altKey", diff --git a/modules/@angular/platform-browser/src/web_workers/ui/platform_location.ts b/modules/@angular/platform-browser/src/web_workers/ui/platform_location.ts index c868dbca4e..0c97fc9b1a 100644 --- a/modules/@angular/platform-browser/src/web_workers/ui/platform_location.ts +++ b/modules/@angular/platform-browser/src/web_workers/ui/platform_location.ts @@ -6,8 +6,8 @@ import {ServiceMessageBrokerFactory, ServiceMessageBroker} from '../shared/servi import {PRIMITIVE, Serializer} from '../shared/serializer'; import {LocationType} from '../shared/serialized_types'; import {MessageBus} from '../shared/message_bus'; -import {EventEmitter, ObservableWrapper, PromiseWrapper} from '../../../src/facade/async'; -import {FunctionWrapper} from '../../../src/facade/lang'; +import {EventEmitter, ObservableWrapper, PromiseWrapper} from '../../facade/async'; +import {FunctionWrapper} from '../../facade/lang'; @Injectable() export class MessageBasedPlatformLocation { diff --git a/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts b/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts index a400b9a7d6..534b2df2f7 100644 --- a/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts +++ b/modules/@angular/platform-browser/src/web_workers/worker/platform_location.ts @@ -8,12 +8,12 @@ import { import {PlatformLocation, UrlChangeListener} from '@angular/common'; import {ROUTER_CHANNEL} from '../shared/messaging_api'; import {LocationType} from '../shared/serialized_types'; -import {PromiseWrapper, EventEmitter, ObservableWrapper} from '../../../src/facade/async'; -import {BaseException} from '../../../src/facade/exceptions'; +import {PromiseWrapper, EventEmitter, ObservableWrapper} from '../../facade/async'; +import {BaseException} from '../../facade/exceptions'; import {PRIMITIVE, Serializer} from '../shared/serializer'; import {MessageBus} from '../shared/message_bus'; -import {StringMapWrapper} from '../../../src/facade/collection'; -import {StringWrapper} from '../../../src/facade/lang'; +import {StringMapWrapper} from '../../facade/collection'; +import {StringWrapper} from '../../facade/lang'; import {deserializeGenericEvent} from './event_deserializer'; @Injectable() diff --git a/modules/@angular/platform-browser/src/web_workers/worker/renderer.ts b/modules/@angular/platform-browser/src/web_workers/worker/renderer.ts index 073bccd5b3..ca0fae90ee 100644 --- a/modules/@angular/platform-browser/src/web_workers/worker/renderer.ts +++ b/modules/@angular/platform-browser/src/web_workers/worker/renderer.ts @@ -7,13 +7,13 @@ import { } from '@angular/core'; import {ClientMessageBrokerFactory, FnArg, UiArguments} from '../shared/client_message_broker'; -import {isPresent, isBlank} from '../../../src/facade/lang'; -import {ListWrapper} from '../../../src/facade/collection'; +import {isPresent, isBlank} from '../../facade/lang'; +import {ListWrapper} from '../../facade/collection'; import {RenderStore} from '../shared/render_store'; import {RENDERER_CHANNEL, EVENT_CHANNEL} from '../shared/messaging_api'; import {Serializer, RenderStoreObject} from '../shared/serializer'; import {MessageBus} from '../shared/message_bus'; -import {ObservableWrapper} from '../../../src/facade/async'; +import {ObservableWrapper} from '../../facade/async'; import {deserializeGenericEvent} from './event_deserializer'; import {AnimationKeyframe, AnimationPlayer, AnimationStyles, RenderDebugInfo} from '../../../core_private'; diff --git a/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts b/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts index f0d474e84a..58868e26e5 100644 --- a/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts +++ b/modules/@angular/platform-browser/src/web_workers/worker/worker_adapter.ts @@ -1,4 +1,4 @@ -import {Type} from '../../../src/facade/lang'; +import {Type} from '../../facade/lang'; import {DomAdapter, setRootDomAdapter} from '../../dom/dom_adapter'; /** diff --git a/modules/@angular/platform-browser/src/xhr/xhr_cache.ts b/modules/@angular/platform-browser/src/xhr/xhr_cache.ts index 37eb3771b5..cc1c1a2a29 100644 --- a/modules/@angular/platform-browser/src/xhr/xhr_cache.ts +++ b/modules/@angular/platform-browser/src/xhr/xhr_cache.ts @@ -1,7 +1,7 @@ import {XHR} from '@angular/compiler'; -import {BaseException} from '../../src/facade/exceptions'; -import {global} from '../../src/facade/lang'; -import {PromiseWrapper} from '../../src/facade/promise'; +import {BaseException} from '../facade/exceptions'; +import {global} from '../facade/lang'; +import {PromiseWrapper} from '../facade/promise'; /** * An implementation of XHR that uses a template cache to avoid doing an actual diff --git a/modules/@angular/platform-browser/src/xhr/xhr_impl.ts b/modules/@angular/platform-browser/src/xhr/xhr_impl.ts index 70ee4cfa41..860ab65b15 100644 --- a/modules/@angular/platform-browser/src/xhr/xhr_impl.ts +++ b/modules/@angular/platform-browser/src/xhr/xhr_impl.ts @@ -1,6 +1,6 @@ import {XHR} from '@angular/compiler'; -import {PromiseWrapper, PromiseCompleter} from '../../src/facade/promise'; -import {isPresent} from '../../src/facade/lang'; +import {PromiseWrapper, PromiseCompleter} from '../facade/promise'; +import {isPresent} from '../facade/lang'; export class XHRImpl extends XHR { get(url: string): Promise { diff --git a/modules/@angular/router-deprecated/src/directives/router_link.ts b/modules/@angular/router-deprecated/src/directives/router_link.ts index 9a069b9b57..bcd3914972 100644 --- a/modules/@angular/router-deprecated/src/directives/router_link.ts +++ b/modules/@angular/router-deprecated/src/directives/router_link.ts @@ -1,6 +1,6 @@ import {Directive} from '@angular/core'; import {Location} from '@angular/common'; -import {isString} from '../../src/facade/lang'; +import {isString} from '../facade/lang'; import {Router} from '../router'; import {Instruction} from '../instruction'; diff --git a/modules/@angular/router-deprecated/src/directives/router_outlet.ts b/modules/@angular/router-deprecated/src/directives/router_outlet.ts index f7279758fe..2dce9b1075 100644 --- a/modules/@angular/router-deprecated/src/directives/router_outlet.ts +++ b/modules/@angular/router-deprecated/src/directives/router_outlet.ts @@ -1,6 +1,6 @@ -import {PromiseWrapper, EventEmitter} from '../../src/facade/async'; -import {StringMapWrapper} from '../../src/facade/collection'; -import {isBlank, isPresent} from '../../src/facade/lang'; +import {PromiseWrapper, EventEmitter} from '../facade/async'; +import {StringMapWrapper} from '../facade/collection'; +import {isBlank, isPresent} from '../facade/lang'; import { Directive, Attribute, diff --git a/modules/@angular/router-deprecated/src/route_config/route_config_impl.ts b/modules/@angular/router-deprecated/src/route_config/route_config_impl.ts index dfa984ceb0..0ade30f5bc 100644 --- a/modules/@angular/router-deprecated/src/route_config/route_config_impl.ts +++ b/modules/@angular/router-deprecated/src/route_config/route_config_impl.ts @@ -1,4 +1,4 @@ -import {Type} from '../../src/facade/lang'; +import {Type} from '../facade/lang'; import {RouteDefinition} from '../route_definition'; import {RegexSerializer} from '../rules/route_paths/regex_route_path'; diff --git a/modules/@angular/router-deprecated/src/route_config/route_config_normalizer.ts b/modules/@angular/router-deprecated/src/route_config/route_config_normalizer.ts index f3a24766c4..1c365a7b2d 100644 --- a/modules/@angular/router-deprecated/src/route_config/route_config_normalizer.ts +++ b/modules/@angular/router-deprecated/src/route_config/route_config_normalizer.ts @@ -1,7 +1,7 @@ import {AsyncRoute, AuxRoute, Route, Redirect, RouteDefinition} from './route_config_decorator'; import {ComponentDefinition} from '../route_definition'; -import {isType, Type} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; +import {isType, Type} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; import {RouteRegistry} from '../route_registry'; diff --git a/modules/@angular/router-deprecated/src/rules/route_handlers/async_route_handler.ts b/modules/@angular/router-deprecated/src/rules/route_handlers/async_route_handler.ts index 6c2da47a33..6a6a4cbcdf 100644 --- a/modules/@angular/router-deprecated/src/rules/route_handlers/async_route_handler.ts +++ b/modules/@angular/router-deprecated/src/rules/route_handlers/async_route_handler.ts @@ -1,4 +1,4 @@ -import {isPresent, Type} from '../../../src/facade/lang'; +import {isPresent, Type} from '../../facade/lang'; import {RouteHandler} from './route_handler'; import {RouteData, BLANK_ROUTE_DATA} from '../../instruction'; diff --git a/modules/@angular/router-deprecated/src/rules/route_handlers/route_handler.ts b/modules/@angular/router-deprecated/src/rules/route_handlers/route_handler.ts index 32c99d0fc2..d55c6e0eb4 100644 --- a/modules/@angular/router-deprecated/src/rules/route_handlers/route_handler.ts +++ b/modules/@angular/router-deprecated/src/rules/route_handlers/route_handler.ts @@ -1,4 +1,4 @@ -import {Type} from '../../../src/facade/lang'; +import {Type} from '../../facade/lang'; import {RouteData} from '../../instruction'; export interface RouteHandler { diff --git a/modules/@angular/router-deprecated/src/rules/route_handlers/sync_route_handler.ts b/modules/@angular/router-deprecated/src/rules/route_handlers/sync_route_handler.ts index ef4b486e06..fce25b3151 100644 --- a/modules/@angular/router-deprecated/src/rules/route_handlers/sync_route_handler.ts +++ b/modules/@angular/router-deprecated/src/rules/route_handlers/sync_route_handler.ts @@ -1,5 +1,5 @@ -import {PromiseWrapper} from '../../../src/facade/async'; -import {isPresent, Type} from '../../../src/facade/lang'; +import {PromiseWrapper} from '../../facade/async'; +import {isPresent, Type} from '../../facade/lang'; import {RouteHandler} from './route_handler'; import {RouteData, BLANK_ROUTE_DATA} from '../../instruction'; diff --git a/modules/@angular/router-deprecated/src/rules/route_paths/param_route_path.ts b/modules/@angular/router-deprecated/src/rules/route_paths/param_route_path.ts index e9e80154b4..d93afed0cc 100644 --- a/modules/@angular/router-deprecated/src/rules/route_paths/param_route_path.ts +++ b/modules/@angular/router-deprecated/src/rules/route_paths/param_route_path.ts @@ -1,6 +1,6 @@ -import {RegExpWrapper, StringWrapper, isPresent, isBlank} from '../../../src/facade/lang'; -import {BaseException} from '../../../src/facade/exceptions'; -import {StringMapWrapper} from '../../../src/facade/collection'; +import {RegExpWrapper, StringWrapper, isPresent, isBlank} from '../../facade/lang'; +import {BaseException} from '../../facade/exceptions'; +import {StringMapWrapper} from '../../facade/collection'; import {TouchMap, normalizeString} from '../../utils'; import {Url, RootUrl, convertUrlParamsToArray} from '../../url_parser'; import {RoutePath, GeneratedUrl, MatchedUrl} from './route_path'; diff --git a/modules/@angular/router-deprecated/src/rules/route_paths/regex_route_path.ts b/modules/@angular/router-deprecated/src/rules/route_paths/regex_route_path.ts index cc404476fd..a004d4e160 100644 --- a/modules/@angular/router-deprecated/src/rules/route_paths/regex_route_path.ts +++ b/modules/@angular/router-deprecated/src/rules/route_paths/regex_route_path.ts @@ -1,4 +1,4 @@ -import {RegExpWrapper, RegExpMatcherWrapper, isBlank} from '../../../src/facade/lang'; +import {RegExpWrapper, RegExpMatcherWrapper, isBlank} from '../../facade/lang'; import {BaseException} from '@angular/core'; import {Url} from '../../url_parser'; import {RoutePath, GeneratedUrl, MatchedUrl} from './route_path'; diff --git a/modules/@angular/router-deprecated/src/rules/rule_set.ts b/modules/@angular/router-deprecated/src/rules/rule_set.ts index 28bee97b71..85f8a8fa59 100644 --- a/modules/@angular/router-deprecated/src/rules/rule_set.ts +++ b/modules/@angular/router-deprecated/src/rules/rule_set.ts @@ -1,7 +1,7 @@ -import {isBlank, isPresent, isFunction} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; -import {Map} from '../../src/facade/collection'; -import {PromiseWrapper} from '../../src/facade/async'; +import {isBlank, isPresent, isFunction} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {Map} from '../facade/collection'; +import {PromiseWrapper} from '../facade/async'; import {AbstractRule, RouteRule, RedirectRule, RouteMatch, PathMatch} from './rules'; import { Route, diff --git a/modules/@angular/router-deprecated/src/rules/rules.ts b/modules/@angular/router-deprecated/src/rules/rules.ts index 6adf17da5b..b085de7cb4 100644 --- a/modules/@angular/router-deprecated/src/rules/rules.ts +++ b/modules/@angular/router-deprecated/src/rules/rules.ts @@ -1,7 +1,7 @@ -import {isPresent, isBlank} from '../../src/facade/lang'; -import {BaseException} from '../../src/facade/exceptions'; -import {PromiseWrapper} from '../../src/facade/promise'; -import {Map} from '../../src/facade/collection'; +import {isPresent, isBlank} from '../facade/lang'; +import {BaseException} from '../facade/exceptions'; +import {PromiseWrapper} from '../facade/promise'; +import {Map} from '../facade/collection'; import {RouteHandler} from './route_handlers/route_handler'; import {Url, convertUrlParamsToArray} from '../url_parser'; import {ComponentInstruction} from '../instruction';