Aaaaand, one last fix for using b-c-ts 2.0 correctly.

Author: chriskrycho

blueprints/ember-cli-typescript/files/tsconfig.json

@@ -5,16 +5,17 @@
     "moduleResolution": "node",
     "noEmitOnError": false,
     "noEmit": true,
-    "baseUrl": ".",
-    "outDir": "dist",
     "sourceMap": true,
+    "baseUrl": ".",
     "paths": {
       "<%= dasherizedPackageName %>/tests/*": ["tests/*"],
       "<%= dasherizedPackageName %>/*": ["app/*"]
     }
   },
-  "include": [
-    "app/**/*",
-    "tests/**/*"
+  "exclude": [
+    "tmp",
+    "dist",
+    "node_modules",
+    "bower_components"
   ]
 }

index.js

@@ -14,16 +14,7 @@ try {
 module.exports = {
   name: 'ember-cli-typescript',
 
-  included(app) {
-    this._super.included.apply(this, arguments);
-    this.app = app;
-  },
-
-  blueprintsPath() {
-    return path.join(__dirname, 'blueprints');
-  },
-
-  setupPreprocessorRegistry: function(type, registry) {
+  setupPreprocessorRegistry(type, registry) {
     if (!TsPreprocessor) {
       this.ui.write(
         'Note: TypeScript preprocessor not available -- some dependencies not installed. ' +
@@ -34,8 +25,7 @@ module.exports = {
     }
 
     try {
-      const plugin = new TsPreprocessor({ includeExtensions: ['.ts', '.js'] });
-      registry.add('js', plugin);
+      registry.add('js', new TsPreprocessor());
     } catch (ex) {
       this.ui.write(
         'Missing or invalid tsconfig.json, please fix or run `ember generate ember-cli-typescript`.'

lib/typescript-preprocessor.js

@@ -1,41 +1,59 @@
 /* eslint-env node */
+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 funnel = require('broccoli-funnel');
+const mergeTrees = require('broccoli-merge-trees');
 const tsc = require('broccoli-typescript-compiler').typescript;
 
+const BroccoliDebug = require('broccoli-debug');
+
+let tag = 0;
+
 class TypeScriptPreprocessor {
   constructor(options) {
-    debug('creating new instance with options ', options);
     this.name = 'ember-cli-typescript';
-    this.ext = 'ts';
-    this.options = JSON.parse(JSON.stringify(options));
+    this._tag = tag++;
+
+    // Update the config for how Broccoli handles the file system: no need for
+    // includes, always emit, and let Broccoli manage any outDir.
+    this.config = JSON.parse(fs.readFileSync(path.join(process.cwd(), 'tsconfig.json')));
+    this.config.compilerOptions.noEmit = false;
+    delete this.config.compilerOptions.outDir;
+    delete this.config.include;
   }
 
-  toTree(inputNode /* , inputPath, outputPath */) {
-    const js = new Funnel(inputNode, {
+  toTree(inputNode, inputPath, outputPath) {
+    const js = funnel(inputNode, {
       exclude: ['**/*.ts'],
       annotation: 'JS files',
     });
 
-    const tsFiles = new Funnel(inputNode, {
-      include: ['**/*.ts'],
-      annotation: 'TS files',
-    });
+    const debugTree = BroccoliDebug.buildDebugCallback('ember-cli-typescript');
 
-    const ts = tsc(tsFiles, {
-      annotation: 'Compiled TS files',
-      compilerOptions: {
-        allowJs: false, // don't compile JS here; let Babel manage that
-        noEmit: false, // we *must* emit for Broccoli to do its thing
-      },
-    });
+    const uncompiledTs = debugTree(
+      funnel(inputNode, {
+        include: ['**/*.ts'],
+        annotation: 'uncompiled TS files',
+      }),
+      `${this._tag}`
+    );
+
+    const ts = debugTree(
+      tsc(uncompiledTs, {
+        throwOnError: true,
+        annotation: 'Compiled TS files',
+        include: ['**/*'],
+        tsconfig: this.config,
+      }),
+      `${this._tag}`
+    );
 
     // Put everything together.
-    return new MergeTrees([js, ts], {
+    return mergeTrees([js, ts], {
       overwrite: true,
-      annotation: 'compiled TypeScript',
+      annotation: 'merged JS & compiled TS',
     });
   }
 }

package.json

@@ -28,6 +28,7 @@
     "test": "ember try:each"
   },
   "dependencies": {
+    "broccoli-debug": "^0.6.3",
     "broccoli-funnel": "^1.0.6",
     "broccoli-merge-trees": "^1.1.4",
     "broccoli-plugin": "^1.2.1",