diff --git a/modules/angular2/router.js b/modules/angular2/router.js index e2936cc2a7..ac734a48e4 100644 --- a/modules/angular2/router.js +++ b/modules/angular2/router.js @@ -10,7 +10,7 @@ export {Router} from './src/router/router'; export {RouterOutlet} from './src/router/router_outlet'; export {RouterLink} from './src/router/router_link'; export {RouteParams} from './src/router/instruction'; -export {RouteConfig} from './src/router/route_config'; +export {RouteConfig} from './src/router/route_config_annotation'; import {Router, RootRouter} from './src/router/router'; import {RouteRegistry} from './src/router/route_registry'; diff --git a/modules/angular2/src/router/route_config_annotation.dart b/modules/angular2/src/router/route_config_annotation.dart new file mode 100644 index 0000000000..be520efc56 --- /dev/null +++ b/modules/angular2/src/router/route_config_annotation.dart @@ -0,0 +1,3 @@ +library angular2.router.route_config_annotations; + +export './route_config_impl.dart'; diff --git a/modules/angular2/src/router/route_config_annotation.es6 b/modules/angular2/src/router/route_config_annotation.es6 new file mode 100644 index 0000000000..862711fb39 --- /dev/null +++ b/modules/angular2/src/router/route_config_annotation.es6 @@ -0,0 +1,5 @@ +export {RouteConfig as RouteConfigAnnotation} from './route_config_impl'; + +import {makeDecorator} from 'angular2/src/util/decorators'; + +export var RouteConfig = makeDecorator(RouteConfig); diff --git a/modules/angular2/src/router/route_config.js b/modules/angular2/src/router/route_config_impl.js similarity index 100% rename from modules/angular2/src/router/route_config.js rename to modules/angular2/src/router/route_config_impl.js diff --git a/modules/angular2/src/router/route_registry.js b/modules/angular2/src/router/route_registry.js index b5c9dcfd2a..2bf5d2065f 100644 --- a/modules/angular2/src/router/route_registry.js +++ b/modules/angular2/src/router/route_registry.js @@ -2,7 +2,7 @@ import {RouteRecognizer} from './route_recognizer'; import {Instruction, noopInstruction} from './instruction'; import {List, ListWrapper, Map, MapWrapper, StringMap, StringMapWrapper} from 'angular2/src/facade/collection'; import {isPresent, isBlank, isType, StringWrapper, BaseException} from 'angular2/src/facade/lang'; -import {RouteConfig} from './route_config'; +import {RouteConfig} from './route_config_impl'; import {reflector} from 'angular2/src/reflection/reflection'; export class RouteRegistry { diff --git a/modules/angular2/test/router/outlet_spec.js b/modules/angular2/test/router/outlet_spec.js index 211b71c8a7..a7689f4745 100644 --- a/modules/angular2/test/router/outlet_spec.js +++ b/modules/angular2/test/router/outlet_spec.js @@ -21,7 +21,8 @@ import {View} from 'angular2/src/core/annotations_impl/view'; import {RootRouter} from 'angular2/src/router/router'; import {Pipeline} from 'angular2/src/router/pipeline'; -import {Router, RouterOutlet, RouterLink, RouteConfig, RouteParams} from 'angular2/router'; +import {Router, RouterOutlet, RouterLink, RouteParams} from 'angular2/router'; +import {RouteConfig} from 'angular2/src/router/route_config_impl'; import {DOM} from 'angular2/src/dom/dom_adapter'; diff --git a/modules/angular2/test/router/route_registry_spec.js b/modules/angular2/test/router/route_registry_spec.js index 8d11c73960..f4b9eb8a03 100644 --- a/modules/angular2/test/router/route_registry_spec.js +++ b/modules/angular2/test/router/route_registry_spec.js @@ -7,7 +7,7 @@ import { SpyObject} from 'angular2/test_lib'; import {RouteRegistry} from 'angular2/src/router/route_registry'; -import {RouteConfig} from 'angular2/src/router/route_config'; +import {RouteConfig} from 'angular2/src/router/route_config_impl'; export function main() { describe('RouteRegistry', () => {