Merge pull request #61 from simonihmig/use-console-ui

Use console-ui for TS diagnostics

Author: chriskrycho

index.js

@@ -24,7 +24,9 @@ module.exports = {
     }
 
     try {
-      registry.add('js', new TsPreprocessor());
+      registry.add('js', new TsPreprocessor({
+        ui: this.ui
+      }));
     } catch (ex) {
       this.ui.write(
         'Missing or invalid tsconfig.json, please fix or run `ember generate ember-cli-typescript`.'

lib/typescript-preprocessor.js

@@ -2,10 +2,9 @@
 const fs = require('fs');
 const path = require('path');
 
-const debug = require('debug')('ember-cli-typescript');
 const funnel = require('broccoli-funnel');
 const mergeTrees = require('broccoli-merge-trees');
-const tsc = require('broccoli-typescript-compiler').typescript;
+const TypeScriptPlugin = require('broccoli-typescript-compiler').TypeScriptPlugin;
 
 const BroccoliDebug = require('broccoli-debug');
 
@@ -16,6 +15,7 @@ class TypeScriptPreprocessor {
     this.name = 'ember-cli-typescript';
     this._tag = tag++;
     this.ext = 'ts';
+    this.ui = options.ui;
 
     // Update the config for how Broccoli handles the file system: no need for
     // includes, always emit, and let Broccoli manage any outDir.
@@ -42,13 +42,16 @@ class TypeScriptPreprocessor {
       `${this._tag}`
     );
 
+    const tsc = new TypeScriptPlugin(uncompiledTs, {
+      throwOnError: this.config.compilerOptions.noEmitOnError,
+      annotation: 'Compiled TS files',
+      include: ['**/*'],
+      tsconfig: this.config,
+    });
+    tsc.setDiagnosticWriter(this.ui.writeWarnLine.bind(this.ui));
+
     const ts = debugTree(
-      tsc(uncompiledTs, {
-        throwOnError: this.config.compilerOptions.noEmitOnError,
-        annotation: 'Compiled TS files',
-        include: ['**/*'],
-        tsconfig: this.config,
-      }),
+      tsc,
       `${this._tag}`
     );