chore(build): Upgrade to [email protected]

This change also makes us compliant with 1.6.0-dev compiler,
so we can do some experiments with apps that use 1.6 features
and compile against Angular.

We should probably add a travis build for 1.6 so we stay compatible
with both versions.

Author: alexeagle

gulpfile.js

@@ -760,10 +760,10 @@ gulp.task('!pre.test.typings', ['docs/typings'], function() {
 });
 
 // -----------------
-// TODO: Use a version of TypeScript that matches what is used by DefinitelyTyped.
 gulp.task('test.typings', ['!pre.test.typings'], function() {
   return gulp.src(['typing_spec/*.ts', 'dist/docs/typings/angular2/angular2.d.ts'])
       .pipe(tsc({target: 'ES5', module: 'commonjs',
+                 experimentalDecorators: true,
                  noImplicitAny: true,
                  // Don't use the version of typescript that gulp-typescript depends on, we need 1.5
                  // see https://github.com/ivogabe/gulp-typescript#typescript-version

modules/angular2/annotations.ts

@@ -27,12 +27,7 @@ export {
 } from 'angular2/src/core/compiler/interfaces';
 
 
-export {
-  Class,
-  ClassDefinition,
-  ParameterDecorator,
-  TypeDecorator
-} from 'angular2/src/util/decorators';
+export {Class, ClassDefinition, TypeDecorator} from 'angular2/src/util/decorators';
 
 export {
   Attribute,

modules/angular2/src/core/annotations/decorators.ts

@@ -1,13 +1,7 @@
 import {ComponentAnnotation, DirectiveAnnotation, LifecycleEvent} from './annotations';
 import {ViewAnnotation} from './view';
 import {AttributeAnnotation, QueryAnnotation, ViewQueryAnnotation} from './di';
-import {
-  makeDecorator,
-  makeParamDecorator,
-  TypeDecorator,
-  ParameterDecorator,
-  Class
-} from '../../util/decorators';
+import {makeDecorator, makeParamDecorator, TypeDecorator, Class} from '../../util/decorators';
 import {Type} from 'angular2/src/facade/lang';
 import {ViewEncapsulation} from 'angular2/src/render/api';
 

modules/angular2/src/facade/intl.ts

@@ -8,6 +8,9 @@ declare module Intl {
     currency?: string;
     currencyDisplay?: string;
     useGrouping?: boolean;
+    minimumIntegerDigits?: number;
+    minimumFractionDigits?: number;
+    maximumFractionDigits?: number;
   }
 
   interface NumberFormat {

modules/angular2/src/facade/lang.ts

@@ -59,18 +59,18 @@ export function CONST_EXPR<T>(expr: T): T {
   return expr;
 }
 
-export function CONST():<T>(target: T) => T {
+export function CONST(): ClassDecorator {
   return (target) => target;
 }
 
-export function ABSTRACT():<T>(target: T) => T {
+export function ABSTRACT(): ClassDecorator {
   return (t) => t;
 }
 
 // Note: This is only a marker annotation needed for ts2dart.
 // This is written so that is can be used as a Traceur annotation
 // or a Typescript decorator.
-export function IMPLEMENTS(_):<T>(target: T) => T {
+export function IMPLEMENTS(_): ClassDecorator {
   return (t) => t;
 }
 

modules/angular2/src/mock/location_mock.ts

@@ -6,7 +6,7 @@ import {List, ListWrapper} from 'angular2/src/facade/collection';
 import {Location} from 'angular2/src/router/location';
 
 
-@proxy
+@proxy()
 @IMPLEMENTS(Location)
 export class SpyLocation extends SpyObject {
   urlChanges: List<string>;

modules/angular2/src/router/route_config_impl.ts

@@ -22,10 +22,15 @@ export class Route implements RouteDefinition {
   path: string;
   component: Type;
   as: string;
+  // added next two properties to work around https://github.com/Microsoft/TypeScript/issues/4107
+  loader: Function;
+  redirectTo: string;
   constructor({path, component, as}: {path: string, component: Type, as?: string}) {
     this.path = path;
     this.component = component;
     this.as = as;
+    this.loader = null;
+    this.redirectTo = null;
   }
 }
 

modules/angular2/src/test_lib/spies.dart

@@ -4,32 +4,32 @@ import 'package:angular2/src/change_detection/change_detection.dart';
 import 'package:angular2/di.dart';
 import './test_lib.dart';
 
-@proxy
+@proxy()
 class SpyChangeDetector extends SpyObject implements ChangeDetector {
   noSuchMethod(m) => super.noSuchMethod(m);
 }
 
-@proxy
+@proxy()
 class SpyProtoChangeDetector extends SpyObject implements ProtoChangeDetector {
   noSuchMethod(m) => super.noSuchMethod(m);
 }
 
-@proxy
+@proxy()
 class SpyPipe extends SpyObject implements Pipe {
   noSuchMethod(m) => super.noSuchMethod(m);
 }
 
-@proxy
+@proxy()
 class SpyPipeFactory extends SpyObject implements PipeFactory {
   noSuchMethod(m) => super.noSuchMethod(m);
 }
 
-@proxy
+@proxy()
 class SpyDependencyProvider extends SpyObject implements DependencyProvider {
   noSuchMethod(m) => super.noSuchMethod(m);
 }
 
-@proxy
+@proxy()
 class SpyChangeDetectorRef extends SpyObject implements ChangeDetectorRef {
   noSuchMethod(m) => super.noSuchMethod(m);
 }

modules/angular2/src/test_lib/test_lib.ts

@@ -12,7 +12,9 @@ import {createTestInjector, FunctionWithParamTokens, inject} from './test_inject
 
 export {inject} from './test_injector';
 
-export function proxy() {}
+export function proxy(): ClassDecorator {
+  return (t) => t;
+}
 
 var _global: jasmine.GlobalPolluter = <any>(typeof window === 'undefined' ? global : window);
 

modules/angular2/src/util/decorators.ts

@@ -49,6 +49,12 @@ export interface TypeDecorator {
    */
   <T extends Type>(type: T): T;
 
+  // Make TypeDecorator assignable to built-in ParameterDecorator type.
+  // ParameterDecorator is declared in lib.d.ts as a `declare type`
+  // so we cannot declare this interface as a subtype.
+  // see https://github.com/angular/angular/issues/3379#issuecomment-126169417
+  (target: Object, propertyKey: string | symbol, parameterIndex: number): void;
+
   /**
    * Storage for the accumulated annotations so far used by the DSL syntax.
    *
@@ -62,17 +68,6 @@ export interface TypeDecorator {
   Class(obj: ClassDefinition): Type;
 }
 
-/**
- * An interface implemented by all Angular parameter decorators, which allows them to be used as ES7
- * decorators.
- */
-export interface ParameterDecorator {
-  /**
-   * Invoke as ES7 decorator.
-   */
-  (cls: Type, unusedKey: any, index: number): void;
-}
-
 function extractAnnotation(annotation: any): any {
   if (isFunction(annotation) && annotation.hasOwnProperty('annotation')) {
     // it is a decorator, extract annotation