Skip to content

Commit a02614b

Browse files
mheverymprobst
mhevery
authored and
mprobst
committed
chore: replace CONST_EXPR with /*@ts2dart_const*/
1 parent d2527b5 commit a02614b

99 files changed

Lines changed: 431 additions & 492 deletions

File tree

Some content is hidden

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

‎modules/angular2/alt_router.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@ export {ROUTER_PROVIDERS} from './src/alt_router/router_providers';
1717

1818
import {RouterOutlet} from './src/alt_router/directives/router_outlet';
1919
import {RouterLink} from './src/alt_router/directives/router_link';
20-
import {CONST_EXPR} from './src/facade/lang';
2120

22-
export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
21+
export const ROUTER_DIRECTIVES: any[] = /*@ts2dart_const*/ [RouterOutlet, RouterLink];

‎modules/angular2/platform/browser.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export {
1313
disableDebugTools
1414
} from 'angular2/src/platform/browser_common';
1515

16-
import {Type, isPresent, isBlank, CONST_EXPR} from 'angular2/src/facade/lang';
16+
import {Type, isPresent, isBlank} from 'angular2/src/facade/lang';
1717
import {
1818
BROWSER_PROVIDERS,
1919
BROWSER_APP_COMMON_PROVIDERS,
@@ -39,10 +39,10 @@ import {Provider} from 'angular2/src/core/di';
3939
/**
4040
* An array of providers that should be passed into `application()` when bootstrapping a component.
4141
*/
42-
export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> = CONST_EXPR([
42+
export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> = /*@ts2dart_const*/ [
4343
BROWSER_APP_COMMON_PROVIDERS,
4444
COMPILER_PROVIDERS,
45-
new Provider(XHR, {useClass: XHRImpl}),
45+
new Provider(XHR, {useClass: XHRImpl},
4646
]);
4747

4848
export function browserPlatform(): PlatformRef {

‎modules/angular2/platform/browser_static.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
* have been precompiled offline.
3434
*/
3535
export const BROWSER_APP_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
36-
BROWSER_APP_COMMON_PROVIDERS;
36+
/*@ts2dart_const*/ BROWSER_APP_COMMON_PROVIDERS;
3737

3838
export function browserStaticPlatform(): PlatformRef {
3939
if (isBlank(getPlatform())) {

‎modules/angular2/platform/testing/browser.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import {
33
ADDITIONAL_TEST_BROWSER_PROVIDERS
44
} from 'angular2/platform/testing/browser_static';
55
import {BROWSER_APP_PROVIDERS} from 'angular2/platform/browser';
6-
import {CONST_EXPR} from 'angular2/src/facade/lang';
76

87
/**
98
* Providers for using template cache to avoid actual XHR.
@@ -15,10 +14,10 @@ export {CACHED_TEMPLATE_PROVIDER} from 'angular2/platform/browser';
1514
* Default platform providers for testing.
1615
*/
1716
export const TEST_BROWSER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
18-
CONST_EXPR([TEST_BROWSER_STATIC_PLATFORM_PROVIDERS]);
17+
/*@ts2dart_const*/[TEST_BROWSER_STATIC_PLATFORM_PROVIDERS];
1918

2019
/**
2120
* Default application providers for testing.
2221
*/
2322
export const TEST_BROWSER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
24-
CONST_EXPR([BROWSER_APP_PROVIDERS, ADDITIONAL_TEST_BROWSER_PROVIDERS]);
23+
/*@ts2dart_const*/[BROWSER_APP_PROVIDERS, ADDITIONAL_TEST_BROWSER_PROVIDERS];

‎modules/angular2/platform/testing/browser_static.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import {BrowserDetection} from 'angular2/src/testing/utils';
3030

3131
import {ELEMENT_PROBE_PROVIDERS} from 'angular2/platform/common_dom';
3232

33-
import {CONST_EXPR, IS_DART} from 'angular2/src/facade/lang';
33+
import {IS_DART} from 'angular2/src/facade/lang';
3434

3535
import {Log} from 'angular2/src/testing/utils';
3636

@@ -47,14 +47,14 @@ function createNgZone(): NgZone {
4747
* Default platform providers for testing without a compiler.
4848
*/
4949
export const TEST_BROWSER_STATIC_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
50-
CONST_EXPR([
50+
/*@ts2dart_const*/ [
5151
PLATFORM_COMMON_PROVIDERS,
52-
new Provider(PLATFORM_INITIALIZER, {useValue: initBrowserTests, multi: true})
52+
new Provider(PLATFORM_INITIALIZER, {useValue: initBrowserTests, multi: true}
5353
]);
5454

5555
export const ADDITIONAL_TEST_BROWSER_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
56-
CONST_EXPR([
57-
new Provider(APP_ID, {useValue: 'a'}),
56+
/*@ts2dart_const*/ [
57+
new Provider(APP_ID, {useValue: 'a'},
5858
ELEMENT_PROBE_PROVIDERS,
5959
new Provider(DirectiveResolver, {useClass: MockDirectiveResolver}),
6060
new Provider(ViewResolver, {useClass: MockViewResolver}),
@@ -69,8 +69,8 @@ export const ADDITIONAL_TEST_BROWSER_PROVIDERS: Array<any /*Type | Provider | an
6969
* Default application providers for testing without a compiler.
7070
*/
7171
export const TEST_BROWSER_STATIC_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
72-
CONST_EXPR([
72+
/*@ts2dart_const*/ [
7373
BROWSER_APP_COMMON_PROVIDERS,
74-
new Provider(XHR, {useClass: XHRImpl}),
74+
new Provider(XHR, {useClass: XHRImpl},
7575
ADDITIONAL_TEST_BROWSER_PROVIDERS
7676
]);

‎modules/angular2/platform/testing/server.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import {
3838
import {DomEventsPlugin} from 'angular2/src/platform/dom/events/dom_events';
3939
import {LocationStrategy} from 'angular2/platform/common';
4040

41-
import {CONST_EXPR} from 'angular2/src/facade/lang';
4241

4342
import {Log} from 'angular2/src/testing/utils';
4443

@@ -50,10 +49,11 @@ function initServerTests() {
5049
/**
5150
* Default platform providers for testing.
5251
*/
53-
export const TEST_SERVER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> = CONST_EXPR([
54-
PLATFORM_COMMON_PROVIDERS,
55-
new Provider(PLATFORM_INITIALIZER, {useValue: initServerTests, multi: true})
56-
]);
52+
export const TEST_SERVER_PLATFORM_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
53+
/*@ts2dart_const*/ [
54+
PLATFORM_COMMON_PROVIDERS,
55+
new Provider(PLATFORM_INITIALIZER, {useValue: initServerTests, multi: true}
56+
]);
5757

5858
function appDoc() {
5959
try {
@@ -67,8 +67,8 @@ function appDoc() {
6767
* Default application providers for testing.
6868
*/
6969
export const TEST_SERVER_APPLICATION_PROVIDERS: Array<any /*Type | Provider | any[]*/> =
70-
CONST_EXPR([
71-
// TODO(julie): when angular2/platform/server is available, use that instead of making our own
70+
/*@ts2dart_const*/ [
71+
// TODO(julie: when angular2/platform/server is available, use that instead of making our own
7272
// list here.
7373
APPLICATION_COMMON_PROVIDERS,
7474
COMPILER_PROVIDERS,

‎modules/angular2/router.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export {ROUTER_PROVIDERS, ROUTER_BINDINGS} from 'angular2/src/router/router_prov
2020

2121
import {RouterOutlet} from './src/router/directives/router_outlet';
2222
import {RouterLink} from './src/router/directives/router_link';
23-
import {CONST_EXPR} from './src/facade/lang';
2423

2524
/**
2625
* A list of directives. To use the router directives like {@link RouterOutlet} and
@@ -44,4 +43,4 @@ import {CONST_EXPR} from './src/facade/lang';
4443
* bootstrap(AppCmp, [ROUTER_PROVIDERS]);
4544
* ```
4645
*/
47-
export const ROUTER_DIRECTIVES: any[] = CONST_EXPR([RouterOutlet, RouterLink]);
46+
export const ROUTER_DIRECTIVES: any[] = /*@ts2dart_const*/[RouterOutlet, RouterLink];

‎modules/angular2/router/router_link_dsl.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {TEMPLATE_TRANSFORMS} from 'angular2/compiler';
22
import {Provider} from 'angular2/core';
33
import {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
4-
import {CONST_EXPR} from 'angular2/src/facade/lang';
54

65
export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_transform';
76

@@ -32,4 +31,5 @@ export {RouterLinkTransform} from 'angular2/src/router/directives/router_link_tr
3231
* ```
3332
*/
3433
export const ROUTER_LINK_DSL_PROVIDER =
35-
CONST_EXPR(new Provider(TEMPLATE_TRANSFORMS, {useClass: RouterLinkTransform, multi: true}));
34+
/*@ts2dart_const*/
35+
new Provider(TEMPLATE_TRANSFORMS, {useClass: RouterLinkTransform, multi: true});

‎modules/angular2/src/common/common_directives.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CONST_EXPR, Type} from 'angular2/src/facade/lang';
1+
import {Type} from 'angular2/src/facade/lang';
22

33
import {FORM_DIRECTIVES} from './forms';
44
import {CORE_DIRECTIVES} from './directives';
@@ -46,4 +46,4 @@ import {CORE_DIRECTIVES} from './directives';
4646
* }
4747
* ```
4848
*/
49-
export const COMMON_DIRECTIVES: Type[][] = CONST_EXPR([CORE_DIRECTIVES, FORM_DIRECTIVES]);
49+
export const COMMON_DIRECTIVES: Type[][] = /*@ts2dart_const*/[CORE_DIRECTIVES, FORM_DIRECTIVES];

‎modules/angular2/src/common/directives/core_directives.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {CONST_EXPR, Type} from 'angular2/src/facade/lang';
1+
import {Type} from 'angular2/src/facade/lang';
22
import {NgClass} from './ng_class';
33
import {NgFor} from './ng_for';
44
import {NgIf} from './ng_if';
@@ -47,7 +47,7 @@ import {NgPlural, NgPluralCase} from './ng_plural';
4747
* }
4848
* ```
4949
*/
50-
export const CORE_DIRECTIVES: Type[] = CONST_EXPR([
50+
export const CORE_DIRECTIVES: Type[] = /*@ts2dart_const*/[
5151
NgClass,
5252
NgFor,
5353
NgIf,
@@ -58,4 +58,4 @@ export const CORE_DIRECTIVES: Type[] = CONST_EXPR([
5858
NgSwitchDefault,
5959
NgPlural,
6060
NgPluralCase
61-
]);
61+
];

0 commit comments

Comments
 (0)