repackaging: all the repackaging changes squashed

tools/compiler_cli/src/codegen.ts

@@ -5,20 +5,19 @@
 import * as ts from 'typescript';
 import * as path from 'path';
 
-import * as compiler from 'angular2/compiler';
+import * as compiler from '@angular/compiler';
 import {StaticReflector} from './static_reflector';
-import {CompileMetadataResolver} from 'angular2/src/compiler/metadata_resolver';
-import {HtmlParser} from 'angular2/src/compiler/html_parser';
-import {DirectiveNormalizer} from 'angular2/src/compiler/directive_normalizer';
-import {Lexer} from 'angular2/src/compiler/expression_parser/lexer';
-import {Parser} from 'angular2/src/compiler/expression_parser/parser';
-import {TemplateParser} from 'angular2/src/compiler/template_parser';
-import {DomElementSchemaRegistry} from 'angular2/src/compiler/schema/dom_element_schema_registry';
-import {StyleCompiler} from 'angular2/src/compiler/style_compiler';
-import {ViewCompiler} from 'angular2/src/compiler/view_compiler/view_compiler';
-import {TypeScriptEmitter} from 'angular2/src/compiler/output/ts_emitter';
-import {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
-import {Parse5DomAdapter} from 'angular2/platform/server';
+import {CompileMetadataResolver} from '@angular/compiler/src/metadata_resolver';
+import {HtmlParser} from '@angular/compiler/src/html_parser';
+import {DirectiveNormalizer} from '@angular/compiler/src/directive_normalizer';
+import {Lexer} from '@angular/compiler/src/expression_parser/lexer';
+import {Parser} from '@angular/compiler/src/expression_parser/parser';
+import {TemplateParser} from '@angular/compiler/src/template_parser';
+import {DomElementSchemaRegistry} from '@angular/compiler/src/schema/dom_element_schema_registry';
+import {StyleCompiler} from '@angular/compiler/src/style_compiler';
+import {ViewCompiler} from '@angular/compiler/src/view_compiler/view_compiler';
+import {TypeScriptEmitter} from '@angular/compiler/src/output/ts_emitter';
+import {Parse5DomAdapter} from '@angular/platform-server';
 
 import {MetadataCollector} from 'ts-metadata-collector';
 import {NodeReflectorHost} from './reflector_host';
@@ -125,7 +124,7 @@ export class CodeGenerator {
     const normalizer = new DirectiveNormalizer(xhr, urlResolver, htmlParser);
     const parser = new Parser(new Lexer());
     const tmplParser = new TemplateParser(parser, new DomElementSchemaRegistry(), htmlParser,
-                                          /*console*/ null, [new RouterLinkTransform(parser)]);
+                                          /*console*/ null, []);
     const offlineCompiler = new compiler.OfflineCompiler(
         normalizer, tmplParser, new StyleCompiler(urlResolver),
         new ViewCompiler(new compiler.CompilerConfig(true, true, true)), new TypeScriptEmitter());

tools/compiler_cli/src/static_reflector.ts

@@ -1,4 +1,4 @@
-import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
+import {StringMapWrapper, ListWrapper} from '@angular/facade/src/collection';
 import {
   isArray,
   isPresent,
@@ -6,7 +6,7 @@ import {
   isPrimitive,
   isStringMap,
   FunctionWrapper
-} from 'angular2/src/facade/lang';
+} from '@angular/facade/src/lang';
 import {
   AttributeMetadata,
   DirectiveMetadata,
@@ -22,10 +22,10 @@ import {
   ViewChildrenMetadata,
   ViewQueryMetadata,
   QueryMetadata,
-} from 'angular2/src/core/metadata';
-import {ReflectorReader} from 'angular2/src/core/reflection/reflector_reader';
-import {reflector} from 'angular2/src/core/reflection/reflection';
-import {Provider} from 'angular2/src/core/di/provider';
+} from '@angular/core';
+import {ReflectorReader} from '@angular/core/src/reflection/reflector_reader';
+import {reflector} from '@angular/core';
+import {Provider} from '@angular/core';
 import {
   HostMetadata,
   OptionalMetadata,
@@ -33,7 +33,7 @@ import {
   SelfMetadata,
   SkipSelfMetadata,
   InjectMetadata,
-} from "angular2/src/core/di/metadata";
+} from "@angular/core";
 
 /**
  * The host of the static resolver is expected to be able to provide module metadata in the form of

tools/compiler_cli/src/static_reflector_spec.ts

@@ -1,8 +1,8 @@
 /// <reference path="../../typings/jasmine/jasmine.d.ts" />
 
-import {describe, it, iit, expect, ddescribe, beforeEach} from 'angular2/testing_internal';
-import {isBlank} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {describe, it, iit, expect, ddescribe, beforeEach} from '@angular/core/testing/testing_internal';
+import {isBlank} from '@angular/facade/src/lang';
+import {ListWrapper} from '@angular/facade/src/collection';
 
 import {StaticReflector, StaticReflectorHost, StaticSymbol} from './static_reflector';
 

tools/compiler_cli/src/tsconfig.json

@@ -7,7 +7,8 @@
         "sourceMap": true,
         "baseUrl": "../../..",
         "paths": {
-          "angular2/*": ["dist/js/cjs/angular2/*"],
+          "@angular/*": ["dist/all/@angular/*"],
+          "@angular/core": ["dist/all/@angular/core/"],
           "ts-metadata-collector": ["dist/tools/metadata"]
         },
         "experimentalDecorators": true,

tools/compiler_cli/test/src/a/multiple_components.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'my-comp',

tools/compiler_cli/test/src/basic.ts

@@ -1,5 +1,5 @@
-import {Component, Inject} from 'angular2/core';
-import {FORM_DIRECTIVES} from 'angular2/common';
+import {Component, Inject} from '@angular/core';
+import {FORM_DIRECTIVES} from '@angular/common';
 import {MyComp} from './a/multiple_components';
 
 @Component({selector: 'basic', templateUrl: './basic.html', directives: [MyComp, FORM_DIRECTIVES]})

tools/compiler_cli/test/src/bootstrap.ts

@@ -1,5 +1,5 @@
-import {coreBootstrap, ReflectiveInjector} from 'angular2/core';
-import {browserPlatform, BROWSER_APP_PROVIDERS} from 'angular2/platform/browser';
+import {coreBootstrap, ReflectiveInjector} from '@angular/core';
+import {browserPlatform, BROWSER_APP_PROVIDERS} from '@angular/platform-browser';
 import {BasicNgFactory} from './basic.ngfactory';
 import {Basic} from './basic';
 

tools/compiler_cli/test/src/features.ts

@@ -1,5 +1,5 @@
-import {Component, Inject, OpaqueToken} from 'angular2/core';
-import {NgIf} from 'angular2/common';
+import {Component, Inject, OpaqueToken} from '@angular/core';
+import {NgIf} from '@angular/common';
 
 export const SOME_OPAQUE_TOKEN = new OpaqueToken('opaqueToken');
 

tools/compiler_cli/test/tsconfig.json

@@ -19,7 +19,8 @@
          */
         "baseUrl": "../../..",
         "paths": {
-          "angular2/*": ["dist/js/cjs/angular2/*"],
+          "@angular/*": ["dist/all/@angular/*"],
+          "@angular/core": ["dist/all/@angular/core/"],
           "rxjs/*": ["node_modules/rxjs/*"],
           "ts-metadata-collector": ["dist/tools/metadata"]
         }