Skip to content

refactor(dart/transform): Remove deprecated angular2/bootstrap #7650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kegluneq wants to merge 1 commit into from
Closed

refactor(dart/transform): Remove deprecated angular2/bootstrap #7650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions modules/angular2/bootstrap.ts
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions modules/angular2/bootstrap_static.ts
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions modules_dart/transform/lib/src/transform/common/annotation_matcher.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ const _INJECTABLES = const [
const ClassDescriptor('Injectable', 'package:angular2/core.dart'),
const ClassDescriptor('Injectable', 'package:angular2/src/core/di.dart'),
const ClassDescriptor('Injectable', 'package:angular2/angular2.dart'),
const ClassDescriptor('Injectable', 'package:angular2/bootstrap_static.dart'),
const ClassDescriptor(
'Injectable', 'package:angular2/web_worker/worker.dart'),
];
Expand Down Expand Up @@ -65,7 +64,6 @@ const _PIPES = const [
const _VIEWS = const [
const ClassDescriptor('View', 'package:angular2/angular2.dart'),
const ClassDescriptor('View', 'package:angular2/web_worker/worker.dart'),
const ClassDescriptor('View', 'package:angular2/bootstrap_static.dart'),
const ClassDescriptor('View', 'package:angular2/core.dart'),
const ClassDescriptor('View', 'package:angular2/src/core/metadata/view.dart'),
const ClassDescriptor('View', 'package:angular2/src/core/metadata.dart'),
Expand All @@ -74,9 +72,6 @@ const _VIEWS = const [
const _ENTRYPOINTS = const [
const ClassDescriptor('AngularEntrypoint', 'package:angular2/angular2.dart'),
const ClassDescriptor('AngularEntrypoint', 'package:angular2/core.dart'),
const ClassDescriptor('AngularEntrypoint', 'package:angular2/bootstrap.dart'),
const ClassDescriptor(
'AngularEntrypoint', 'package:angular2/bootstrap_static.dart'),
const ClassDescriptor(
'AngularEntrypoint', 'package:angular2/platform/browser.dart'),
const ClassDescriptor(
Expand Down
15 changes: 6 additions & 9 deletions modules_dart/transform/lib/src/transform/common/mirror_matcher.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ library angular2.transform.common.mirror_matcher;
import 'package:analyzer/src/generated/ast.dart';
import 'package:angular2/src/transform/common/names.dart';

/// Files from which `bootstrap` is exported.
/// File 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',
];
/// This file transitively imports dart:mirrors.
/// It should be replaced with [BOOTSTRAP_STATIC_URI] in production apps.
const _BOOTSTRAP_URI = 'package:angular2/platform/browser.dart';

/// File from which `ReflectionCapabilities` is exported.
///
Expand All @@ -23,7 +20,7 @@ const _REFLECTION_CAPABILITIES_URI =
/// 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.
/// It should be used in place of [_BOOTSTRAP_URI] in production apps.
const BOOTSTRAP_STATIC_URI = 'package:angular2/platform/browser_static.dart';

/// Syntactially checks for code related to the use of `dart:mirrors`.
Expand All @@ -42,5 +39,5 @@ class MirrorMatcher {
}

bool hasBootstrapUri(UriBasedDirective node) =>
_BOOTSTRAP_URIS.contains(node.uri.stringValue);
_BOOTSTRAP_URI == node.uri.stringValue;
}
11 changes: 0 additions & 11 deletions modules_dart/transform/test/transform/reflection_remover/all_tests.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,6 @@ void allTests() {
});

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')
Expand Down
7 changes: 0 additions & 7 deletions ...es_dart/transform/test/transform/reflection_remover/deprecated_bootstrap_files/index.dart
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools/broccoli/html-replace/SCRIPTS.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// not even be in src/*. Move them!
'angular2/src/testing/benchmark_util',
'angular2/src/facade/browser',
'angular2/bootstrap',
'rxjs'
];
if (@@USE_BUNDLES) {
Expand Down
1 change: 0 additions & 1 deletion tools/broccoli/html-replace/SCRIPTS_benchmarks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
// not even be in src/*. Move them!
'angular2/src/testing/benchmark_util',
'angular2/src/facade/browser',
'angular2/bootstrap',
'rxjs'
];
if (@@USE_BUNDLES) {
Expand Down