From 793098bcce160dddeb1404479fb4cc66e2d0593f Mon Sep 17 00:00:00 2001 From: Pawel Kozlowski Date: Wed, 9 Dec 2015 17:05:49 +0100 Subject: [PATCH] refactor(upgrade): remove imports from angular2/angular2 Related #5739 --- modules/angular2/src/upgrade/downgrade_ng2_adapter.ts | 3 +-- modules/angular2/src/upgrade/metadata.ts | 2 +- modules/angular2/src/upgrade/upgrade_adapter.ts | 9 +++------ modules/angular2/src/upgrade/upgrade_ng1_adapter.ts | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts b/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts index 8ac6e9900e..b1172a2e08 100644 --- a/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts +++ b/modules/angular2/src/upgrade/downgrade_ng2_adapter.ts @@ -1,5 +1,4 @@ import { - bind, provide, AppViewManager, ChangeDetectorRef, @@ -8,7 +7,7 @@ import { OnChanges, ProtoViewRef, SimpleChange -} from 'angular2/angular2'; +} from 'angular2/core'; import {NG1_SCOPE} from './constants'; import {ComponentInfo} from './metadata'; import Element = protractor.Element; diff --git a/modules/angular2/src/upgrade/metadata.ts b/modules/angular2/src/upgrade/metadata.ts index 9f74cf6814..56270fcb30 100644 --- a/modules/angular2/src/upgrade/metadata.ts +++ b/modules/angular2/src/upgrade/metadata.ts @@ -1,4 +1,4 @@ -import {Type, ComponentMetadata, DirectiveResolver, DirectiveMetadata} from 'angular2/angular2'; +import {Type, DirectiveResolver, DirectiveMetadata} from 'angular2/core'; import {stringify} from './util'; var COMPONENT_SELECTOR = /^[\w|-]*$/; diff --git a/modules/angular2/src/upgrade/upgrade_adapter.ts b/modules/angular2/src/upgrade/upgrade_adapter.ts index 49a205d00a..baccd8dc3e 100644 --- a/modules/angular2/src/upgrade/upgrade_adapter.ts +++ b/modules/angular2/src/upgrade/upgrade_adapter.ts @@ -1,20 +1,17 @@ import { - bind, provide, platform, ApplicationRef, AppViewManager, Compiler, - Inject, Injector, NgZone, PlatformRef, ProtoViewRef, Provider, - Type -} from 'angular2/angular2'; -import {APPLICATION_COMMON_PROVIDERS} from 'angular2/core'; -import {COMPILER_PROVIDERS} from 'angular2/src/compiler/compiler'; + Type, + APPLICATION_COMMON_PROVIDERS +} from 'angular2/core'; import {ObservableWrapper} from 'angular2/src/facade/async'; import {BROWSER_PROVIDERS, BROWSER_APP_PROVIDERS} from 'angular2/platform/browser'; diff --git a/modules/angular2/src/upgrade/upgrade_ng1_adapter.ts b/modules/angular2/src/upgrade/upgrade_ng1_adapter.ts index 6a9d560243..d6a7136ba3 100644 --- a/modules/angular2/src/upgrade/upgrade_ng1_adapter.ts +++ b/modules/angular2/src/upgrade/upgrade_ng1_adapter.ts @@ -7,7 +7,7 @@ import { OnChanges, SimpleChange, Type -} from 'angular2/angular2'; +} from 'angular2/core'; import { NG1_COMPILE, NG1_SCOPE,