Add support to specify custom typescript compiler, fixes #9

Author: andreypopp

README.md

@@ -24,13 +24,39 @@ module.exports = {
         test: /\.ts$/,
         loader: 'typescript-loader'
       }
-    ],
+    ]
   }
 };
 ```
 
 ## Best Practices
 
+### Using with JSX-TypeScript compuler
+
+You can use `typescript-loader` together with
+[jsx-typscript](https://github.com/fdecampredon/jsx-typescript) compiler which
+has support for JSX syntax (used in React.js).
+
+For that you need to install `jsx-typescript`:
+
+    % npm install jsx-typescript
+
+And specify `typescriptCompiler` loader option:
+
+```javascript
+module.exports = {
+
+  module: {
+    loaders: [
+      {
+        test: /\.ts$/,
+        loader: 'typescript-loader?typescriptCompiler=jsx-typescript'
+      }
+    ]
+  }
+};
+```
+
 ### External Modules
 
 The most natural way to structure your code with TypeScript and webpack is to use [external modules](https://github.com/Microsoft/TypeScript/wiki/Modules#going-external), and these work as you would expect. 

lib/TypeScriptWebpackHost.js

@@ -6,7 +6,6 @@
 var fs            = require('fs');
 var util          = require('util');
 var path          = require('path');
-var ts            = require('typescript');
 var objectAssign  = require('object-assign');
 var Promise       = require('bluebird');
 
@@ -19,21 +18,20 @@ function prepareStaticSource(moduleId) {
 var RUNTIME = prepareStaticSource('./webpack-runtime.d.ts');
 var LIB     = prepareStaticSource('typescript/bin/lib.d.ts');
 
-var DEFAULT_OPTIONS = {
-  target: ts.ScriptTarget.ES5,
-  module: ts.ModuleKind.CommonJS,
-  sourceMap: true,
-  verbose: false
-};
-
-function TypeScriptWebpackHost(options, fs) {
+function TypeScriptWebpackHost(options, fs, ts) {
+  ts = ts || require('typescript');
+  this.ts = ts;
   this.options = {};
-  objectAssign(this.options, DEFAULT_OPTIONS);
+  objectAssign(this.options, {
+    target: this.ts.ScriptTarget.ES5,
+    module: this.ts.ModuleKind.CommonJS,
+    sourceMap: true,
+    verbose: false
+  });
   objectAssign(this.options, options);
-
   this._fs = fs;
   this._files = {};
-  this._services = ts.createLanguageService(this, ts.createDocumentRegistry());
+  this._services = this.ts.createLanguageService(this, this.ts.createDocumentRegistry());
   this._runtimeRead = null;
 
   this._addFile(RUNTIME.filename, RUNTIME.text);
@@ -118,19 +116,18 @@ TypeScriptWebpackHost.prototype.log = function log(message) {
 TypeScriptWebpackHost.prototype._findImportDeclarations = function _findImportDeclarations(filename) {
   var node = this._services.getSourceFile(filename);
   var result = [];
-  visit(node);
-  return result;
-
-  function visit(node) {
-    if (node.kind === ts.SyntaxKind.ImportDeclaration) {
+  var visit = function(node) {
+    if (node.kind === this.ts.SyntaxKind.ImportDeclaration) {
       result.push(node.moduleReference.expression.text);
-    } else if (node.kind === ts.SyntaxKind.SourceFile) {
+    } else if (node.kind === this.ts.SyntaxKind.SourceFile) {
       result = result.concat(node.referencedFiles.map(function(f) {
         return path.resolve(path.dirname(node.filename), f.filename);
       }));
     }
-    ts.forEachChild(node, visit);
-  }
+    this.ts.forEachChild(node, visit);
+  }.bind(this);
+  visit(node);
+  return result;
 };
 
 TypeScriptWebpackHost.prototype._addFile = function _addFile(filename, text) {
@@ -187,7 +184,7 @@ TypeScriptWebpackHost.prototype.emit = function emit(resolver, filename, text) {
 
   return this._addDependencies(resolver, filename).then(function() {
     var output = this._services.getEmitOutput(filename);
-    if (output.emitOutputStatus === ts.EmitReturnStatus.Succeeded) {
+    if (output.emitOutputStatus === this.ts.EmitReturnStatus.Succeeded) {
       return output;
     } else {
       var diagnostics = this._services

lib/index.js

@@ -4,7 +4,6 @@
 'use strict';
 
 var Promise               = require('bluebird');
-var ts                    = require('typescript');
 var loaderUtils           = require('loader-utils');
 var path                  = require('path');
 var TypeScriptWebpackHost = require('./TypeScriptWebpackHost');
@@ -19,12 +18,18 @@ function typescriptLoader(text) {
 
   if (this._compiler.typeScriptWebpackHost === undefined) {
     var options = loaderUtils.parseQuery(this.query);
+    if (options.typescriptCompiler) {
+      var ts = require(options.typescriptCompiler);
+    } else {
+      var ts = require('typescript');
+    }
     if (options.target) {
-      options.target = parseOptionTarget(options.target);
+      options.target = parseOptionTarget(options.target, ts);
     }
     this._compiler.typeScriptWebpackHost = new TypeScriptWebpackHost(
       options,
-      this._compiler.inputFileSystem
+      this._compiler.inputFileSystem,
+      ts
     );
   }
 
@@ -66,7 +71,7 @@ function findResultFor(output, filename) {
   };
 }
 
-function parseOptionTarget(target) {
+function parseOptionTarget(target, ts) {
   target = target.toLowerCase();
   switch (target) {
     case 'es3':