From e4412afa55d364c90b1c0528e482fe23bcc7a977 Mon Sep 17 00:00:00 2001
From: Jeremy Elbourn <jelbourn@google.com>
Date: Wed, 15 Nov 2017 15:13:50 -0800
Subject: [PATCH] build: align versions of @bazel/typescript and typescript

---
 package-lock.json | 36 +++++++++---------------------------
 package.json      |  4 ++--
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d146e9fe3548..2b8e6197c4ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -188,16 +188,16 @@
       "dev": true
     },
     "@bazel/typescript": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.3.1.tgz",
-      "integrity": "sha1-VDZ9+PMPoPsl5BEG63qlWFNMNt0=",
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/@bazel/typescript/-/typescript-0.2.2.tgz",
+      "integrity": "sha1-Cg0JkkUIyUbeMuas2ytcwe4yxQY=",
       "dev": true,
       "requires": {
         "@types/node": "7.0.18",
         "@types/source-map": "0.5.2",
         "protobufjs": "5.0.0",
-        "tsickle": "0.25.5",
-        "typescript": "2.5.3"
+        "tsickle": "0.24.1",
+        "typescript": "2.4.2"
       },
       "dependencies": {
         "@types/node": {
@@ -230,24 +230,6 @@
             "glob": "5.0.15",
             "yargs": "3.32.0"
           }
-        },
-        "tsickle": {
-          "version": "0.25.5",
-          "resolved": "https://registry.npmjs.org/tsickle/-/tsickle-0.25.5.tgz",
-          "integrity": "sha512-CgOT/1WqOKtE1fyvqB+kTJ7bizE33xj1TyUIzGbxJBGCbQmknCrZbb35DtxMiK6pJo4CrPyoS8iGFddfHKtSNA==",
-          "dev": true,
-          "requires": {
-            "minimist": "1.2.0",
-            "mkdirp": "0.5.1",
-            "source-map": "0.5.7",
-            "source-map-support": "0.4.18"
-          }
-        },
-        "typescript": {
-          "version": "2.5.3",
-          "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
-          "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
-          "dev": true
         }
       }
     },
@@ -4328,7 +4310,7 @@
         "resolve-dependency-path": "1.0.2",
         "sass-lookup": "1.1.0",
         "stylus-lookup": "1.0.2",
-        "typescript": "2.5.3"
+        "typescript": "2.4.2"
       }
     },
     "fill-range": {
@@ -17727,9 +17709,9 @@
       "dev": true
     },
     "typescript": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.5.3.tgz",
-      "integrity": "sha512-ptLSQs2S4QuS6/OD1eAKG+S5G8QQtrU5RT32JULdZQtM1L3WTi34Wsu48Yndzi8xsObRAB9RPt/KhA9wlpEF6w==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.4.2.tgz",
+      "integrity": "sha1-+DlfhdRZJ2BnyYiqQYN6j4KHCEQ=",
       "dev": true
     },
     "typescript-eslint-parser": {
diff --git a/package.json b/package.json
index 1fd589cea932..bdaa35a0b910 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@angular/router": "^5.0.0",
     "@angular/upgrade": "^5.0.1",
     "@bazel/ibazel": "0.0.1",
-    "@bazel/typescript": "^0.3.1",
+    "@bazel/typescript": "0.2.x",
     "@google-cloud/storage": "^1.1.1",
     "@types/chalk": "^0.4.31",
     "@types/fs-extra": "^4.0.3",
@@ -123,7 +123,7 @@
     "tsconfig-paths": "^2.3.0",
     "tslint": "^5.8.0",
     "tsutils": "^2.6.0",
-    "typescript": "~2.5.3",
+    "typescript": "~2.4.2",
     "uglify-js": "^2.8.14",
     "web-animations-js": "^2.2.5"
   }