diff --git a/modules/angular2/angular2.js b/modules/angular2/angular2.js index 4d11f3e1fd7..060153e5ca5 100644 --- a/modules/angular2/angular2.js +++ b/modules/angular2/angular2.js @@ -1,6 +1,6 @@ /** * Define public API for Angular here. */ -export * from 'change_detection/change_detection'; -export * from 'core/core'; -export * from 'directives/directives'; +export * from './change_detection'; +export * from './core'; +export * from './directives'; diff --git a/modules/angular2/change_detection.js b/modules/angular2/change_detection.js index 7c9b32afa9c..8f7b5677357 100644 --- a/modules/angular2/change_detection.js +++ b/modules/angular2/change_detection.js @@ -1,15 +1,20 @@ -export {AST} from './src/parser/ast'; -export {Lexer} from './src/parser/lexer'; -export {Parser} from './src/parser/parser'; -export {ContextWithVariableBindings} from './src/parser/context_with_variable_bindings'; +export {AST} from './src/change_detection/parser/ast'; +export {Lexer} from './src/change_detection/parser/lexer'; +export {Parser} from './src/change_detection/parser/parser'; +export {ContextWithVariableBindings} + from './src/change_detection/parser/context_with_variable_bindings'; -export {ExpressionChangedAfterItHasBeenChecked, ChangeDetectionError} from './src/exceptions'; +export {ExpressionChangedAfterItHasBeenChecked, ChangeDetectionError} + from './src/change_detection/exceptions'; export {ChangeRecord, ChangeDispatcher, ChangeDetector, - CHECK_ONCE, CHECK_ALWAYS, DETACHED, CHECKED} from './src/interfaces'; -export {ProtoChangeDetector, DynamicProtoChangeDetector, JitProtoChangeDetector} from './src/proto_change_detector'; -export {DynamicChangeDetector} from './src/dynamic_change_detector'; + CHECK_ONCE, CHECK_ALWAYS, DETACHED, CHECKED} from './src/change_detection/interfaces'; +export {ProtoChangeDetector, DynamicProtoChangeDetector, JitProtoChangeDetector} + from './src/change_detection/proto_change_detector'; +export {DynamicChangeDetector} + from './src/change_detection/dynamic_change_detector'; -import {ProtoChangeDetector, DynamicProtoChangeDetector, JitProtoChangeDetector} from './src/proto_change_detector'; +import {ProtoChangeDetector, DynamicProtoChangeDetector, JitProtoChangeDetector} + from './src/change_detection/proto_change_detector'; export class ChangeDetection { createProtoChangeDetector(name:string){} diff --git a/modules/angular2/core.js b/modules/angular2/core.js index d2a16431ba0..5dbc4d61fb2 100644 --- a/modules/angular2/core.js +++ b/modules/angular2/core.js @@ -1,13 +1,13 @@ -export * from './src/annotations/annotations'; -export * from './src/annotations/visibility'; -export * from './src/compiler/interfaces'; -export * from './src/annotations/template_config'; +export * from './src/core/annotations/annotations'; +export * from './src/core/annotations/visibility'; +export * from './src/core/compiler/interfaces'; +export * from './src/core/annotations/template_config'; -export * from './src/application'; +export * from './src/core/application'; -export * from './src/compiler/compiler'; -export * from './src/compiler/template_loader'; -export * from './src/compiler/view'; -export * from './src/compiler/viewport'; +export * from './src/core/compiler/compiler'; +export * from './src/core/compiler/template_loader'; +export * from './src/core/compiler/view'; +export * from './src/core/compiler/viewport'; -export * from './src/dom/element'; +export * from './src/core/dom/element'; diff --git a/modules/angular2/di.js b/modules/angular2/di.js index 3e3d0f02716..ae6bff62cc0 100644 --- a/modules/angular2/di.js +++ b/modules/angular2/di.js @@ -1,7 +1,7 @@ -export {Inject, InjectPromise, InjectLazy, DependencyAnnotation} from './src/annotations'; -export {Injector} from './src/injector'; -export {Binding, Dependency, bind} from './src/binding'; -export {Key, KeyRegistry} from './src/key'; +export {Inject, InjectPromise, InjectLazy, DependencyAnnotation} from './src/di/annotations'; +export {Injector} from './src/di/injector'; +export {Binding, Dependency, bind} from './src/di/binding'; +export {Key, KeyRegistry} from './src/di/key'; export {KeyMetadataError, NoProviderError, ProviderError, AsyncBindingError, CyclicDependencyError, - InstantiationError, InvalidBindingError, NoAnnotationError} from './src/exceptions'; -export {OpaqueToken} from './src/opaque_token'; + InstantiationError, InvalidBindingError, NoAnnotationError} from './src/di/exceptions'; +export {OpaqueToken} from './src/di/opaque_token'; diff --git a/modules/angular2/directives.js b/modules/angular2/directives.js index f77ab0325e2..b96135cd131 100644 --- a/modules/angular2/directives.js +++ b/modules/angular2/directives.js @@ -1,4 +1,4 @@ -export * from './src/ng_if'; -export * from './src/ng_non_bindable'; -export * from './src/ng_repeat'; -export * from './src/ng_switch'; +export * from './src/directives/ng_if'; +export * from './src/directives/ng_non_bindable'; +export * from './src/directives/ng_repeat'; +export * from './src/directives/ng_switch'; diff --git a/modules/e2e_test_lib/e2e_test/perf_util.es6 b/modules/angular2/e2e_test/perf_util.es6 similarity index 100% rename from modules/e2e_test_lib/e2e_test/perf_util.es6 rename to modules/angular2/e2e_test/perf_util.es6 diff --git a/modules/e2e_test_lib/e2e_test/test_util.es6 b/modules/angular2/e2e_test/test_util.es6 similarity index 100% rename from modules/e2e_test_lib/e2e_test/test_util.es6 rename to modules/angular2/e2e_test/test_util.es6 diff --git a/modules/angular2/pubspec.yaml b/modules/angular2/pubspec.yaml index 7c365591172..91bb46e3db3 100644 --- a/modules/angular2/pubspec.yaml +++ b/modules/angular2/pubspec.yaml @@ -1,20 +1,8 @@ -name: angular +name: angular2 version: 2.0.0-alpha.1 environment: sdk: '>=1.4.0' dependencies: stack_trace: '1.1.1' - change_detection: - path: ../change_detection - di: - path: ../di - facade: - path: ../facade - reflection: - path: ../reflection - directives: - path: ../directives dev_dependencies: - test_lib: - path: ../test_lib guinness: ">=0.1.16 <0.2.0" diff --git a/modules/angular2/src/change_detection/abstract_change_detector.js b/modules/angular2/src/change_detection/abstract_change_detector.js index d24c967e58b..5d4ac97defc 100644 --- a/modules/angular2/src/change_detection/abstract_change_detector.js +++ b/modules/angular2/src/change_detection/abstract_change_detector.js @@ -1,5 +1,5 @@ -import {isPresent} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; +import {isPresent} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; import {ChangeDetector, CHECK_ALWAYS, CHECK_ONCE, CHECKED, DETACHED} from './interfaces'; export class AbstractChangeDetector extends ChangeDetector { diff --git a/modules/angular2/src/change_detection/array_changes.js b/modules/angular2/src/change_detection/array_changes.js index cb2d9ac79d4..a4ccb5dee65 100644 --- a/modules/angular2/src/change_detection/array_changes.js +++ b/modules/angular2/src/change_detection/array_changes.js @@ -3,7 +3,7 @@ import { iterateListLike, ListWrapper, MapWrapper -} from 'facade/src/collection'; +} from 'angular2/src/facade/collection'; import { int, @@ -12,7 +12,7 @@ import { stringify, getMapKey, looseIdentical, -} from 'facade/src/lang'; +} from 'angular2/src/facade/lang'; export class ArrayChanges { _collection; diff --git a/modules/angular2/src/change_detection/change_detection_jit_generator.es6 b/modules/angular2/src/change_detection/change_detection_jit_generator.es6 index b580ffbc7da..22cb1ce93cf 100644 --- a/modules/angular2/src/change_detection/change_detection_jit_generator.es6 +++ b/modules/angular2/src/change_detection/change_detection_jit_generator.es6 @@ -1,5 +1,5 @@ -import {isPresent, isBlank, BaseException, Type} from 'facade/src/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {isPresent, isBlank, BaseException, Type} from 'angular2/src/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {ContextWithVariableBindings} from './parser/context_with_variable_bindings'; import {AbstractChangeDetector} from './abstract_change_detector'; diff --git a/modules/angular2/src/change_detection/change_detection_util.js b/modules/angular2/src/change_detection/change_detection_util.js index e351b1cfc66..7cc880c78c7 100644 --- a/modules/angular2/src/change_detection/change_detection_util.js +++ b/modules/angular2/src/change_detection/change_detection_util.js @@ -1,5 +1,5 @@ -import {isPresent, isBlank, BaseException, Type} from 'facade/src/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {isPresent, isBlank, BaseException, Type} from 'angular2/src/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {ContextWithVariableBindings} from './parser/context_with_variable_bindings'; import {ArrayChanges} from './array_changes'; import {KeyValueChanges} from './keyvalue_changes'; diff --git a/modules/angular2/src/change_detection/coalesce.js b/modules/angular2/src/change_detection/coalesce.js index 6fffda1f64d..cb1bf4d5df3 100644 --- a/modules/angular2/src/change_detection/coalesce.js +++ b/modules/angular2/src/change_detection/coalesce.js @@ -1,5 +1,5 @@ -import {isPresent} from 'facade/src/lang'; -import {List, ListWrapper, Map, MapWrapper} from 'facade/src/collection'; +import {isPresent} from 'angular2/src/facade/lang'; +import {List, ListWrapper, Map, MapWrapper} from 'angular2/src/facade/collection'; import {RECORD_TYPE_SELF, ProtoRecord} from './proto_change_detector'; /** diff --git a/modules/angular2/src/change_detection/dynamic_change_detector.js b/modules/angular2/src/change_detection/dynamic_change_detector.js index 544184ebab0..bc1d4ecb6d6 100644 --- a/modules/angular2/src/change_detection/dynamic_change_detector.js +++ b/modules/angular2/src/change_detection/dynamic_change_detector.js @@ -1,5 +1,5 @@ -import {isPresent, isBlank, BaseException, FunctionWrapper} from 'facade/src/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {isPresent, isBlank, BaseException, FunctionWrapper} from 'angular2/src/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {ContextWithVariableBindings} from './parser/context_with_variable_bindings'; import {AbstractChangeDetector} from './abstract_change_detector'; diff --git a/modules/angular2/src/change_detection/interfaces.js b/modules/angular2/src/change_detection/interfaces.js index 77a06a392d6..6f6bc42009f 100644 --- a/modules/angular2/src/change_detection/interfaces.js +++ b/modules/angular2/src/change_detection/interfaces.js @@ -1,4 +1,4 @@ -import {List} from 'facade/src/collection'; +import {List} from 'angular2/src/facade/collection'; export class ChangeRecord { bindingMemento:any; diff --git a/modules/angular2/src/change_detection/keyvalue_changes.js b/modules/angular2/src/change_detection/keyvalue_changes.js index bbef6e5ebd3..0262b9a2820 100644 --- a/modules/angular2/src/change_detection/keyvalue_changes.js +++ b/modules/angular2/src/change_detection/keyvalue_changes.js @@ -1,6 +1,6 @@ -import {ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {stringify, looseIdentical, isJsObject} from 'facade/src/lang'; +import {stringify, looseIdentical, isJsObject} from 'angular2/src/facade/lang'; export class KeyValueChanges { _records:Map; diff --git a/modules/angular2/src/change_detection/parser/ast.js b/modules/angular2/src/change_detection/parser/ast.js index 92ff157d616..eaf03d9a860 100644 --- a/modules/angular2/src/change_detection/parser/ast.js +++ b/modules/angular2/src/change_detection/parser/ast.js @@ -1,5 +1,5 @@ -import {FIELD, autoConvertAdd, isBlank, isPresent, FunctionWrapper, BaseException} from "facade/src/lang"; -import {List, Map, ListWrapper, StringMapWrapper} from "facade/src/collection"; +import {FIELD, autoConvertAdd, isBlank, isPresent, FunctionWrapper, BaseException} from "angular2/src/facade/lang"; +import {List, Map, ListWrapper, StringMapWrapper} from "angular2/src/facade/collection"; import {ContextWithVariableBindings} from "./context_with_variable_bindings"; export class AST { diff --git a/modules/angular2/src/change_detection/parser/context_with_variable_bindings.js b/modules/angular2/src/change_detection/parser/context_with_variable_bindings.js index 71ece124675..ae7fcc48948 100644 --- a/modules/angular2/src/change_detection/parser/context_with_variable_bindings.js +++ b/modules/angular2/src/change_detection/parser/context_with_variable_bindings.js @@ -1,5 +1,5 @@ -import {MapWrapper} from 'facade/src/collection'; -import {BaseException} from 'facade/src/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {BaseException} from 'angular2/src/facade/lang'; export class ContextWithVariableBindings { parent:any; diff --git a/modules/angular2/src/change_detection/parser/lexer.js b/modules/angular2/src/change_detection/parser/lexer.js index 3a8aef458ea..09028c5fac4 100644 --- a/modules/angular2/src/change_detection/parser/lexer.js +++ b/modules/angular2/src/change_detection/parser/lexer.js @@ -1,5 +1,5 @@ -import {List, ListWrapper, SetWrapper} from "facade/src/collection"; -import {int, FIELD, NumberWrapper, StringJoiner, StringWrapper} from "facade/src/lang"; +import {List, ListWrapper, SetWrapper} from "angular2/src/facade/collection"; +import {int, FIELD, NumberWrapper, StringJoiner, StringWrapper} from "angular2/src/facade/lang"; export const TOKEN_TYPE_CHARACTER = 1; export const TOKEN_TYPE_IDENTIFIER = 2; diff --git a/modules/angular2/src/change_detection/parser/parser.js b/modules/angular2/src/change_detection/parser/parser.js index a6e1d5588ef..16953b00a63 100644 --- a/modules/angular2/src/change_detection/parser/parser.js +++ b/modules/angular2/src/change_detection/parser/parser.js @@ -1,8 +1,8 @@ -import {FIELD, int, isBlank, isPresent, BaseException, StringWrapper, RegExpWrapper} from 'facade/src/lang'; -import {ListWrapper, List} from 'facade/src/collection'; +import {FIELD, int, isBlank, isPresent, BaseException, StringWrapper, RegExpWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper, List} from 'angular2/src/facade/collection'; import {Lexer, EOF, Token, $PERIOD, $COLON, $SEMICOLON, $LBRACKET, $RBRACKET, $COMMA, $LBRACE, $RBRACE, $LPAREN, $RPAREN} from './lexer'; -import {reflector, Reflector} from 'reflection/src/reflection'; +import {reflector, Reflector} from 'angular2/src/reflection/reflection'; import { AST, EmptyExpr, diff --git a/modules/angular2/src/change_detection/proto_change_detector.js b/modules/angular2/src/change_detection/proto_change_detector.js index 3dca29d2345..cfccdfd884b 100644 --- a/modules/angular2/src/change_detection/proto_change_detector.js +++ b/modules/angular2/src/change_detection/proto_change_detector.js @@ -1,5 +1,5 @@ -import {isPresent, isBlank, BaseException, Type, isString} from 'facade/src/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {isPresent, isBlank, BaseException, Type, isString} from 'angular2/src/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import { AccessMember, diff --git a/modules/angular2/src/core/annotations/annotations.js b/modules/angular2/src/core/annotations/annotations.js index 911fe20a729..1ebe8340640 100644 --- a/modules/angular2/src/core/annotations/annotations.js +++ b/modules/angular2/src/core/annotations/annotations.js @@ -1,5 +1,5 @@ -import {ABSTRACT, CONST, normalizeBlank} from 'facade/src/lang'; -import {List} from 'facade/src/collection'; +import {ABSTRACT, CONST, normalizeBlank} from 'angular2/src/facade/lang'; +import {List} from 'angular2/src/facade/collection'; import {TemplateConfig} from './template_config'; import {ShadowDomStrategy} from '../compiler/shadow_dom'; diff --git a/modules/angular2/src/core/annotations/events.js b/modules/angular2/src/core/annotations/events.js index 1983c7ef283..b5c48701c9e 100644 --- a/modules/angular2/src/core/annotations/events.js +++ b/modules/angular2/src/core/annotations/events.js @@ -1,5 +1,5 @@ -import {CONST} from 'facade/src/lang'; -import {DependencyAnnotation} from 'di/di'; +import {CONST} from 'angular2/src/facade/lang'; +import {DependencyAnnotation} from 'angular2/di'; /** * The directive can inject an emitter function that would emit events onto the diff --git a/modules/angular2/src/core/annotations/template_config.js b/modules/angular2/src/core/annotations/template_config.js index a0990ee5bb3..edd6e958783 100644 --- a/modules/angular2/src/core/annotations/template_config.js +++ b/modules/angular2/src/core/annotations/template_config.js @@ -1,5 +1,5 @@ -import {ABSTRACT, CONST, Type} from 'facade/src/lang'; -import {List} from 'facade/src/collection'; +import {ABSTRACT, CONST, Type} from 'angular2/src/facade/lang'; +import {List} from 'angular2/src/facade/collection'; export class TemplateConfig { url:any; //string; diff --git a/modules/angular2/src/core/annotations/visibility.js b/modules/angular2/src/core/annotations/visibility.js index 84e2da298a3..767cf667642 100644 --- a/modules/angular2/src/core/annotations/visibility.js +++ b/modules/angular2/src/core/annotations/visibility.js @@ -1,5 +1,5 @@ -import {CONST} from 'facade/src/lang'; -import {DependencyAnnotation} from 'di/di'; +import {CONST} from 'angular2/src/facade/lang'; +import {DependencyAnnotation} from 'angular2/di'; /** * The directive can only be injected from the current element diff --git a/modules/angular2/src/core/application.js b/modules/angular2/src/core/application.js index d9bdc8b4211..b6e7a641c70 100644 --- a/modules/angular2/src/core/application.js +++ b/modules/angular2/src/core/application.js @@ -1,17 +1,17 @@ -import {Injector, bind, OpaqueToken} from 'di/di'; -import {Type, FIELD, isBlank, isPresent, BaseException, assertionsEnabled, print} from 'facade/src/lang'; -import {DOM, Element} from 'facade/src/dom'; +import {Injector, bind, OpaqueToken} from 'angular2/di'; +import {Type, FIELD, isBlank, isPresent, BaseException, assertionsEnabled, print} from 'angular2/src/facade/lang'; +import {DOM, Element} from 'angular2/src/facade/dom'; import {Compiler, CompilerCache} from './compiler/compiler'; import {ProtoView} from './compiler/view'; -import {Reflector, reflector} from 'reflection/src/reflection'; -import {Parser, Lexer, ChangeDetection, dynamicChangeDetection, jitChangeDetection} from 'change_detection/change_detection'; +import {Reflector, reflector} from 'angular2/src/reflection/reflection'; +import {Parser, Lexer, ChangeDetection, dynamicChangeDetection, jitChangeDetection} from 'angular2/change_detection'; import {TemplateLoader} from './compiler/template_loader'; import {DirectiveMetadataReader} from './compiler/directive_metadata_reader'; import {DirectiveMetadata} from './compiler/directive_metadata'; -import {List, ListWrapper} from 'facade/src/collection'; -import {PromiseWrapper} from 'facade/src/async'; -import {VmTurnZone} from 'core/src/zone/vm_turn_zone'; -import {LifeCycle} from 'core/src/life_cycle/life_cycle'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone'; +import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; var _rootInjector: Injector; diff --git a/modules/angular2/src/core/compiler/binding_propagation_config.js b/modules/angular2/src/core/compiler/binding_propagation_config.js index 164fd7ed660..229994ddb0b 100644 --- a/modules/angular2/src/core/compiler/binding_propagation_config.js +++ b/modules/angular2/src/core/compiler/binding_propagation_config.js @@ -1,4 +1,4 @@ -import {ChangeDetector, CHECK_ONCE, DETACHED, CHECK_ALWAYS} from 'change_detection/change_detection'; +import {ChangeDetector, CHECK_ONCE, DETACHED, CHECK_ALWAYS} from 'angular2/change_detection'; export class BindingPropagationConfig { _cd:ChangeDetector; diff --git a/modules/angular2/src/core/compiler/compiler.js b/modules/angular2/src/core/compiler/compiler.js index 301bd4b1bc7..64ec5562359 100644 --- a/modules/angular2/src/core/compiler/compiler.js +++ b/modules/angular2/src/core/compiler/compiler.js @@ -1,9 +1,9 @@ -import {Type, FIELD, isBlank, isPresent, BaseException, stringify} from 'facade/src/lang'; -import {Promise, PromiseWrapper} from 'facade/src/async'; -import {List, ListWrapper, MapWrapper} from 'facade/src/collection'; -import {DOM, Element} from 'facade/src/dom'; +import {Type, FIELD, isBlank, isPresent, BaseException, stringify} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM, Element} from 'angular2/src/facade/dom'; -import {ChangeDetection, Parser} from 'change_detection/change_detection'; +import {ChangeDetection, Parser} from 'angular2/change_detection'; import {DirectiveMetadataReader} from './directive_metadata_reader'; import {ProtoView} from './view'; diff --git a/modules/angular2/src/core/compiler/directive_metadata.js b/modules/angular2/src/core/compiler/directive_metadata.js index 3b735fcad26..ca46f7927d0 100644 --- a/modules/angular2/src/core/compiler/directive_metadata.js +++ b/modules/angular2/src/core/compiler/directive_metadata.js @@ -1,6 +1,6 @@ -import {Type} from 'facade/src/lang'; +import {Type} from 'angular2/src/facade/lang'; import {Directive} from '../annotations/annotations' -import {List} from 'facade/src/collection' +import {List} from 'angular2/src/facade/collection' import {ShadowDomStrategy} from './shadow_dom'; /** diff --git a/modules/angular2/src/core/compiler/directive_metadata_reader.js b/modules/angular2/src/core/compiler/directive_metadata_reader.js index 9e85a099fcf..9fcf16feb89 100644 --- a/modules/angular2/src/core/compiler/directive_metadata_reader.js +++ b/modules/angular2/src/core/compiler/directive_metadata_reader.js @@ -1,8 +1,8 @@ -import {Type, isPresent, BaseException, stringify} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; +import {Type, isPresent, BaseException, stringify} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; import {Directive, Component} from '../annotations/annotations'; import {DirectiveMetadata} from './directive_metadata'; -import {reflector} from 'reflection/src/reflection'; +import {reflector} from 'angular2/src/reflection/reflection'; import {ShadowDom, ShadowDomStrategy, ShadowDomNative} from './shadow_dom'; export class DirectiveMetadataReader { diff --git a/modules/angular2/src/core/compiler/element_binder.js b/modules/angular2/src/core/compiler/element_binder.js index 3ddb64db67d..aa372474365 100644 --- a/modules/angular2/src/core/compiler/element_binder.js +++ b/modules/angular2/src/core/compiler/element_binder.js @@ -1,8 +1,8 @@ import {ProtoElementInjector} from './element_injector'; -import {FIELD} from 'facade/src/lang'; -import {MapWrapper} from 'facade/src/collection'; +import {FIELD} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; import {DirectiveMetadata} from './directive_metadata'; -import {List, Map} from 'facade/src/collection'; +import {List, Map} from 'angular2/src/facade/collection'; import {ProtoView} from './view'; export class ElementBinder { diff --git a/modules/angular2/src/core/compiler/element_injector.js b/modules/angular2/src/core/compiler/element_injector.js index 58f10372c60..46cfbd2da4b 100644 --- a/modules/angular2/src/core/compiler/element_injector.js +++ b/modules/angular2/src/core/compiler/element_injector.js @@ -1,16 +1,16 @@ -import {FIELD, isPresent, isBlank, Type, int, BaseException} from 'facade/src/lang'; -import {Math} from 'facade/src/math'; -import {List, ListWrapper, MapWrapper} from 'facade/src/collection'; -import {Injector, Key, Dependency, bind, Binding, NoProviderError, ProviderError, CyclicDependencyError} from 'di/di'; -import {Parent, Ancestor} from 'core/src/annotations/visibility'; -import {EventEmitter} from 'core/src/annotations/events'; -import {onDestroy} from 'core/src/annotations/annotations'; -import {View, ProtoView} from 'core/src/compiler/view'; -import {LightDom, SourceLightDom, DestinationLightDom} from 'core/src/compiler/shadow_dom_emulation/light_dom'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {NgElement} from 'core/src/dom/element'; -import {Directive} from 'core/src/annotations/annotations' -import {BindingPropagationConfig} from 'core/src/compiler/binding_propagation_config' +import {FIELD, isPresent, isBlank, Type, int, BaseException} from 'angular2/src/facade/lang'; +import {Math} from 'angular2/src/facade/math'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {Injector, Key, Dependency, bind, Binding, NoProviderError, ProviderError, CyclicDependencyError} from 'angular2/di'; +import {Parent, Ancestor} from 'angular2/src/core/annotations/visibility'; +import {EventEmitter} from 'angular2/src/core/annotations/events'; +import {onDestroy} from 'angular2/src/core/annotations/annotations'; +import {View, ProtoView} from 'angular2/src/core/compiler/view'; +import {LightDom, SourceLightDom, DestinationLightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {NgElement} from 'angular2/src/core/dom/element'; +import {Directive} from 'angular2/src/core/annotations/annotations' +import {BindingPropagationConfig} from 'angular2/src/core/compiler/binding_propagation_config' var _MAX_DIRECTIVE_CONSTRUCTION_COUNTER = 10; diff --git a/modules/angular2/src/core/compiler/pipeline/compile_control.js b/modules/angular2/src/core/compiler/pipeline/compile_control.js index 24cc0b32807..90f9befce07 100644 --- a/modules/angular2/src/core/compiler/pipeline/compile_control.js +++ b/modules/angular2/src/core/compiler/pipeline/compile_control.js @@ -1,6 +1,6 @@ -import {isBlank} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; -import {DOM, Element} from 'facade/src/dom'; +import {isBlank} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {DOM, Element} from 'angular2/src/facade/dom'; import {CompileElement} from './compile_element'; import {CompileStep} from './compile_step'; diff --git a/modules/angular2/src/core/compiler/pipeline/compile_element.js b/modules/angular2/src/core/compiler/pipeline/compile_element.js index 8a73b90cf94..597ca1e05a0 100644 --- a/modules/angular2/src/core/compiler/pipeline/compile_element.js +++ b/modules/angular2/src/core/compiler/pipeline/compile_element.js @@ -1,6 +1,6 @@ -import {List, Map, ListWrapper, MapWrapper} from 'facade/src/collection'; -import {Element, DOM} from 'facade/src/dom'; -import {int, isBlank, isPresent, Type} from 'facade/src/lang'; +import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {Element, DOM} from 'angular2/src/facade/dom'; +import {int, isBlank, isPresent, Type} from 'angular2/src/facade/lang'; import {DirectiveMetadata} from '../directive_metadata'; import {Decorator} from '../../annotations/annotations'; import {Component} from '../../annotations/annotations'; @@ -9,7 +9,7 @@ import {ElementBinder} from '../element_binder'; import {ProtoElementInjector} from '../element_injector'; import {ProtoView} from '../view'; -import {AST} from 'change_detection/change_detection'; +import {AST} from 'angular2/change_detection'; /** * Collects all data that is needed to process an element diff --git a/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js b/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js index 012d022f07a..6ceef132ae3 100644 --- a/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js +++ b/modules/angular2/src/core/compiler/pipeline/compile_pipeline.js @@ -1,6 +1,6 @@ -import {isPresent} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; -import {Element, Node, DOM} from 'facade/src/dom'; +import {isPresent} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {Element, Node, DOM} from 'angular2/src/facade/dom'; import {CompileElement} from './compile_element'; import {CompileControl} from './compile_control'; import {CompileStep} from './compile_step'; diff --git a/modules/angular2/src/core/compiler/pipeline/default_steps.js b/modules/angular2/src/core/compiler/pipeline/default_steps.js index 27f406475ef..d34b194dd9b 100644 --- a/modules/angular2/src/core/compiler/pipeline/default_steps.js +++ b/modules/angular2/src/core/compiler/pipeline/default_steps.js @@ -1,5 +1,5 @@ -import {ChangeDetection, Parser} from 'change_detection/change_detection'; -import {List} from 'facade/src/collection'; +import {ChangeDetection, Parser} from 'angular2/change_detection'; +import {List} from 'angular2/src/facade/collection'; import {PropertyBindingParser} from './property_binding_parser'; import {TextInterpolationParser} from './text_interpolation_parser'; @@ -9,8 +9,8 @@ import {ElementBindingMarker} from './element_binding_marker'; import {ProtoViewBuilder} from './proto_view_builder'; import {ProtoElementInjectorBuilder} from './proto_element_injector_builder'; import {ElementBinderBuilder} from './element_binder_builder'; -import {DirectiveMetadata} from 'core/src/compiler/directive_metadata'; -import {stringify} from 'facade/src/lang'; +import {DirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata'; +import {stringify} from 'angular2/src/facade/lang'; /** * Default steps used for compiling a template. diff --git a/modules/angular2/src/core/compiler/pipeline/directive_parser.js b/modules/angular2/src/core/compiler/pipeline/directive_parser.js index 2576cf32a8d..fe4f86bbe32 100644 --- a/modules/angular2/src/core/compiler/pipeline/directive_parser.js +++ b/modules/angular2/src/core/compiler/pipeline/directive_parser.js @@ -1,6 +1,6 @@ -import {isPresent, BaseException} from 'facade/src/lang'; -import {List, MapWrapper} from 'facade/src/collection'; -import {TemplateElement} from 'facade/src/dom'; +import {isPresent, BaseException} from 'angular2/src/facade/lang'; +import {List, MapWrapper} from 'angular2/src/facade/collection'; +import {TemplateElement} from 'angular2/src/facade/dom'; import {SelectorMatcher} from '../selector'; import {CssSelector} from '../selector'; diff --git a/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js b/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js index f48b50868e1..9eaea4af035 100644 --- a/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js +++ b/modules/angular2/src/core/compiler/pipeline/element_binder_builder.js @@ -1,10 +1,10 @@ -import {int, isPresent, isBlank, Type, BaseException, StringWrapper, stringify} from 'facade/src/lang'; -import {Element, DOM} from 'facade/src/dom'; -import {ListWrapper, List, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {int, isPresent, isBlank, Type, BaseException, StringWrapper, stringify} from 'angular2/src/facade/lang'; +import {Element, DOM} from 'angular2/src/facade/dom'; +import {ListWrapper, List, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {reflector} from 'reflection/src/reflection'; +import {reflector} from 'angular2/src/reflection/reflection'; -import {Parser, ProtoChangeDetector} from 'change_detection/change_detection'; +import {Parser, ProtoChangeDetector} from 'angular2/change_detection'; import {Component, Directive} from '../../annotations/annotations'; import {DirectiveMetadata} from '../directive_metadata'; diff --git a/modules/angular2/src/core/compiler/pipeline/element_binding_marker.js b/modules/angular2/src/core/compiler/pipeline/element_binding_marker.js index 4876e037bad..a5ad8844fac 100644 --- a/modules/angular2/src/core/compiler/pipeline/element_binding_marker.js +++ b/modules/angular2/src/core/compiler/pipeline/element_binding_marker.js @@ -1,6 +1,6 @@ -import {isPresent} from 'facade/src/lang'; -import {MapWrapper} from 'facade/src/collection'; -import {DOM} from 'facade/src/dom'; +import {isPresent} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/facade/dom'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/compiler/pipeline/property_binding_parser.js b/modules/angular2/src/core/compiler/pipeline/property_binding_parser.js index a5c75a127f6..d6103944c0d 100644 --- a/modules/angular2/src/core/compiler/pipeline/property_binding_parser.js +++ b/modules/angular2/src/core/compiler/pipeline/property_binding_parser.js @@ -1,8 +1,8 @@ -import {isPresent, isBlank, RegExpWrapper, BaseException} from 'facade/src/lang'; -import {MapWrapper} from 'facade/src/collection'; -import {TemplateElement} from 'facade/src/dom'; +import {isPresent, isBlank, RegExpWrapper, BaseException} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {TemplateElement} from 'angular2/src/facade/dom'; -import {Parser, AST, ExpressionWithSource} from 'change_detection/change_detection'; +import {Parser, AST, ExpressionWithSource} from 'angular2/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/compiler/pipeline/proto_element_injector_builder.js b/modules/angular2/src/core/compiler/pipeline/proto_element_injector_builder.js index b77d321f88c..65477744284 100644 --- a/modules/angular2/src/core/compiler/pipeline/proto_element_injector_builder.js +++ b/modules/angular2/src/core/compiler/pipeline/proto_element_injector_builder.js @@ -1,7 +1,7 @@ -import {isPresent, isBlank} from 'facade/src/lang'; -import {ListWrapper} from 'facade/src/collection'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; -import {Key} from 'di/di'; +import {Key} from 'angular2/di'; import {ProtoElementInjector, ComponentKeyMetaData, DirectiveBinding} from '../element_injector'; import {CompileStep} from './compile_step'; diff --git a/modules/angular2/src/core/compiler/pipeline/proto_view_builder.js b/modules/angular2/src/core/compiler/pipeline/proto_view_builder.js index b86d8161997..88fb0617df2 100644 --- a/modules/angular2/src/core/compiler/pipeline/proto_view_builder.js +++ b/modules/angular2/src/core/compiler/pipeline/proto_view_builder.js @@ -1,8 +1,8 @@ -import {isPresent, BaseException} from 'facade/src/lang'; -import {ListWrapper, MapWrapper} from 'facade/src/collection'; +import {isPresent, BaseException} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {ProtoView} from '../view'; -import {ChangeDetection} from 'change_detection/change_detection'; +import {ChangeDetection} from 'angular2/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/compiler/pipeline/text_interpolation_parser.js b/modules/angular2/src/core/compiler/pipeline/text_interpolation_parser.js index 54f56f48abc..da2d4a424af 100644 --- a/modules/angular2/src/core/compiler/pipeline/text_interpolation_parser.js +++ b/modules/angular2/src/core/compiler/pipeline/text_interpolation_parser.js @@ -1,7 +1,7 @@ -import {RegExpWrapper, StringWrapper, isPresent} from 'facade/src/lang'; -import {Node, DOM} from 'facade/src/dom'; +import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/facade/lang'; +import {Node, DOM} from 'angular2/src/facade/dom'; -import {Parser} from 'change_detection/change_detection'; +import {Parser} from 'angular2/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/compiler/pipeline/view_splitter.js b/modules/angular2/src/core/compiler/pipeline/view_splitter.js index 60be2e65799..59af5daf11f 100644 --- a/modules/angular2/src/core/compiler/pipeline/view_splitter.js +++ b/modules/angular2/src/core/compiler/pipeline/view_splitter.js @@ -1,8 +1,8 @@ -import {isBlank, isPresent, BaseException} from 'facade/src/lang'; -import {DOM, TemplateElement} from 'facade/src/dom'; -import {MapWrapper, ListWrapper} from 'facade/src/collection'; +import {isBlank, isPresent, BaseException} from 'angular2/src/facade/lang'; +import {DOM, TemplateElement} from 'angular2/src/facade/dom'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; -import {Parser} from 'change_detection/change_detection'; +import {Parser} from 'angular2/change_detection'; import {CompileStep} from './compile_step'; import {CompileElement} from './compile_element'; diff --git a/modules/angular2/src/core/compiler/selector.js b/modules/angular2/src/core/compiler/selector.js index 2fc12c68025..85c5a96a766 100644 --- a/modules/angular2/src/core/compiler/selector.js +++ b/modules/angular2/src/core/compiler/selector.js @@ -1,5 +1,5 @@ -import {List, Map, ListWrapper, MapWrapper} from 'facade/src/collection'; -import {isPresent, isBlank, RegExpWrapper, RegExpMatcherWrapper, StringWrapper} from 'facade/src/lang'; +import {List, Map, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {isPresent, isBlank, RegExpWrapper, RegExpMatcherWrapper, StringWrapper} from 'angular2/src/facade/lang'; const _EMPTY_ATTR_VALUE = ''; diff --git a/modules/angular2/src/core/compiler/shadow_dom_emulation/content_tag.js b/modules/angular2/src/core/compiler/shadow_dom_emulation/content_tag.js index 2d9ff788228..835185830cb 100644 --- a/modules/angular2/src/core/compiler/shadow_dom_emulation/content_tag.js +++ b/modules/angular2/src/core/compiler/shadow_dom_emulation/content_tag.js @@ -1,10 +1,10 @@ import {Decorator} from '../../annotations/annotations'; import {SourceLightDom, DestinationLightDom, LightDom} from './light_dom'; -import {Inject} from 'di/di'; -import {Element, Node, DOM} from 'facade/src/dom'; -import {isPresent} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; -import {NgElement} from 'core/src/dom/element'; +import {Inject} from 'angular2/di'; +import {Element, Node, DOM} from 'angular2/src/facade/dom'; +import {isPresent} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {NgElement} from 'angular2/src/core/dom/element'; var _scriptTemplate = DOM.createScriptTag('type', 'ng/content') diff --git a/modules/angular2/src/core/compiler/shadow_dom_emulation/light_dom.js b/modules/angular2/src/core/compiler/shadow_dom_emulation/light_dom.js index fead98b6987..a9c606ff042 100644 --- a/modules/angular2/src/core/compiler/shadow_dom_emulation/light_dom.js +++ b/modules/angular2/src/core/compiler/shadow_dom_emulation/light_dom.js @@ -1,6 +1,6 @@ -import {Element, Node, DOM} from 'facade/src/dom'; -import {List, ListWrapper} from 'facade/src/collection'; -import {isBlank, isPresent} from 'facade/src/lang'; +import {Element, Node, DOM} from 'angular2/src/facade/dom'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {isBlank, isPresent} from 'angular2/src/facade/lang'; import {View} from '../view'; import {ElementInjector} from '../element_injector'; diff --git a/modules/angular2/src/core/compiler/shadow_dom_strategy.js b/modules/angular2/src/core/compiler/shadow_dom_strategy.js index 79815bda540..e086a99f958 100644 --- a/modules/angular2/src/core/compiler/shadow_dom_strategy.js +++ b/modules/angular2/src/core/compiler/shadow_dom_strategy.js @@ -1,6 +1,6 @@ -import {CONST} from 'facade/src/lang'; -import {DOM, Element} from 'facade/src/dom'; -import {List} from 'facade/src/collection'; +import {CONST} from 'angular2/src/facade/lang'; +import {DOM, Element} from 'angular2/src/facade/dom'; +import {List} from 'angular2/src/facade/collection'; import {View} from './view'; import {Content} from './shadow_dom_emulation/content_tag'; import {LightDom} from './shadow_dom_emulation/light_dom'; diff --git a/modules/angular2/src/core/compiler/template_loader.js b/modules/angular2/src/core/compiler/template_loader.js index 850d1618336..b61c18778b5 100644 --- a/modules/angular2/src/core/compiler/template_loader.js +++ b/modules/angular2/src/core/compiler/template_loader.js @@ -1,5 +1,5 @@ -import {Promise} from 'facade/src/async'; -//import {Document} from 'facade/src/dom'; +import {Promise} from 'angular2/src/facade/async'; +//import {Document} from 'angular2/src/facade/dom'; /** * Strategy to load component templates. diff --git a/modules/angular2/src/core/compiler/view.js b/modules/angular2/src/core/compiler/view.js index 29357182471..494cdf82394 100644 --- a/modules/angular2/src/core/compiler/view.js +++ b/modules/angular2/src/core/compiler/view.js @@ -1,16 +1,16 @@ -import {DOM, Element, Node, Text, DocumentFragment, TemplateElement} from 'facade/src/dom'; -import {ListWrapper, MapWrapper, StringMapWrapper, List} from 'facade/src/collection'; +import {DOM, Element, Node, Text, DocumentFragment, TemplateElement} from 'angular2/src/facade/dom'; +import {ListWrapper, MapWrapper, StringMapWrapper, List} from 'angular2/src/facade/collection'; import {AST, ContextWithVariableBindings, ChangeDispatcher, ProtoChangeDetector, ChangeDetector, ChangeRecord} - from 'change_detection/change_detection'; + from 'angular2/change_detection'; import {ProtoElementInjector, ElementInjector, PreBuiltObjects} from './element_injector'; import {BindingPropagationConfig} from './binding_propagation_config'; import {ElementBinder} from './element_binder'; import {DirectiveMetadata} from './directive_metadata'; -import {SetterFn} from 'reflection/src/types'; -import {FIELD, IMPLEMENTS, int, isPresent, isBlank, BaseException} from 'facade/src/lang'; -import {Injector} from 'di/di'; -import {NgElement} from 'core/src/dom/element'; +import {SetterFn} from 'angular2/src/reflection/types'; +import {FIELD, IMPLEMENTS, int, isPresent, isBlank, BaseException} from 'angular2/src/facade/lang'; +import {Injector} from 'angular2/di'; +import {NgElement} from 'angular2/src/core/dom/element'; import {ViewPort} from './viewport'; import {OnChange} from './interfaces'; import {Content} from './shadow_dom_emulation/content_tag'; diff --git a/modules/angular2/src/core/compiler/viewport.js b/modules/angular2/src/core/compiler/viewport.js index 2c688f8b54c..3e4bdadd308 100644 --- a/modules/angular2/src/core/compiler/viewport.js +++ b/modules/angular2/src/core/compiler/viewport.js @@ -1,10 +1,10 @@ import {View, ProtoView} from './view'; -import {DOM, Node, Element} from 'facade/src/dom'; -import {ListWrapper, MapWrapper, List} from 'facade/src/collection'; -import {BaseException} from 'facade/src/lang'; -import {Injector} from 'di/di'; -import {ElementInjector} from 'core/src/compiler/element_injector'; -import {isPresent, isBlank} from 'facade/src/lang'; +import {DOM, Node, Element} from 'angular2/src/facade/dom'; +import {ListWrapper, MapWrapper, List} from 'angular2/src/facade/collection'; +import {BaseException} from 'angular2/src/facade/lang'; +import {Injector} from 'angular2/di'; +import {ElementInjector} from 'angular2/src/core/compiler/element_injector'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; export class ViewPort { parentView: View; diff --git a/modules/angular2/src/core/dom/element.js b/modules/angular2/src/core/dom/element.js index ec7930113eb..c5457d78fdd 100644 --- a/modules/angular2/src/core/dom/element.js +++ b/modules/angular2/src/core/dom/element.js @@ -1,5 +1,5 @@ -import {DOM, Element} from 'facade/src/dom'; -import {normalizeBlank} from 'facade/src/lang'; +import {DOM, Element} from 'angular2/src/facade/dom'; +import {normalizeBlank} from 'angular2/src/facade/lang'; export class NgElement { domElement:Element; diff --git a/modules/angular2/src/core/life_cycle/life_cycle.js b/modules/angular2/src/core/life_cycle/life_cycle.js index 18ab438d6bf..a7c24834083 100644 --- a/modules/angular2/src/core/life_cycle/life_cycle.js +++ b/modules/angular2/src/core/life_cycle/life_cycle.js @@ -1,7 +1,7 @@ -import {FIELD, print} from 'facade/src/lang'; -import {ChangeDetector} from 'change_detection/change_detection'; -import {VmTurnZone} from 'core/src/zone/vm_turn_zone'; -import {ListWrapper} from 'facade/src/collection'; +import {FIELD, print} from 'angular2/src/facade/lang'; +import {ChangeDetector} from 'angular2/change_detection'; +import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone'; +import {ListWrapper} from 'angular2/src/facade/collection'; export class LifeCycle { _changeDetector:ChangeDetector; diff --git a/modules/angular2/src/core/zone/vm_turn_zone.es6 b/modules/angular2/src/core/zone/vm_turn_zone.es6 index 83ab359cc54..8207eeb68fc 100644 --- a/modules/angular2/src/core/zone/vm_turn_zone.es6 +++ b/modules/angular2/src/core/zone/vm_turn_zone.es6 @@ -1,5 +1,5 @@ -import {List, ListWrapper, StringMapWrapper} from 'facade/src/collection'; -import {normalizeBlank, isPresent} from 'facade/src/lang'; +import {List, ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {normalizeBlank, isPresent} from 'angular2/src/facade/lang'; export class VmTurnZone { _outerZone; diff --git a/modules/angular2/src/di/annotations.js b/modules/angular2/src/di/annotations.js index b4884ab271d..f24930811cc 100644 --- a/modules/angular2/src/di/annotations.js +++ b/modules/angular2/src/di/annotations.js @@ -1,4 +1,4 @@ -import {CONST} from "facade/src/lang"; +import {CONST} from "angular2/src/facade/lang"; /** * A parameter annotation that creates a synchronous eager dependency. diff --git a/modules/angular2/src/di/binding.js b/modules/angular2/src/di/binding.js index 5acb358a58b..690a8a192d3 100644 --- a/modules/angular2/src/di/binding.js +++ b/modules/angular2/src/di/binding.js @@ -1,6 +1,6 @@ -import {FIELD, Type, isBlank, isPresent} from 'facade/src/lang'; -import {List, MapWrapper, ListWrapper} from 'facade/src/collection'; -import {reflector} from 'reflection/src/reflection'; +import {FIELD, Type, isBlank, isPresent} from 'angular2/src/facade/lang'; +import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {reflector} from 'angular2/src/reflection/reflection'; import {Key} from './key'; import {Inject, InjectLazy, InjectPromise, DependencyAnnotation} from './annotations'; import {NoAnnotationError} from './exceptions'; diff --git a/modules/angular2/src/di/exceptions.js b/modules/angular2/src/di/exceptions.js index f81839a830c..10b87ca11ab 100644 --- a/modules/angular2/src/di/exceptions.js +++ b/modules/angular2/src/di/exceptions.js @@ -1,5 +1,5 @@ -import {ListWrapper, List} from 'facade/src/collection'; -import {stringify} from 'facade/src/lang'; +import {ListWrapper, List} from 'angular2/src/facade/collection'; +import {stringify} from 'angular2/src/facade/lang'; import {Key} from './key'; function findFirstClosedCycle(keys:List) { diff --git a/modules/angular2/src/di/injector.js b/modules/angular2/src/di/injector.js index 1c183e0da38..7ac1c231e8a 100644 --- a/modules/angular2/src/di/injector.js +++ b/modules/angular2/src/di/injector.js @@ -1,9 +1,9 @@ -import {Map, List, MapWrapper, ListWrapper} from 'facade/src/collection'; +import {Map, List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; import {Binding, BindingBuilder, bind} from './binding'; import {ProviderError, NoProviderError, InvalidBindingError, AsyncBindingError, CyclicDependencyError, InstantiationError} from './exceptions'; -import {FunctionWrapper, Type, isPresent, isBlank} from 'facade/src/lang'; -import {Promise, PromiseWrapper} from 'facade/src/async'; +import {FunctionWrapper, Type, isPresent, isBlank} from 'angular2/src/facade/lang'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; import {Key} from './key'; var _constructing = new Object(); diff --git a/modules/angular2/src/di/key.js b/modules/angular2/src/di/key.js index 4b9c231d06f..9a37742c587 100644 --- a/modules/angular2/src/di/key.js +++ b/modules/angular2/src/di/key.js @@ -1,6 +1,6 @@ import {KeyMetadataError} from './exceptions'; -import {MapWrapper, Map} from 'facade/src/collection'; -import {FIELD, int, isPresent} from 'facade/src/lang'; +import {MapWrapper, Map} from 'angular2/src/facade/collection'; +import {FIELD, int, isPresent} from 'angular2/src/facade/lang'; export class Key { token; diff --git a/modules/angular2/src/directives/ng_if.js b/modules/angular2/src/directives/ng_if.js index 9b88c59141b..1b6c457f44e 100644 --- a/modules/angular2/src/directives/ng_if.js +++ b/modules/angular2/src/directives/ng_if.js @@ -1,6 +1,6 @@ -import {Template} from 'core/src/annotations/annotations'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {isBlank} from 'facade/src/lang'; +import {Template} from 'angular2/src/core/annotations/annotations'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {isBlank} from 'angular2/src/facade/lang'; @Template({ selector: '[ng-if]', diff --git a/modules/angular2/src/directives/ng_non_bindable.js b/modules/angular2/src/directives/ng_non_bindable.js index d5ae03343c1..28cf47a87e8 100644 --- a/modules/angular2/src/directives/ng_non_bindable.js +++ b/modules/angular2/src/directives/ng_non_bindable.js @@ -1,4 +1,4 @@ -import {Decorator} from 'core/src/annotations/annotations'; +import {Decorator} from 'angular2/src/core/annotations/annotations'; @Decorator({ selector: '[ng-non-bindable]', diff --git a/modules/angular2/src/directives/ng_repeat.js b/modules/angular2/src/directives/ng_repeat.js index 7468d047b83..48c972ef0e6 100644 --- a/modules/angular2/src/directives/ng_repeat.js +++ b/modules/angular2/src/directives/ng_repeat.js @@ -1,9 +1,9 @@ -import {Template} from 'core/src/annotations/annotations'; -import {OnChange} from 'core/src/compiler/interfaces'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {View} from 'core/src/compiler/view'; -import {isPresent, isBlank} from 'facade/src/lang'; -import {ListWrapper} from 'facade/src/collection'; +import {Template} from 'angular2/src/core/annotations/annotations'; +import {OnChange} from 'angular2/src/core/compiler/interfaces'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {View} from 'angular2/src/core/compiler/view'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; @Template({ selector: '[ng-repeat]', diff --git a/modules/angular2/src/directives/ng_switch.js b/modules/angular2/src/directives/ng_switch.js index 8fe28f6860f..b583f4aef86 100644 --- a/modules/angular2/src/directives/ng_switch.js +++ b/modules/angular2/src/directives/ng_switch.js @@ -1,10 +1,10 @@ -import {Decorator, Template} from 'core/src/annotations/annotations'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {NgElement} from 'core/src/dom/element'; -import {DOM} from 'facade/src/dom'; -import {isPresent, isBlank} from 'facade/src/lang'; -import {ListWrapper, List, MapWrapper, Map} from 'facade/src/collection'; -import {Parent} from 'core/src/annotations/visibility'; +import {Decorator, Template} from 'angular2/src/core/annotations/annotations'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {NgElement} from 'angular2/src/core/dom/element'; +import {DOM} from 'angular2/src/facade/dom'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper, List, MapWrapper, Map} from 'angular2/src/facade/collection'; +import {Parent} from 'angular2/src/core/annotations/visibility'; /** * The `ngSwitch` directive is used to conditionally swap DOM structure on your template based on a diff --git a/modules/angular2/src/facade/async.es6 b/modules/angular2/src/facade/async.es6 index 7b71b4fe26e..829212c0b0e 100644 --- a/modules/angular2/src/facade/async.es6 +++ b/modules/angular2/src/facade/async.es6 @@ -1,5 +1,5 @@ -import {int} from 'facade/src/lang'; -import {List} from 'facade/src/collection'; +import {int} from 'angular2/src/facade/lang'; +import {List} from 'angular2/src/facade/collection'; export var Promise = window.Promise; export class PromiseWrapper { diff --git a/modules/angular2/src/facade/collection.es6 b/modules/angular2/src/facade/collection.es6 index ef37fd5b6f5..6b673a9e3f0 100644 --- a/modules/angular2/src/facade/collection.es6 +++ b/modules/angular2/src/facade/collection.es6 @@ -1,4 +1,4 @@ -import {int, isJsObject} from 'facade/src/lang'; +import {int, isJsObject} from 'angular2/src/facade/lang'; export var List = window.Array; export var Map = window.Map; diff --git a/modules/angular2/src/facade/dom.es6 b/modules/angular2/src/facade/dom.es6 index 64bc98af9eb..c6b84006455 100644 --- a/modules/angular2/src/facade/dom.es6 +++ b/modules/angular2/src/facade/dom.es6 @@ -9,7 +9,7 @@ export var document = window.document; export var location = window.location; export var gc = window.gc ? () => window.gc() : () => null; -import {List, MapWrapper, ListWrapper} from 'facade/src/collection'; +import {List, MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; export class DOM { static query(selector) { diff --git a/modules/angular2/src/reflection/reflection.dart b/modules/angular2/src/reflection/reflection.dart index 92d18f1e720..d56d9f97677 100644 --- a/modules/angular2/src/reflection/reflection.dart +++ b/modules/angular2/src/reflection/reflection.dart @@ -3,7 +3,7 @@ library reflection.reflection; import 'reflector.dart'; import 'types.dart'; export 'reflector.dart'; -import 'package:facade/src/lang.dart'; +import 'package:angular2/src/facade/lang.dart'; class NoReflectionCapabilities { Function factory(Type type){ diff --git a/modules/angular2/src/reflection/reflection.es6 b/modules/angular2/src/reflection/reflection.es6 index 6b34296739a..1a6aa039211 100644 --- a/modules/angular2/src/reflection/reflection.es6 +++ b/modules/angular2/src/reflection/reflection.es6 @@ -1,5 +1,5 @@ -import {Type, isPresent} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; +import {Type, isPresent} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; import {Reflector} from './reflector'; export {Reflector} from './reflector'; import {ReflectionCapabilities} from './reflection_capabilities'; diff --git a/modules/angular2/src/reflection/reflection_capabilities.es6 b/modules/angular2/src/reflection/reflection_capabilities.es6 index 7d398d92e08..1842294ca28 100644 --- a/modules/angular2/src/reflection/reflection_capabilities.es6 +++ b/modules/angular2/src/reflection/reflection_capabilities.es6 @@ -1,5 +1,5 @@ -import {Type, isPresent} from 'facade/src/lang'; -import {List, ListWrapper} from 'facade/src/collection'; +import {Type, isPresent} from 'angular2/src/facade/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; import {GetterFn, SetterFn, MethodFn} from './types'; export class ReflectionCapabilities { diff --git a/modules/angular2/src/reflection/reflector.js b/modules/angular2/src/reflection/reflector.js index 74ee1aede3d..fc846d34442 100644 --- a/modules/angular2/src/reflection/reflector.js +++ b/modules/angular2/src/reflection/reflector.js @@ -1,5 +1,5 @@ -import {Type, isPresent, stringify, BaseException} from 'facade/src/lang'; -import {List, ListWrapper, Map, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {Type, isPresent, stringify, BaseException} from 'angular2/src/facade/lang'; +import {List, ListWrapper, Map, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; import {SetterFn, GetterFn, MethodFn} from './types'; export {SetterFn, GetterFn, MethodFn} from './types'; diff --git a/modules/e2e_test_lib/src/benchmark_util.js b/modules/angular2/src/test_lib/benchmark_util.js similarity index 83% rename from modules/e2e_test_lib/src/benchmark_util.js rename to modules/angular2/src/test_lib/benchmark_util.js index 030ab1d42ed..058b586c74c 100644 --- a/modules/e2e_test_lib/src/benchmark_util.js +++ b/modules/angular2/src/test_lib/benchmark_util.js @@ -1,5 +1,5 @@ -import {DOM, document, location} from 'facade/src/dom'; -import {NumberWrapper, BaseException, isBlank} from 'facade/src/lang'; +import {DOM, document, location} from 'angular2/src/facade/dom'; +import {NumberWrapper, BaseException, isBlank} from 'angular2/src/facade/lang'; export function getIntParameter(name:string) { return NumberWrapper.parseInt(getStringParameter(name), 10); diff --git a/modules/test_lib/src/test_lib.dart b/modules/angular2/src/test_lib/test_lib.dart similarity index 89% rename from modules/test_lib/src/test_lib.dart rename to modules/angular2/src/test_lib/test_lib.dart index 986480ebd81..e97a946688b 100644 --- a/modules/test_lib/src/test_lib.dart +++ b/modules/angular2/src/test_lib/test_lib.dart @@ -5,9 +5,9 @@ export 'package:guinness/guinness_html.dart'; import 'package:unittest/unittest.dart' hide expect; import 'dart:mirrors'; import 'dart:async'; -import 'package:reflection/src/reflection.dart'; -import 'package:facade/src/dom.dart'; -import 'package:reflection/src/reflection_capabilities.dart'; +import 'package:angular2/src/reflection/reflection.dart'; +import 'package:angular2/src/facade/dom.dart'; +import 'package:angular2/src/reflection/reflection_capabilities.dart'; bool IS_DARTIUM = true; diff --git a/modules/test_lib/src/test_lib.es6 b/modules/angular2/src/test_lib/test_lib.es6 similarity index 98% rename from modules/test_lib/src/test_lib.es6 rename to modules/angular2/src/test_lib/test_lib.es6 index 976ab594474..6f38e1c6511 100644 --- a/modules/test_lib/src/test_lib.es6 +++ b/modules/angular2/src/test_lib/test_lib.es6 @@ -1,4 +1,4 @@ -import {DOM} from 'facade/src/dom'; +import {DOM} from 'angular2/src/facade/dom'; export var describe = window.describe; export var xdescribe = window.xdescribe; diff --git a/modules/test_lib/src/utils.js b/modules/angular2/src/test_lib/utils.js similarity index 81% rename from modules/test_lib/src/utils.js rename to modules/angular2/src/test_lib/utils.js index 8a0fc2ee6c1..cf17a1982c3 100644 --- a/modules/test_lib/src/utils.js +++ b/modules/angular2/src/test_lib/utils.js @@ -1,6 +1,6 @@ -import {List, ListWrapper} from 'facade/src/collection'; -import {DOM} from 'facade/src/dom'; -import {isPresent} from 'facade/src/lang'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/facade/dom'; +import {isPresent} from 'angular2/src/facade/lang'; export class Log { _result:List; diff --git a/modules/angular2/test/change_detection/array_changes_spec.js b/modules/angular2/test/change_detection/array_changes_spec.js index c83695ff650..2130e010ed8 100644 --- a/modules/angular2/test/change_detection/array_changes_spec.js +++ b/modules/angular2/test/change_detection/array_changes_spec.js @@ -1,8 +1,8 @@ -import {describe, it, iit, xit, expect, beforeEach, afterEach} from 'test_lib/test_lib'; -import {ArrayChanges} from 'change_detection/src/array_changes'; +import {describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; +import {ArrayChanges} from 'angular2/src/change_detection/array_changes'; -import {NumberWrapper} from 'facade/src/lang'; -import {ListWrapper, MapWrapper} from 'facade/src/collection'; +import {NumberWrapper} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; import {TestIterable} from './iterable'; import {arrayChangesAsString} from './util'; diff --git a/modules/angular2/test/change_detection/change_detection_spec.js b/modules/angular2/test/change_detection/change_detection_spec.js index 7cde272f634..5166ff70e8a 100644 --- a/modules/angular2/test/change_detection/change_detection_spec.js +++ b/modules/angular2/test/change_detection/change_detection_spec.js @@ -1,19 +1,19 @@ -import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach, IS_DARTIUM} from 'test_lib/test_lib'; +import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach, IS_DARTIUM} from 'angular2/test_lib'; -import {isPresent, isBlank, isJsObject, BaseException, FunctionWrapper} from 'facade/src/lang'; -import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; +import {isPresent, isBlank, isJsObject, BaseException, FunctionWrapper} from 'angular2/src/facade/lang'; +import {List, ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; -import {Parser} from 'change_detection/src/parser/parser'; -import {Lexer} from 'change_detection/src/parser/lexer'; -import {reflector} from 'reflection/src/reflection'; +import {Parser} from 'angular2/src/change_detection/parser/parser'; +import {Lexer} from 'angular2/src/change_detection/parser/lexer'; +import {reflector} from 'angular2/src/reflection/reflection'; import {arrayChangesAsString, kvChangesAsString} from './util'; import {ChangeDispatcher, DynamicChangeDetector, ChangeDetectionError, ContextWithVariableBindings, - CHECK_ALWAYS, CHECK_ONCE, CHECKED, DETACHED} from 'change_detection/change_detection'; + CHECK_ALWAYS, CHECK_ONCE, CHECKED, DETACHED} from 'angular2/change_detection'; -import {JitProtoChangeDetector, DynamicProtoChangeDetector} from 'change_detection/src/proto_change_detector'; -import {ChangeDetectionUtil} from 'change_detection/src/change_detection_util'; +import {JitProtoChangeDetector, DynamicProtoChangeDetector} from 'angular2/src/change_detection/proto_change_detector'; +import {ChangeDetectionUtil} from 'angular2/src/change_detection/change_detection_util'; export function main() { diff --git a/modules/angular2/test/change_detection/coalesce_spec.js b/modules/angular2/test/change_detection/coalesce_spec.js index 0608af18ccd..bcb3ab10811 100644 --- a/modules/angular2/test/change_detection/coalesce_spec.js +++ b/modules/angular2/test/change_detection/coalesce_spec.js @@ -1,7 +1,7 @@ -import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'test_lib/test_lib'; +import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; -import {coalesce} from 'change_detection/src/coalesce'; -import {RECORD_TYPE_SELF, ProtoRecord} from 'change_detection/src/proto_change_detector'; +import {coalesce} from 'angular2/src/change_detection/coalesce'; +import {RECORD_TYPE_SELF, ProtoRecord} from 'angular2/src/change_detection/proto_change_detector'; export function main() { function r(funcOrValue, args, contextIndex, selfIndex, lastInBinding = false) { diff --git a/modules/angular2/test/change_detection/keyvalue_changes_spec.js b/modules/angular2/test/change_detection/keyvalue_changes_spec.js index bd559691e6a..7ef078f4a1b 100644 --- a/modules/angular2/test/change_detection/keyvalue_changes_spec.js +++ b/modules/angular2/test/change_detection/keyvalue_changes_spec.js @@ -1,7 +1,7 @@ -import {describe, it, iit, xit, expect, beforeEach, afterEach} from 'test_lib/test_lib'; -import {KeyValueChanges} from 'change_detection/src/keyvalue_changes'; -import {NumberWrapper, isJsObject} from 'facade/src/lang'; -import {MapWrapper} from 'facade/src/collection'; +import {describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib'; +import {KeyValueChanges} from 'angular2/src/change_detection/keyvalue_changes'; +import {NumberWrapper, isJsObject} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; import {kvChangesAsString} from './util'; // todo(vicb): Update the code & tests for object equality diff --git a/modules/angular2/test/change_detection/parser/context_with_variable_bindings_spec.js b/modules/angular2/test/change_detection/parser/context_with_variable_bindings_spec.js index 6a6455487c4..a354d7b0c63 100644 --- a/modules/angular2/test/change_detection/parser/context_with_variable_bindings_spec.js +++ b/modules/angular2/test/change_detection/parser/context_with_variable_bindings_spec.js @@ -1,9 +1,9 @@ -import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'test_lib/test_lib'; +import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib'; -import {ContextWithVariableBindings} from 'change_detection/src/parser/context_with_variable_bindings'; +import {ContextWithVariableBindings} from 'angular2/src/change_detection/parser/context_with_variable_bindings'; -import {BaseException, isBlank, isPresent} from 'facade/src/lang'; -import {MapWrapper, ListWrapper} from 'facade/src/collection'; +import {BaseException, isBlank, isPresent} from 'angular2/src/facade/lang'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; export function main() { describe('ContextWithVariableBindings', () => { diff --git a/modules/angular2/test/change_detection/parser/lexer_spec.js b/modules/angular2/test/change_detection/parser/lexer_spec.js index fdaabf197d4..16b2a3fb7fb 100644 --- a/modules/angular2/test/change_detection/parser/lexer_spec.js +++ b/modules/angular2/test/change_detection/parser/lexer_spec.js @@ -1,9 +1,9 @@ -import {describe, it, expect} from 'test_lib/test_lib'; +import {describe, it, expect} from 'angular2/test_lib'; -import {Lexer, Token} from 'change_detection/src/parser/lexer'; +import {Lexer, Token} from 'angular2/src/change_detection/parser/lexer'; -import {List, ListWrapper} from "facade/src/collection"; -import {StringWrapper, int} from "facade/src/lang"; +import {List, ListWrapper} from "angular2/src/facade/collection"; +import {StringWrapper, int} from "angular2/src/facade/lang"; function lex(text:string):List { return new Lexer().tokenize(text); diff --git a/modules/angular2/test/change_detection/parser/parser_spec.js b/modules/angular2/test/change_detection/parser/parser_spec.js index fd1c18a1807..4e702bd84e9 100644 --- a/modules/angular2/test/change_detection/parser/parser_spec.js +++ b/modules/angular2/test/change_detection/parser/parser_spec.js @@ -1,11 +1,11 @@ -import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'test_lib/test_lib'; -import {BaseException, isBlank, isPresent} from 'facade/src/lang'; -import {reflector} from 'reflection/src/reflection'; -import {MapWrapper, ListWrapper} from 'facade/src/collection'; -import {Parser} from 'change_detection/src/parser/parser'; -import {Lexer} from 'change_detection/src/parser/lexer'; -import {ContextWithVariableBindings} from 'change_detection/src/parser/context_with_variable_bindings'; -import {Formatter, LiteralPrimitive} from 'change_detection/src/parser/ast'; +import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib'; +import {BaseException, isBlank, isPresent} from 'angular2/src/facade/lang'; +import {reflector} from 'angular2/src/reflection/reflection'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {Parser} from 'angular2/src/change_detection/parser/parser'; +import {Lexer} from 'angular2/src/change_detection/parser/lexer'; +import {ContextWithVariableBindings} from 'angular2/src/change_detection/parser/context_with_variable_bindings'; +import {Formatter, LiteralPrimitive} from 'angular2/src/change_detection/parser/ast'; class TestData { a; diff --git a/modules/angular2/test/change_detection/util.js b/modules/angular2/test/change_detection/util.js index bbc6b00604f..45e5b02ee70 100644 --- a/modules/angular2/test/change_detection/util.js +++ b/modules/angular2/test/change_detection/util.js @@ -1,4 +1,4 @@ -import {isBlank} from 'facade/src/lang'; +import {isBlank} from 'angular2/src/facade/lang'; export function arrayChangesAsString({collection, previous, additions, moves, removals}) { if (isBlank(collection)) collection = []; diff --git a/modules/angular2/test/core/application_spec.js b/modules/angular2/test/core/application_spec.js index 254ab887917..d59340bb364 100644 --- a/modules/angular2/test/core/application_spec.js +++ b/modules/angular2/test/core/application_spec.js @@ -1,12 +1,12 @@ -import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach} from 'test_lib/test_lib'; +import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach} from 'angular2/test_lib'; import {bootstrap, appDocumentToken, appElementToken} - from 'core/src/application'; -import {Component} from 'core/src/annotations/annotations'; -import {DOM} from 'facade/src/dom'; -import {ListWrapper} from 'facade/src/collection'; -import {PromiseWrapper} from 'facade/src/async'; -import {bind, Inject} from 'di/di'; -import {TemplateConfig} from 'core/src/annotations/template_config'; + from 'angular2/src/core/application'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {DOM} from 'angular2/src/facade/dom'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {bind, Inject} from 'angular2/di'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; @Component({ selector: 'hello-app', diff --git a/modules/angular2/test/core/compiler/compiler_spec.js b/modules/angular2/test/core/compiler/compiler_spec.js index 82a2387733c..f483e97dd54 100644 --- a/modules/angular2/test/core/compiler/compiler_spec.js +++ b/modules/angular2/test/core/compiler/compiler_spec.js @@ -1,18 +1,18 @@ -import {describe, beforeEach, it, expect, ddescribe, iit, el} from 'test_lib/test_lib'; -import {DOM} from 'facade/src/dom'; -import {List} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, ddescribe, iit, el} from 'angular2/test_lib'; +import {DOM} from 'angular2/src/facade/dom'; +import {List} from 'angular2/src/facade/collection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {ProtoView} from 'core/src/compiler/view'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {TemplateLoader} from 'core/src/compiler/template_loader'; -import {Component} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step' -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {ProtoView} from 'angular2/src/core/compiler/view'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step' +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; -import {Lexer, Parser, dynamicChangeDetection} from 'change_detection/change_detection'; +import {Lexer, Parser, dynamicChangeDetection} from 'angular2/change_detection'; export function main() { describe('compiler', function() { diff --git a/modules/angular2/test/core/compiler/directive_metadata_reader_spec.js b/modules/angular2/test/core/compiler/directive_metadata_reader_spec.js index a32a5d38fd1..6cbb12918e7 100644 --- a/modules/angular2/test/core/compiler/directive_metadata_reader_spec.js +++ b/modules/angular2/test/core/compiler/directive_metadata_reader_spec.js @@ -1,10 +1,10 @@ -import {ddescribe, describe, it, iit, expect, beforeEach} from 'test_lib/test_lib'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Decorator, Component} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; -import {DirectiveMetadata} from 'core/src/compiler/directive_metadata'; -import {ShadowDomStrategy, ShadowDomNative} from 'core/src/compiler/shadow_dom'; -import {CONST} from 'facade/src/lang'; +import {ddescribe, describe, it, iit, expect, beforeEach} from 'angular2/test_lib'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Decorator, Component} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; +import {DirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata'; +import {ShadowDomStrategy, ShadowDomNative} from 'angular2/src/core/compiler/shadow_dom'; +import {CONST} from 'angular2/src/facade/lang'; class FakeShadowDomStrategy extends ShadowDomStrategy { diff --git a/modules/angular2/test/core/compiler/element_injector_spec.js b/modules/angular2/test/core/compiler/element_injector_spec.js index b4f051f7a86..52c6e37fae8 100644 --- a/modules/angular2/test/core/compiler/element_injector_spec.js +++ b/modules/angular2/test/core/compiler/element_injector_spec.js @@ -1,18 +1,18 @@ -import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach, SpyObject} from 'test_lib/test_lib'; -import {isBlank, isPresent, FIELD, IMPLEMENTS, proxy} from 'facade/src/lang'; -import {ListWrapper, MapWrapper, List} from 'facade/src/collection'; -import {ProtoElementInjector, PreBuiltObjects, DirectiveBinding} from 'core/src/compiler/element_injector'; -import {Parent, Ancestor} from 'core/src/annotations/visibility'; -import {EventEmitter} from 'core/src/annotations/events'; -import {onDestroy} from 'core/src/annotations/annotations'; -import {Injector, Inject, bind} from 'di/di'; -import {View} from 'core/src/compiler/view'; -import {ProtoRecordRange} from 'change_detection/change_detection'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {NgElement} from 'core/src/dom/element'; -import {LightDom, SourceLightDom, DestinationLightDom} from 'core/src/compiler/shadow_dom_emulation/light_dom'; -import {Directive} from 'core/src/annotations/annotations'; -import {BindingPropagationConfig} from 'core/src/compiler/binding_propagation_config'; +import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach, SpyObject} from 'angular2/test_lib'; +import {isBlank, isPresent, FIELD, IMPLEMENTS, proxy} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper, List} from 'angular2/src/facade/collection'; +import {ProtoElementInjector, PreBuiltObjects, DirectiveBinding} from 'angular2/src/core/compiler/element_injector'; +import {Parent, Ancestor} from 'angular2/src/core/annotations/visibility'; +import {EventEmitter} from 'angular2/src/core/annotations/events'; +import {onDestroy} from 'angular2/src/core/annotations/annotations'; +import {Injector, Inject, bind} from 'angular2/di'; +import {View} from 'angular2/src/core/compiler/view'; +import {ProtoRecordRange} from 'angular2/change_detection'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {NgElement} from 'angular2/src/core/dom/element'; +import {LightDom, SourceLightDom, DestinationLightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom'; +import {Directive} from 'angular2/src/core/annotations/annotations'; +import {BindingPropagationConfig} from 'angular2/src/core/compiler/binding_propagation_config'; @proxy @IMPLEMENTS(View) diff --git a/modules/angular2/test/core/compiler/integration_spec.js b/modules/angular2/test/core/compiler/integration_spec.js index f2fc902c3cb..93607cabc47 100644 --- a/modules/angular2/test/core/compiler/integration_spec.js +++ b/modules/angular2/test/core/compiler/integration_spec.js @@ -1,19 +1,19 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; -import {DOM} from 'facade/src/dom'; +import {DOM} from 'angular2/src/facade/dom'; -import {Injector} from 'di/di'; -import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection'; +import {Injector} from 'angular2/di'; +import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {ShadowDomEmulated} from 'core/src/compiler/shadow_dom'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {ShadowDomEmulated} from 'angular2/src/core/compiler/shadow_dom'; -import {Decorator, Component, Template} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; +import {Decorator, Component, Template} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {MapWrapper} from 'facade/src/collection'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {MapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('integration tests', function() { diff --git a/modules/angular2/test/core/compiler/pipeline/directive_parser_spec.js b/modules/angular2/test/core/compiler/pipeline/directive_parser_spec.js index 6bdc76d780f..83758bfd534 100644 --- a/modules/angular2/test/core/compiler/pipeline/directive_parser_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/directive_parser_spec.js @@ -1,18 +1,18 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {isPresent} from 'facade/src/lang'; -import {ListWrapper, MapWrapper, StringMapWrapper} from 'facade/src/collection'; -import {DirectiveParser} from 'core/src/compiler/pipeline/directive_parser'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; -import {DOM} from 'facade/src/dom'; -import {Component} from 'core/src/annotations/annotations'; -import {Decorator} from 'core/src/annotations/annotations'; -import {Template} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Lexer, Parser} from 'change_detection/change_detection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {isPresent} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper, StringMapWrapper} from 'angular2/src/facade/collection'; +import {DirectiveParser} from 'angular2/src/core/compiler/pipeline/directive_parser'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; +import {DOM} from 'angular2/src/facade/dom'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {Decorator} from 'angular2/src/core/annotations/annotations'; +import {Template} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Lexer, Parser} from 'angular2/change_detection'; export function main() { describe('DirectiveParser', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js b/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js index 3cea16d18c0..a6ffe8ef241 100644 --- a/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/element_binder_builder_spec.js @@ -1,24 +1,24 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {isPresent} from 'facade/src/lang'; -import {DOM} from 'facade/src/dom'; -import {ListWrapper, MapWrapper} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {isPresent} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/facade/dom'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; -import {ElementBinderBuilder} from 'core/src/compiler/pipeline/element_binder_builder'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step' -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; +import {ElementBinderBuilder} from 'angular2/src/core/compiler/pipeline/element_binder_builder'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step' +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; -import {Decorator} from 'core/src/annotations/annotations'; -import {Template} from 'core/src/annotations/annotations'; -import {Component} from 'core/src/annotations/annotations'; -import {ProtoView, ElementPropertyMemento, DirectivePropertyMemento} from 'core/src/compiler/view'; -import {ProtoElementInjector} from 'core/src/compiler/element_injector'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; +import {Decorator} from 'angular2/src/core/annotations/annotations'; +import {Template} from 'angular2/src/core/annotations/annotations'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {ProtoView, ElementPropertyMemento, DirectivePropertyMemento} from 'angular2/src/core/compiler/view'; +import {ProtoElementInjector} from 'angular2/src/core/compiler/element_injector'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; import {ChangeDetector, Lexer, Parser, DynamicProtoChangeDetector, - } from 'change_detection/change_detection'; -import {Injector} from 'di/di'; + } from 'angular2/change_detection'; +import {Injector} from 'angular2/di'; export function main() { describe('ElementBinderBuilder', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/element_binding_marker_spec.js b/modules/angular2/test/core/compiler/pipeline/element_binding_marker_spec.js index 4c53f407c86..387341119e7 100644 --- a/modules/angular2/test/core/compiler/pipeline/element_binding_marker_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/element_binding_marker_spec.js @@ -1,15 +1,15 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {isPresent} from 'facade/src/lang'; -import {DOM} from 'facade/src/dom'; -import {MapWrapper} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {isPresent} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/facade/dom'; +import {MapWrapper} from 'angular2/src/facade/collection'; -import {ElementBindingMarker} from 'core/src/compiler/pipeline/element_binding_marker'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step' -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Template, Decorator, Component} from 'core/src/annotations/annotations'; +import {ElementBindingMarker} from 'angular2/src/core/compiler/pipeline/element_binding_marker'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step' +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Template, Decorator, Component} from 'angular2/src/core/annotations/annotations'; export function main() { describe('ElementBindingMarker', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js b/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js index 195ee17966c..39392345a1c 100644 --- a/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/pipeline_spec.js @@ -1,12 +1,12 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {ListWrapper, List, MapWrapper} from 'facade/src/collection'; -import {DOM} from 'facade/src/dom'; -import {isPresent, NumberWrapper, StringWrapper} from 'facade/src/lang'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {ListWrapper, List, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/facade/dom'; +import {isPresent, NumberWrapper, StringWrapper} from 'angular2/src/facade/lang'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step' -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step' +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; export function main() { describe('compile_pipeline', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/property_binding_parser_spec.js b/modules/angular2/test/core/compiler/pipeline/property_binding_parser_spec.js index 354634d8b00..42eb5c369d5 100644 --- a/modules/angular2/test/core/compiler/pipeline/property_binding_parser_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/property_binding_parser_spec.js @@ -1,10 +1,10 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {PropertyBindingParser} from 'core/src/compiler/pipeline/property_binding_parser'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {DOM} from 'facade/src/dom'; -import {MapWrapper} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {PropertyBindingParser} from 'angular2/src/core/compiler/pipeline/property_binding_parser'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {DOM} from 'angular2/src/facade/dom'; +import {MapWrapper} from 'angular2/src/facade/collection'; -import {Lexer, Parser} from 'change_detection/change_detection'; +import {Lexer, Parser} from 'angular2/change_detection'; export function main() { describe('PropertyBindingParser', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js b/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js index 85fdf309c46..ad2a393872d 100644 --- a/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/proto_element_injector_builder_spec.js @@ -1,17 +1,17 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {isPresent, isBlank} from 'facade/src/lang'; -import {DOM} from 'facade/src/dom'; -import {List, ListWrapper} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {isPresent, isBlank} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/facade/dom'; +import {List, ListWrapper} from 'angular2/src/facade/collection'; -import {ProtoElementInjectorBuilder} from 'core/src/compiler/pipeline/proto_element_injector_builder'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step' -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; -import {ProtoView} from 'core/src/compiler/view'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Template, Decorator, Component} from 'core/src/annotations/annotations'; -import {ProtoElementInjector} from 'core/src/compiler/element_injector'; +import {ProtoElementInjectorBuilder} from 'angular2/src/core/compiler/pipeline/proto_element_injector_builder'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step' +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; +import {ProtoView} from 'angular2/src/core/compiler/view'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Template, Decorator, Component} from 'angular2/src/core/annotations/annotations'; +import {ProtoElementInjector} from 'angular2/src/core/compiler/element_injector'; export function main() { describe('ProtoElementInjectorBuilder', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/proto_view_builder_spec.js b/modules/angular2/test/core/compiler/pipeline/proto_view_builder_spec.js index 631cb9dd92f..c28491ff2dd 100644 --- a/modules/angular2/test/core/compiler/pipeline/proto_view_builder_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/proto_view_builder_spec.js @@ -1,14 +1,14 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {isPresent} from 'facade/src/lang'; -import {dynamicChangeDetection} from 'change_detection/change_detection'; -import {ElementBinder} from 'core/src/compiler/element_binder'; -import {ProtoViewBuilder} from 'core/src/compiler/pipeline/proto_view_builder'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {CompileElement} from 'core/src/compiler/pipeline/compile_element'; -import {CompileStep} from 'core/src/compiler/pipeline/compile_step' -import {CompileControl} from 'core/src/compiler/pipeline/compile_control'; -import {DOM} from 'facade/src/dom'; -import {MapWrapper} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {isPresent} from 'angular2/src/facade/lang'; +import {dynamicChangeDetection} from 'angular2/change_detection'; +import {ElementBinder} from 'angular2/src/core/compiler/element_binder'; +import {ProtoViewBuilder} from 'angular2/src/core/compiler/pipeline/proto_view_builder'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {CompileElement} from 'angular2/src/core/compiler/pipeline/compile_element'; +import {CompileStep} from 'angular2/src/core/compiler/pipeline/compile_step' +import {CompileControl} from 'angular2/src/core/compiler/pipeline/compile_control'; +import {DOM} from 'angular2/src/facade/dom'; +import {MapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('ProtoViewBuilder', () => { diff --git a/modules/angular2/test/core/compiler/pipeline/text_interpolation_parser_spec.js b/modules/angular2/test/core/compiler/pipeline/text_interpolation_parser_spec.js index da306a21be0..7053f0cbdc7 100644 --- a/modules/angular2/test/core/compiler/pipeline/text_interpolation_parser_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/text_interpolation_parser_spec.js @@ -1,10 +1,10 @@ -import {describe, beforeEach, expect, it, iit, ddescribe, el} from 'test_lib/test_lib'; -import {TextInterpolationParser} from 'core/src/compiler/pipeline/text_interpolation_parser'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {DOM} from 'facade/src/dom'; -import {MapWrapper} from 'facade/src/collection'; +import {describe, beforeEach, expect, it, iit, ddescribe, el} from 'angular2/test_lib'; +import {TextInterpolationParser} from 'angular2/src/core/compiler/pipeline/text_interpolation_parser'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {DOM} from 'angular2/src/facade/dom'; +import {MapWrapper} from 'angular2/src/facade/collection'; -import {Lexer, Parser} from 'change_detection/change_detection'; +import {Lexer, Parser} from 'angular2/change_detection'; import {IgnoreChildrenStep} from './pipeline_spec'; export function main() { diff --git a/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js b/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js index 302479a5ca4..088f931d694 100644 --- a/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js +++ b/modules/angular2/test/core/compiler/pipeline/view_splitter_spec.js @@ -1,12 +1,12 @@ -import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'test_lib/test_lib'; -import {isPresent} from 'facade/src/lang'; -import {MapWrapper} from 'facade/src/collection'; +import {describe, beforeEach, it, expect, iit, ddescribe, el} from 'angular2/test_lib'; +import {isPresent} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; -import {ViewSplitter} from 'core/src/compiler/pipeline/view_splitter'; -import {CompilePipeline} from 'core/src/compiler/pipeline/compile_pipeline'; -import {DOM, TemplateElement} from 'facade/src/dom'; +import {ViewSplitter} from 'angular2/src/core/compiler/pipeline/view_splitter'; +import {CompilePipeline} from 'angular2/src/core/compiler/pipeline/compile_pipeline'; +import {DOM, TemplateElement} from 'angular2/src/facade/dom'; -import {Lexer, Parser} from 'change_detection/change_detection'; +import {Lexer, Parser} from 'angular2/change_detection'; export function main() { describe('ViewSplitter', () => { diff --git a/modules/angular2/test/core/compiler/selector_spec.js b/modules/angular2/test/core/compiler/selector_spec.js index 3f1758525b5..bb543223807 100644 --- a/modules/angular2/test/core/compiler/selector_spec.js +++ b/modules/angular2/test/core/compiler/selector_spec.js @@ -1,8 +1,8 @@ -import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'test_lib/test_lib'; -import {SelectorMatcher} from 'core/src/compiler/selector'; -import {CssSelector} from 'core/src/compiler/selector'; -import {List, ListWrapper, MapWrapper} from 'facade/src/collection'; -import {DOM} from 'facade/src/dom'; +import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib'; +import {SelectorMatcher} from 'angular2/src/core/compiler/selector'; +import {CssSelector} from 'angular2/src/core/compiler/selector'; +import {List, ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/facade/dom'; export function main() { describe('SelectorMatcher', () => { diff --git a/modules/angular2/test/core/compiler/shadow_dom/content_tag_spec.js b/modules/angular2/test/core/compiler/shadow_dom/content_tag_spec.js index b0277528366..c2eb2a4a892 100644 --- a/modules/angular2/test/core/compiler/shadow_dom/content_tag_spec.js +++ b/modules/angular2/test/core/compiler/shadow_dom/content_tag_spec.js @@ -1,9 +1,9 @@ -import {describe, beforeEach, it, expect, ddescribe, iit, SpyObject, el} from 'test_lib/test_lib'; -import {proxy, IMPLEMENTS} from 'facade/src/lang'; -import {DOM} from 'facade/src/dom'; -import {Content} from 'core/src/compiler/shadow_dom_emulation/content_tag'; -import {NgElement} from 'core/src/dom/element'; -import {LightDom} from 'core/src/compiler/shadow_dom_emulation/light_dom'; +import {describe, beforeEach, it, expect, ddescribe, iit, SpyObject, el} from 'angular2/test_lib'; +import {proxy, IMPLEMENTS} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/facade/dom'; +import {Content} from 'angular2/src/core/compiler/shadow_dom_emulation/content_tag'; +import {NgElement} from 'angular2/src/core/dom/element'; +import {LightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom'; @proxy @IMPLEMENTS(LightDom) diff --git a/modules/angular2/test/core/compiler/shadow_dom/light_dom_spec.js b/modules/angular2/test/core/compiler/shadow_dom/light_dom_spec.js index 39842452a5b..be56a063dae 100644 --- a/modules/angular2/test/core/compiler/shadow_dom/light_dom_spec.js +++ b/modules/angular2/test/core/compiler/shadow_dom/light_dom_spec.js @@ -1,14 +1,14 @@ -import {describe, beforeEach, it, expect, ddescribe, iit, SpyObject, el} from 'test_lib/test_lib'; -import {proxy, IMPLEMENTS, isBlank} from 'facade/src/lang'; -import {ListWrapper, MapWrapper} from 'facade/src/collection'; -import {DOM} from 'facade/src/dom'; -import {Content} from 'core/src/compiler/shadow_dom_emulation/content_tag'; -import {NgElement} from 'core/src/dom/element'; -import {LightDom} from 'core/src/compiler/shadow_dom_emulation/light_dom'; -import {View} from 'core/src/compiler/view'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {ElementInjector} from 'core/src/compiler/element_injector'; -import {ProtoRecordRange} from 'change_detection/change_detection'; +import {describe, beforeEach, it, expect, ddescribe, iit, SpyObject, el} from 'angular2/test_lib'; +import {proxy, IMPLEMENTS, isBlank} from 'angular2/src/facade/lang'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM} from 'angular2/src/facade/dom'; +import {Content} from 'angular2/src/core/compiler/shadow_dom_emulation/content_tag'; +import {NgElement} from 'angular2/src/core/dom/element'; +import {LightDom} from 'angular2/src/core/compiler/shadow_dom_emulation/light_dom'; +import {View} from 'angular2/src/core/compiler/view'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {ElementInjector} from 'angular2/src/core/compiler/element_injector'; +import {ProtoRecordRange} from 'angular2/change_detection'; @proxy @IMPLEMENTS(ElementInjector) diff --git a/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js b/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js index 5078e5e03c3..ef14a9f49d2 100644 --- a/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js +++ b/modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js @@ -1,20 +1,20 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; -import {DOM} from 'facade/src/dom'; +import {DOM} from 'angular2/src/facade/dom'; -import {Injector} from 'di/di'; -import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection'; +import {Injector} from 'angular2/di'; +import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {LifeCycle} from 'core/src/life_cycle/life_cycle'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {ShadowDomStrategy, ShadowDomNative, ShadowDomEmulated} from 'core/src/compiler/shadow_dom'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {ShadowDomStrategy, ShadowDomNative, ShadowDomEmulated} from 'angular2/src/core/compiler/shadow_dom'; -import {Decorator, Component, Template} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; +import {Decorator, Component, Template} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {StringMapWrapper, MapWrapper} from 'facade/src/collection'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {StringMapWrapper, MapWrapper} from 'angular2/src/facade/collection'; export function main() { describe('integration tests', function() { diff --git a/modules/angular2/test/core/compiler/view_spec.js b/modules/angular2/test/core/compiler/view_spec.js index 8cd68424c54..0ae1bbfa525 100644 --- a/modules/angular2/test/core/compiler/view_spec.js +++ b/modules/angular2/test/core/compiler/view_spec.js @@ -1,21 +1,21 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; -import {ProtoView, ElementPropertyMemento, DirectivePropertyMemento} from 'core/src/compiler/view'; -import {ProtoElementInjector, ElementInjector} from 'core/src/compiler/element_injector'; -import {ShadowDomEmulated} from 'core/src/compiler/shadow_dom'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Component, Decorator, Template} from 'core/src/annotations/annotations'; -import {OnChange} from 'core/core'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; +import {ProtoView, ElementPropertyMemento, DirectivePropertyMemento} from 'angular2/src/core/compiler/view'; +import {ProtoElementInjector, ElementInjector} from 'angular2/src/core/compiler/element_injector'; +import {ShadowDomEmulated} from 'angular2/src/core/compiler/shadow_dom'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Component, Decorator, Template} from 'angular2/src/core/annotations/annotations'; +import {OnChange} from 'angular2/core'; import {Lexer, Parser, DynamicProtoChangeDetector, - ChangeDetector} from 'change_detection/change_detection'; -import {TemplateConfig} from 'core/src/annotations/template_config'; -import {EventEmitter} from 'core/src/annotations/events'; -import {List, MapWrapper} from 'facade/src/collection'; -import {DOM, Element} from 'facade/src/dom'; -import {int, proxy, IMPLEMENTS} from 'facade/src/lang'; -import {Injector} from 'di/di'; -import {View} from 'core/src/compiler/view'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {reflector} from 'reflection/src/reflection'; + ChangeDetector} from 'angular2/change_detection'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; +import {EventEmitter} from 'angular2/src/core/annotations/events'; +import {List, MapWrapper} from 'angular2/src/facade/collection'; +import {DOM, Element} from 'angular2/src/facade/dom'; +import {int, proxy, IMPLEMENTS} from 'angular2/src/facade/lang'; +import {Injector} from 'angular2/di'; +import {View} from 'angular2/src/core/compiler/view'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {reflector} from 'angular2/src/reflection/reflection'; @proxy diff --git a/modules/angular2/test/core/compiler/viewport_spec.js b/modules/angular2/test/core/compiler/viewport_spec.js index 5e09b9c0291..268116c8a9f 100644 --- a/modules/angular2/test/core/compiler/viewport_spec.js +++ b/modules/angular2/test/core/compiler/viewport_spec.js @@ -1,12 +1,12 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; -import {View, ProtoView} from 'core/src/compiler/view'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {proxy, IMPLEMENTS} from 'facade/src/lang'; -import {DOM} from 'facade/src/dom'; -import {ListWrapper, MapWrapper} from 'facade/src/collection'; -import {Injector} from 'di/di'; -import {ProtoElementInjector, ElementInjector} from 'core/src/compiler/element_injector'; -import {DynamicProtoChangeDetector, ChangeDetector, Lexer, Parser} from 'change_detection/change_detection'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; +import {View, ProtoView} from 'angular2/src/core/compiler/view'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {proxy, IMPLEMENTS} from 'angular2/src/facade/lang'; +import {DOM} from 'angular2/src/facade/dom'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {Injector} from 'angular2/di'; +import {ProtoElementInjector, ElementInjector} from 'angular2/src/core/compiler/element_injector'; +import {DynamicProtoChangeDetector, ChangeDetector, Lexer, Parser} from 'angular2/change_detection'; function createView(nodes) { var view = new View(null, nodes, new DynamicProtoChangeDetector(), MapWrapper.create()); diff --git a/modules/angular2/test/core/zone/vm_turn_zone_spec.js b/modules/angular2/test/core/zone/vm_turn_zone_spec.js index 515547854e7..388719e7b75 100644 --- a/modules/angular2/test/core/zone/vm_turn_zone_spec.js +++ b/modules/angular2/test/core/zone/vm_turn_zone_spec.js @@ -1,8 +1,8 @@ -import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach, async, tick} from 'test_lib/test_lib'; -import {Log, once} from 'test_lib/test_lib'; -import {PromiseWrapper} from 'facade/src/async'; -import {BaseException} from 'facade/src/lang'; -import {VmTurnZone} from 'core/src/zone/vm_turn_zone'; +import {describe, ddescribe, it, iit, xit, xdescribe, expect, beforeEach, async, tick} from 'angular2/test_lib'; +import {Log, once} from 'angular2/test_lib'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {BaseException} from 'angular2/src/facade/lang'; +import {VmTurnZone} from 'angular2/src/core/zone/vm_turn_zone'; export function main() { describe("VmTurnZone", () => { diff --git a/modules/angular2/test/di/async_spec.js b/modules/angular2/test/di/async_spec.js index 2c1f136248c..52a6a8c88d2 100644 --- a/modules/angular2/test/di/async_spec.js +++ b/modules/angular2/test/di/async_spec.js @@ -1,6 +1,6 @@ -import {ddescribe, describe, it, iit, xit, expect, beforeEach} from 'test_lib/test_lib'; -import {Injector, Inject, InjectPromise, bind, Key} from 'di/di'; -import {Promise, PromiseWrapper} from 'facade/src/async'; +import {ddescribe, describe, it, iit, xit, expect, beforeEach} from 'angular2/test_lib'; +import {Injector, Inject, InjectPromise, bind, Key} from 'angular2/di'; +import {Promise, PromiseWrapper} from 'angular2/src/facade/async'; class UserList { } diff --git a/modules/angular2/test/di/injector_spec.js b/modules/angular2/test/di/injector_spec.js index 07a79bd2044..9897e2cf294 100644 --- a/modules/angular2/test/di/injector_spec.js +++ b/modules/angular2/test/di/injector_spec.js @@ -1,5 +1,5 @@ -import {describe, ddescribe, it, iit, expect, beforeEach} from 'test_lib/test_lib'; -import {Injector, Inject, InjectLazy, bind} from 'di/di'; +import {describe, ddescribe, it, iit, expect, beforeEach} from 'angular2/test_lib'; +import {Injector, Inject, InjectLazy, bind} from 'angular2/di'; class Engine { } diff --git a/modules/angular2/test/di/key_spec.js b/modules/angular2/test/di/key_spec.js index 40137d7a152..5182ea7beb9 100644 --- a/modules/angular2/test/di/key_spec.js +++ b/modules/angular2/test/di/key_spec.js @@ -1,5 +1,5 @@ -import {describe, iit, it, expect, beforeEach} from 'test_lib/test_lib'; -import {Key, KeyRegistry} from 'di/di'; +import {describe, iit, it, expect, beforeEach} from 'angular2/test_lib'; +import {Key, KeyRegistry} from 'angular2/di'; export function main() { diff --git a/modules/angular2/test/directives/ng_if_spec.js b/modules/angular2/test/directives/ng_if_spec.js index 5439b5eb3de..bc3c733bda5 100644 --- a/modules/angular2/test/directives/ng_if_spec.js +++ b/modules/angular2/test/directives/ng_if_spec.js @@ -1,17 +1,17 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, IS_DARTIUM, el} from 'test_lib/test_lib'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, IS_DARTIUM, el} from 'angular2/test_lib'; -import {DOM} from 'facade/src/dom'; +import {DOM} from 'angular2/src/facade/dom'; -import {Injector} from 'di/di'; -import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection'; +import {Injector} from 'angular2/di'; +import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; -import {Component} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; -import {NgIf} from 'directives/src/ng_if'; +import {NgIf} from 'angular2/src/directives/ng_if'; export function main() { describe('ng-if', () => { diff --git a/modules/angular2/test/directives/ng_non_bindable_spec.js b/modules/angular2/test/directives/ng_non_bindable_spec.js index 102edb9caa4..fa70f7deb2c 100644 --- a/modules/angular2/test/directives/ng_non_bindable_spec.js +++ b/modules/angular2/test/directives/ng_non_bindable_spec.js @@ -1,13 +1,13 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; -import {DOM} from 'facade/src/dom'; -import {Injector} from 'di/di'; -import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Decorator, Component} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; -import {NgElement} from 'core/src/dom/element'; -import {NgNonBindable} from 'directives/src/ng_non_bindable'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; +import {DOM} from 'angular2/src/facade/dom'; +import {Injector} from 'angular2/di'; +import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Decorator, Component} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; +import {NgElement} from 'angular2/src/core/dom/element'; +import {NgNonBindable} from 'angular2/src/directives/ng_non_bindable'; export function main() { describe('ng-non-bindable', () => { diff --git a/modules/angular2/test/directives/ng_repeat_spec.js b/modules/angular2/test/directives/ng_repeat_spec.js index 3487b842bf1..62048bfa189 100644 --- a/modules/angular2/test/directives/ng_repeat_spec.js +++ b/modules/angular2/test/directives/ng_repeat_spec.js @@ -1,20 +1,20 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; -import {DOM} from 'facade/src/dom'; +import {DOM} from 'angular2/src/facade/dom'; -import {Injector} from 'di/di'; -import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'change_detection/change_detection'; +import {Injector} from 'angular2/di'; +import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {OnChange} from 'core/src/compiler/interfaces'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {OnChange} from 'angular2/src/core/compiler/interfaces'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; -import {Decorator, Component, Template} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; +import {Decorator, Component, Template} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; -import {ViewPort} from 'core/src/compiler/viewport'; -import {MapWrapper, ListWrapper} from 'facade/src/collection'; -import {NgRepeat} from 'directives/src/ng_repeat'; +import {ViewPort} from 'angular2/src/core/compiler/viewport'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {NgRepeat} from 'angular2/src/directives/ng_repeat'; export function main() { describe('ng-repeat', () => { diff --git a/modules/angular2/test/directives/ng_switch_spec.js b/modules/angular2/test/directives/ng_switch_spec.js index 02cf2660b68..574a6f9b5e6 100644 --- a/modules/angular2/test/directives/ng_switch_spec.js +++ b/modules/angular2/test/directives/ng_switch_spec.js @@ -1,12 +1,12 @@ -import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'test_lib/test_lib'; -import {DOM} from 'facade/src/dom'; -import {Injector} from 'di/di'; -import {Lexer, Parser, dynamicChangeDetection} from 'change_detection/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {Component} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; -import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'directives/src/ng_switch'; +import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib'; +import {DOM} from 'angular2/src/facade/dom'; +import {Injector} from 'angular2/di'; +import {Lexer, Parser, dynamicChangeDetection} from 'angular2/change_detection'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; +import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/src/directives/ng_switch'; export function main() { describe('ng-switch', () => { diff --git a/modules/angular2/test/reflection/reflector_spec.js b/modules/angular2/test/reflection/reflector_spec.js index f4060ef6e01..9e5eb7e7e8a 100644 --- a/modules/angular2/test/reflection/reflector_spec.js +++ b/modules/angular2/test/reflection/reflector_spec.js @@ -1,7 +1,7 @@ -import {describe, it, iit, ddescribe, expect, beforeEach} from 'test_lib/test_lib'; -import {Reflector} from 'reflection/src/reflection'; -import {ReflectionCapabilities} from 'reflection/src/reflection_capabilities'; -import {CONST} from 'facade/src/lang'; +import {describe, it, iit, ddescribe, expect, beforeEach} from 'angular2/test_lib'; +import {Reflector} from 'angular2/src/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; +import {CONST} from 'angular2/src/facade/lang'; class Annotation { value; diff --git a/modules/test_lib/test/test_lib_spec.js b/modules/angular2/test/test_lib/test_lib_spec.js similarity index 91% rename from modules/test_lib/test/test_lib_spec.js rename to modules/angular2/test/test_lib/test_lib_spec.js index 0aee62b0174..dbdbd973340 100644 --- a/modules/test_lib/test/test_lib_spec.js +++ b/modules/angular2/test/test_lib/test_lib_spec.js @@ -1,7 +1,7 @@ -import {describe, it, iit, ddescribe, expect, tick, async, SpyObject, beforeEach} from 'test_lib/test_lib'; -import {MapWrapper, ListWrapper} from 'facade/src/collection'; -import {PromiseWrapper} from 'facade/src/async'; -import {IMPLEMENTS, proxy} from 'facade/src/lang'; +import {describe, it, iit, ddescribe, expect, tick, async, SpyObject, beforeEach} from 'angular2/test_lib'; +import {MapWrapper, ListWrapper} from 'angular2/src/facade/collection'; +import {PromiseWrapper} from 'angular2/src/facade/async'; +import {IMPLEMENTS, proxy} from 'angular2/src/facade/lang'; class TestObj { prop; diff --git a/modules/angular2/test_lib.js b/modules/angular2/test_lib.js new file mode 100644 index 00000000000..fac6ae874ff --- /dev/null +++ b/modules/angular2/test_lib.js @@ -0,0 +1,2 @@ +export * from './src/test_lib/test_lib'; +export * from './src/test_lib/utils'; diff --git a/modules/benchmarks/pubspec.yaml b/modules/benchmarks/pubspec.yaml index 8a0b61498a1..f07364e075b 100644 --- a/modules/benchmarks/pubspec.yaml +++ b/modules/benchmarks/pubspec.yaml @@ -2,20 +2,8 @@ name: benchmarks environment: sdk: '>=1.4.0' dependencies: - angular: - path: ../angular - facade: - path: ../facade - di: - path: ../di - reflection: - path: ../reflection - core: - path: ../core - change_detection: - path: ../change_detection - e2e_test_lib: - path: ../e2e_test_lib + angular2: + path: ../angular2 browser: '>=0.10.0 <0.11.0' transformers: - $dart2js: diff --git a/modules/benchmarks/src/change_detection/change_detection_benchmark.js b/modules/benchmarks/src/change_detection/change_detection_benchmark.js index 4ab4a2e311a..3556199596c 100644 --- a/modules/benchmarks/src/change_detection/change_detection_benchmark.js +++ b/modules/benchmarks/src/change_detection/change_detection_benchmark.js @@ -1,7 +1,7 @@ -import {ListWrapper, MapWrapper} from 'facade/src/collection'; -import {reflector} from 'reflection/src/reflection'; -import {isPresent, isJsObject} from 'facade/src/lang'; -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {ListWrapper, MapWrapper} from 'angular2/src/facade/collection'; +import {reflector} from 'angular2/src/reflection/reflection'; +import {isPresent, isJsObject} from 'angular2/src/facade/lang'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; import { Lexer, @@ -10,7 +10,7 @@ import { ChangeDetection, dynamicChangeDetection, jitChangeDetection -} from 'change_detection/change_detection'; +} from 'angular2/change_detection'; class Obj { diff --git a/modules/benchmarks/src/compiler/compiler_benchmark.js b/modules/benchmarks/src/compiler/compiler_benchmark.js index 4964bef6b71..f044b70081b 100644 --- a/modules/benchmarks/src/compiler/compiler_benchmark.js +++ b/modules/benchmarks/src/compiler/compiler_benchmark.js @@ -1,19 +1,19 @@ -import {DOM, document} from 'facade/src/dom'; -import {isBlank, Type} from 'facade/src/lang'; -import {MapWrapper} from 'facade/src/collection'; -import {DirectiveMetadata} from 'core/src/compiler/directive_metadata'; +import {DOM, document} from 'angular2/src/facade/dom'; +import {isBlank, Type} from 'angular2/src/facade/lang'; +import {MapWrapper} from 'angular2/src/facade/collection'; +import {DirectiveMetadata} from 'angular2/src/core/compiler/directive_metadata'; -import {Parser, Lexer, ProtoRecordRange, dynamicChangeDetection} from 'change_detection/change_detection'; +import {Parser, Lexer, ProtoRecordRange, dynamicChangeDetection} from 'angular2/change_detection'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; -import {Component} from 'core/src/annotations/annotations'; -import {Decorator} from 'core/src/annotations/annotations'; -import {TemplateConfig} from 'core/src/annotations/template_config'; +import {Component} from 'angular2/src/core/annotations/annotations'; +import {Decorator} from 'angular2/src/core/annotations/annotations'; +import {TemplateConfig} from 'angular2/src/core/annotations/template_config'; -import {reflector} from 'reflection/src/reflection'; -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {reflector} from 'angular2/src/reflection/reflection'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; function setupReflector() { reflector.registerType(BenchmarkComponent, { diff --git a/modules/benchmarks/src/compiler/selector_benchmark.js b/modules/benchmarks/src/compiler/selector_benchmark.js index faa34326b8f..a40b6121835 100644 --- a/modules/benchmarks/src/compiler/selector_benchmark.js +++ b/modules/benchmarks/src/compiler/selector_benchmark.js @@ -1,8 +1,8 @@ -import {SelectorMatcher} from "core/src/compiler/selector"; -import {CssSelector} from "core/src/compiler/selector"; -import {StringWrapper, Math} from 'facade/src/lang'; -import {ListWrapper} from 'facade/src/collection'; -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {SelectorMatcher} from "angular2/src/core/compiler/selector"; +import {CssSelector} from "angular2/src/core/compiler/selector"; +import {StringWrapper, Math} from 'angular2/src/facade/lang'; +import {ListWrapper} from 'angular2/src/facade/collection'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; export function main() { var count = getIntParameter('selectors'); diff --git a/modules/benchmarks/src/di/di_benchmark.js b/modules/benchmarks/src/di/di_benchmark.js index 7de62333909..39b54aa3bc5 100644 --- a/modules/benchmarks/src/di/di_benchmark.js +++ b/modules/benchmarks/src/di/di_benchmark.js @@ -1,6 +1,6 @@ -import {Injector, Key} from "di/di"; -import {reflector} from 'reflection/src/reflection'; -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {Injector, Key} from "angular2/di"; +import {reflector} from 'angular2/src/reflection/reflection'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; var count = 0; diff --git a/modules/benchmarks/src/element_injector/element_injector_benchmark.js b/modules/benchmarks/src/element_injector/element_injector_benchmark.js index 7b87460443b..a88a17b044a 100644 --- a/modules/benchmarks/src/element_injector/element_injector_benchmark.js +++ b/modules/benchmarks/src/element_injector/element_injector_benchmark.js @@ -1,7 +1,7 @@ -import {reflector} from 'reflection/src/reflection'; -import {Injector} from 'di/di'; -import {ProtoElementInjector} from 'core/src/compiler/element_injector'; -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {reflector} from 'angular2/src/reflection/reflection'; +import {Injector} from 'angular2/di'; +import {ProtoElementInjector} from 'angular2/src/core/compiler/element_injector'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; var count = 0; diff --git a/modules/benchmarks/src/tree/tree_benchmark.js b/modules/benchmarks/src/tree/tree_benchmark.js index ddc59b9f228..2066e57fa58 100644 --- a/modules/benchmarks/src/tree/tree_benchmark.js +++ b/modules/benchmarks/src/tree/tree_benchmark.js @@ -1,17 +1,17 @@ import {Parser, Lexer, ChangeDetector, ChangeDetection, jitChangeDetection} - from 'change_detection/change_detection'; + from 'angular2/change_detection'; -import {bootstrap, Component, Template, TemplateConfig, ViewPort, Compiler} from 'angular/angular'; +import {bootstrap, Component, Template, TemplateConfig, ViewPort, Compiler} from 'angular2/angular2'; -import {CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {TemplateLoader} from 'core/src/compiler/template_loader'; -import {LifeCycle} from 'core/src/life_cycle/life_cycle'; +import {CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; +import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {reflector} from 'reflection/src/reflection'; -import {DOM, document, window, Element, gc} from 'facade/src/dom'; -import {isPresent} from 'facade/src/lang'; -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {reflector} from 'angular2/src/reflection/reflection'; +import {DOM, document, window, Element, gc} from 'angular2/src/facade/dom'; +import {isPresent} from 'angular2/src/facade/lang'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; function setupReflector() { // TODO: Put the general calls to reflector.register... in a shared file diff --git a/modules/benchmarks_external/pubspec.yaml b/modules/benchmarks_external/pubspec.yaml index ce97889134e..43cfd74c382 100644 --- a/modules/benchmarks_external/pubspec.yaml +++ b/modules/benchmarks_external/pubspec.yaml @@ -2,11 +2,12 @@ name: benchmarks_external environment: sdk: '>=1.4.0' dependencies: - e2e_test_lib: - path: ../e2e_test_lib angular: '>=1.0.0 <2.0.0' browser: '>=0.10.0 <0.11.0' fixnum: '>=0.9.0 <1.0.0' +dev_dependencies: + angular2: + path: ../angular2 transformers: - angular: html_files: diff --git a/modules/benchmarks_external/src/compiler/compiler_benchmark.dart b/modules/benchmarks_external/src/compiler/compiler_benchmark.dart index b9c5d59335a..3ca68551fdb 100644 --- a/modules/benchmarks_external/src/compiler/compiler_benchmark.dart +++ b/modules/benchmarks_external/src/compiler/compiler_benchmark.dart @@ -4,7 +4,7 @@ library compiler_benchmark_ng10; import 'package:angular/angular.dart'; import 'package:angular/application_factory.dart'; import 'dart:html'; -import 'package:e2e_test_lib/src/benchmark_util.dart'; +import 'package:angular2/src/test_lib/benchmark_util.dart'; main() { diff --git a/modules/benchmarks_external/src/compiler/compiler_benchmark.es6 b/modules/benchmarks_external/src/compiler/compiler_benchmark.es6 index d6d35a11622..e4a60b311b7 100644 --- a/modules/benchmarks_external/src/compiler/compiler_benchmark.es6 +++ b/modules/benchmarks_external/src/compiler/compiler_benchmark.es6 @@ -1,5 +1,5 @@ // compiler benchmark in AngularJS 1.x -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; export function main() { var ngEl = document.createElement('div'); diff --git a/modules/benchmarks_external/src/largetable/largetable_benchmark.es6 b/modules/benchmarks_external/src/largetable/largetable_benchmark.es6 index 97cd94e713b..fc8a260800d 100644 --- a/modules/benchmarks_external/src/largetable/largetable_benchmark.es6 +++ b/modules/benchmarks_external/src/largetable/largetable_benchmark.es6 @@ -1,4 +1,4 @@ -import {getIntParameter, getStringParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {getIntParameter, getStringParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; var totalRows = getIntParameter('rows'); var totalColumns = getIntParameter('columns'); diff --git a/modules/benchmarks_external/src/naive_infinite_scroll/app.dart b/modules/benchmarks_external/src/naive_infinite_scroll/app.dart index a7294415616..7f058b9da9b 100644 --- a/modules/benchmarks_external/src/naive_infinite_scroll/app.dart +++ b/modules/benchmarks_external/src/naive_infinite_scroll/app.dart @@ -3,7 +3,7 @@ library scroll_app; import 'dart:async'; import 'dart:html'; import 'package:angular/angular.dart'; -import 'package:e2e_test_lib/src/benchmark_util.dart'; +import 'package:angular2/src/test_lib/benchmark_util.dart'; @Component( selector: 'scroll-app', diff --git a/modules/benchmarks_external/src/tree/tree_benchmark.dart b/modules/benchmarks_external/src/tree/tree_benchmark.dart index fa65ee893f5..fc28619df28 100644 --- a/modules/benchmarks_external/src/tree/tree_benchmark.dart +++ b/modules/benchmarks_external/src/tree/tree_benchmark.dart @@ -4,7 +4,7 @@ library tree_benchmark_ng10; import 'package:angular/angular.dart'; import 'package:angular/application_factory.dart'; import 'dart:html'; -import 'package:e2e_test_lib/src/benchmark_util.dart'; +import 'package:angular2/src/test_lib/benchmark_util.dart'; setup() { diff --git a/modules/benchmarks_external/src/tree/tree_benchmark.es6 b/modules/benchmarks_external/src/tree/tree_benchmark.es6 index 3592b74f6be..153c701af7c 100644 --- a/modules/benchmarks_external/src/tree/tree_benchmark.es6 +++ b/modules/benchmarks_external/src/tree/tree_benchmark.es6 @@ -1,5 +1,5 @@ // tree benchmark in AngularJS 1.x -import {getIntParameter, bindAction} from 'e2e_test_lib/src/benchmark_util'; +import {getIntParameter, bindAction} from 'angular2/src/test_lib/benchmark_util'; export function main() { angular.bootstrap(document.querySelector('tree'), ['app']); diff --git a/modules/e2e_test_lib/pubspec.yaml b/modules/e2e_test_lib/pubspec.yaml deleted file mode 100644 index bf9a3f809bf..00000000000 --- a/modules/e2e_test_lib/pubspec.yaml +++ /dev/null @@ -1,7 +0,0 @@ -name: e2e_test_lib -environment: - sdk: '>=1.4.0' -dependencies: - facade: - path: ../facade - browser: '>=0.10.0 <0.11.0' diff --git a/modules/examples/pubspec.yaml b/modules/examples/pubspec.yaml index 8f14fb1722b..05fd145e482 100644 --- a/modules/examples/pubspec.yaml +++ b/modules/examples/pubspec.yaml @@ -2,18 +2,10 @@ name: examples environment: sdk: '>=1.4.0' dependencies: - angular: - path: ../angular - facade: - path: ../facade - reflection: - path: ../reflection - core: - path: ../core + angular2: + path: ../angular2 browser: '>=0.10.0 <0.11.0' dev_dependencies: - test_lib: - path: ../test_lib guinness: ">=0.1.16 <0.2.0" transformers: - $dart2js: diff --git a/modules/examples/src/hello_world/index.js b/modules/examples/src/hello_world/index.js index b8049ca527b..c00cb67d879 100644 --- a/modules/examples/src/hello_world/index.js +++ b/modules/examples/src/hello_world/index.js @@ -1,6 +1,6 @@ import * as app from './index_common'; -import {reflector} from 'reflection/src/reflection'; -import {ReflectionCapabilities} from 'reflection/src/reflection_capabilities'; +import {reflector} from 'angular2/src/reflection/reflection'; +import {ReflectionCapabilities} from 'angular2/src/reflection/reflection_capabilities'; export function main() { // Initializing the reflector is only required for the Dart version of the application. diff --git a/modules/examples/src/hello_world/index_common.js b/modules/examples/src/hello_world/index_common.js index e0b1e11a9bc..2033d47594a 100644 --- a/modules/examples/src/hello_world/index_common.js +++ b/modules/examples/src/hello_world/index_common.js @@ -1,4 +1,4 @@ -import {bootstrap, Component, Decorator, TemplateConfig, NgElement} from 'angular/angular'; +import {bootstrap, Component, Decorator, TemplateConfig, NgElement} from 'angular2/angular2'; // Angular 2.0 supports 3 basic types of directives: // - Component - the basic building blocks of Angular 2.0 apps. Backed by diff --git a/modules/examples/src/hello_world/index_static.js b/modules/examples/src/hello_world/index_static.js index 58ea578db91..553dbfc14e1 100644 --- a/modules/examples/src/hello_world/index_static.js +++ b/modules/examples/src/hello_world/index_static.js @@ -1,14 +1,14 @@ import * as app from './index_common'; -import {Component, Decorator, TemplateConfig, NgElement} from 'angular/angular'; -import {Lexer, Parser, ChangeDetection, ChangeDetector} from 'change_detection/change_detection'; -import {LifeCycle} from 'core/src/life_cycle/life_cycle'; +import {Component, Decorator, TemplateConfig, NgElement} from 'angular2/angular2'; +import {Lexer, Parser, ChangeDetection, ChangeDetector} from 'angular2/change_detection'; +import {LifeCycle} from 'angular2/src/core/life_cycle/life_cycle'; -import {Compiler, CompilerCache} from 'core/src/compiler/compiler'; -import {DirectiveMetadataReader} from 'core/src/compiler/directive_metadata_reader'; -import {TemplateLoader} from 'core/src/compiler/template_loader'; +import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler'; +import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader'; +import {TemplateLoader} from 'angular2/src/core/compiler/template_loader'; -import {reflector} from 'reflection/src/reflection'; +import {reflector} from 'angular2/src/reflection/reflection'; function setup() { reflector.registerType(app.HelloCmp, { diff --git a/modules/test_lib/pubspec.yaml b/modules/test_lib/pubspec.yaml deleted file mode 100644 index 8c49ae70ac4..00000000000 --- a/modules/test_lib/pubspec.yaml +++ /dev/null @@ -1,10 +0,0 @@ -name: test_lib -environment: - sdk: '>=1.4.0' -dependencies: - facade: - path: ../facade - reflection: - path: ../reflection -dev_dependencies: - guinness: ">=0.1.16 <0.2.0" \ No newline at end of file diff --git a/modules/test_lib/test_lib.js b/modules/test_lib/test_lib.js deleted file mode 100644 index 999fb8afa3a..00000000000 --- a/modules/test_lib/test_lib.js +++ /dev/null @@ -1,2 +0,0 @@ -export * from './src/test_lib'; -export * from './src/utils'; \ No newline at end of file