From 2900fdc0602ac6522b94edc7b3f54650a2631a4b Mon Sep 17 00:00:00 2001
From: Alex Eagle <alexeagle@google.com>
Date: Fri, 25 Sep 2015 14:32:45 -0700
Subject: [PATCH] chore(ts2dart): remove hand-written ts2dart typings

Now that we are on TS 1.6, we can use the new node module resolution strategy.
---
 npm-shrinkwrap.clean.json          |  2 +-
 npm-shrinkwrap.json                |  6 +++---
 package.json                       |  2 +-
 tools/broccoli/broccoli-ts2dart.ts |  7 +++----
 tools/broccoli/ts2dart.d.ts        | 18 ------------------
 5 files changed, 8 insertions(+), 27 deletions(-)
 delete mode 100644 tools/broccoli/ts2dart.d.ts

diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index e2dea72a7484..e0d75c66c977 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -10026,7 +10026,7 @@
       }
     },
     "ts2dart": {
-      "version": "0.7.5",
+      "version": "0.7.7",
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 054a7a3c544e..30fc6730f182 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -15496,9 +15496,9 @@
       }
     },
     "ts2dart": {
-      "version": "0.7.5",
-      "from": "ts2dart@0.7.5",
-      "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.5.tgz",
+      "version": "0.7.7",
+      "from": "ts2dart@0.7.7",
+      "resolved": "https://registry.npmjs.org/ts2dart/-/ts2dart-0.7.7.tgz",
       "dependencies": {
         "source-map": {
           "version": "0.4.4",
diff --git a/package.json b/package.json
index b61247a44a08..1e5fc23ffa8c 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
     "temp": "^0.8.1",
     "ternary-stream": "^1.2.3",
     "through2": "^0.6.1",
-    "ts2dart": "^0.7.5",
+    "ts2dart": "^0.7.7",
     "tsd": "^0.6.5-beta",
     "tslint": "^2.5.0",
     "typescript": "^1.6.2",
diff --git a/tools/broccoli/broccoli-ts2dart.ts b/tools/broccoli/broccoli-ts2dart.ts
index 49f3ca58bad6..c2db5cf6c45f 100644
--- a/tools/broccoli/broccoli-ts2dart.ts
+++ b/tools/broccoli/broccoli-ts2dart.ts
@@ -1,20 +1,19 @@
 /// <reference path="../typings/node/node.d.ts" />
 /// <reference path="../typings/fs-extra/fs-extra.d.ts" />
-/// <reference path="./ts2dart.d.ts" />
 
 import fs = require('fs');
 import fse = require('fs-extra');
 import path = require('path');
-import ts2dart = require('ts2dart');
+import * as ts2dart from 'ts2dart';
 import {wrapDiffingPlugin, DiffingBroccoliPlugin, DiffResult} from './diffing-broccoli-plugin';
 
 class TSToDartTranspiler implements DiffingBroccoliPlugin {
   static includeExtensions = ['.ts'];
 
-  private basePath: string;
   private transpiler: ts2dart.Transpiler;
 
-  constructor(public inputPath: string, public cachePath: string, public options) {
+  constructor(public inputPath: string, public cachePath: string,
+              public options: ts2dart.TranspilerOptions) {
     options.basePath = inputPath;
     this.transpiler = new ts2dart.Transpiler(options);
   }
diff --git a/tools/broccoli/ts2dart.d.ts b/tools/broccoli/ts2dart.d.ts
deleted file mode 100644
index 9c7c856798d2..000000000000
--- a/tools/broccoli/ts2dart.d.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-// TODO(martinprobst): This is a hand-written declarations file. Replace with an automatically
-// generated one when TypeScript has a strategy to distribute TS source via npm.
-
-declare module "ts2dart" {
-  export interface TranspilerOptions {
-    failFast?: boolean;
-    generateLibraryName?: boolean;
-    generateSourceMap?: boolean;
-    basePath?: string;
-    translateBuiltins?: boolean;
-  }
-
-  export class Transpiler {
-    constructor(options: TranspilerOptions);
-
-    transpile(fileNames: string[], outdir?: string);
-  }
-}