From 85c1927993d3c930500f4d677c288e873b8ab3f1 Mon Sep 17 00:00:00 2001 From: Chuck Jazdzewski Date: Thu, 7 Apr 2016 10:14:38 -0700 Subject: [PATCH] build(broccoli): AngularBuilder compiles with TypeScript 1.8+. Beginning with 1.8, if a modules has both a .ts and .d.ts file, the .js file is not written. Closes #7947 --- tools/broccoli/angular_builder.d.ts | 5 ----- tools/broccoli/angular_builder.ts | 6 ++++++ tools/broccoli/trees/dart_tree.ts | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 tools/broccoli/angular_builder.d.ts diff --git a/tools/broccoli/angular_builder.d.ts b/tools/broccoli/angular_builder.d.ts deleted file mode 100644 index c7476f3c498..00000000000 --- a/tools/broccoli/angular_builder.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -interface AngularBuilderOptions { - outputPath: string; - dartSDK?: any; - logs?: any; -} diff --git a/tools/broccoli/angular_builder.ts b/tools/broccoli/angular_builder.ts index 12322d1e0a9..7a047de834c 100644 --- a/tools/broccoli/angular_builder.ts +++ b/tools/broccoli/angular_builder.ts @@ -17,6 +17,12 @@ export type Options = { useBundles: boolean; }; +export interface AngularBuilderOptions { + outputPath: string; + dartSDK?: any; + logs?: any; +} + /** * BroccoliBuilder facade for all of our build pipelines. */ diff --git a/tools/broccoli/trees/dart_tree.ts b/tools/broccoli/trees/dart_tree.ts index f94bf89eff5..2e33a0756c1 100644 --- a/tools/broccoli/trees/dart_tree.ts +++ b/tools/broccoli/trees/dart_tree.ts @@ -1,5 +1,4 @@ /// -/// 'use strict'; import {MultiCopy} from './../multi_copy'; @@ -12,6 +11,7 @@ var stew = require('broccoli-stew'); import ts2dart from '../broccoli-ts2dart'; import dartfmt from '../broccoli-dartfmt'; import replace from '../broccoli-replace'; +import {AngularBuilderOptions} from '../angular_builder'; var global_excludes = [ 'angular2/examples/**/ts/**/*',