cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(dart/transform): Use angular2/platform/browser as bootstrap lib

Browse Source 
Update the Angular 2 transformer to recognize
`package:angular2/platform/browser.dart` as the library which exports
the `bootstrap` function.

Update playground, examples, benchmarks, & tests to import bootstrap from
platform/browser.

Closes #7647
This commit is contained in:
Tim Blasi
2016-03-17 12:49:46 -07:00
committed by Timothy Blasi
parent c194f6695d
commit b6507e37ef
77 changed files with 130 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules_dart/payload/hello_world/web/index.dart
View File

@ -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;

31
modules_dart/transform/lib/src/transform/common/mirror_matcher.dart
View File

@ -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);
}

2
modules_dart/transform/test/transform/integration/directive_chain_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/directive_dep_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/event_getter_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/list_of_types_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/simple_annotation_files/expected/index.template.dart
View File

@ -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;

2
modules_dart/transform/test/transform/integration/simple_annotation_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/synthetic_ctor_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/two_annotations_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/integration/two_deps_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/abstract_method_annotation_files/index.dart
View File

@ -1,6 +1,6 @@
library web_foo;
import 'package:angular2/bootstrap.dart';
import 'package:angular2/platform/browser.dart';
abstract class TestBootstrapper {
@AngularEntrypoint()

31
modules_dart/transform/test/transform/reflection_remover/all_tests.dart
View File

@ -48,7 +48,8 @@ void allTests() {
'should replace uses of mirrors with the debug implementation & '
'insert calls to generated code in `MirrorMode.debug`.', () {
var output = new Rewriter(code, codegen, entrypointMatcher,
mirrorMode: MirrorMode.debug).rewrite(parseCompilationUnit(code));
mirrorMode: MirrorMode.debug)
.rewrite(parseCompilationUnit(code));
expect(output).toEqual(debug_mirrors.code);
});
@ -56,24 +57,38 @@ void allTests() {
'should replace uses of mirrors with the verbose implementation '
'in `MirrorMode.verbose`.', () {
var output = new Rewriter(code, codegen, entrypointMatcher,
mirrorMode: MirrorMode.verbose).rewrite(parseCompilationUnit(code));
mirrorMode: MirrorMode.verbose)
.rewrite(parseCompilationUnit(code));
expect(output).toEqual(verbose_mirrors.code);
});
it('should not initialize the reflector when `writeStaticInit` is `false`.',
() {
var output = new Rewriter(code, codegen, entrypointMatcher,
writeStaticInit: false).rewrite(parseCompilationUnit(code));
var output =
new Rewriter(code, codegen, entrypointMatcher, writeStaticInit: false)
.rewrite(parseCompilationUnit(code));
expect(output).toEqual(log_mirrors.code);
});
describe('`bootstrap` import and call', () {
// TODO(kegluneq): Remove when we remove angular2/bootstrap.dart
it('deprecated import should be rewritten to `bootstrapStatic`.', () {
final bootstrapCode =
readFile('reflection_remover/deprecated_bootstrap_files/index.dart')
.replaceAll('\r\n', '\n');
var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
writeStaticInit: true)
.rewrite(parseCompilationUnit(bootstrapCode));
expect(output).toEqual(bootstrap_expected.code);
});
it('should be rewritten to `bootstrapStatic`.', () {
final bootstrapCode =
readFile('reflection_remover/bootstrap_files/index.dart')
.replaceAll('\r\n', '\n');
var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
writeStaticInit: true).rewrite(parseCompilationUnit(bootstrapCode));
writeStaticInit: true)
.rewrite(parseCompilationUnit(bootstrapCode));
expect(output).toEqual(bootstrap_expected.code);
});
@ -81,7 +96,8 @@ void allTests() {
final bootstrapCode =
readFile('reflection_remover/deferred_bootstrap_files/index.dart');
var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
writeStaticInit: true).rewrite(parseCompilationUnit(bootstrapCode));
writeStaticInit: true)
.rewrite(parseCompilationUnit(bootstrapCode));
expect(output).toEqual(deferred_bootstrap_expected.code);
});
@ -89,7 +105,8 @@ void allTests() {
final bootstrapCode =
readFile('reflection_remover/combinator_files/index.dart');
var output = new Rewriter(bootstrapCode, codegen, entrypointMatcher,
writeStaticInit: true).rewrite(parseCompilationUnit(bootstrapCode));
writeStaticInit: true)
.rewrite(parseCompilationUnit(bootstrapCode));
expect(output).toEqual(combinator_expected.code);
});
});

