From 2d4f331c63cdb3e1ed5f13b944bcc43237fa77b7 Mon Sep 17 00:00:00 2001
From: Jeff Cross <middlefloor@gmail.com>
Date: Tue, 1 Sep 2015 00:54:58 -0700
Subject: [PATCH] chore: update ts2dart version

---
 .../{ => manual_typings}/globals.d.ts         |  2 +-
 .../{ => manual_typings}/traceur-runtime.d.ts |  2 +-
 npm-shrinkwrap.clean.json                     |  4 ++--
 npm-shrinkwrap.json                           | 23 +++++++++++--------
 4 files changed, 18 insertions(+), 13 deletions(-)
 rename modules/angular2/{ => manual_typings}/globals.d.ts (93%)
 rename modules/angular2/{ => manual_typings}/traceur-runtime.d.ts (97%)

diff --git a/modules/angular2/globals.d.ts b/modules/angular2/manual_typings/globals.d.ts
similarity index 93%
rename from modules/angular2/globals.d.ts
rename to modules/angular2/manual_typings/globals.d.ts
index 9e1b5c3151..fb9ab8e2f9 100644
--- a/modules/angular2/globals.d.ts
+++ b/modules/angular2/manual_typings/globals.d.ts
@@ -2,7 +2,7 @@
  * This file contains declarations of global symbols we reference in our code
  */
 
-/// <reference path="typings/zone/zone.d.ts"/>
+/// <reference path="../typings/zone/zone.d.ts"/>
 declare var assert: any;
 
 // FIXME: K must be string!
diff --git a/modules/angular2/traceur-runtime.d.ts b/modules/angular2/manual_typings/traceur-runtime.d.ts
similarity index 97%
rename from modules/angular2/traceur-runtime.d.ts
rename to modules/angular2/manual_typings/traceur-runtime.d.ts
index 7e6cbe526c..cac659bb15 100644
--- a/modules/angular2/traceur-runtime.d.ts
+++ b/modules/angular2/manual_typings/traceur-runtime.d.ts
@@ -5,7 +5,7 @@
 
 // We also want the following typings to be available only when compiling to
 // ES5, because they are redundant with lib.es6.d.ts.
-/// <reference path="../angular2/typings/es6-promise/es6-promise.d.ts"/>
+/// <reference path="../typings/es6-promise/es6-promise.d.ts"/>
 
 // es6-promise.d.ts chose a different name for this interface than TS lib.es6.d.ts
 // Generic Type Alises are in TS 1.6 (https://github.com/Microsoft/TypeScript/pull/3397)
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 190a2a9210..a03619816e 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -9828,7 +9828,7 @@
       }
     },
     "ts2dart": {
-      "version": "0.7.3",
+      "version": "0.7.4",
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
@@ -10505,5 +10505,5 @@
     }
   },
   "name": "angular",
-  "version": "2.0.0-alpha.35"
+  "version": "2.0.0-alpha.36"
 }
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index bc6813f8c9..586312b7e9 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "angular",
-  "version": "2.0.0-alpha.35",
+  "version": "2.0.0-alpha.36",
   "dependencies": {
     "angular": {
       "version": "1.3.5",
@@ -15190,40 +15190,45 @@
       }
     },
     "ts2dart": {
-      "version": "0.7.3",
-      "from": "ts2dart@0.7.3",
-      "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.3.tgz",
+      "version": "0.7.4",
+      "from": "ts2dart@0.7.4",
+      "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.4.tgz",
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
-          "from": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "from": "source-map@>=0.4.2 <0.5.0",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
           "dependencies": {
             "amdefine": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+              "from": "amdefine@>=0.0.4",
               "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
             }
           }
         },
         "source-map-support": {
           "version": "0.3.2",
-          "from": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz",
+          "from": "source-map-support@>=0.3.1 <0.4.0",
           "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.1.32",
-              "from": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
+              "from": "source-map@0.1.32",
               "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
               "dependencies": {
                 "amdefine": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz",
+                  "from": "amdefine@>=0.0.4",
                   "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"
                 }
               }
             }
           }
+        },
+        "typescript": {
+          "version": "1.5.3",
+          "from": "microsoft/TypeScript#release-1.5",
+          "resolved": "git://github.com/microsoft/TypeScript.git#a24aa6f57d281bafd3535f0f4c3f492364a8b4d6"
         }
       }
     },