Merge 31c11df into 2c8c006

typescript-ruby · Aug 18, 2016 · ae8d50f · ae8d50f
2 parents 2c8c006 + 31c11df
commit ae8d50f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/lib/typescript/rails/compiler.rb b/lib/typescript/rails/compiler.rb
@@ -58,7 +58,8 @@ def compile(ts_path, source, context=nil, *options)
       end
       s = replace_relative_references(ts_path, source)
       begin
-        ::TypeScript::Node.compile(s, *default_options, *options)
+        extension = File.extname(ts_path)
+        ::TypeScript::Node.compile(s, extension, *default_options, *options)
       rescue Exception => e
         raise "Typescript error in file '#{ts_path}':\n#{e.message}"
       end

diff --git a/lib/typescript/rails/railtie.rb b/lib/typescript/rails/railtie.rb
@@ -9,10 +9,11 @@ class Typescript::Rails::Railtie < ::Rails::Railtie
 
       if Sprockets.respond_to?(:register_engine)
         Sprockets.register_engine '.ts', Typescript::Rails::Template, silence_deprecation: true
+        Sprockets.register_engine '.tsx', Typescript::Rails::Template, silence_deprecation: true
       end
 
       if Sprockets.respond_to?(:register_transformer)
-        Sprockets.register_mime_type 'text/typescript', extensions: ['.ts']
+        Sprockets.register_mime_type 'text/typescript', extensions: ['.ts', '.tsx']
         Sprockets.register_transformer 'text/typescript', 'application/javascript', Typescript::Rails::Transformer
       end
     end

diff --git a/lib/typescript/rails/template_handler.rb b/lib/typescript/rails/template_handler.rb
@@ -18,4 +18,5 @@ def call(template)
 
 ActiveSupport.on_load(:action_view) do
   ActionView::Template.register_template_handler :ts, Typescript::Rails::TemplateHandler
+  ActionView::Template.register_template_handler :tsx, Typescript::Rails::TemplateHandler
 end