repackaging: all the repackaging changes squashed

modules/@angular/compiler/src/view_compiler/compile_element.ts

@@ -1,10 +1,11 @@
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {BaseException} from '@angular/core';
+import {isPresent, isBlank} from '../../src/facade/lang';
+import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+
 import * as o from '../output/output_ast';
 import {Identifiers, identifierToken} from '../identifiers';
 import {InjectMethodVars} from './constants';
 import {CompileView} from './compile_view';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
 import {TemplateAst, ProviderAst, ProviderAstType, ReferenceAst} from '../template_ast';
 import {
   CompileTokenMap,
@@ -14,7 +15,6 @@ import {
   CompileProviderMetadata,
   CompileDiDependencyMetadata,
   CompileIdentifierMetadata,
-  CompileTypeMetadata,
 } from '../compile_metadata';
 import {getPropertyInView, createDiTokenExpression, injectFromViewParentInjector} from './util';
 import {CompileQuery, createQueryList, addQueryToTokenMap} from './compile_query';
@@ -424,4 +424,4 @@ class _ValueOutputAstTransformer extends ValueTransformer {
       throw new BaseException(`Illegal state: Don't now how to compile value ${value}`);
     }
   }
-}
+}

modules/@angular/compiler/src/view_compiler/compile_method.ts

@@ -1,5 +1,5 @@
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {isPresent} from '../../src/facade/lang';
+import {ListWrapper} from '../../src/facade/collection';
 
 import * as o from '../output/output_ast';
 import {TemplateAst} from '../template_ast';

modules/@angular/compiler/src/view_compiler/compile_pipe.ts

@@ -1,5 +1,5 @@
-import {isBlank, isPresent} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {isBlank, isPresent} from '../facade/lang';
+import {BaseException} from '../facade/exceptions';
 import * as o from '../output/output_ast';
 import {CompileView} from './compile_view';
 import {CompilePipeMetadata} from '../compile_metadata';

modules/@angular/compiler/src/view_compiler/compile_query.ts

@@ -1,12 +1,11 @@
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {isPresent, isBlank} from '../../src/facade/lang';
+import {ListWrapper} from '../../src/facade/collection';
 
 import * as o from '../output/output_ast';
 import {Identifiers} from '../identifiers';
 
 import {
   CompileQueryMetadata,
-  CompileIdentifierMetadata,
   CompileTokenMap
 } from '../compile_metadata';
 

modules/@angular/compiler/src/view_compiler/compile_view.ts

@@ -1,5 +1,7 @@
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper, MapWrapper} from 'angular2/src/facade/collection';
+import {ViewType} from '../../core_private';
+
+import {isPresent, isBlank} from '../../src/facade/lang';
+import {ListWrapper} from '../../src/facade/collection';
 
 import * as o from '../output/output_ast';
 import {EventHandlerVars} from './constants';
@@ -8,7 +10,6 @@ import {NameResolver} from './expression_converter';
 import {CompileElement, CompileNode} from './compile_element';
 import {CompileMethod} from './compile_method';
 import {CompilePipe} from './compile_pipe';
