repackaging: all the repackaging changes squashed

modules/playground/src/animate/animate-app.ts

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

modules/playground/src/animate/index.ts

@@ -1,5 +1,5 @@
 import {AnimateApp} from './animate-app';
-import {bootstrap} from 'angular2/platform/browser';
+import {bootstrap} from '@angular/platform-browser';
 
 export function main() {
   bootstrap(AnimateApp);

modules/playground/src/async/index.ts

@@ -1,7 +1,7 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
-import {NgIf} from 'angular2/common';
-import {TimerWrapper} from 'angular2/src/facade/async';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
+import {NgIf} from '@angular/common';
+import {TimerWrapper} from '@angular/facade';
 
 @Component({
   selector: 'async-app',

modules/playground/src/gestures/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
 
 @Component({selector: 'gestures-app', templateUrl: 'template.html'})
 class GesturesCmp {

modules/playground/src/hash_routing/index.ts

@@ -1,7 +1,7 @@
-import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/platform/browser';
-import {RouteConfig, Route, ROUTER_PROVIDERS, ROUTER_DIRECTIVES} from 'angular2/router';
-import {HashLocationStrategy, LocationStrategy} from 'angular2/platform/common';
+import {Component, provide} from '@angular/core';
+import {bootstrap} from '@angular/platform-browser';
+import {RouteConfig, Route, ROUTER_PROVIDERS, ROUTER_DIRECTIVES} from '@angular/router';
+import {HashLocationStrategy, LocationStrategy} from '@angular/common';
 
 
 @Component({selector: 'hello-cmp', template: `hello`})

modules/playground/src/hello_world/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
+import {bootstrap} from '@angular/platform-browser';
+import {Renderer, ElementRef, Component, Directive, Injectable} from '@angular/core';
 
 export function main() {
   // Bootstrapping only requires specifying a root component.

modules/playground/src/http/http_comp.ts

@@ -1,5 +1,5 @@
-import {Component} from 'angular2/core';
-import {Http, Response} from 'angular2/http';
+import {Component} from '@angular/core';
+import {Http, Response} from '@angular/http/http';
 import 'rxjs/add/operator/map';
 
 @Component({

modules/playground/src/http/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {HTTP_PROVIDERS} from 'angular2/http';
+import {bootstrap} from '@angular/platform-browser';
+import {HTTP_PROVIDERS} from '@angular/http/http';
 import {HttpCmp} from './http_comp';
 
 export function main() {

modules/playground/src/jsonp/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {JSONP_PROVIDERS} from 'angular2/http';
+import {bootstrap} from '@angular/platform-browser';
+import {JSONP_PROVIDERS} from '@angular/http/http';
 import {JsonpCmp} from './jsonp_comp';
 
 export function main() {

modules/playground/src/jsonp/jsonp_comp.ts

@@ -1,6 +1,6 @@
-import {Component} from 'angular2/core';
-import {Jsonp, Response} from 'angular2/http';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+import {Component} from '@angular/core';
+import {Jsonp, Response} from '@angular/http/http';
+import {ObservableWrapper} from '@angular/facade';
 
 @Component({
   selector: 'jsonp-app',

modules/playground/src/key_events/index.ts

@@ -1,6 +1,6 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
-import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
+import {KeyEventsPlugin} from '@angular/platform-browser/src/dom/events/key_events';
 
 @Component({
   selector: 'key-events-app',

modules/playground/src/model_driven_forms/index.ts

@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/platform/browser';
+import {bootstrap} from '@angular/platform-browser';
 import {
   FORM_DIRECTIVES,
   ControlGroup,
@@ -8,11 +8,11 @@ import {
   FormBuilder,
   NgIf,
   NgFor
-} from 'angular2/common';
-import {Component, Directive, Host} from 'angular2/core';
+} from '@angular/common';
+import {Component, Directive, Host} from '@angular/core';
 
-import {RegExpWrapper, print, isPresent} from 'angular2/src/facade/lang';
-import {AbstractControl} from 'angular2/common';
+import {RegExpWrapper, print, isPresent} from '@angular/facade';
+import {AbstractControl} from '@angular/common';
 
 /**
  * Custom validator.

modules/playground/src/order_management/index.ts

@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/platform/browser';
+import {bootstrap} from '@angular/platform-browser';
 import {
   Component,
   Directive,
@@ -9,10 +9,10 @@ import {
   Injectable,
   Input,
   Output
-} from 'angular2/core';
-import {NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
+} from '@angular/core';
+import {NgIf, NgFor, FORM_DIRECTIVES} from '@angular/common';
 
-import {ListWrapper} from 'angular2/src/facade/collection';
+import {ListWrapper} from '@angular/facade';
 
 /**
  * You can find the Angular 1 implementation of this example here:

modules/playground/src/person_management/index.ts

@@ -1,7 +1,6 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component, Directive, Host, forwardRef, Provider, Injectable} from 'angular2/core';
-import {NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
-
+import {bootstrap} from '@angular/platform-browser-dynamic';
+import {Component, Directive, Host, forwardRef, Provider, Injectable} from '@angular/core';
+import {NgIf, NgFor, FORM_DIRECTIVES} from '@angular/common';
 
 /**
  * You can find the Angular 1 implementation of this example here:

modules/playground/src/relative_assets/index.ts

@@ -1,6 +1,6 @@
-import {bootstrap} from 'angular2/platform/browser';
+import {bootstrap} from '@angular/platform-browser';
 
-import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
+import {Renderer, ElementRef, Component, Directive, Injectable} from '@angular/core';
 import {MyCmp} from './my_cmp/my_cmp';
 
 export function main() {

modules/playground/src/relative_assets/my_cmp/my_cmp.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 @Component(
     {selector: 'my-cmp', templateUrl: 'tpl.html', styleUrls: ['style.css'], moduleId: module.id})
 export class MyCmp {

modules/playground/src/routing/inbox-app.ts

@@ -1,10 +1,10 @@
-import {Component, Injectable} from 'angular2/core';
-import {RouterLink, RouteConfig, Router, Route, RouterOutlet, RouteParams} from 'angular2/router';
+import {Component, Injectable} from '@angular/core';
+import {RouterLink, RouteConfig, Router, Route, RouterOutlet, RouteParams} from '@angular/router';
 import * as db from './data';
-import {Location} from 'angular2/platform/common';
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {isPresent, DateWrapper} from 'angular2/src/facade/lang';
-import {PromiseCompleter} from 'angular2/src/facade/promise';
+import {Location} from '@angular/common';
+import {PromiseWrapper} from '@angular/facade';
+import {isPresent, DateWrapper} from '@angular/facade';
+import {PromiseCompleter} from '@angular/facade';
 
 class InboxRecord {
   id: string = '';

modules/playground/src/routing/index.ts

@@ -1,8 +1,8 @@
 import {InboxApp} from './inbox-app';
-import {provide} from 'angular2/core';
-import {bootstrap} from 'angular2/platform/browser';
-import {HashLocationStrategy, LocationStrategy} from 'angular2/platform/common';
-import {ROUTER_PROVIDERS} from 'angular2/router';
+import {provide} from '@angular/core';
+import {bootstrap} from '@angular/platform-browser';
+import {HashLocationStrategy, LocationStrategy} from '@angular/common';
+import {ROUTER_PROVIDERS} from '@angular/router';
 
 export function main() {
   bootstrap(InboxApp,

modules/playground/src/sourcemap/index.ts

@@ -1,6 +1,6 @@
-import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
+import {BaseException, WrappedException} from '@angular/facade';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'error-app',

modules/playground/src/svg/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
 
 @Component({selector: '[svg-group]', template: `<svg:text x="20" y="20">Hello</svg:text>`})
 class SvgGroup {

modules/playground/src/template_driven_forms/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component, Directive, Host, forwardRef, Provider} from 'angular2/core';
+import {bootstrap} from '@angular/platform-browser-dynamic';
+import {Component, Directive, Host, forwardRef, Provider} from '@angular/core';
 import {
   ControlGroup,
   NgIf,
@@ -9,9 +9,9 @@ import {
   NgControl,
   Validators,
   NgForm
-} from 'angular2/common';
+} from '@angular/common';
 
-import {RegExpWrapper, print, isPresent} from 'angular2/src/facade/lang';
+import {RegExpWrapper, print, isPresent} from '@angular/facade';
 
 /**
  * A domain model we are binding the form controls to.

modules/playground/src/todo/index.ts

@@ -1,6 +1,6 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
-import {NgFor} from 'angular2/common';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
+import {NgFor} from '@angular/common';
 import {Store, Todo, TodoFactory} from './services/TodoStore';
 
 @Component({

modules/playground/src/todo/services/TodoStore.ts

@@ -1,5 +1,5 @@
-import {Injectable} from 'angular2/core';
-import {ListWrapper, Predicate} from 'angular2/src/facade/collection';
+import {Injectable} from '@angular/core';
+import {ListWrapper, Predicate} from '@angular/facade';
 
 // base model for RecordStore
 export abstract class KeyModel {

modules/playground/src/upgrade/index.ts

@@ -1,6 +1,6 @@
-import {Component, Input, Output, EventEmitter} from 'angular2/core';
-import {UpgradeAdapter} from 'angular2/upgrade';
-import * as angular from '../../../angular2/src/upgrade/angular_js';
+import {Component, Input, Output, EventEmitter} from '@angular/core';
+import {UpgradeAdapter} from '@angular/upgrade';
+import * as angular from '@angular/upgrade/src/angular_js';
 
 var styles = [
   `

modules/playground/src/web_workers/images/background_index.ts

@@ -1,5 +1,5 @@
-import {ImageDemo} from "./index_common";
-import {bootstrapApp} from "angular2/platform/worker_app";
+import {ImageDemo} from './index_common';
+import {bootstrapApp} from '../../../../@angular/platform-browser/src/worker_app';
 
 export function main() {
   bootstrapApp(ImageDemo);

modules/playground/src/web_workers/images/index.ts

@@ -1,6 +1,6 @@
-import {Provider} from 'angular2/core';
+import {Provider} from '@angular/core';
 import {
   bootstrapRender,
-} from 'angular2/platform/worker_render';
+} from '../../../../@angular/platform-browser/src/worker_render';
 
 bootstrapRender("loader.js");

modules/playground/src/web_workers/images/index_common.ts

@@ -1,8 +1,8 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 import {BitmapService} from './services/bitmap';
-import {EventListener} from 'angular2/src/facade/browser';
+import {EventListener} from '@angular/facade';
 import {FileReader, Uint8ArrayWrapper} from './file_api';
-import {TimerWrapper} from 'angular2/src/facade/async';
+import {TimerWrapper} from '@angular/facade';
 
 @Component({selector: 'image-demo', viewProviders: [BitmapService], templateUrl: 'image_demo.html'})
 export class ImageDemo {

modules/playground/src/web_workers/images/services/bitmap.ts

@@ -1,5 +1,5 @@
 /// <reference path="../bitmap.d.ts" /> /// <reference path="../b64.d.ts" />
-import {Injectable} from 'angular2/core';
+import {Injectable} from '@angular/core';
 declare var base64js;
 
 // Temporary fix for Typescript issue #4220 (https://github.com/Microsoft/TypeScript/issues/4220)
@@ -63,7 +63,7 @@ export class BitmapService {
     return imageData;
   }
 
-  private _swap(data: Uint8Array | number[], index1: number, index2: number) {
+  private _swap(data: Uint8Array | Uint8ClampedArray | number[], index1: number, index2: number) {
     var temp = data[index1];
     data[index1] = data[index2];
     data[index2] = temp;

modules/playground/src/web_workers/images/single_thread.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from "angular2/platform/browser";
-import {ImageDemo} from "./index_common";
+import {bootstrap} from '@angular/platform-browser';
+import {ImageDemo} from './index_common';
 
 export function main() {
   bootstrap(ImageDemo);

modules/playground/src/web_workers/input/background_index.ts

@@ -1,5 +1,5 @@
-import {InputCmp} from "./index_common";
-import {bootstrapApp} from "angular2/platform/worker_app";
+import {InputCmp} from './index_common';
+import {bootstrapApp} from '../../../../@angular/platform-browser/src/worker_app';
 
 export function main() {
   bootstrapApp(InputCmp);

modules/playground/src/web_workers/input/index.ts

@@ -1,4 +1,4 @@
-import {Provider} from 'angular2/core';
-import {bootstrapRender} from 'angular2/platform/worker_render';
+import {Provider} from '@angular/core';
+import {bootstrapRender} from '../../../../@angular/platform-browser/src/worker_render';
 
 bootstrapRender("loader.js");

modules/playground/src/web_workers/input/index_common.ts

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

modules/playground/src/web_workers/kitchen_sink/background_index.ts

@@ -1,6 +1,6 @@
-import {HelloCmp} from "./index_common";
-import {bootstrapApp} from "angular2/platform/worker_app";
+import {HelloCmp} from './index_common';
+import {bootstrapApp} from '../../../../@angular/platform-browser/src/worker_app';
 
 export function main() {
   bootstrapApp(HelloCmp);
-}
+}

modules/playground/src/web_workers/kitchen_sink/index.ts

@@ -1,4 +1,4 @@
-import {Provider} from 'angular2/core';
-import {bootstrapRender} from 'angular2/platform/worker_render';
+import {Provider} from '@angular/core';
+import {bootstrapRender} from '../../../../@angular/platform-browser/src/worker_render';
 
 bootstrapRender("loader.js");

modules/playground/src/web_workers/kitchen_sink/index_common.ts

@@ -1,9 +1,9 @@
-import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
-import {StringWrapper} from 'angular2/src/facade/lang';
+import {Renderer, ElementRef, Component, Directive, Injectable} from '@angular/core';
+import {StringWrapper} from '@angular/facade';
 
 // A service available to the Injector, used by the HelloCmp component.
 @Injectable()
-class GreetingService {
+export class GreetingService {
   greeting: string = 'hello';
 }
 

modules/playground/src/web_workers/message_broker/background_index.ts

@@ -1,5 +1,5 @@
-import {bootstrapApp} from "angular2/platform/worker_app";
-import {App} from "./index_common";
+import {bootstrapApp} from '../../../../@angular/platform-browser/src/worker_app';
+import {App} from './index_common';
 
 export function main() {
   bootstrapApp(App);

modules/playground/src/web_workers/message_broker/index.ts

@@ -1,11 +1,11 @@
-import {Provider, ApplicationRef} from 'angular2/core';
+import {Provider, ApplicationRef} from '@angular/core';
 import {
   bootstrapRender,
   UiArguments,
   FnArg,
   PRIMITIVE,
   ClientMessageBrokerFactory
-} from 'angular2/platform/worker_render';
+} from '../../../../@angular/platform-browser/src/worker_render';
 
 const ECHO_CHANNEL = "ECHO";
 
@@ -33,4 +33,4 @@ function afterBootstrap(ref: ApplicationRef) {
                   `<span class='response'>${echo_result}</span>`;
             });
       });
-}
+}

modules/playground/src/web_workers/message_broker/index_common.ts

@@ -1,6 +1,6 @@
-import {PromiseWrapper} from "angular2/src/facade/async";
-import {Component} from "angular2/core";
-import {ServiceMessageBrokerFactory, PRIMITIVE} from "angular2/platform/worker_app";
+import {PromiseWrapper} from '@angular/facade';
+import {Component} from '@angular/core';
+import {ServiceMessageBrokerFactory, PRIMITIVE} from '../../../../@angular/platform-browser/src/worker_app';
 
 const ECHO_CHANNEL = "ECHO";
 

modules/playground/src/web_workers/router/background_index.ts

@@ -1,7 +1,7 @@
-import {Provider} from "angular2/core";
-import {bootstrapApp, WORKER_APP_ROUTER} from "angular2/platform/worker_app";
-import {HashLocationStrategy, LocationStrategy} from 'angular2/platform/common';
-import {App} from "./index_common";
+import {Provider} from '@angular/core';
+import {bootstrapApp, WORKER_APP_ROUTER} from '../../../../@angular/platform-browser/src/worker_app';
+import {HashLocationStrategy, LocationStrategy} from '@angular/common';
+import {App} from './index_common';
 
 export function main() {
   bootstrapApp(App,

modules/playground/src/web_workers/router/components/about.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 @Component({selector: 'about', template: '<h1>About</h1>'})
 export class About {
-}
+}

modules/playground/src/web_workers/router/components/contact.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 @Component({selector: 'contact', template: '<h1>Contact</h1>'})
 export class Contact {
-}
+}

modules/playground/src/web_workers/router/components/start.ts

@@ -1,4 +1,4 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 @Component({selector: 'start', template: '<h1>Start</h1>'})
 export class Start {
-}
+}

modules/playground/src/web_workers/router/index.ts

@@ -1,5 +1,3 @@
-import {Provider} from 'angular2/core';
-import {bootstrapRender, WORKER_RENDER_ROUTER} from 'angular2/platform/worker_render';
-import {MessageBasedPlatformLocation} from "angular2/src/web_workers/ui/platform_location";
+import {bootstrapRender, WORKER_RENDER_ROUTER} from '../../../../@angular/platform-browser/src/worker_render';
 
-let ref = bootstrapRender("loader.js", WORKER_RENDER_ROUTER);
+bootstrapRender("loader.js", WORKER_RENDER_ROUTER);

modules/playground/src/web_workers/router/index_common.ts

@@ -1,8 +1,8 @@
-import {Component} from 'angular2/core';
+import {Component} from '@angular/core';
 import {Start} from './components/start';
 import {About} from './components/about';
 import {Contact} from './components/contact';
-import {ROUTER_DIRECTIVES, RouteConfig, Route} from 'angular2/router';
+import {ROUTER_DIRECTIVES, RouteConfig, Route} from '@angular/router';
 
 @Component({selector: 'app', directives: [ROUTER_DIRECTIVES], templateUrl: 'app.html'})
 @RouteConfig([

modules/playground/src/web_workers/todo/background_index.ts

@@ -1,5 +1,5 @@
-import {TodoApp} from "./index_common";
-import {bootstrapApp} from "angular2/platform/worker_app";
+import {TodoApp} from './index_common';
+import {bootstrapApp} from '../../../../@angular/platform-browser/src/worker_app';
 
 export function main() {
   bootstrapApp(TodoApp);

modules/playground/src/web_workers/todo/index.ts

@@ -1,4 +1,4 @@
-import {Provider} from 'angular2/core';
-import {bootstrapRender} from 'angular2/platform/worker_render';
+import {Provider} from '@angular/core';
+import {bootstrapRender} from '../../../../@angular/platform-browser/src/worker_render';
 
-bootstrapRender("loader.js");
+bootstrapRender("loader.js");

modules/playground/src/web_workers/todo/index_common.ts

@@ -1,5 +1,5 @@
-import {Component} from 'angular2/core';
-import {NgFor, FORM_DIRECTIVES} from 'angular2/common';
+import {Component} from '@angular/core';
+import {NgFor, FORM_DIRECTIVES} from '@angular/common';
 import {Store, Todo, TodoFactory} from './services/TodoStore';
 
 @Component({

modules/playground/src/web_workers/todo/services/TodoStore.ts

@@ -1,5 +1,5 @@
-import {Injectable} from 'angular2/core';
-import {ListWrapper, Predicate} from 'angular2/src/facade/collection';
+import {Injectable} from '@angular/core';
+import {ListWrapper, Predicate} from '@angular/facade';
 
 // base model for RecordStore
 export class KeyModel {

modules/playground/src/zippy_component/index.ts

@@ -1,5 +1,5 @@
-import {bootstrap} from 'angular2/platform/browser';
-import {Component} from 'angular2/core';
+import {bootstrap} from '@angular/platform-browser';
+import {Component} from '@angular/core';
 import {Zippy} from './zippy';
 
 @Component({

modules/playground/src/zippy_component/zippy.ts

@@ -1,5 +1,5 @@
-import {Component, EventEmitter, Input, Output} from 'angular2/core';
-import {ObservableWrapper} from 'angular2/src/facade/async';
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {ObservableWrapper} from '@angular/facade';
 
 @Component({selector: 'zippy', templateUrl: 'zippy.html'})
 export class Zippy {