build(npm): update to typescript@1.7.3 + fix broccoli-typescript + fix src

modules/angular2/src/compiler/selector.ts

@@ -181,7 +181,7 @@ export class SelectorMatcher {
    */
   private _addSelectable(cssSelector: CssSelector, callbackCtxt: any,
                          listContext: SelectorListContext) {
-    var matcher = this;
+    var matcher: SelectorMatcher = this;
     var element = cssSelector.element;
     var classNames = cssSelector.classNames;
     var attrs = cssSelector.attrs;

modules/angular2/src/core/di/injector.ts

@@ -932,7 +932,7 @@ export class Injector {
   /** @internal */
   _getByKeyHost(key: Key, optional: boolean, providerVisibility: Visibility,
                 lowerBoundVisibility: Object): any {
-    var inj = this;
+    var inj: Injector = this;
 
     if (lowerBoundVisibility instanceof SkipSelfMetadata) {
       if (inj._isHost) {
@@ -965,7 +965,7 @@ export class Injector {
   /** @internal */
   _getByKeyDefault(key: Key, optional: boolean, providerVisibility: Visibility,
                    lowerBoundVisibility: Object): any {
-    var inj = this;
+    var inj: Injector = this;
 
     if (lowerBoundVisibility instanceof SkipSelfMetadata) {
       providerVisibility = inj._isHost ? Visibility.PublicAndPrivate : Visibility.Public;

modules/angular2/src/core/linker/element_injector.ts

@@ -571,7 +571,7 @@ export class ElementInjector extends TreeNode<ElementInjector> implements Depend
   ngAfterContentChecked(): void { this._queryStrategy.updateContentQueries(); }
 
   traverseAndSetQueriesAsDirty(): void {
-    var inj = this;
+    var inj: ElementInjector = this;
     while (isPresent(inj)) {
       inj._setQueriesAsDirty();
       inj = inj.parent;

modules/angular2/src/facade/browser.ts

@@ -8,10 +8,10 @@ export var document = window.document;
 export var location = window.location;
 export var gc = window['gc'] ? () => window['gc']() : () => null;
 export var performance = window['performance'] ? window['performance'] : null;
-export const Event = Event;
+export const Event = window['Event'];
-export const MouseEvent = MouseEvent;
+export const MouseEvent = window['MouseEvent'];
-export const KeyboardEvent = KeyboardEvent;
+export const KeyboardEvent = window['KeyboardEvent'];
-export const EventTarget = EventTarget;
+export const EventTarget = window['EventTarget'];
-export const History = History;
+export const History = window['History'];
-export const Location = Location;
+export const Location = window['Location'];
-export const EventListener = EventListener;
+export const EventListener = window['EventListener'];

modules/angular2/src/router/router.ts

@@ -116,7 +116,7 @@ export class Router {
    * otherwise `false`.
    */
   isRouteActive(instruction: Instruction): boolean {
-    var router = this;
+    var router: Router = this;
     while (isPresent(router.parent) && isPresent(instruction.child)) {
       router = router.parent;
       instruction = instruction.child;
@@ -382,7 +382,7 @@ export class Router {
 
   private _getAncestorInstructions(): Instruction[] {
     var ancestorComponents = [];
-    var ancestorRouter = this;
+    var ancestorRouter: Router = this;
     while (isPresent(ancestorRouter.parent) &&
            isPresent(ancestorRouter.parent._currentInstruction)) {
       ancestorRouter = ancestorRouter.parent;

npm-shrinkwrap.clean.json

@@ -14213,7 +14213,7 @@
       }
     },
     "typescript": {
-      "version": "1.6.2"
+      "version": "1.7.3"
     },
     "universal-analytics": {
       "version": "0.3.9",

npm-shrinkwrap.json

@@ -21796,9 +21796,9 @@
       }
     },
     "typescript": {
-      "version": "1.6.2",
+      "version": "1.7.3",
-      "from": "typescript@1.6.2",
+      "from": "typescript@1.7.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.2.tgz"
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.7.3.tgz"
     },
     "universal-analytics": {
       "version": "0.3.9",

package.json

@@ -115,7 +115,7 @@
     "ts2dart": "^0.7.16",
     "tsd": "^0.6.5-beta",
     "tslint": "^3.0.0-dev.1",
-    "typescript": "^1.6.2",
+    "typescript": "^1.7.3",
     "universal-analytics": "^0.3.9",
     "webpack": "^1.12.6",
     "which": "~1",

tools/broccoli/broccoli-typescript.ts

@@ -44,9 +44,10 @@ class DiffingTSCompiler implements DiffingBroccoliPlugin {
       this.rootFilePaths = [];
     }
 
-    // in tsc 1.7.x this api was renamed to parseJsonConfigFileContent
     // the conversion is a bit awkward, see https://github.com/Microsoft/TypeScript/issues/5276
-    this.tsOpts = ts.parseConfigFile({compilerOptions: options, files: []}, null, null).options;
+    // in 1.8 use convertCompilerOptionsFromJson
+    this.tsOpts =
+        ts.parseJsonConfigFileContent({compilerOptions: options, files: []}, null, null).options;
 
     // TODO: the above turns rootDir set to './' into an empty string - looks like a tsc bug
     //       check back when we upgrade to 1.7.x