-import {ViewType} from 'angular2/src/core/linker/view_type';
 import {
   CompileDirectiveMetadata,
   CompilePipeMetadata,
@@ -19,8 +20,7 @@ import {
   getViewFactoryName,
   injectFromViewParentInjector,
   createDiTokenExpression,
-  getPropertyInView,
-  createPureProxy
+  getPropertyInView, createPureProxy
 } from './util';
 import {CompilerConfig} from '../config';
 import {CompileBinding} from './compile_binding';

modules/@angular/compiler/src/view_compiler/constants.ts

@@ -1,11 +1,8 @@
-import {serializeEnum, isBlank, resolveEnumToken} from 'angular2/src/facade/lang';
-import {CompileIdentifierMetadata, CompileTokenMetadata} from '../compile_metadata';
-import {
-  ChangeDetectorState,
-  ChangeDetectionStrategy
-} from 'angular2/src/core/change_detection/change_detection';
-import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
-import {ViewType} from 'angular2/src/core/linker/view_type';
+import {ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
+import {ChangeDetectorState, ViewType} from '../../core_private';
+
+import {isBlank, resolveEnumToken} from '../../src/facade/lang';
+import {CompileIdentifierMetadata} from '../compile_metadata';
 import * as o from '../output/output_ast';
 import {Identifiers} from '../identifiers';
 

modules/@angular/compiler/src/view_compiler/event_binder.ts

@@ -1,5 +1,6 @@
-import {isBlank, isPresent, StringWrapper} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
+import {isBlank, isPresent, StringWrapper} from '../../src/facade/lang';
+import {ListWrapper, StringMapWrapper} from '../../src/facade/collection';
+
 import {EventHandlerVars, ViewProperties} from './constants';
 
 import * as o from '../output/output_ast';

modules/@angular/compiler/src/view_compiler/expression_converter.ts

@@ -1,10 +1,10 @@
+import {BaseException} from '../../src/facade/exceptions';
+import {isBlank, isPresent, isArray} from '../../src/facade/lang';
+
 import * as cdAst from '../expression_parser/ast';
 import * as o from '../output/output_ast';
 import {Identifiers} from '../identifiers';
 
-import {BaseException} from 'angular2/src/facade/exceptions';
-import {isBlank, isPresent, isArray} from 'angular2/src/facade/lang';
-
 var IMPLICIT_RECEIVER = o.variable('#implicit');
 
 export interface NameResolver {

modules/@angular/compiler/src/view_compiler/lifecycle_binder.ts

@@ -1,12 +1,13 @@
+import {LifecycleHooks} from '../../core_private';
 import * as o from '../output/output_ast';
 import {DetectChangesVars, ChangeDetectorStateEnum} from './constants';
-import {LifecycleHooks} from 'angular2/src/core/metadata/lifecycle_hooks';
-
 import {CompileDirectiveMetadata, CompilePipeMetadata} from '../compile_metadata';
 import {DirectiveAst} from '../template_ast';
 import {CompileElement} from './compile_element';
 import {CompileView} from './compile_view';
 
+
+
 var STATE_IS_NEVER_CHECKED =
     o.THIS_EXPR.prop('cdState').identical(ChangeDetectorStateEnum.NeverChecked);
 var NOT_THROW_ON_CHANGES = o.not(DetectChangesVars.throwOnChange);

modules/@angular/compiler/src/view_compiler/property_binder.ts

@@ -1,3 +1,7 @@
+import {LifecycleHooks, isDefaultChangeDetectionStrategy} from '../../core_private';
+
+import {isBlank, isPresent} from '../../src/facade/lang';
+
 import * as cdAst from '../expression_parser/ast';
 import * as o from '../output/output_ast';
 import {Identifiers} from '../identifiers';
@@ -8,23 +12,19 @@ import {
   BoundElementPropertyAst,
   DirectiveAst,
   PropertyBindingType,
-  TemplateAst
 } from '../template_ast';
 
-import {isBlank, isPresent, isArray} from 'angular2/src/facade/lang';
-
 import {CompileView} from './compile_view';
 import {CompileElement, CompileNode} from './compile_element';
 import {CompileMethod} from './compile_method';
 
-import {LifecycleHooks} from 'angular2/src/core/metadata/lifecycle_hooks';
-import {isDefaultChangeDetectionStrategy} from 'angular2/src/core/change_detection/constants';
 import {camelCaseToDashCase} from '../util';
 
 import {convertCdExpressionToIr} from './expression_converter';
 
 import {CompileBinding} from './compile_binding';
 
+
 function createBindFieldExpr(exprIndex: number): o.ReadPropExpr {
   return o.THIS_EXPR.prop(`_expr_${exprIndex}`);
 }

modules/@angular/compiler/src/view_compiler/util.ts

@@ -1,11 +1,10 @@
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
-import {BaseException} from 'angular2/src/facade/exceptions';
+import {isPresent, isBlank} from '../../src/facade/lang';
+import {BaseException} from '../../src/facade/exceptions';
 
 import * as o from '../output/output_ast';
 import {
   CompileTokenMetadata,
   CompileDirectiveMetadata,
-  CompileIdentifierMetadata
 } from '../compile_metadata';
 import {CompileView} from './compile_view';
 import {Identifiers} from '../identifiers';

modules/@angular/compiler/src/view_compiler/view_binder.ts

@@ -1,6 +1,6 @@
 import {
   ListWrapper,
-} from 'angular2/src/facade/collection';
+} from '../../src/facade/collection';
 import {
   TemplateAst,
   TemplateAstVisitor,
@@ -17,8 +17,6 @@ import {
   DirectiveAst,
   BoundDirectivePropertyAst,
   templateVisitAll,
-  PropertyBindingType,
-  ProviderAst
 } from '../template_ast';
 import {
   bindRenderText,

modules/@angular/compiler/src/view_compiler/view_builder.ts

@@ -1,5 +1,8 @@
-import {isPresent, isBlank, StringWrapper} from 'angular2/src/facade/lang';
-import {ListWrapper, StringMapWrapper, SetWrapper} from 'angular2/src/facade/collection';
+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 * as o from '../output/output_ast';
 import {Identifiers, identifierToken} from '../identifiers';
@@ -12,10 +15,6 @@ import {
   ChangeDetectionStrategyEnum,
   ViewProperties
 } from './constants';
-import {
-  ChangeDetectionStrategy,
-  isDefaultChangeDetectionStrategy
-} from 'angular2/src/core/change_detection/change_detection';
 
 import {CompileView} from './compile_view';
 import {CompileElement, CompileNode} from './compile_element';
@@ -36,15 +35,10 @@ import {
   DirectiveAst,
   BoundDirectivePropertyAst,
   templateVisitAll,
-  PropertyBindingType,
-  ProviderAst
 } from '../template_ast';
 
 import {getViewFactoryName, createFlatArray, createDiTokenExpression} from './util';
 
-import {ViewType} from 'angular2/src/core/linker/view_type';
-import {ViewEncapsulation} from 'angular2/src/core/metadata/view';
-
 import {
   CompileIdentifierMetadata,
   CompileDirectiveMetadata,

modules/@angular/compiler/src/view_compiler/view_compiler.ts

@@ -1,13 +1,10 @@
-import {Injectable} from 'angular2/src/core/di';
-
+import {Injectable} from '@angular/core';
 import * as o from '../output/output_ast';
 import {CompileElement} from './compile_element';
 import {CompileView} from './compile_view';
 import {buildView, finishView, ViewCompileDependency} from './view_builder';
 import {bindView} from './view_binder';
-
 import {CompileDirectiveMetadata, CompilePipeMetadata} from '../compile_metadata';
-
 import {TemplateAst} from '../template_ast';
 import {CompilerConfig} from '../config';