angular · kegluneq · Mar 17, 2016
diff --git a/modules/angular2/docs/cheatsheet/bootstrapping.md b/modules/angular2/docs/cheatsheet/bootstrapping.md
@@ -4,7 +4,7 @@ Bootstrapping
 @description
 {@target ts}`import {bootstrap} from 'angular2/platform/browser';`{@endtarget}
 {@target js}Available from the `ng.platform.browser` namespace{@endtarget}
-{@target dart}`import 'package:angular2/bootstrap.dart';`{@endtarget}
+{@target dart}`import 'package:angular2/platform/browser.dart';`{@endtarget}
 
 @cheatsheetItem
 syntax(ts dart):

diff --git a/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts b/modules/angular2/examples/compiler/ts/url_resolver/url_resolver.ts
@@ -1,5 +1,5 @@
 import {provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {UrlResolver} from 'angular2/compiler';
 
 var MyApp: any;

diff --git a/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts b/modules/angular2/examples/core/forms/ts/ng_validators/ng_validators.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {NG_VALIDATORS} from 'angular2/common';
 import {Provider} from 'angular2/core';
 

diff --git a/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/async_pipe/async_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Observable, Subscriber} from 'rxjs/Rx';
 
 // #docregion AsyncPipe

diff --git a/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/date_pipe/date_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion DatePipe
 @Component({

diff --git a/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/json_pipe/json_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion JsonPipe
 @Component({

diff --git a/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/lowerupper_pipe/lowerupper_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion LowerUpperPipe
 @Component({

diff --git a/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/number_pipe/number_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion NumberPipe
 @Component({

diff --git a/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts b/modules/angular2/examples/core/pipes/ts/slice_pipe/slice_pipe_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 // #docregion SlicePipe_string
 @Component({

diff --git a/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts b/modules/angular2/examples/core/ts/prod_mode/prod_mode_example.ts
@@ -1,6 +1,6 @@
 // #docregion enableProdMode
 import {enableProdMode} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {MyComponent} from './my_component';
 
 enableProdMode();

diff --git a/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts b/modules/angular2/examples/router/ts/can_activate/can_activate_example.ts
@@ -1,5 +1,5 @@
 import {provide, Component} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   CanActivate,
   RouteConfig,

diff --git a/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts b/modules/angular2/examples/router/ts/can_deactivate/can_deactivate_example.ts
@@ -1,5 +1,5 @@
 import {provide, Component} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   CanDeactivate,
   RouteConfig,

diff --git a/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts b/modules/angular2/examples/router/ts/on_activate/on_activate_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   OnActivate,
   ComponentInstruction,

diff --git a/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts b/modules/angular2/examples/router/ts/on_deactivate/on_deactivate_example.ts
@@ -1,5 +1,5 @@
 import {Component, Injectable, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   OnDeactivate,
   ComponentInstruction,

diff --git a/modules/angular2/examples/router/ts/reuse/reuse_example.ts b/modules/angular2/examples/router/ts/reuse/reuse_example.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   CanActivate,
   RouteConfig,

diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.ts b/modules/benchmarks/src/compiler/compiler_benchmark.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {BrowserDomAdapter} from 'angular2/src/platform/browser/browser_adapter';
 import {DOM} from 'angular2/src/platform/dom/dom_adapter';
 import {PromiseWrapper} from 'angular2/src/facade/async';

diff --git a/modules/benchmarks/src/costs/index.ts b/modules/benchmarks/src/costs/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, DynamicComponentLoader, ElementRef} from 'angular2/core';
 import {NgIf, NgFor} from 'angular2/common';
 import {ApplicationRef} from 'angular2/src/core/application_ref';

diff --git a/modules/benchmarks/src/largetable/largetable_benchmark.ts b/modules/benchmarks/src/largetable/largetable_benchmark.ts
@@ -7,7 +7,7 @@ import {
   windowProfile,
   windowProfileEnd
 } from 'angular2/src/testing/benchmark_util';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, bind, provide} from 'angular2/core';
 import {NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/common';
 import {ApplicationRef} from 'angular2/src/core/application_ref';

diff --git a/modules/benchmarks/src/naive_infinite_scroll/index.ts b/modules/benchmarks/src/naive_infinite_scroll/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 import {App} from './app';
 

diff --git a/modules/benchmarks/src/static_tree/tree_benchmark.ts b/modules/benchmarks/src/static_tree/tree_benchmark.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {NgIf} from 'angular2/common';
 import {
   Compiler,

diff --git a/modules/benchmarks/src/tree/tree_benchmark.ts b/modules/benchmarks/src/tree/tree_benchmark.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   Compiler,
   Component,

diff --git a/modules/payload_tests/hello_world/ts/webpack/index.ts b/modules/payload_tests/hello_world/ts/webpack/index.ts
@@ -1,5 +1,5 @@
 import {Component} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 @Component({
   selector: 'hello-app',

diff --git a/modules/playground/src/animate/index.ts b/modules/playground/src/animate/index.ts
@@ -1,5 +1,5 @@
 import {AnimateApp} from './animate-app';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 export function main() {
   bootstrap(AnimateApp);

diff --git a/modules/playground/src/async/index.ts b/modules/playground/src/async/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {NgIf} from 'angular2/common';
 import {TimerWrapper} from 'angular2/src/facade/async';

diff --git a/modules/playground/src/gestures/index.ts b/modules/playground/src/gestures/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 
 @Component({selector: 'gestures-app', templateUrl: 'template.html'})

diff --git a/modules/playground/src/hash_routing/index.ts b/modules/playground/src/hash_routing/index.ts
@@ -1,5 +1,5 @@
 import {Component, provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   RouteConfig,
   Route,

diff --git a/modules/playground/src/hello_world/index.ts b/modules/playground/src/hello_world/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
 
 export function main() {

diff --git a/modules/playground/src/http/index.ts b/modules/playground/src/http/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {HTTP_PROVIDERS} from 'angular2/http';
 import {HttpCmp} from './http_comp';
 

diff --git a/modules/playground/src/jsonp/index.ts b/modules/playground/src/jsonp/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {JSONP_PROVIDERS} from 'angular2/http';
 import {JsonpCmp} from './jsonp_comp';
 

diff --git a/modules/playground/src/key_events/index.ts b/modules/playground/src/key_events/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {KeyEventsPlugin} from 'angular2/src/platform/dom/events/key_events';
 

diff --git a/modules/playground/src/model_driven_forms/index.ts b/modules/playground/src/model_driven_forms/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   FORM_DIRECTIVES,
   ControlGroup,

diff --git a/modules/playground/src/order_management/index.ts b/modules/playground/src/order_management/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {
   Component,
   Directive,

diff --git a/modules/playground/src/person_management/index.ts b/modules/playground/src/person_management/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, Host, forwardRef, Provider, Injectable} from 'angular2/core';
 import {NgIf, NgFor, FORM_DIRECTIVES} from 'angular2/common';
 

diff --git a/modules/playground/src/relative_assets/index.ts b/modules/playground/src/relative_assets/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 
 import {Renderer, ElementRef, Component, Directive, Injectable} from 'angular2/core';
 import {MyCmp} from './my_cmp/my_cmp';

diff --git a/modules/playground/src/routing/index.ts b/modules/playground/src/routing/index.ts
@@ -1,6 +1,6 @@
 import {InboxApp} from './inbox-app';
 import {provide} from 'angular2/core';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {ROUTER_PROVIDERS, HashLocationStrategy, LocationStrategy} from 'angular2/router';
 
 export function main() {

diff --git a/modules/playground/src/sourcemap/index.ts b/modules/playground/src/sourcemap/index.ts
@@ -1,5 +1,5 @@
 import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 
 @Component({

diff --git a/modules/playground/src/svg/index.ts b/modules/playground/src/svg/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 
 @Component({selector: '[svg-group]', template: `<svg:text x="20" y="20">Hello</svg:text>`})

diff --git a/modules/playground/src/template_driven_forms/index.ts b/modules/playground/src/template_driven_forms/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component, Directive, Host, forwardRef, Provider} from 'angular2/core';
 import {
   ControlGroup,

diff --git a/modules/playground/src/todo/index.ts b/modules/playground/src/todo/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {NgFor} from 'angular2/common';
 import {Store, Todo, TodoFactory} from './services/TodoStore';

diff --git a/modules/playground/src/web_workers/images/single_thread.ts b/modules/playground/src/web_workers/images/single_thread.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from "angular2/bootstrap";
+import {bootstrap} from "angular2/platform/browser";
 import {ImageDemo} from "./index_common";
 
 export function main() {

diff --git a/modules/playground/src/zippy_component/index.ts b/modules/playground/src/zippy_component/index.ts
@@ -1,4 +1,4 @@
-import {bootstrap} from 'angular2/bootstrap';
+import {bootstrap} from 'angular2/platform/browser';
 import {Component} from 'angular2/core';
 import {Zippy} from './zippy';
 

diff --git a/modules_dart/payload/hello_world/web/index.dart b/modules_dart/payload/hello_world/web/index.dart
@@ -1,6 +1,7 @@
 library hello_world.index;
 
-import "package:angular2/bootstrap.dart" show AngularEntrypoint, bootstrap;
+import "package:angular2/platform/browser.dart"
+    show AngularEntrypoint, bootstrap;
 import "package:angular2/angular2.dart"
     show Component, Directive, ElementRef, Injectable, Renderer;
 

diff --git a/modules_dart/transform/lib/src/transform/common/mirror_matcher.dart b/modules_dart/transform/lib/src/transform/common/mirror_matcher.dart
@@ -3,11 +3,29 @@ library angular2.transform.common.mirror_matcher;
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:angular2/src/transform/common/names.dart';
 
-const BOOTSTRAP_STATIC_URI = 'package:angular2/bootstrap_static.dart';
-const BOOTSTRAP_URI = 'package:angular2/bootstrap.dart';
-const REFLECTION_CAPABILITIES_URI =
+/// Files from which `bootstrap` is exported.
+///
+/// These files transitively imports dart:mirrors.
+/// They should be replaced with [BOOTSTRAP_STATIC_URI] in production apps.
+const _BOOTSTRAP_URIS = const <String>[
+  'package:angular2/bootstrap.dart',
+  'package:angular2/platform/browser.dart',
+];
+
+/// File from which `ReflectionCapabilities` is exported.
+///
+/// This file transitively imports dart:mirrors and should be removed from
+/// production apps. The Angular2 reflection framework should be initialized
+/// with generated code such that no reflection is necessary.
+const _REFLECTION_CAPABILITIES_URI =
     'package:angular2/src/core/reflection/reflection_capabilities.dart';
 
+/// File from which `bootstrapStatic` is exported.
+///
+/// This file does not transitively import dart:mirrors.
+/// It should be used in place of [_BOOTSTRAP_URIS] in production apps.
+const BOOTSTRAP_STATIC_URI = 'package:angular2/platform/browser_static.dart';
+
 /// Syntactially checks for code related to the use of `dart:mirrors`.
 ///
 /// Checks various [AstNode]s to determine if they are
@@ -20,10 +38,9 @@ class MirrorMatcher {
       '${node.constructorName.type.name}' == REFLECTION_CAPABILITIES_NAME;
 
   bool hasReflectionCapabilitiesUri(UriBasedDirective node) {
-    return node.uri.stringValue == REFLECTION_CAPABILITIES_URI;
+    return node.uri.stringValue == _REFLECTION_CAPABILITIES_URI;
   }
 
-  bool hasBootstrapUri(UriBasedDirective node) {
-    return node.uri.stringValue == BOOTSTRAP_URI;
-  }
+  bool hasBootstrapUri(UriBasedDirective node) =>
+      _BOOTSTRAP_URIS.contains(node.uri.stringValue);
 }
diff --git a/modules_dart/transform/test/transform/integration/directive_chain_files/index.dart b/modules_dart/transform/test/transform/integration/directive_chain_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 

diff --git a/modules_dart/transform/test/transform/integration/directive_dep_files/index.dart b/modules_dart/transform/test/transform/integration/directive_dep_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 

diff --git a/modules_dart/transform/test/transform/integration/event_getter_files/index.dart b/modules_dart/transform/test/transform/integration/event_getter_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';

diff --git a/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart b/modules_dart/transform/test/transform/integration/list_of_types_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 

diff --git a/...transform/test/transform/integration/simple_annotation_files/expected/index.template.dart b/...transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
@@ -2,7 +2,7 @@ library web_foo.template.dart;
 
 import 'index.dart';
 import 'package:angular2/src/core/reflection/reflection.dart' as _ngRef;
-import 'package:angular2/bootstrap_static.dart' show bootstrapStatic;
+import 'package:angular2/platform/browser_static.dart' show bootstrapStatic;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'bar.dart';
 import 'bar.template.dart' as i0;

diff --git a/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart b/modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart' show bootstrap;
+import 'package:angular2/platform/browser.dart' show bootstrap;
 import 'package:angular2/src/core/reflection/reflection.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';

diff --git a/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart b/modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';
 

diff --git a/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart b/modules_dart/transform/test/transform/integration/two_annotations_files/index.dart
@@ -1,6 +1,6 @@
 library web_foo;
 
-import 'package:angular2/bootstrap.dart';
+import 'package:angular2/platform/browser.dart';
 import 'package:angular2/src/core/reflection/reflection_capabilities.dart';
 import 'bar.dart';