From bb50fc131bd74bed2e394df2eaba1bcff75fc6bc Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Wed, 29 Apr 2015 11:47:11 -0700
Subject: [PATCH] chore(build): update TypeScript version to unreleased beta

Also fixup the typings which were broken by changes in typescript's lib.d.ts.
Second attempt to merge this, now that bugfix for tsd is in.
---
 modules/angular2/globals.ts         |  1 -
 modules/angular2/src/facade/math.ts |  2 +-
 modules/angular2/tsd.json           |  5 +----
 npm-shrinkwrap.clean.json           |  4 ++--
 npm-shrinkwrap.json                 | 10 +++++-----
 package.json                        |  4 ++--
 6 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/modules/angular2/globals.ts b/modules/angular2/globals.ts
index bb478ac690..d3f5a050a6 100644
--- a/modules/angular2/globals.ts
+++ b/modules/angular2/globals.ts
@@ -19,7 +19,6 @@ interface Window {
   JSON: typeof JSON;
   Math: typeof Math;
   assert: typeof assert;
-  NaN: typeof NaN;
   gc(): void;
   Reflect: any;
 }
diff --git a/modules/angular2/src/facade/math.ts b/modules/angular2/src/facade/math.ts
index f813fd8d85..4c15bf1e3e 100644
--- a/modules/angular2/src/facade/math.ts
+++ b/modules/angular2/src/facade/math.ts
@@ -6,4 +6,4 @@ import {global} from 'angular2/src/facade/lang';
 export var __esModule = true;
 
 export var Math = global.Math;
-export var NaN = global.NaN;
+export var NaN = typeof NaN;
diff --git a/modules/angular2/tsd.json b/modules/angular2/tsd.json
index 3ce6280f40..c04d5adc31 100644
--- a/modules/angular2/tsd.json
+++ b/modules/angular2/tsd.json
@@ -9,7 +9,7 @@
       "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
     "hammerjs/hammerjs.d.ts": {
-      "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
+      "commit": "22c44d95912a07f81c103a694330b15b92f7cb40"
     },
     "jasmine/jasmine.d.ts": {
       "commit": "055b3172e8eb374a75826710c4d08677872620d3"
@@ -72,9 +72,6 @@
     "selenium-webdriver/selenium-webdriver.d.ts": {
       "commit": "be0b6b394f77a59e192ad7cfec18078706e44db5"
     },
-    "touch-events/touch-events.d.ts": {
-      "commit": "055b3172e8eb374a75826710c4d08677872620d3"
-    },
     "zone/zone.d.ts": {
       "commit": "055b3172e8eb374a75826710c4d08677872620d3"
     }
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 01f0963352..e1c38233d3 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -8672,7 +8672,7 @@
       }
     },
     "ts2dart": {
-      "version": "0.3.0",
+      "version": "0.4.2",
       "dependencies": {
         "source-map": {
           "version": "0.4.2",
@@ -9087,7 +9087,7 @@
     },
     "typescript": {
       "version": "1.5.0",
-      "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823"
+      "resolved": "git://github.com/mhegazy/TypeScript.git#v1.5-beta"
     },
     "vinyl": {
       "version": "0.4.6",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index af430c5ac6..6215a2886e 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -13384,9 +13384,9 @@
       }
     },
     "ts2dart": {
-      "version": "0.3.0",
-      "from": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.3.0.tgz",
-      "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.3.0.tgz",
+      "version": "0.4.2",
+      "from": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.4.2.tgz",
+      "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.4.2.tgz",
       "dependencies": {
         "source-map": {
           "version": "0.4.2",
@@ -14032,8 +14032,8 @@
     },
     "typescript": {
       "version": "1.5.0",
-      "from": "alexeagle/TypeScript#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823",
-      "resolved": "git://github.com/alexeagle/TypeScript.git#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823"
+      "from": "mhegazy/TypeScript#v1.5-beta",
+      "resolved": "mhegazy/TypeScript#v1.5-beta"
     },
     "vinyl": {
       "version": "0.4.6",
diff --git a/package.json b/package.json
index 06eafb37f0..608730fa1c 100644
--- a/package.json
+++ b/package.json
@@ -107,9 +107,9 @@
     "temp": "^0.8.1",
     "ternary-stream": "^1.2.3",
     "through2": "^0.6.1",
-    "ts2dart": "^0.3.0",
+    "ts2dart": "^0.4.2",
     "tsd": "^0.5.7",
-    "typescript": "alexeagle/TypeScript#93dbbe2a2d0b42cefd02ac949e4bc8ab6b5b5823",
+    "typescript": "mhegazy/TypeScript#v1.5-beta",
     "vinyl": "^0.4.6",
     "walk-sync": "^0.1.3",
     "xtend": "^4.0.0",