Skip to content

Commit 8ed22ce

Browse files
jeffbcrossjeffbcross
committed
chore: update all import paths
1 parent 10437ab commit 8ed22ce

File tree

592 files changed

+1623
-1493
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

592 files changed

+1623
-1493
lines changed

‎docs/public-docs-package/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = new Package('angular-v2-public-docs', [basePackage])
1010
'angular2/core.ts',
1111
'angular2/di.ts',
1212
'angular2/directives.ts',
13-
'http/http.ts',
13+
'angular2/http.ts',
1414
'angular2/forms.ts',
1515
'angular2/router.ts',
1616
'angular2/test.ts',

‎docs/typescript-definition-package/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
4040
readTypeScriptModules.sourceFiles = [
4141
'angular2/angular2.ts',
4242
'angular2/router.ts',
43-
'http/http.ts'
43+
'angular2/http.ts'
4444
];
4545
readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules'));
4646

@@ -62,10 +62,10 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
6262
}
6363
},
6464
{
65-
id: 'http/http',
65+
id: 'angular2/http',
6666
namespace: 'ngHttp',
6767
modules: {
68-
'http/http':'http/http'
68+
'angular2/http':'angular2/http'
6969
}
7070
}
7171
];

‎gulpfile.js

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ gulp.task('test.unit.dart/ci', function (done) {
699699

700700

701701
gulp.task('test.unit.cjs/ci', function(done) {
702-
runJasmineTests(['dist/js/cjs/{angular2,benchpress,http}/test/**/*_spec.js'], done);
702+
runJasmineTests(['dist/js/cjs/{angular2,benchpress}/test/**/*_spec.js'], done);
703703
});
704704

705705

@@ -1020,7 +1020,7 @@ gulp.task('!bundle.js.prod', ['build.js.prod'], function() {
10201020
then(function(){
10211021
return bundler.bundle(
10221022
bundleConfig,
1023-
'http/http',
1023+
'angular2/http',
10241024
'./dist/build/http.js',
10251025
{
10261026
sourceMaps: true
@@ -1042,7 +1042,7 @@ gulp.task('!bundle.js.min', ['build.js.prod'], function() {
10421042
then(function(){
10431043
return bundler.bundle(
10441044
bundleConfig,
1045-
'http/http',
1045+
'angular2/http',
10461046
'./dist/build/http.min.js',
10471047
{
10481048
sourceMaps: true,
@@ -1067,7 +1067,7 @@ gulp.task('!bundle.js.dev', ['build.js.dev'], function() {
10671067
then(function() {
10681068
return bundler.bundle(
10691069
devBundleConfig,
1070-
'http/http',
1070+
'angular2/http',
10711071
'./dist/build/http.dev.js',
10721072
{ sourceMaps: true });
10731073
});
@@ -1115,15 +1115,7 @@ gulp.task('!bundle.js.sfx.dev', ['build.js.dev'], function() {
11151115
'angular2/angular2_sfx',
11161116
'./dist/build/angular2.sfx.dev.js',
11171117
{ sourceMaps: true },
1118-
/* self-executing */ true).
1119-
then(function() {
1120-
return bundler.bundle(
1121-
devBundleConfig,
1122-
'http/http_sfx',
1123-
'./dist/build/http.sfx.dev.js',
1124-
{ sourceMaps: true },
1125-
true)
1126-
});
1118+
/* self-executing */ true);
11271119
});
11281120

11291121
gulp.task('!bundle.js.prod.deps', ['!bundle.js.prod'], function() {
@@ -1221,7 +1213,7 @@ gulp.task('build.change_detect.dart', function(done) {
12211213

12221214
gulp.task('!build/change_detect.dart', function(done) {
12231215
var fs = require('fs');
1224-
var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/change_detection/');
1216+
var changeDetectDir = path.join(CONFIG.dest.dart, 'angular2/test/core/change_detection/');
12251217
var srcDir = path.join(changeDetectDir, 'generator');
12261218
var destDir = path.join(changeDetectDir, 'generated');
12271219

‎karma-dart.conf.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ module.exports = function(config) {
4545
'/packages/path': '/base/packages/path',
4646

4747
// Local dependencies, transpiled from the source.
48+
'/packages/angular2/test/': '/base/dist/dart/angular2/test/',
4849
'/packages/angular2': '/base/dist/dart/angular2/lib',
4950
'/packages/http': '/base/dist/dart/http/lib',
5051
'/packages/angular2_material': '/base/dist/dart/angular2_material/lib',

‎modules/angular1_router/build.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function angularFactory(name, deps, body) {
121121

122122
function isFacadeModule(modulePath) {
123123
return modulePath.indexOf('facade') > -1 ||
124-
modulePath === 'angular2/src/reflection/reflection';
124+
modulePath === 'angular2/src/core/reflection/reflection';
125125
}
126126

127127
module.exports = function () {

‎modules/angular2/change_detection.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ export {
2929
KeyValueDiffer,
3030
KeyValueDifferFactory
3131

32-
} from 'angular2/src/change_detection/change_detection';
32+
} from 'angular2/src/core/change_detection/change_detection';

‎modules/angular2/core.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export 'package:angular2/src/core/application_tokens.dart' show APP_COMPONENT;
44
export 'package:angular2/src/core/application_ref.dart' show ApplicationRef;
55

66
// Compiler Related Dependencies.
7-
export 'package:angular2/src/services/app_root_url.dart' show AppRootUrl;
8-
export 'package:angular2/src/services/url_resolver.dart' show UrlResolver;
7+
export 'package:angular2/src/core/services/app_root_url.dart' show AppRootUrl;
8+
export 'package:angular2/src/core/services/url_resolver.dart' show UrlResolver;
99
export 'package:angular2/src/core/compiler/component_url_mapper.dart'
1010
show ComponentUrlMapper;
1111
export 'package:angular2/src/core/compiler/directive_resolver.dart'
@@ -28,4 +28,4 @@ export 'package:angular2/src/core/compiler/dynamic_component_loader.dart'
2828
show ComponentRef;
2929

3030
export 'package:angular2/src/core/zone/ng_zone.dart' show NgZone;
31-
export 'package:angular2/src/facade/async.dart' show Stream, EventEmitter;
31+
export 'package:angular2/src/core/facade/async.dart' show Stream, EventEmitter;

‎modules/angular2/core.ts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
*/
66
export {APP_COMPONENT} from 'angular2/src/core/application_tokens';
77
export {commonBootstrap as bootstrap} from 'angular2/src/core/application_common';
8-
export {Type} from 'angular2/src/facade/lang';
8+
export {Type} from 'angular2/src/core/facade/lang';
99
export {ApplicationRef} from 'angular2/src/core/application_ref';
1010

1111

1212
// Compiler Related Dependencies.
13-
export {AppRootUrl} from 'angular2/src/services/app_root_url';
14-
export {UrlResolver} from 'angular2/src/services/url_resolver';
13+
export {AppRootUrl} from 'angular2/src/core/services/app_root_url';
14+
export {UrlResolver} from 'angular2/src/core/services/url_resolver';
1515
export {ComponentUrlMapper} from 'angular2/src/core/compiler/component_url_mapper';
1616
export {DirectiveResolver} from 'angular2/src/core/compiler/directive_resolver';
1717
export {Compiler} from 'angular2/src/core/compiler/compiler';
@@ -28,4 +28,9 @@ export {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
2828
export {ComponentRef} from 'angular2/src/core/compiler/dynamic_component_loader';
2929

3030
export {NgZone} from 'angular2/src/core/zone/ng_zone';
31-
export {Observable, EventEmitter} from 'angular2/src/facade/async';
31+
export {Observable, EventEmitter} from 'angular2/src/core/facade/async';
32+
33+
// DI
34+
export {Injector} from 'angular2/src/core/di/injector';
35+
export {bind} from 'angular2/src/core/di/binding';
36+
export {Inject} from 'angular2/src/core/di/decorators';

‎modules/angular2/debug.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
export * from './src/debug/debug_element';
1+
export * from './src/core/debug/debug_element';
22
export {
33
inspectNativeElement,
44
ELEMENT_PROBE_BINDINGS
5-
} from './src/debug/debug_element_view_listener';
5+
} from './src/core/debug/debug_element_view_listener';

‎modules/angular2/di.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ export {
1212
HostMetadata,
1313
SkipSelfMetadata,
1414
DependencyMetadata
15-
} from './src/di/metadata';
15+
} from './src/core/di/metadata';
1616

1717
// we have to reexport * because Dart and TS export two different sets of types
18-
export * from './src/di/decorators';
18+
export * from './src/core/di/decorators';
1919

20-
export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/di/forward_ref';
20+
export {forwardRef, resolveForwardRef, ForwardRefFn} from './src/core/di/forward_ref';
2121
export {
2222
Injector,
2323
ProtoInjector,
2424
BindingWithVisibility,
2525
DependencyProvider,
2626
Visibility,
2727
UNDEFINED
28-
} from './src/di/injector';
29-
export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/di/binding';
30-
export {Key, KeyRegistry, TypeLiteral} from './src/di/key';
28+
} from './src/core/di/injector';
29+
export {Binding, BindingBuilder, ResolvedBinding, Dependency, bind} from './src/core/di/binding';
30+
export {Key, KeyRegistry, TypeLiteral} from './src/core/di/key';
3131
export {
3232
NoBindingError,
3333
AbstractBindingError,
@@ -36,5 +36,5 @@ export {
3636
InvalidBindingError,
3737
NoAnnotationError,
3838
OutOfBoundsError
39-
} from './src/di/exceptions';
40-
export {OpaqueToken} from './src/di/opaque_token';
39+
} from './src/core/di/exceptions';
40+
export {OpaqueToken} from './src/core/di/opaque_token';

‎modules/angular2/directives.ts

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44
* Common directives shipped with Angular.
55
*/
66

7-
import {CONST_EXPR, Type} from './src/facade/lang';
8-
import {NgClass} from './src/directives/ng_class';
9-
import {NgFor} from './src/directives/ng_for';
10-
import {NgIf} from './src/directives/ng_if';
11-
import {NgNonBindable} from './src/directives/ng_non_bindable';
12-
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/directives/ng_switch';
7+
import {CONST_EXPR, Type} from './src/core/facade/lang';
8+
import {NgClass} from './src/core/directives/ng_class';
9+
import {NgFor} from './src/core/directives/ng_for';
10+
import {NgIf} from './src/core/directives/ng_if';
11+
import {NgNonBindable} from './src/core/directives/ng_non_bindable';
12+
import {NgSwitch, NgSwitchWhen, NgSwitchDefault} from './src/core/directives/ng_switch';
1313

14-
export * from './src/directives/ng_class';
15-
export * from './src/directives/ng_for';
16-
export * from './src/directives/ng_if';
17-
export * from './src/directives/ng_non_bindable';
18-
export * from './src/directives/ng_style';
19-
export * from './src/directives/ng_switch';
14+
export * from './src/core/directives/ng_class';
15+
export * from './src/core/directives/ng_for';
16+
export * from './src/core/directives/ng_if';
17+
export * from './src/core/directives/ng_non_bindable';
18+
export * from './src/core/directives/ng_style';
19+
export * from './src/core/directives/ng_switch';
2020

2121
/**
2222
* A collection of the Angular core directives that are likely to be used in each and every Angular

‎modules/angular2/forms.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ export {NgValidator, NgRequiredValidator} from './src/forms/directives/validator
3737
export {FormBuilder} from './src/forms/form_builder';
3838

3939
import {FormBuilder} from './src/forms/form_builder';
40-
import {CONST_EXPR, Type} from './src/facade/lang';
40+
import {CONST_EXPR, Type} from './src/core/facade/lang';
4141

4242
export const FORM_BINDINGS: List<Type> = CONST_EXPR([FormBuilder]);

‎modules/angular2/http.ts

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@
55
* class.
66
*/
77
import {bind, Binding} from 'angular2/di';
8-
import {Http, Jsonp} from './src/http';
9-
import {XHRBackend, XHRConnection} from './src/backends/xhr_backend';
10-
import {JSONPBackend, JSONPConnection} from './src/backends/jsonp_backend';
11-
import {BrowserXhr} from './src/backends/browser_xhr';
12-
import {BrowserJsonp} from './src/backends/browser_jsonp';
13-
import {BaseRequestOptions, RequestOptions} from './src/base_request_options';
14-
import {ConnectionBackend} from './src/interfaces';
15-
import {BaseResponseOptions, ResponseOptions} from './src/base_response_options';
8+
import {Http, Jsonp} from './src/http/http';
9+
import {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
10+
import {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend';
11+
import {BrowserXhr} from './src/http/backends/browser_xhr';
12+
import {BrowserJsonp} from './src/http/backends/browser_jsonp';
13+
import {BaseRequestOptions, RequestOptions} from './src/http/base_request_options';
14+
import {ConnectionBackend} from './src/http/interfaces';
15+
import {BaseResponseOptions, ResponseOptions} from './src/http/base_response_options';
1616

17-
export {MockConnection, MockBackend} from './src/backends/mock_backend';
18-
export {Request} from './src/static_request';
19-
export {Response} from './src/static_response';
17+
export {MockConnection, MockBackend} from './src/http/backends/mock_backend';
18+
export {Request} from './src/http/static_request';
19+
export {Response} from './src/http/static_response';
2020

2121
export {
2222
RequestOptionsArgs,
2323
ResponseOptionsArgs,
2424
Connection,
2525
ConnectionBackend
26-
} from './src/interfaces';
26+
} from './src/http/interfaces';
2727

28-
export {BrowserXhr} from './src/backends/browser_xhr';
29-
export {BaseRequestOptions, RequestOptions} from './src/base_request_options';
30-
export {BaseResponseOptions, ResponseOptions} from './src/base_response_options';
31-
export {XHRBackend, XHRConnection} from './src/backends/xhr_backend';
32-
export {JSONPBackend, JSONPConnection} from './src/backends/jsonp_backend';
33-
export {Http, Jsonp} from './src/http';
28+
export {BrowserXhr} from './src/http/backends/browser_xhr';
29+
export {BaseRequestOptions, RequestOptions} from './src/http/base_request_options';
30+
export {BaseResponseOptions, ResponseOptions} from './src/http/base_response_options';
31+
export {XHRBackend, XHRConnection} from './src/http/backends/xhr_backend';
32+
export {JSONPBackend, JSONPConnection} from './src/http/backends/jsonp_backend';
33+
export {Http, Jsonp} from './src/http/http';
3434

35-
export {Headers} from './src/headers';
35+
export {Headers} from './src/http/headers';
3636

3737
export {
3838
ResponseTypes,

‎modules/angular2/metadata.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ export {
4545
OnCheck
4646
} from './src/core/compiler/interfaces';
4747

48-
export {Class, ClassDefinition, TypeDecorator} from './src/util/decorators';
48+
export {Class, ClassDefinition, TypeDecorator} from './src/core/util/decorators';

‎modules/angular2/mock.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ export * from './src/mock/mock_location_strategy';
22
export {LocationStrategy} from './src/router/location_strategy';
33

44
export {MockViewResolver} from 'angular2/src/mock/view_resolver_mock';
5-
export {MockXHR} from 'angular2/src/render/xhr_mock';
5+
export {MockXHR} from 'angular2/src/core/render/xhr_mock';

‎modules/angular2/pipes.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
* This module provides advanced support for extending change detection.
55
*/
66

7-
export {UpperCasePipe} from './src/pipes/uppercase_pipe';
8-
export {LowerCasePipe} from './src/pipes/lowercase_pipe';
9-
export {AsyncPipe} from './src/pipes/async_pipe';
10-
export {JsonPipe} from './src/pipes/json_pipe';
11-
export {DatePipe} from './src/pipes/date_pipe';
12-
export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/pipes/number_pipe';
13-
export {LimitToPipe} from './src/pipes/limit_to_pipe';
14-
export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/pipes/default_pipes';
7+
export {UpperCasePipe} from './src/core/pipes/uppercase_pipe';
8+
export {LowerCasePipe} from './src/core/pipes/lowercase_pipe';
9+
export {AsyncPipe} from './src/core/pipes/async_pipe';
10+
export {JsonPipe} from './src/core/pipes/json_pipe';
11+
export {DatePipe} from './src/core/pipes/date_pipe';
12+
export {DecimalPipe, PercentPipe, CurrencyPipe} from './src/core/pipes/number_pipe';
13+
export {LimitToPipe} from './src/core/pipes/limit_to_pipe';
14+
export {DEFAULT_PIPES_TOKEN, DEFAULT_PIPES} from './src/core/pipes/default_pipes';

‎modules/angular2/profile.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ export {
44
wtfStartTimeRange,
55
wtfEndTimeRange,
66
WtfScopeFn
7-
} from './src/profile/profile';
7+
} from './src/core/profile/profile';

‎modules/angular2/render.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ export {
1818
DOCUMENT,
1919
APP_ID,
2020
MAX_IN_MEMORY_ELEMENTS_PER_TEMPLATE
21-
} from './src/render/render';
21+
} from './src/core/render/render';

‎modules/angular2/router.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ import {Pipeline} from './src/router/pipeline';
3434
import {Location} from './src/router/location';
3535
import {APP_COMPONENT} from './src/core/application_tokens';
3636
import {Binding} from './di';
37-
import {CONST_EXPR} from './src/facade/lang';
38-
import {List} from './src/facade/collection';
37+
import {CONST_EXPR} from './src/core/facade/lang';
38+
import {List} from './src/core/facade/collection';
3939

4040
export const ROUTER_DIRECTIVES: List<any> = CONST_EXPR([RouterOutlet, RouterLink]);
4141

‎modules/angular2/src/core/application.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ library angular2.application;
22

33
import 'dart:async';
44

5-
import 'package:angular2/src/reflection/reflection.dart' show reflector;
6-
import 'package:angular2/src/reflection/reflection_capabilities.dart'
5+
import 'package:angular2/src/core/reflection/reflection.dart' show reflector;
6+
import 'package:angular2/src/core/reflection/reflection_capabilities.dart'
77
show ReflectionCapabilities;
88
import 'application_common.dart';
99
import 'application_ref.dart';

0 commit comments

Comments
 (0)