2
modules_dart/transform/test/transform/reflection_remover/arrow_annotation_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/bootstrap_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.reflection_remover_files;
var code = """
library web_foo;
import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
void main() async {
var appRef = await bootstrapStatic(MyComponent, null, () { ngStaticInit.initReflector(); });

2
modules_dart/transform/test/transform/reflection_remover/bootstrap_files/index.dart
View File

@ -1,6 +1,6 @@
library web_foo;
import 'package:angular2/bootstrap.dart';
import 'package:angular2/platform/browser.dart';
void main() async {
var appRef = await bootstrap(MyComponent);

2
modules_dart/transform/test/transform/reflection_remover/combinator_files/expected/index.dart
View File

@ -9,7 +9,7 @@ library angular2.test.transform.reflection_remover.combinator_files;
// those we are removing.
var code = """
import 'package:angular2/bootstrap_static.dart' show bootstrapStatic, initReflector;import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart' show bootstrapStatic, initReflector;import 'index.template.dart' as ngStaticInit;
void main() {
bootstrapStatic(MyComponent, null, () { ngStaticInit.initReflector(); });

2
modules_dart/transform/test/transform/reflection_remover/combinator_files/index.dart
View File

@ -1,4 +1,4 @@
import 'package:angular2/bootstrap.dart' show bootstrap;
import 'package:angular2/platform/browser.dart' show bootstrap;
void main() {
bootstrap(MyComponent);

2
modules_dart/transform/test/transform/reflection_remover/debug_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.debug_reflection_remover_files;
var code = """
library web_foo;
import 'package:angular2/bootstrap.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/src/core/reflection/reflection.dart';
import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';

2
modules_dart/transform/test/transform/reflection_remover/debug_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.debug_mirrors_files.expected;
var code = """
library web_foo;
import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/src/core/reflection/reflection.dart';
import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';

2
modules_dart/transform/test/transform/reflection_remover/debug_mirrors_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/expected/index.dart
View File

@ -9,7 +9,7 @@ library angular2.test.transform.reflection_remover.deferred_bootstrap_files;
// those we are removing.
var code = """
import 'package:angular2/bootstrap_static.dart' deferred as ng;import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart' deferred as ng;import 'index.template.dart' as ngStaticInit;
void main() {
ng.loadLibrary().then((_) {

2
modules_dart/transform/test/transform/reflection_remover/deferred_bootstrap_files/index.dart
View File

@ -1,4 +1,4 @@
import 'package:angular2/bootstrap.dart' deferred as ng;
import 'package:angular2/platform/browser.dart' deferred as ng;
void main() {
ng.loadLibrary().then((_) {

7
modules_dart/transform/test/transform/reflection_remover/deprecated_bootstrap_files/index.dart Normal file
View File

@ -0,0 +1,7 @@
library web_foo;
import 'package:angular2/platform/browser.dart';
void main() async {
var appRef = await bootstrap(MyComponent);
}

2
modules_dart/transform/test/transform/reflection_remover/function_annotation_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.function_annotation_files;
const code = """
library web_foo;
import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/src/core/reflection/reflection.dart';
/*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/

2
modules_dart/transform/test/transform/reflection_remover/function_annotation_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.log_mirrors_files.expected;
var code = """
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';*/

2
modules_dart/transform/test/transform/reflection_remover/log_mirrors_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/method_annotation_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.method_annotation_files;
const code = """
library web_foo;
import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
class TestBootstrapper {
@AngularEntrypoint("Method entrypoint")

2
modules_dart/transform/test/transform/reflection_remover/method_annotation_files/index.dart
View File

@ -1,6 +1,6 @@
library web_foo;
import 'package:angular2/bootstrap.dart';
import 'package:angular2/platform/browser.dart';
class TestBootstrapper {
@AngularEntrypoint("Method entrypoint")

2
modules_dart/transform/test/transform/reflection_remover/native_annotation_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.reflection_remover_files;
var code = """
library web_foo;
import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/src/core/reflection/reflection.dart';
/*import 'package:angular2/src/core/reflection/reflection_capabilities.dart';*/

2
modules_dart/transform/test/transform/reflection_remover/reflection_remover_files/index.dart
View File

@ -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';

2
modules_dart/transform/test/transform/reflection_remover/verbose_files/expected/index.dart
View File

@ -11,7 +11,7 @@ library angular2.test.transform.reflection_remover.verbose_files.expected;
var code = """
library web_foo;
import 'package:angular2/bootstrap_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/platform/browser_static.dart';import 'index.template.dart' as ngStaticInit;
import 'package:angular2/src/core/reflection/reflection.dart';
import 'package:angular2/src/core/reflection/debug_reflection_capabilities.dart';