diff --git a/modules/benchmarks/src/change_detection/change_detection_benchmark.js b/modules/benchmarks/src/change_detection/change_detection_benchmark.js index 698b92ac71..c58e51ca16 100644 --- a/modules/benchmarks/src/change_detection/change_detection_benchmark.js +++ b/modules/benchmarks/src/change_detection/change_detection_benchmark.js @@ -1,15 +1,15 @@ import {ListWrapper, MapWrapper} from 'facade/collection'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; import {reflector} from 'reflection/reflection'; import {isPresent} from 'facade/lang'; import {document, DOM} from 'facade/dom'; import { + Lexer, + Parser, ChangeDetector, ProtoRecordRange, ChangeDispatcher, -} from 'change_detection/change_detector'; +} from 'change_detection/change_detection'; var ITERATIONS = 500000; diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.js b/modules/benchmarks/src/compiler/compiler_benchmark.js index 3b207c9012..a5a1a6d8ca 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.js +++ b/modules/benchmarks/src/compiler/compiler_benchmark.js @@ -3,9 +3,7 @@ import {isBlank, Type} from 'facade/lang'; import {MapWrapper} from 'facade/collection'; import {DirectiveMetadata} from 'core/compiler/directive_metadata'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; -import {ProtoRecordRange} from 'change_detection/record_range'; +import {Parser, Lexer, ProtoRecordRange} from 'change_detection/change_detection'; import {Compiler, CompilerCache} from 'core/compiler/compiler'; import {DirectiveMetadataReader} from 'core/compiler/directive_metadata_reader'; diff --git a/modules/benchmarks/src/tree/tree_benchmark.js b/modules/benchmarks/src/tree/tree_benchmark.js index 526489793d..c247bb4217 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.js +++ b/modules/benchmarks/src/tree/tree_benchmark.js @@ -1,6 +1,4 @@ -import {ChangeDetector} from 'change_detection/change_detector'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Parser, Lexer, ChangeDetector} from 'change_detection/change_detection'; import {bootstrap, Component, Template, TemplateConfig, ViewPort, Compiler} from 'core/core'; diff --git a/modules/change_detection/src/change_detection.js b/modules/change_detection/src/change_detection.js new file mode 100644 index 0000000000..6fac7d72de --- /dev/null +++ b/modules/change_detection/src/change_detection.js @@ -0,0 +1,7 @@ +export {ChangeDetectionError, ChangeDetector} from './change_detector'; +export {AST, ASTWithSource} from './parser/ast'; +export {Lexer} from './parser/lexer'; +export {Parser} from './parser/parser'; +export {ProtoRecordRange, RecordRange, ChangeDispatcher} from './record_range'; +export {ProtoRecord, Record} from './record'; +export {ContextWithVariableBindings} from './parser/context_with_variable_bindings'; diff --git a/modules/change_detection/test/array_changes_spec.js b/modules/change_detection/test/array_changes_spec.js index 7f5dc83405..6419799558 100644 --- a/modules/change_detection/test/array_changes_spec.js +++ b/modules/change_detection/test/array_changes_spec.js @@ -1,7 +1,9 @@ import {describe, it, iit, xit, expect, beforeEach, afterEach} from 'test_lib/test_lib'; import {ArrayChanges} from 'change_detection/array_changes'; + import {NumberWrapper} from 'facade/lang'; import {ListWrapper, MapWrapper} from 'facade/collection'; + import {TestIterable} from './iterable'; import {arrayChangesAsString} from './util'; diff --git a/modules/change_detection/test/change_detector_spec.js b/modules/change_detection/test/change_detector_spec.js index b8425fe1ae..533d804885 100644 --- a/modules/change_detection/test/change_detector_spec.js +++ b/modules/change_detection/test/change_detector_spec.js @@ -2,9 +2,10 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach} from 'test_lib/te import {isPresent, isBlank, isJsObject, BaseException} from 'facade/lang'; import {List, ListWrapper, MapWrapper} from 'facade/collection'; -import {ContextWithVariableBindings} from 'change_detection/parser/context_with_variable_bindings'; + import {Parser} from 'change_detection/parser/parser'; import {Lexer} from 'change_detection/parser/lexer'; +import {ContextWithVariableBindings} from 'change_detection/parser/context_with_variable_bindings'; import {arrayChangesAsString, kvChangesAsString} from './util'; import { diff --git a/modules/change_detection/test/parser/context_with_variable_bindings_spec.js b/modules/change_detection/test/parser/context_with_variable_bindings_spec.js index fdf5e90de1..300badfa43 100644 --- a/modules/change_detection/test/parser/context_with_variable_bindings_spec.js +++ b/modules/change_detection/test/parser/context_with_variable_bindings_spec.js @@ -1,7 +1,9 @@ import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'test_lib/test_lib'; + +import {ContextWithVariableBindings} from 'change_detection/parser/context_with_variable_bindings'; + import {BaseException, isBlank, isPresent} from 'facade/lang'; import {MapWrapper, ListWrapper} from 'facade/collection'; -import {ContextWithVariableBindings} from 'change_detection/parser/context_with_variable_bindings'; export function main() { describe('ContextWithVariableBindings', () => { diff --git a/modules/change_detection/test/parser/lexer_spec.js b/modules/change_detection/test/parser/lexer_spec.js index 025977df24..5b17de7150 100644 --- a/modules/change_detection/test/parser/lexer_spec.js +++ b/modules/change_detection/test/parser/lexer_spec.js @@ -1,5 +1,7 @@ import {describe, it, expect} from 'test_lib/test_lib'; + import {Lexer, Token} from 'change_detection/parser/lexer'; + import {List, ListWrapper} from "facade/collection"; import {StringWrapper, int} from "facade/lang"; diff --git a/modules/change_detection/test/record_range_spec.js b/modules/change_detection/test/record_range_spec.js index b0c977767b..1045cce500 100644 --- a/modules/change_detection/test/record_range_spec.js +++ b/modules/change_detection/test/record_range_spec.js @@ -1,9 +1,10 @@ import {ddescribe, describe, it, iit, xit, expect, beforeEach} from 'test_lib/test_lib'; +import {Parser} from 'change_detection/parser/parser'; +import {Lexer} from 'change_detection/parser/lexer'; + import {List, ListWrapper, MapWrapper} from 'facade/collection'; import {isPresent} from 'facade/lang'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; import { ChangeDetector, diff --git a/modules/core/src/application.js b/modules/core/src/application.js index b7b29a132c..775829e4f3 100644 --- a/modules/core/src/application.js +++ b/modules/core/src/application.js @@ -4,10 +4,7 @@ import {DOM, Element} from 'facade/dom'; import {Compiler, CompilerCache} from './compiler/compiler'; import {ProtoView} from './compiler/view'; import {Reflector, reflector} from 'reflection/reflection'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; -import {ChangeDetector} from 'change_detection/change_detector'; -import {RecordRange} from 'change_detection/record_range'; +import {Parser, Lexer, ChangeDetector, RecordRange} from 'change_detection/change_detection'; import {TemplateLoader} from './compiler/template_loader'; import {DirectiveMetadataReader} from './compiler/directive_metadata_reader'; import {DirectiveMetadata} from './compiler/directive_metadata'; diff --git a/modules/core/src/compiler/compiler.js b/modules/core/src/compiler/compiler.js index efadcdb305..2f603e2040 100644 --- a/modules/core/src/compiler/compiler.js +++ b/modules/core/src/compiler/compiler.js @@ -3,7 +3,7 @@ import {Promise, PromiseWrapper} from 'facade/async'; import {List, ListWrapper, MapWrapper} from 'facade/collection'; import {DOM, Element} from 'facade/dom'; -import {Parser} from 'change_detection/parser/parser'; +import {Parser} from 'change_detection/change_detection'; import {DirectiveMetadataReader} from './directive_metadata_reader'; import {ProtoView} from './view'; diff --git a/modules/core/src/compiler/pipeline/compile_element.js b/modules/core/src/compiler/pipeline/compile_element.js index cf4461b129..962a2a58c1 100644 --- a/modules/core/src/compiler/pipeline/compile_element.js +++ b/modules/core/src/compiler/pipeline/compile_element.js @@ -9,7 +9,7 @@ import {ElementBinder} from '../element_binder'; import {ProtoElementInjector} from '../element_injector'; import {ProtoView} from '../view'; -import {ASTWithSource} from 'change_detection/parser/ast'; +import {ASTWithSource} from 'change_detection/change_detection'; /** * Collects all data that is needed to process an element diff --git a/modules/core/src/compiler/pipeline/default_steps.js b/modules/core/src/compiler/pipeline/default_steps.js index 5537c8e46b..cd30e5dafd 100644 --- a/modules/core/src/compiler/pipeline/default_steps.js +++ b/modules/core/src/compiler/pipeline/default_steps.js @@ -1,4 +1,4 @@ -import {Parser} from 'change_detection/parser/parser'; +import {Parser} from 'change_detection/change_detection'; import {List} from 'facade/collection'; import {PropertyBindingParser} from './property_binding_parser'; diff --git a/modules/core/src/compiler/pipeline/element_binder_builder.js b/modules/core/src/compiler/pipeline/element_binder_builder.js index 4c36128669..bdbc226611 100644 --- a/modules/core/src/compiler/pipeline/element_binder_builder.js +++ b/modules/core/src/compiler/pipeline/element_binder_builder.js @@ -4,8 +4,7 @@ import {ListWrapper, List, MapWrapper, StringMapWrapper} from 'facade/collection import {reflector} from 'reflection/reflection'; -import {Parser} from 'change_detection/parser/parser'; -import {ProtoRecordRange} from 'change_detection/record_range'; +import {Parser, ProtoRecordRange} from 'change_detection/change_detection'; import {Component, Directive} from '../../annotations/annotations'; import {DirectiveMetadata} from '../directive_metadata'; diff --git a/modules/core/src/compiler/pipeline/property_binding_parser.js b/modules/core/src/compiler/pipeline/property_binding_parser.js index e593f3386e..32e05fef3a 100644 --- a/modules/core/src/compiler/pipeline/property_binding_parser.js +++ b/modules/core/src/compiler/pipeline/property_binding_parser.js @@ -2,9 +2,7 @@ import {isPresent, isBlank, RegExpWrapper, BaseException} from 'facade/lang'; import {MapWrapper} from 'facade/collection'; import {TemplateElement} from 'facade/dom'; -import {Parser} from 'change_detection/parser/parser'; -import {AST} from 'change_detection/parser/ast'; -import {ExpressionWithSource} from 'change_detection/parser/ast'; +import {Parser, AST, ExpressionWithSource} from 'change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/core/src/compiler/pipeline/proto_view_builder.js b/modules/core/src/compiler/pipeline/proto_view_builder.js index 5ba6cec59a..6376dbc267 100644 --- a/modules/core/src/compiler/pipeline/proto_view_builder.js +++ b/modules/core/src/compiler/pipeline/proto_view_builder.js @@ -2,7 +2,7 @@ import {isPresent, BaseException} from 'facade/lang'; import {ListWrapper, MapWrapper} from 'facade/collection'; import {ProtoView} from '../view'; -import {ProtoRecordRange} from 'change_detection/record_range'; +import {ProtoRecordRange} from 'change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/core/src/compiler/pipeline/text_interpolation_parser.js b/modules/core/src/compiler/pipeline/text_interpolation_parser.js index 58c60ff8a5..09c0def1ae 100644 --- a/modules/core/src/compiler/pipeline/text_interpolation_parser.js +++ b/modules/core/src/compiler/pipeline/text_interpolation_parser.js @@ -1,7 +1,7 @@ import {RegExpWrapper, StringWrapper, isPresent} from 'facade/lang'; import {Node, DOM} from 'facade/dom'; -import {Parser} from 'change_detection/parser/parser'; +import {Parser} from 'change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/core/src/compiler/pipeline/view_splitter.js b/modules/core/src/compiler/pipeline/view_splitter.js index 21caed37db..fb157f030a 100644 --- a/modules/core/src/compiler/pipeline/view_splitter.js +++ b/modules/core/src/compiler/pipeline/view_splitter.js @@ -2,7 +2,7 @@ import {isBlank, isPresent} from 'facade/lang'; import {DOM, TemplateElement} from 'facade/dom'; import {MapWrapper, ListWrapper} from 'facade/collection'; -import {Parser} from 'change_detection/parser/parser'; +import {Parser} from 'change_detection/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/core/src/compiler/view.js b/modules/core/src/compiler/view.js index 2ccf8a749a..8dcaccb7d8 100644 --- a/modules/core/src/compiler/view.js +++ b/modules/core/src/compiler/view.js @@ -1,8 +1,7 @@ import {DOM, Element, Node, Text, DocumentFragment, TemplateElement} from 'facade/dom'; import {ListWrapper, MapWrapper, StringMapWrapper, List} from 'facade/collection'; -import {ProtoRecordRange, RecordRange, ChangeDispatcher} from 'change_detection/record_range'; -import {Record} from 'change_detection/record'; -import {AST} from 'change_detection/parser/ast'; +import {ProtoRecordRange, RecordRange, Record, + ChangeDispatcher, AST, ContextWithVariableBindings} from 'change_detection/change_detection'; import {ProtoElementInjector, ElementInjector, PreBuiltObjects} from './element_injector'; import {ElementBinder} from './element_binder'; @@ -13,7 +12,6 @@ import {Injector} from 'di/di'; import {NgElement} from 'core/dom/element'; import {ViewPort} from './viewport'; import {OnChange} from './interfaces'; -import {ContextWithVariableBindings} from 'change_detection/parser/context_with_variable_bindings'; const NG_BINDING_CLASS = 'ng-binding'; const NG_BINDING_CLASS_SELECTOR = '.ng-binding'; diff --git a/modules/core/src/core.js b/modules/core/src/core.js index 44b36456f9..8f3247464d 100644 --- a/modules/core/src/core.js +++ b/modules/core/src/core.js @@ -7,9 +7,7 @@ export * from './annotations/template_config'; export * from './application'; -export * from 'change_detection/change_detector'; -export * from 'change_detection/record_range'; -export * from 'change_detection/record'; +export * from 'change_detection/change_detection'; export * from './compiler/compiler'; export * from './compiler/template_loader'; diff --git a/modules/core/src/life_cycle/life_cycle.js b/modules/core/src/life_cycle/life_cycle.js index 6654a91d19..c78761e406 100644 --- a/modules/core/src/life_cycle/life_cycle.js +++ b/modules/core/src/life_cycle/life_cycle.js @@ -1,5 +1,5 @@ import {FIELD, print} from 'facade/lang'; -import {ChangeDetector} from 'change_detection/change_detector'; +import {ChangeDetector} from 'change_detection/change_detection'; import {VmTurnZone} from 'core/zone/vm_turn_zone'; import {ListWrapper} from 'facade/collection'; diff --git a/modules/core/test/compiler/compiler_spec.js b/modules/core/test/compiler/compiler_spec.js index 0839cbc911..968f92ad88 100644 --- a/modules/core/test/compiler/compiler_spec.js +++ b/modules/core/test/compiler/compiler_spec.js @@ -12,8 +12,7 @@ import {CompileElement} from 'core/compiler/pipeline/compile_element'; import {CompileStep} from 'core/compiler/pipeline/compile_step' import {CompileControl} from 'core/compiler/pipeline/compile_control'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser} from 'change_detection/change_detection'; export function main() { describe('compiler', function() { diff --git a/modules/core/test/compiler/element_injector_spec.js b/modules/core/test/compiler/element_injector_spec.js index 09ec73e0aa..e000d85215 100644 --- a/modules/core/test/compiler/element_injector_spec.js +++ b/modules/core/test/compiler/element_injector_spec.js @@ -5,7 +5,7 @@ import {ProtoElementInjector, PreBuiltObjects} from 'core/compiler/element_injec import {Parent, Ancestor} from 'core/annotations/visibility'; import {Injector, Inject, bind} from 'di/di'; import {View} from 'core/compiler/view'; -import {ProtoRecordRange} from 'change_detection/record_range'; +import {ProtoRecordRange} from 'change_detection/change_detection'; import {ViewPort} from 'core/compiler/viewport'; import {NgElement} from 'core/dom/element'; diff --git a/modules/core/test/compiler/integration_spec.js b/modules/core/test/compiler/integration_spec.js index d248cf8b6c..de63c7cc6b 100644 --- a/modules/core/test/compiler/integration_spec.js +++ b/modules/core/test/compiler/integration_spec.js @@ -3,9 +3,7 @@ import {describe, xit, it, expect, beforeEach, ddescribe, iit} from 'test_lib/te import {DOM} from 'facade/dom'; import {Injector} from 'di/di'; -import {ChangeDetector} from 'change_detection/change_detector'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser, ChangeDetector} from 'change_detection/change_detection'; import {Compiler, CompilerCache} from 'core/compiler/compiler'; import {DirectiveMetadataReader} from 'core/compiler/directive_metadata_reader'; diff --git a/modules/core/test/compiler/pipeline/directive_parser_spec.js b/modules/core/test/compiler/pipeline/directive_parser_spec.js index aa171ce03e..0e70f33c08 100644 --- a/modules/core/test/compiler/pipeline/directive_parser_spec.js +++ b/modules/core/test/compiler/pipeline/directive_parser_spec.js @@ -12,8 +12,7 @@ import {Decorator} from 'core/annotations/annotations'; import {Template} from 'core/annotations/annotations'; import {TemplateConfig} from 'core/annotations/template_config'; import {DirectiveMetadataReader} from 'core/compiler/directive_metadata_reader'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser} from 'change_detection/change_detection'; export function main() { describe('DirectiveParser', () => { diff --git a/modules/core/test/compiler/pipeline/element_binder_builder_spec.js b/modules/core/test/compiler/pipeline/element_binder_builder_spec.js index 29a5fe79e3..81ece02767 100644 --- a/modules/core/test/compiler/pipeline/element_binder_builder_spec.js +++ b/modules/core/test/compiler/pipeline/element_binder_builder_spec.js @@ -16,10 +16,7 @@ import {ProtoView, ElementPropertyMemento, DirectivePropertyMemento} from 'core/ import {ProtoElementInjector} from 'core/compiler/element_injector'; import {DirectiveMetadataReader} from 'core/compiler/directive_metadata_reader'; -import {ProtoRecordRange} from 'change_detection/record_range'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; -import {ChangeDetector} from 'change_detection/change_detector'; +import {ChangeDetector, Lexer, Parser, ProtoRecordRange} from 'change_detection/change_detection'; import {Injector} from 'di/di'; export function main() { diff --git a/modules/core/test/compiler/pipeline/property_binding_parser_spec.js b/modules/core/test/compiler/pipeline/property_binding_parser_spec.js index ea94fc21f3..4c5f0da9fb 100644 --- a/modules/core/test/compiler/pipeline/property_binding_parser_spec.js +++ b/modules/core/test/compiler/pipeline/property_binding_parser_spec.js @@ -4,8 +4,7 @@ import {CompilePipeline} from 'core/compiler/pipeline/compile_pipeline'; import {DOM} from 'facade/dom'; import {MapWrapper} from 'facade/collection'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser} from 'change_detection/change_detection'; export function main() { describe('PropertyBindingParser', () => { diff --git a/modules/core/test/compiler/pipeline/text_interpolation_parser_spec.js b/modules/core/test/compiler/pipeline/text_interpolation_parser_spec.js index 79bf75f46e..918955c78a 100644 --- a/modules/core/test/compiler/pipeline/text_interpolation_parser_spec.js +++ b/modules/core/test/compiler/pipeline/text_interpolation_parser_spec.js @@ -4,8 +4,7 @@ import {CompilePipeline} from 'core/compiler/pipeline/compile_pipeline'; import {DOM} from 'facade/dom'; import {MapWrapper} from 'facade/collection'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser} from 'change_detection/change_detection'; export function main() { describe('TextInterpolationParser', () => { diff --git a/modules/core/test/compiler/pipeline/view_splitter_spec.js b/modules/core/test/compiler/pipeline/view_splitter_spec.js index 9432e9ac80..e84c1098ea 100644 --- a/modules/core/test/compiler/pipeline/view_splitter_spec.js +++ b/modules/core/test/compiler/pipeline/view_splitter_spec.js @@ -6,8 +6,7 @@ import {ViewSplitter} from 'core/compiler/pipeline/view_splitter'; import {CompilePipeline} from 'core/compiler/pipeline/compile_pipeline'; import {DOM, TemplateElement} from 'facade/dom'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser} from 'change_detection/change_detection'; export function main() { describe('ViewSplitter', () => { diff --git a/modules/core/test/compiler/view_spec.js b/modules/core/test/compiler/view_spec.js index ac32eb5031..2fd83354e9 100644 --- a/modules/core/test/compiler/view_spec.js +++ b/modules/core/test/compiler/view_spec.js @@ -5,11 +5,8 @@ import {ShadowDomEmulated} from 'core/compiler/shadow_dom'; import {DirectiveMetadataReader} from 'core/compiler/directive_metadata_reader'; import {Component, Decorator, Template} from 'core/annotations/annotations'; import {OnChange} from 'core/core'; -import {ProtoRecordRange} from 'change_detection/record_range'; -import {ChangeDetector} from 'change_detection/change_detector'; +import {Lexer, Parser, ProtoRecordRange, ChangeDetector} from 'change_detection/change_detection'; import {TemplateConfig} from 'core/annotations/template_config'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; import {DOM, Element} from 'facade/dom'; import {FIELD} from 'facade/lang'; import {Injector} from 'di/di'; diff --git a/modules/core/test/compiler/viewport_spec.js b/modules/core/test/compiler/viewport_spec.js index d2662df22b..27b0b9ceaa 100644 --- a/modules/core/test/compiler/viewport_spec.js +++ b/modules/core/test/compiler/viewport_spec.js @@ -5,9 +5,7 @@ import {DOM} from 'facade/dom'; import {ListWrapper, MapWrapper} from 'facade/collection'; import {Injector} from 'di/di'; import {ProtoElementInjector, ElementInjector} from 'core/compiler/element_injector'; -import {ProtoRecordRange} from 'change_detection/record_range'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {ProtoRecordRange, Lexer, Parser} from 'change_detection/change_detection'; function createElement(html) { return DOM.createTemplate(html).content.firstChild; diff --git a/modules/directives/test/ng_repeat_spec.js b/modules/directives/test/ng_repeat_spec.js index f71b1a8130..15d326d7cf 100644 --- a/modules/directives/test/ng_repeat_spec.js +++ b/modules/directives/test/ng_repeat_spec.js @@ -3,9 +3,7 @@ import {describe, xit, it, expect, beforeEach, ddescribe, iit} from 'test_lib/te import {DOM} from 'facade/dom'; import {Injector} from 'di/di'; -import {ChangeDetector} from 'change_detection/change_detector'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser, ChangeDetector} from 'change_detection/change_detection'; import {Compiler, CompilerCache} from 'core/compiler/compiler'; import {OnChange} from 'core/compiler/interfaces'; diff --git a/modules/examples/src/hello_world/index_static.js b/modules/examples/src/hello_world/index_static.js index 6eff25464c..b72dfabc5b 100644 --- a/modules/examples/src/hello_world/index_static.js +++ b/modules/examples/src/hello_world/index_static.js @@ -1,10 +1,8 @@ import * as app from './index_common'; import {Component, Decorator, TemplateConfig, NgElement} from 'core/core'; -import {Parser} from 'change_detection/parser/parser'; -import {Lexer} from 'change_detection/parser/lexer'; +import {Lexer, Parser, ChangeDetector} from 'change_detection/change_detection'; import {LifeCycle} from 'core/life_cycle/life_cycle'; -import {ChangeDetector} from 'change_detection/change_detector'; import {Compiler, CompilerCache} from 'core/compiler/compiler'; import {DirectiveMetadataReader} from 'core/compiler/directive_metadata_reader';